patch 7.4.947

Problem:    Test_listchars fails with MingW. (Michael Soyka)
Solution:   Add the test to the ones that need the fileformat fixed.
            (Christian Brabandt)

diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index 047c778cb0a5aea5fff49c2ba58451ddea298cbd..bfbb5c23e22fbcf7441c1e086444f343c414d258 100644 (file)
--- 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 2fbc3c7b34afa9ea48f65de4f41b8200b9fdb925..a8526bf674d54b02d3284c913dbac08ef185c9d5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    947,
 /**/
     946,
 /**/