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 1885bd7ed20178722bf179b3480ad3957837a9d0..84474d920c42054540aee9a4a6e5c6f82e1d9b7f 100644 (file)
--- 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 f4a14503197a0ceee6a6cedcad5c85d2d563eaf6..94ff8b1dac013b0fc33a0a074baa47a50d72db86 100644 (file)
--- 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 51068b43236cf3745f3989b2cae86080631108c5..c3c932381a82f8818b07e12dee9e074295bea0e3 100644 (file)
--- 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,
 /**/