summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-07-09 15:38:32 +0200
committerBram Moolenaar <Bram@vim.org>2016-07-09 15:38:32 +0200
commitfc4ad616073a169badfb2b9906fee2844f76f730 (patch)
tree5eb84c0a9bd1bf140532d4b85fc9a29ec5590e23 /src
parent30445cb6e94698d212ba866ef3e4022ac625540a (diff)
downloadvim-git-fc4ad616073a169badfb2b9906fee2844f76f730.tar.gz
patch 7.4.2007v7.4.2007
Problem: Running the tests leaves a viminfo file behind. Solution: Make the viminfo option empty.
Diffstat (limited to 'src')
-rw-r--r--src/testdir/runtest.vim3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 57edcc17c..c094da031 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -149,6 +149,9 @@ for s:test in sort(s:tests)
endif
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/version.c b/src/version.c
index 89e8c7f76..5305beecf 100644
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2007,
+/**/
2006,
/**/
2005,