From: Bram Moolenaar Date: Mon, 22 Feb 2016 21:05:32 +0000 (+0100) Subject: patch 7.4.1392 X-Git-Tag: v7.4.1392 X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=2cd5bb2505acc001933e97cf788f473f8db60895;p=thirdparty%2Fvim.git patch 7.4.1392 Problem: Some tests fail for Win32 console version. Solution: Move the tests to SCRIPTS_MORE2. Pass VIMRUNTIME. (Christian Brabandt) --- diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak index bb92904bf0..3e645e7ed5 100644 --- a/src/testdir/Make_all.mak +++ b/src/testdir/Make_all.mak @@ -15,7 +15,6 @@ SCRIPTS_ALL = \ test7.out \ test8.out \ test9.out \ - test13.out \ test14.out \ test15.out \ test18.out \ @@ -104,7 +103,6 @@ SCRIPTS_ALL = \ test_insertcount.out \ test_listchars.out \ test_listlbr.out \ - test_listlbr_utf8.out \ test_mapping.out \ test_marks.out \ test_match_conceal.out \ @@ -135,9 +133,11 @@ SCRIPTS_MORE2 = \ test2.out \ test10.out \ test12.out \ + test13.out \ test25.out \ test49.out \ - test97.out + test97.out \ + test_listlbr_utf8.out # Tests that run on most systems, but not MingW and Cygwin. diff --git a/src/version.c b/src/version.c index 7af412b03b..b545581842 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 */ +/**/ + 1392, /**/ 1391, /**/