patch 7.4.1424

Problem:    Not using --not-a-term when running tests on MS-Windows.
Solution:   Use NO_PLUGIN. (Christian Brabandt)

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

diff --git a/src/version.c b/src/version.c
index 5e246f9dd477290f5f0e27ef96a6008945013b2e..fe580e0448089809404f79ed73fb1e2fe935d429 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1424,
 /**/
     1423,
 /**/