From: Bram Moolenaar Date: Fri, 26 Feb 2016 14:56:42 +0000 (+0100) Subject: patch 7.4.1424 X-Git-Tag: v7.4.1424 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0c0dac1fb134309462b263fd5347d9232bfe36ed;p=thirdparty%2Fvim.git 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 bfd624c512..66cf12f2e1 100644 --- 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 5e246f9dd4..fe580e0448 100644 --- 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, /**/