aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Ennen <brcolow@users.noreply.github.com>2016-06-12 21:05:42 -0700
committerJustin M. Keyes <justinkz@gmail.com>2016-06-13 00:05:42 -0400
commit0ea01c15861eb6952b5db45f6a6b6ef507954e5b (patch)
tree3309e67aa73caae9c28a7f43702c2926714fdf51 /src
parente247e3acdd3e3559af2a24dd4b7092f02d4afbcb (diff)
downloadrneovim-0ea01c15861eb6952b5db45f6a6b6ef507954e5b.tar.gz
rneovim-0ea01c15861eb6952b5db45f6a6b6ef507954e5b.tar.bz2
rneovim-0ea01c15861eb6952b5db45f6a6b6ef507954e5b.zip
vim-patch:7.4.1352 (#4914)
Problem: The test script lists all functions before executing them. Solution: Only list the function currently being executed. https://github.com/vim/vim/commit/93bf558caef2d507ef6baf56eaf6025b63da1e34
Diffstat (limited to 'src')
-rw-r--r--src/nvim/testdir/runtest.vim3
-rw-r--r--src/nvim/version.c2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim
index 2712fb9371..578d64efde 100644
--- a/src/nvim/testdir/runtest.vim
+++ b/src/nvim/testdir/runtest.vim
@@ -61,12 +61,13 @@ endif
" Locate Test_ functions and execute them.
set nomore
redir @q
-function /^Test_
+silent function /^Test_
redir END
let tests = split(substitute(@q, 'function \(\k*()\)', '\1', 'g'))
" Execute the tests in alphabetical order.
for test in sort(tests)
+ echo 'Executing ' . test
if exists("*SetUp")
call SetUp()
endif
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 1a66589080..04a6f63451 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -341,7 +341,7 @@ static int included_patches[] = {
// 1355 NA
// 1354 NA
// 1353 NA
- // 1352,
+ 1352,
// 1351 NA
// 1350 NA
// 1349 NA