summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-01-17 17:10:59 +0100
committerBram Moolenaar <Bram@vim.org>2016-01-17 17:10:59 +0100
commita99b90437af730dcafd9143c0942c87777a00d52 (patch)
treec1916f7044cdeb260cf5fe6d4ed5c9d6d5dbacd8
parentd82103ed8534a1207742e9666ac7ef1e47dda12d (diff)
patch 7.4.1118v7.4.1118
Problem: Tests hang in 24 line terminal. Solution: Set the 'more' option off.
-rw-r--r--src/testdir/runtest.vim1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 2a9231abcc..686a4df625 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -84,6 +84,7 @@ else
endif
" Locate Test_ functions and execute them.
+set nomore
redir @q
function /^Test_
redir END
diff --git a/src/version.c b/src/version.c
index ee4ec0e016..26cd06e8d1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1118,
+/**/
1117,
/**/
1116,