From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 24 Apr 2013 13:47:15 +0000 (+0200)
Subject: updated for version 7.3.914
X-Git-Tag: v7.3.914
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2ab0713279c26f23718a2913e92e22957833fe35;p=thirdparty%2Fvim.git

updated for version 7.3.914
Problem:    ~/.viminfo is messed up when running tests.
Solution:   Set the viminfo filename.
---

diff --git a/src/testdir/test89.in b/src/testdir/test89.in
index 122165d4f0..4306edda59 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 1d32f554f0..27cab473da 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 bc36d412ef..adab0a83ba 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    914,
 /**/
     913,
 /**/