From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 2 Apr 2016 20:24:20 +0000 (+0200)
Subject: patch 7.4.1698
X-Git-Tag: v7.4.1698
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=298c65971e884666d57c32bff6b730d517d9dc30;p=vim

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 030d52780..3c92d8ced 100644
--- 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 cfca22ed6..19e44d87c 100644
--- 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,
 /**/