aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShougo Matsushita <Shougo.Matsu@gmail.com>2016-11-25 06:39:10 +0900
committerShougo Matsushita <Shougo.Matsu@gmail.com>2016-11-25 06:43:36 +0900
commitd24222cea82923cc69b190cefef5117aca890df2 (patch)
treebafa7ffd8a414568bdd190506aaef61df5ac5352
parent071a7d3d786af5b7be04a095e40327a064365550 (diff)
downloadrneovim-d24222cea82923cc69b190cefef5117aca890df2.tar.gz
rneovim-d24222cea82923cc69b190cefef5117aca890df2.tar.bz2
rneovim-d24222cea82923cc69b190cefef5117aca890df2.zip
vim-patch:7.4.2007
Problem: Running the tests leaves a viminfo file behind. Solution: Make the viminfo option empty. https://github.com/vim/vim/commit/fc4ad616073a169badfb2b9906fee2844f76f730
-rw-r--r--src/nvim/testdir/runtest.vim3
-rw-r--r--src/nvim/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim
index acd2037912..8b56d4007f 100644
--- a/src/nvim/testdir/runtest.vim
+++ b/src/nvim/testdir/runtest.vim
@@ -126,6 +126,9 @@ for s:test in sort(s:tests)
endfor
+" Don't write viminfo on exit.
+set viminfo=
+
if s:fail == 0
" Success, create the .res file so that make knows it's done.
exe 'split ' . fnamemodify(g:testname, ':r') . '.res'
diff --git a/src/nvim/version.c b/src/nvim/version.c
index a4d0c376ff..89928a88f4 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -435,7 +435,7 @@ static int included_patches[] = {
// 2010,
// 2009,
// 2008,
- // 2007,
+ 2007,
// 2006,
// 2005,
// 2004 NA