aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoroni-link <knil.ino@gmail.com>2014-05-22 11:29:18 +0200
committerJustin M. Keyes <justinkz@gmail.com>2014-06-05 18:23:21 -0400
commit1057b29c8ce2c86727a63b0eecde8196ce63832c (patch)
treecb42bf3faa851f4be7d468d13e480e6bf26a1aac /src
parent29eb651a92ded3e3f008d6853f3df6693f296576 (diff)
downloadrneovim-1057b29c8ce2c86727a63b0eecde8196ce63832c.tar.gz
rneovim-1057b29c8ce2c86727a63b0eecde8196ce63832c.tar.bz2
rneovim-1057b29c8ce2c86727a63b0eecde8196ce63832c.zip
vim-patch:7.4.282 #747
Problem: Test 97 fails on Mac. Solution: Do not ignore case in file names. (Jun Takimoto) https://code.google.com/p/vim/source/detail?r=6d0a1132dd71c7f55f7ed53fe99e97c79bfd05a4
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,