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 33fc3451b71e56cc55f34929017f25119ea0b205..81e196c1df84004537c533596f69932b172ed1f8 100644 (file)
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -139,7 +139,6 @@ SCRIPTS_MORE2 = \
        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 c39e450d5c2ba7667a6cc802b62158c5ea3289a0..cea4699cad51deaf5fb89805bc50b5fc935fe023 100644 (file)
--- a/src/testdir/Make_amiga.mak
+++ b/src/testdir/Make_amiga.mak
@@ -15,7 +15,6 @@ include Make_all.mak
 # 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 f6e45d83eb2db0b44183f09113e88d302a59fe04..47f9d222304ebe7ec683d1c7a8dbbd08711d1fe5 100644 (file)
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -14,7 +14,6 @@ default: nongui
 # 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 88e72b15e2ca2391a02d242303c84e623be2f3b9..b4ebaebe91fc166d3a78aead1021bf736d0c70cc 100644 (file)
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -35,7 +35,6 @@ include Make_all.mak
 # 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 fd64c98fc3e3e9892f993c72c19915ae9d30e5cb..2a9231abcc6dbfa33ac048682480bc4f8e8c2d0b 100644 (file)
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -43,6 +43,9 @@ set nomore
 " 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 fd999db1b70d30ef02fed66dec481b20f3ed250b..a68c4226f0b9704c4a8a65b842ad718a5ed16829 100644 (file)
--- a/src/testdir/test_expand.vim
+++ b/src/testdir/test_expand.vim
@@ -16,8 +16,10 @@ func Test_with_directories()
 
   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 a5831bfa9bbad7013c82f895f603981bb23dd08c..ac54f8496ba600fc0b467b33d8ce4316362941de 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1111,
 /**/
     1110,
 /**/