updated for version 7.3.1301

Problem:    Some tests fail on MS-Windows.
Solution:   Fix path separators in test 89 and 96.  Omit test 97, escaping
            works differently.  Make findfile() work on MS-Windows.

diff --git a/src/misc2.c b/src/misc2.c
index bc158088825775404f8a5268d471accc9fea4e9b..960de029c338cb6b4ad74d01bd9768d348577416 100644 (file)
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -4693,14 +4693,14 @@ vim_findfile_init(path, filename, stopdirs, level, free_visited, find_what,
 #ifdef FEAT_PATH_EXTRA
        else
        {
-           char_u *p =  vim_strrchr(search_ctx->ffsc_fix_path, PATHSEP);
+           char_u *p =  gettail(search_ctx->ffsc_fix_path);
            char_u *wc_path = NUL;
            char_u *temp = NUL;
            int    len = 0;
 
-           if (p != NULL)
+           if (p > search_ctx->ffsc_fix_path)
            {
-               len = p - search_ctx->ffsc_fix_path;
+               len = p - search_ctx->ffsc_fix_path - 1;
                STRNCAT(ff_expand_buffer, search_ctx->ffsc_fix_path, len);
                add_pathsep(ff_expand_buffer);
            }

diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 573a1df383351dbf0120867b45df8be6a2e480e7..012ca8febdb5bdd66841f0222015af1432692992 100644 (file)
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -11,7 +11,7 @@ VIMPROG = ..\\vim
 # test12       can't unlink a swap file
 # test25       uses symbolic link
 # test27       can't edit file with "*" in file name
-# test31       16 bit version runs out of memory...
+# test97       \{ and \$ are not escaped characters.
 
 SCRIPTS16 =    test1.out test19.out test20.out test22.out \
                test23.out test24.out test28.out test29.out \
@@ -32,7 +32,7 @@ SCRIPTS =     test3.out test4.out test5.out test6.out test7.out \
                test79.out test80.out test81.out test82.out test83.out \
                test84.out test85.out test86.out test87.out test88.out \
                test89.out test90.out test91.out test92.out test93.out \
-               test94.out test95.out test96.out test97.out
+               test94.out test95.out test96.out
 
 SCRIPTS32 =    test50.out test70.out
 

diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index 51c64efe83be551e60345bf8e89a613a68a40383..800603b317b3ab842f44f3788b340d88f61b146b 100644 (file)
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -28,7 +28,7 @@ VIMPROG = ..$(DIRSLASH)vim
 # test12       can't unlink a swap file
 # test25       uses symbolic link
 # test27       can't edit file with "*" in file name
-# test31       16 bit version runs out of memory...
+# test97       \{ and \$ are not escaped characters.
 
 SCRIPTS16 =    test1.out test19.out test20.out test22.out \
                test23.out test24.out test28.out test29.out \
@@ -52,7 +52,7 @@ SCRIPTS =     test3.out test4.out test5.out test6.out test7.out \
                test79.out test80.out test81.out test82.out test83.out \
                test84.out test85.out test86.out test87.out test88.out \
                test89.out test90.out test91.out test92.out test93.out \
-               test94.out test95.out test96.out test97.out
+               test94.out test95.out test96.out
 
 SCRIPTS32 =    test50.out test70.out
 

diff --git a/src/testdir/Make_os2.mak b/src/testdir/Make_os2.mak
index 8c45229ca251fb0fd0dc918ae8114890f4e0ab69..bb79c00ea5aedab52a01afd464584e8a5d52cb3c 100644 (file)
--- a/src/testdir/Make_os2.mak
+++ b/src/testdir/Make_os2.mak
@@ -15,6 +15,7 @@ VIMPROG = ../vim.exe
 # test52       only for Win32
 # test85       no Lua interface
 # test86, 87   no Python interface
+# test97       \{ and \$ are not escaped characters.
 
 SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
                test7.out test8.out test9.out \
@@ -33,7 +34,7 @@ SCRIPTS = test1.out test3.out test4.out test5.out test6.out \
                test76.out test77.out test78.out test79.out test80.out \
                test81.out test82.out test83.out test84.out test88.out \
                test89.out test90.out test91.out test92.out test93.out \
-               test94.out test95.out test96.out test97.out
+               test94.out test95.out test96.out
 
 .SUFFIXES: .in .out
 

diff --git a/src/testdir/test96.in b/src/testdir/test96.in
index c06caef6c3bd277511b2e6446cbe9b6d63e5047b..9d1a2c83a504a1143a4248e3d33218d98e570035 100644 (file)
--- a/src/testdir/test96.in
+++ b/src/testdir/test96.in
@@ -72,6 +72,8 @@ STARTTEST
 :wincmd n
 :wincmd K
 :b test.out
+:let fileName = substitute(fileName, '\\', '/', 'g')
+:let locationListFileName = substitute(locationListFileName, '\\', '/', 'g')
 :call append(line('$'), "Test A:")
 :call append(line('$'), "  - file name displayed: " . fileName)
 :call append(line('$'), "  - quickfix claims that the file name displayed is: " . locationListFileName)
@@ -125,6 +127,7 @@ STARTTEST
 :wincmd n
 :wincmd K
 :b test.out
+:let bufferName = substitute(bufferName, '\\', '/', 'g')
 :call append(line('$'), "Test C:")
 :call append(line('$'), "  - 'buftype' of the location list window: " . locationListWindowBufType)
 :call append(line('$'), "  - buffer displayed in the 2nd window: " . bufferName)

diff --git a/src/version.c b/src/version.c
index 10da53dfbde777fbe59d0e64953d64e1f169a4ad..1e9ab93460c8c06f508554e408c25c581b61d622 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1301,
 /**/
     1300,
 /**/