From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 1 Dec 2015 19:19:26 +0000 (+0100)
Subject: patch 7.4.947
X-Git-Tag: v7.4.947
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5311c02f25eed8f34e8a80becb98e86264f371c3;p=vim

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 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
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    947,
 /**/
     946,
 /**/