From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 27 Jan 2015 16:12:00 +0000 (+0100)
Subject: updated for version 7.4.604
X-Git-Tag: v7.4.604
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bf7c523ad54f625547ef2cc6009c28c0dd337ed;p=thirdparty%2Fvim.git

updated for version 7.4.604
Problem:    Running tests changes viminfo.
Solution:   Disable viminfo.
---

diff --git a/src/testdir/test_breakindent.in b/src/testdir/test_breakindent.in
index f9d903e51b..d2869317f2 100644
--- a/src/testdir/test_breakindent.in
+++ b/src/testdir/test_breakindent.in
@@ -100,7 +100,7 @@ fygjyl:let line2 = @0
 :$put =line2
 :"
 :let g:test="Test 14: breakindent + visual blockwise delete #1"
-:set all& breakindent
+:set all& breakindent viminfo+=nviminfo
 :30vnew
 :normal! 3a1234567890
 :normal! a    abcde
diff --git a/src/version.c b/src/version.c
index 9ead88c5a0..18c41c7479 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    604,
 /**/
     603,
 /**/