summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-02-01 23:17:36 +0100
committerBram Moolenaar <Bram@vim.org>2017-02-01 23:17:36 +0100
commit7a073549a3b1e72037a4e98ceb406d057ac9ba50 (patch)
tree9e723a81d548367c5ad326e8a29cf49c5ae168a9
parent79da563cf9220b9abb83455a68d995684133ea56 (diff)
downloadvim-git-7a073549a3b1e72037a4e98ceb406d057ac9ba50.tar.gz
patch 8.0.0295: test_viml hangsv8.0.0295
Problem: test_viml hangs. Solution: Put resetting 'more' before sourcing the script.
-rw-r--r--src/testdir/runtest.vim4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 43192c450..33490b61b 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -57,6 +57,9 @@ else
set encoding=latin1
endif
+" Avoid stopping at the "hit enter" prompt
+set nomore
+
" Output all messages in English.
lang mess C
@@ -168,7 +171,6 @@ let s:flaky = [
\ ]
" Locate Test_ functions and execute them.
-set nomore
redir @q
silent function /^Test_
redir END
diff --git a/src/version.c b/src/version.c
index 4a796bfc2..4dc4cd81d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 295,
+/**/
294,
/**/
293,