diff options
| author | Bram Moolenaar <Bram@vim.org> | 2015-12-01 20:19:26 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2015-12-01 20:19:26 +0100 |
| commit | 5311c02f25eed8f34e8a80becb98e86264f371c3 (patch) | |
| tree | 5ebc18c3a548e897e3571f0687580a6f50a429eb | |
| parent | bbfbaf9741deebb9f1ed790885bd571c4cbce17a (diff) | |
| download | vim-git-5311c02f25eed8f34e8a80becb98e86264f371c3.tar.gz | |
patch 7.4.947v7.4.947
Problem: Test_listchars fails with MingW. (Michael Soyka)
Solution: Add the test to the ones that need the fileformat fixed.
(Christian Brabandt)
| -rw-r--r-- | src/testdir/Make_ming.mak | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak index 047c778cb..bfbb5c23e 100644 --- a/src/testdir/Make_ming.mak +++ b/src/testdir/Make_ming.mak @@ -120,7 +120,7 @@ win32: fixff $(SCRIPTS16) $(SCRIPTS) $(SCRIPTS32) fixff: -$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=dos|upd" +q *.in *.ok -$(VIMPROG) -u dos.vim --noplugin "+argdo set ff=unix|upd" +q \ - dotest.in test60.ok test71.ok test74.ok + dotest.in test60.ok test71.ok test74.ok test_listchars.ok clean: -$(DEL) *.out diff --git a/src/version.c b/src/version.c index 2fbc3c7b3..a8526bf67 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 */ /**/ + 947, +/**/ 946, /**/ 945, |