diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-04 12:45:29 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-04 12:45:29 +0100 |
| commit | 485dace817a99f4cf92a598845d27c8ee685df93 (patch) | |
| tree | b7a87b864f34a8e176b210af89c76be696be6de4 | |
| parent | c7803a1c42228566ee2e2efcd621b21d0a8ed3ea (diff) | |
patch 7.4.1049v7.4.1049
Problem: Wordcount test still still fails on MS-Windows.
Solution: Set 'fileformats' 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 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 @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1049, +/**/ 1048, /**/ 1047, |