patch 7.4.1698

Problem:    Two tests fail when running tests with MinGW. (Michael Soyka)
Solution:   Convert test_getcwd.ok test_wordcount.ok to unix fileformat.

diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index 030d52780c7d7ba94e6feba057c9542906d9abfb..3c92d8cedc258cf2cb0c1d44cae037056ce1cfae 100644 (file)
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -65,9 +65,11 @@ win32:       fixff $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32)
        echo ALL DONE
 
 fixff:
+       # TODO: find a way to avoid changing the distributed files.
        -$(VIMPROG) -u dos.vim $(NO_PLUGIN) "+argdo set ff=dos|upd" +q *.in *.ok
        -$(VIMPROG) -u dos.vim $(NO_PLUGIN) "+argdo set ff=unix|upd" +q \
-               dotest.in test60.ok test71.ok test74.ok test_listchars.ok
+               dotest.in test60.ok test71.ok test74.ok test_listchars.ok \
+               test_getcwd.ok test_wordcount.ok
 
 clean:
        -$(DEL) *.out

diff --git a/src/version.c b/src/version.c
index cfca22ed6c5751193153e0cf096ffc59bba8cd67..19e44d87cec9c25854a0a7089b6a56a1f4dac50c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1698,
 /**/
     1697,
 /**/