diff options
| author | KunMing Xie <qqzz014@gmail.com> | 2017-12-03 00:14:18 +0800 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2017-12-02 17:14:18 +0100 |
| commit | 7a4c9dc1c22c8cafba9c33cb7c085b7d0b467226 (patch) | |
| tree | d03b7748b3082f65826c691f36e2b1b43f263a74 /src | |
| parent | 4b83f3791257c0aecff6c35dbe9a644a1a72418c (diff) | |
| download | rneovim-7a4c9dc1c22c8cafba9c33cb7c085b7d0b467226.tar.gz rneovim-7a4c9dc1c22c8cafba9c33cb7c085b7d0b467226.tar.bz2 rneovim-7a4c9dc1c22c8cafba9c33cb7c085b7d0b467226.zip | |
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
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/testdir/runtest.vim | 1 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 1 insertions, 2 deletions
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, |