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
commit6bf7c523ad54f625547ef2cc6009c28c0dd337ed (patch)
treeb673497df760b6507967cdfbbbba2d59154a1bb1
parent1c93429c48c59e22aa8e9cd76f102063799db938 (diff)
downloadvim-git-6bf7c523ad54f625547ef2cc6009c28c0dd337ed.tar.gz
updated for version 7.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 f9d903e51..d2869317f 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 9ead88c5a..18c41c747 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,