aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2020-04-25 20:41:08 -0400
committerGitHub <noreply@github.com>2020-04-25 20:41:08 -0400
commit2238b2a88fbe93f927214f3c9b244a45c144c5cf (patch)
treeae6143b08bd8187893adc1c53cece57678064c63
parent1b42e95ece3a062b66f34d9f5f4509fcc9e161f1 (diff)
parent229a836d9b8a559e42bf1b8b6844d972a1a7afd2 (diff)
downloadrneovim-2238b2a88fbe93f927214f3c9b244a45c144c5cf.tar.gz
rneovim-2238b2a88fbe93f927214f3c9b244a45c144c5cf.tar.bz2
rneovim-2238b2a88fbe93f927214f3c9b244a45c144c5cf.zip
Merge #12181 from janlazo/vim-8.2.0635
vim-patch:8.2.{635,638}
-rw-r--r--src/nvim/syntax.c2
-rw-r--r--src/nvim/testdir/test_messages.vim3
2 files changed, 4 insertions, 1 deletions
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index ddb9188371..ef4dfb3caa 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -6400,7 +6400,7 @@ static int color_numbers_88[28] = { 0, 4, 2, 6,
75, 11, 78, 15, -1 };
// for xterm with 256 colors...
static int color_numbers_256[28] = { 0, 4, 2, 6,
- 1, 5, 130, 130,
+ 1, 5, 130, 3,
248, 248, 7, 7,
242, 242,
12, 81, 10, 121,
diff --git a/src/nvim/testdir/test_messages.vim b/src/nvim/testdir/test_messages.vim
index aad21c002f..7fbf04311d 100644
--- a/src/nvim/testdir/test_messages.vim
+++ b/src/nvim/testdir/test_messages.vim
@@ -6,6 +6,9 @@ function Test_messages()
set nomore
" Avoid the "message maintainer" line.
let $LANG = ''
+ let $LC_ALL = ''
+ let $LC_MESSAGES = ''
+ let $LC_COLLATE = ''
let arr = map(range(10), '"hello" . v:val')
for s in arr