From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 4 Jan 2016 11:45:29 +0000 (+0100)
Subject: patch 7.4.1049
X-Git-Tag: v7.4.1049
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=485dace817a99f4cf92a598845d27c8ee685df93;p=vim

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

diff --git a/src/testdir/test_wordcount.in b/src/testdir/test_wordcount.in
index 45aa593ae..867277302 100644
--- 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 fileformat=unix
+:set selection=inclusive fileformat=unix fileformats=unix
 :new
 :fu DoRecordWin(...)
 :	wincmd k
diff --git a/src/version.c b/src/version.c
index e506309c2..bf37507ba 100644
--- 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 */
+/**/
+    1049,
 /**/
     1048,
 /**/