aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwatiko <service@mail.watiko.net>2015-12-13 22:40:23 +0900
committerwatiko <service@mail.watiko.net>2016-01-10 09:01:30 +0900
commit2586459118ca589c8393121a5d3696802ed1a606 (patch)
tree07aad71053a58f96552633e8ef99a76d142e2fc6
parent47fac915f3a994f11cf94f1ada47b50e078615fc (diff)
downloadrneovim-2586459118ca589c8393121a5d3696802ed1a606.tar.gz
rneovim-2586459118ca589c8393121a5d3696802ed1a606.tar.bz2
rneovim-2586459118ca589c8393121a5d3696802ed1a606.zip
vim-patch:7.4.953
Problem: When a test script navigates to another buffer the .res file is created with the wrong name. Solution: Use the "testname" for the .res file. (Damien) https://github.com/vim/vim/commit/de0ad40cb3c1bc691a754698ed16a5b6cdb4086b
-rw-r--r--src/nvim/testdir/runtest.vim2
-rw-r--r--src/nvim/version.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim
index 8589bf6935..0dc142eb97 100644
--- a/src/nvim/testdir/runtest.vim
+++ b/src/nvim/testdir/runtest.vim
@@ -76,7 +76,7 @@ endfor
if fail == 0
" Success, create the .res file so that make knows it's done.
- split %:r.res
+ exe 'split ' . fnamemodify(testname, ':r') . '.res'
write
endif
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 3f87517f47..4ba901cc0f 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -116,7 +116,7 @@ static int included_patches[] = {
// 956,
// 955,
// 954 NA
- // 953,
+ 953,
// 952,
// 951,
950,