patch 7.4.1118

Problem:    Tests hang in 24 line terminal.
Solution:   Set the 'more' option off.

diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 2a9231abcc6dbfa33ac048682480bc4f8e8c2d0b..686a4df6256bf9eb90cd55aa0bd17283d9269d5e 100644 (file)
--- 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 ee4ec0e016d89e8352e6c6cd8a26c382d59f5cf6..26cd06e8d1649aa58f409e5eec962b121d52420f 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1118,
 /**/
     1117,
 /**/