aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/nvim/testdir/test97.in3
-rw-r--r--src/nvim/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/nvim/testdir/test97.in b/src/nvim/testdir/test97.in
index 13e9dd5b6e..59bb62d15c 100644
--- a/src/nvim/testdir/test97.in
+++ b/src/nvim/testdir/test97.in
@@ -3,7 +3,10 @@ characters.
STARTTEST
:so small.vim
+:" make sure glob() doesn't use the shell
:set shell=doesnotexist
+:" consistent sorting of file names
+:set nofileignorecase
:e test.out
:put =glob('Xxx\{')
:put =glob('Xxx\$')
diff --git a/src/nvim/version.c b/src/nvim/version.c
index f1c7cfec91..5c261c4240 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -205,7 +205,7 @@ static int included_patches[] = {
285,
//284,
//283,
- //282,
+ 282,
281,
280,
//279,