From 485dace817a99f4cf92a598845d27c8ee685df93 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 4 Jan 2016 12:45:29 +0100 Subject: patch 7.4.1049 Problem: Wordcount test still still fails on MS-Windows. Solution: Set 'fileformats' to "unix". --- src/testdir/test_wordcount.in | 2 +- src/version.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/testdir/test_wordcount.in b/src/testdir/test_wordcount.in index 45aa593aef..867277302d 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 e506309c27..bf37507ba9 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, /**/ -- cgit v1.2.3