From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 4 Jan 2016 11:26:23 +0000 (+0100)
Subject: patch 7.4.1048
X-Git-Tag: v7.4.1048
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c7803a1c42228566ee2e2efcd621b21d0a8ed3ea;p=vim

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 449545bab..45aa593ae 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
+:set selection=inclusive fileformat=unix
 :new
 :fu DoRecordWin(...)
 :	wincmd k
diff --git a/src/version.c b/src/version.c
index 9f1ab1b2e..e506309c2 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 */
+/**/
+    1048,
 /**/
     1047,
 /**/