From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 15 Mar 2016 16:10:19 +0000 (+0100)
Subject: patch 7.4.1573
X-Git-Tag: v7.4.1573
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce2ec0a82a778ff4d79a2c3309f6cac079d7b5ee;p=thirdparty%2Fvim.git

patch 7.4.1573
Problem:    Tests get stuck at the more prompt.
Solution:   Move the backspace test out of test_alot.
---

diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index 1885bd7ed2..84474d920c 100644
--- a/src/testdir/Make_all.mak
+++ b/src/testdir/Make_all.mak
@@ -170,6 +170,7 @@ SCRIPTS_GUI = test16.out
 # Keep test_alot.res as the last one, sort the others.
 NEW_TESTS = test_arglist.res \
 	    test_assert.res \
+	    test_backspace_opt.res \
 	    test_cdo.res \
 	    test_channel.res \
 	    test_hardcopy.res \
diff --git a/src/testdir/test_alot.vim b/src/testdir/test_alot.vim
index f4a1450319..94ff8b1dac 100644
--- a/src/testdir/test_alot.vim
+++ b/src/testdir/test_alot.vim
@@ -2,7 +2,6 @@
 " This makes testing go faster, since Vim doesn't need to restart.
 
 source test_assign.vim
-source test_backspace_opt.vim
 source test_cursor_func.vim
 source test_delete.vim
 source test_expand.vim
diff --git a/src/version.c b/src/version.c
index 51068b4323..c3c932381a 100644
--- a/src/version.c
+++ b/src/version.c
@@ -743,6 +743,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1573,
 /**/
     1572,
 /**/