changeset 7494:b4419a42ac32 v7.4.1049

commit https://github.com/vim/vim/commit/485dace817a99f4cf92a598845d27c8ee685df93 Author: Bram Moolenaar <Bram@vim.org> Date: Mon Jan 4 12:45:29 2016 +0100 patch 7.4.1049 Problem: Wordcount test still still fails on MS-Windows. Solution: Set 'fileformats' to "unix".
author Christian Brabandt <cb@256bit.org>
date Mon, 04 Jan 2016 13:00:04 +0100
parents a1d8efb15dcf
children 8407aae08d67
files src/testdir/test_wordcount.in src/version.c
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1049,
+/**/
     1048,
 /**/
     1047,