patch 7.4.2168

Problem:    Not running the startup test on MS-Windows.
Solution:   Write vimcmd.

diff --git a/src/testdir/Make_dos.mak b/src/testdir/Make_dos.mak
index 66cf12f2e1e3e8c4090fe68e7d5e9b80bad219d7..b6aaa6e68fa8fdec24fdba3af71216a0722d2924 100644 (file)
--- a/src/testdir/Make_dos.mak
+++ b/src/testdir/Make_dos.mak
@@ -114,4 +114,6 @@ bench_re_freeze.out: bench_re_freeze.vim
 newtests: $(NEW_TESTS)
 
 .vim.res:
+       @echo "$(VIMPROG)" > vimcmd
        $(VIMPROG) -u NONE $(NO_PLUGIN) -S runtest.vim $*.vim
+       @del vimcmd

diff --git a/src/testdir/Make_ming.mak b/src/testdir/Make_ming.mak
index c2c0239524304fb5a90e2d6f852d97c75867364f..33306910add014a7dd9278f24356f3359f796896 100644 (file)
--- a/src/testdir/Make_ming.mak
+++ b/src/testdir/Make_ming.mak
@@ -48,21 +48,21 @@ $(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS_WIN32) $(NEW_TESTS): $(SCRIPTS_FIRST)
 .SUFFIXES: .in .out .res .vim
 
 vimall:        fixff $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI) $(SCRIPTS_WIN32) newtests
-       echo ALL DONE
+       @echo ALL DONE
 
 nongui:        fixff nolog $(SCRIPTS_FIRST) $(SCRIPTS) newtests
-       echo ALL DONE
+       @echo ALL DONE
 
 benchmark: $(SCRIPTS_BENCH)
 
 small: nolog
-       echo ALL DONE
+       @echo ALL DONE
 
 gui:   fixff nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_GUI) newtests
-       echo ALL DONE
+       @echo ALL DONE
 
 win32: fixff nolog $(SCRIPTS_FIRST) $(SCRIPTS) $(SCRIPTS_WIN32) newtests
-       echo ALL DONE
+       @echo ALL DONE
 
 # TODO: find a way to avoid changing the distributed files.
 fixff:
@@ -117,5 +117,7 @@ bench_re_freeze.out: bench_re_freeze.vim
 newtests: $(NEW_TESTS)
 
 .vim.res:
+       @echo "$(VIMPROG)" > vimcmd
        $(VIMPROG) -u NONE $(NO_PLUGIN) -S runtest.vim $*.vim
+       @$(DEL) vimcmd
 

diff --git a/src/version.c b/src/version.c
index d5623c4cd7c639b64d7ae613cd06f6d2f3392a68..1b55e4fba556685882adc2cd461a7a0f0f78274d 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -763,6 +763,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2168,
 /**/
     2167,
 /**/