summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-04-24 15:47:15 +0200
committerBram Moolenaar <Bram@vim.org>2013-04-24 15:47:15 +0200
commit2ab0713279c26f23718a2913e92e22957833fe35 (patch)
tree863e93d841b3ce1e8aa70cc5f5ee0a16057bdfc5
parentf687cf3f363cc1cbe73b61524ff8dac03aeb65a0 (diff)
downloadvim-git-2ab0713279c26f23718a2913e92e22957833fe35.tar.gz
updated for version 7.3.914v7.3.914
Problem: ~/.viminfo is messed up when running tests. Solution: Set the viminfo filename.
-rw-r--r--src/testdir/test89.in2
-rw-r--r--src/testdir/test94.in2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 2 deletions
diff --git a/src/testdir/test89.in b/src/testdir/test89.in
index 122165d4f..4306edda5 100644
--- a/src/testdir/test89.in
+++ b/src/testdir/test89.in
@@ -2,7 +2,7 @@ Some tests for setting 'number' and 'relativenumber'
STARTTEST
:so small.vim
-:set hidden nocp nu rnu
+:set hidden nocp nu rnu viminfo+=nviminfo
:redir @a | set nu? rnu? | redir END
:e! xx
:redir @b | set nu? rnu? | redir END
diff --git a/src/testdir/test94.in b/src/testdir/test94.in
index 1d32f554f..27cab473d 100644
--- a/src/testdir/test94.in
+++ b/src/testdir/test94.in
@@ -17,7 +17,7 @@ Test cases:
STARTTEST
:so small.vim
-:set nocp
+:set nocp viminfo+=nviminfo
:
:" User functions
:function MoveToCap()
diff --git a/src/version.c b/src/version.c
index bc36d412e..adab0a83b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 914,
+/**/
913,
/**/
912,