commit c7803a1c42228566ee2e2efcd621b21d0a8ed3ea
author Bram Moolenaar <Bram@vim.org> Mon Jan 04 12:26:23 2016 +0100
committer Bram Moolenaar <Bram@vim.org> Mon Jan 04 12:26:23 2016 +0100
tree f175978edd01b54538bb2623726c690785b2414a
parent 7f68203168aeb22fcf8a5a9680503fe16759ebd4

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

src/testdir/test_wordcount.in

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

src/version.c

diff --git a/src/version.c b/src/version.c
index 9f1ab1b..e506309 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1048,
+/**/
     1047,
 /**/
     1046,