patch 7.4.986

Problem:    Test49 doesn't work on MS-Windows.  test70 is listed twice.
Solution:   Move test49 to the group not used on Amiga and MS-Windows.
            Remove test70 from SCRIPTS_WIN32.

diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index c88ed1c2f780607fa31e23624db1d57eb69443c8..d0e277df8dce0d73963d7385d40e7e33cd9e336a 100644 (file)
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -127,7 +127,6 @@ SCRIPTS_ALL = \
 # Tests that run on most systems, but not on Amiga.
 SCRIPTS_MORE1 = \
        test11.out \
-       test49.out \
        test52.out \
        test85.out \
        test86.out \
@@ -141,6 +140,7 @@ SCRIPTS_MORE2 = \
        test12.out \
        test25.out \
        test27.out \
+       test49.out \
        test97.out
 
 
@@ -163,7 +163,7 @@ SCRIPTS_MORE4 = \
 
 
 # Tests specifically for MS-Windows.
-SCRIPTS_WIN32 = test50.out test70.out
+SCRIPTS_WIN32 = test50.out
 
 
 # Tests for the GUI.

diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 6e92668c8bd2170514964e2e282df8224f23066d..b907fe7051e13c9a07b108af827e68349e0e985c 100644 (file)
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -13,6 +13,7 @@ VIMPROG = ..\\vim
 # 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.
 
 SCRIPTS = $(SCRIPTS_ALL) $(SCRIPTS_MORE1) $(SCRIPTS_MORE3) $(SCRIPTS_MORE4)

diff --git a/src/version.c b/src/version.c
index d46aeae6a67274d7850f06951b8ff75cdb7ddbba..8412461771df7182647565d9dbd2cadfcacd2ad4 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 */
+/**/
+    986,
 /**/
     985,
 /**/