summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-03-15 17:10:19 +0100
committerBram Moolenaar <Bram@vim.org>2016-03-15 17:10:19 +0100
commitce2ec0a82a778ff4d79a2c3309f6cac079d7b5ee (patch)
tree9383753723f0ffeada1a16ede4e2dff947c46679
parent85a7cb4dcf50aa562ff1fc872bfc1b50a5a9e368 (diff)
downloadvim-git-ce2ec0a82a778ff4d79a2c3309f6cac079d7b5ee.tar.gz
patch 7.4.1573v7.4.1573
Problem: Tests get stuck at the more prompt. Solution: Move the backspace test out of test_alot.
-rw-r--r--src/testdir/Make_all.mak1
-rw-r--r--src/testdir/test_alot.vim1
-rw-r--r--src/version.c2
3 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/Make_all.mak b/src/testdir/Make_all.mak
index 1885bd7ed..84474d920 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 f4a145031..94ff8b1da 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 51068b432..c3c932381 100644
--- a/src/version.c
+++ b/src/version.c
@@ -744,6 +744,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1573,
+/**/
1572,
/**/
1571,