patch 7.4.1048

Problem:    Wordcount test still fail on MS-Windows.
Solution:   Set 'fileformat' to "unix".

diff --git a/src/testdir/test_wordcount.in b/src/testdir/test_wordcount.in
index 449545bab6558071c18470ff4c586152698b3cc3..45aa593aef3f8f72ceb968987705d680bce9e19d 100644 (file)
--- a/src/testdir/test_wordcount.in
+++ b/src/testdir/test_wordcount.in
@@ -4,7 +4,7 @@ STARTTEST
 :so small.vim
 :so mbyte.vim
 :set enc=utf8
-:set selection=inclusive
+:set selection=inclusive fileformat=unix
 :new
 :fu DoRecordWin(...)
 :      wincmd k

diff --git a/src/version.c b/src/version.c
index 9f1ab1b2ea223c8a706c161ff817cefcac0ccccb..e506309c2776c6dc0d1257a31f90fffbb696e2c1 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 */
+/**/
+    1048,
 /**/
     1047,
 /**/