aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2016-04-26 22:34:12 -0400
committerJustin M. Keyes <justinkz@gmail.com>2016-04-26 22:37:00 -0400
commit0d6fe73d7b4dbba5bcea4559896c92f9c7e3f10a (patch)
tree71d72ff493aee81647602fcfa836c1dce312a19e
parent67d5a1aae2b4564cddc1883b01a926ab29b8be64 (diff)
downloadrneovim-0d6fe73d7b4dbba5bcea4559896c92f9c7e3f10a.tar.gz
rneovim-0d6fe73d7b4dbba5bcea4559896c92f9c7e3f10a.tar.bz2
rneovim-0d6fe73d7b4dbba5bcea4559896c92f9c7e3f10a.zip
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
-rw-r--r--src/nvim/testdir/runtest.vim1
-rw-r--r--src/nvim/version.c2
2 files changed, 2 insertions, 1 deletions
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