changeset 7492:26d13d73837f v7.4.1048

commit https://github.com/vim/vim/commit/c7803a1c42228566ee2e2efcd621b21d0a8ed3ea Author: Bram Moolenaar <Bram@vim.org> Date: Mon Jan 4 12:26:23 2016 +0100 patch 7.4.1048 Problem: Wordcount test still fail on MS-Windows. Solution: Set 'fileformat' to "unix".
author Christian Brabandt <cb@256bit.org>
date Mon, 04 Jan 2016 12:30:04 +0100
parents a924d469a0d7
children a1d8efb15dcf
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
+:set selection=inclusive fileformat=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 */
 /**/
+    1048,
+/**/
     1047,
 /**/
     1046,