From 7a4c9dc1c22c8cafba9c33cb7c085b7d0b467226 Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Sun, 3 Dec 2017 00:14:18 +0800
Subject: vim-patch:8.0.0295 (#7671)

Problem:    test_viml hangs.
Solution:   Put resetting 'more' before sourcing the script.

https://github.com/vim/vim/commit/7a073549a3b1e72037a4e98ceb406d057ac9ba50
---
 src/nvim/testdir/runtest.vim | 1 -
 src/nvim/version.c           | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim
index 39ffabc024..4de1345679 100644
--- a/src/nvim/testdir/runtest.vim
+++ b/src/nvim/testdir/runtest.vim
@@ -203,7 +203,6 @@ let s:flaky = [
       \ ]
 
 " Locate Test_ functions and execute them.
-set nomore
 redir @q
 silent function /^Test_
 redir END
diff --git a/src/nvim/version.c b/src/nvim/version.c
index b228b8909d..96161c91ff 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -961,7 +961,7 @@ static const int included_patches[] = {
   // 298,
   297,
   // 296,
-  // 295,
+  295,
   294,
   // 293,
   292,
-- 
cgit