patch 7.4.1111
Problem: test_expand fails on MS-Windows.
Solution: Always use forward slashes. Remove references to test27.
diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index 33fc345..81e196c 100644
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -139,7 +139,6 @@
test10.out \
test12.out \
test25.out \
- test27.out \
test49.out \
test97.out
diff --git a/src/testdir/Make_amiga.mak b/src/testdir/Make_amiga.mak
index c39e450..cea4699 100644
--- a/src/testdir/Make_amiga.mak
+++ b/src/testdir/Make_amiga.mak
@@ -15,7 +15,6 @@
# test11 "cat" doesn't work properly
# test12 can't unlink a swap file
# test25 uses symbolic link
-# test27 can't edit file with "*"
# test52 only for Win32
# test85 no Lua interface
# test86, 87 no Python interface
diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index f6e45d8..47f9d22 100644
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -14,7 +14,6 @@
# test10 'errorformat' is different
# test12 can't unlink a swap file
# test25 uses symbolic link
-# test27 can't edit file with "*" in file name
# test49 fails in various ways
# test97 \{ and \$ are not escaped characters.
diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index 88e72b1..b4ebaeb 100644
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -35,7 +35,6 @@
# test10 'errorformat' is different
# test12 can't unlink a swap file
# test25 uses symbolic link
-# test27 can't edit file with "*" in file name
# test54 doesn't work yet
# test97 \{ and \$ are not escaped characters
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index fd64c98..2a9231a 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -43,6 +43,9 @@
" Output all messages in English.
lang mess C
+" Always use forward slashes.
+set shellslash
+
let s:srcdir = expand('%:p:h:h')
" Support function: get the alloc ID by name.
diff --git a/src/testdir/test_expand.vim b/src/testdir/test_expand.vim
index fd999db..a68c422 100644
--- a/src/testdir/test_expand.vim
+++ b/src/testdir/test_expand.vim
@@ -16,8 +16,10 @@
next Xdir?/*/file
call assert_equal('Xdir3/Xdir4/file', expand('%'))
- next! Xdir?/*/nofile
- call assert_equal('Xdir?/*/nofile', expand('%'))
+ if has('unix')
+ next! Xdir?/*/nofile
+ call assert_equal('Xdir?/*/nofile', expand('%'))
+ endif
call delete('Xdir1', 'rf')
call delete('Xdir2', 'rf')
diff --git a/src/version.c b/src/version.c
index a5831bf..ac54f84 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1111,
+/**/
1110,
/**/
1109,
