diff --git a/src/misc2.c b/src/misc2.c
index bc15808..960de02 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -4693,14 +4693,14 @@
 #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 573a1df..012ca8f 100644
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -11,7 +11,7 @@
 # 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 @@
 		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 51c64ef..800603b 100644
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -28,7 +28,7 @@
 # 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 @@
 		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 8c45229..bb79c00 100644
--- a/src/testdir/Make_os2.mak
+++ b/src/testdir/Make_os2.mak
@@ -15,6 +15,7 @@
 # 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 @@
 		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 c06caef..9d1a2c8 100644
--- a/src/testdir/test96.in
+++ b/src/testdir/test96.in
@@ -72,6 +72,8 @@
 :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 @@
 :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 10da53d..1e9ab93 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1301,
+/**/
     1300,
 /**/
     1299,