diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-04 12:26:23 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-04 12:26:23 +0100 |
| commit | c7803a1c42228566ee2e2efcd621b21d0a8ed3ea (patch) | |
| tree | f175978edd01b54538bb2623726c690785b2414a | |
| parent | 7f68203168aeb22fcf8a5a9680503fe16759ebd4 (diff) | |
patch 7.4.1048v7.4.1048
Problem: Wordcount test still fail on MS-Windows.
Solution: Set 'fileformat' to "unix".
| -rw-r--r-- | src/testdir/test_wordcount.in | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_wordcount.in b/src/testdir/test_wordcount.in index 449545bab6..45aa593aef 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 9f1ab1b2ea..e506309c27 100644 --- 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, |