From 0d6fe73d7b4dbba5bcea4559896c92f9c7e3f10a Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 26 Apr 2016 22:34:12 -0400
Subject: vim-patch:7.4.1118

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

https://github.com/vim/vim/commit/a99b90437af730dcafd9143c0942c87777a00d52
---
 src/nvim/testdir/runtest.vim | 1 +
 src/nvim/version.c           | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim
index 1c610eab51..6601dcf52f 100644
--- a/src/nvim/testdir/runtest.vim
+++ b/src/nvim/testdir/runtest.vim
@@ -62,6 +62,7 @@ else
 endif
 
 " Locate Test_ functions and execute them.
+set nomore
 redir @q
 function /^Test_
 redir END
diff --git a/src/nvim/version.c b/src/nvim/version.c
index e913d84223..89aef16f07 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -559,7 +559,7 @@ static int included_patches[] = {
   // 1121,
   1120,
   // 1119,
-  // 1118,
+  1118,
   1117,
   1116,
   // 1115 NA
-- 
cgit