commit 485dace817a99f4cf92a598845d27c8ee685df93
author Bram Moolenaar <Bram@vim.org> Mon Jan 04 12:45:29 2016 +0100
committer Bram Moolenaar <Bram@vim.org> Mon Jan 04 12:45:29 2016 +0100
tree b7a87b864f34a8e176b210af89c76be696be6de4
parent c7803a1c42228566ee2e2efcd621b21d0a8ed3ea

patch 7.4.1049
Problem:    Wordcount test still still fails on MS-Windows.
Solution:   Set 'fileformats' to "unix".

src/testdir/test_wordcount.in

diff --git a/src/testdir/test_wordcount.in b/src/testdir/test_wordcount.in
index 45aa593..8672773 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 fileformat=unix
+:set selection=inclusive fileformat=unix fileformats=unix
 :new
 :fu DoRecordWin(...)
 :	wincmd k

src/version.c

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