summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-05-08 11:46:27 +0200
committerBram Moolenaar <Bram@vim.org>2014-05-08 11:46:27 +0200
commitb7547420a4fa576cfc6fb8b620bfc05ba8429f38 (patch)
tree22fcbb4b12c8a9afa73313d5705ad286a5837221 /src
parent04ad7fe05c1c15c31949022d48e3008158f0657a (diff)
downloadvim-b7547420a4fa576cfc6fb8b620bfc05ba8429f38.zip
updated for version 7.4.282
Problem: Test 97 fails on Mac. Solution: Do not ignore case in file names. (Jun Takimoto)
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test97.in3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/testdir/test97.in b/src/testdir/test97.in
index c25176b07..d4ff6d929 100644
--- a/src/testdir/test97.in
+++ b/src/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/version.c b/src/version.c
index 6da67a187..fb0689bf8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 282,
+/**/
281,
/**/
280,