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 030d527..3c92d8c 100644
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -65,9 +65,11 @@
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 cfca22e..19e44d8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -749,6 +749,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1698,
+/**/
1697,
/**/
1696,