summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2015-01-27 17:12:00 +0100
committerBram Moolenaar <bram@vim.org>2015-01-27 17:12:00 +0100
commit58483268804e3b9dc1e1a64e5be7948463aa1758 (patch)
treeaad877f72039c43a0748ce29918f5ce617a15e58
parent56f6fc098fcb8231cddfd8263377be3a70ee36b7 (diff)
downloadvim-58483268804e3b9dc1e1a64e5be7948463aa1758.tar.gz
updated for version 7.4.604v7.4.604v7-4-604
Problem: Running tests changes viminfo. Solution: Disable viminfo.
-rw-r--r--src/testdir/test_breakindent.in2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_breakindent.in b/src/testdir/test_breakindent.in
index f9d903e5..d2869317 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 9ead88c5..18c41c74 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 604,
+/**/
603,
/**/
602,