summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2015-04-13 12:58:12 +0200
committerBram Moolenaar <Bram@vim.org>2015-04-13 12:58:12 +0200
commit29d54df5cdd0ef4caa9c050854ddffdabece7a61 (patch)
tree3d232bc1e126595a25ec004b54e5a35646c9ce3a
parent5a5f45917dbf542cb00617fa5ef70a14898495dd (diff)
patch 7.4.694v7.4.694
Problem: Running tests changes the .viminfo file. Solution: Disable viminfo in the text objects test.
-rw-r--r--src/testdir/test_textobjects.in2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_textobjects.in b/src/testdir/test_textobjects.in
index d1cdafcd04..dc48efc67a 100644
--- a/src/testdir/test_textobjects.in
+++ b/src/testdir/test_textobjects.in
@@ -3,7 +3,7 @@ Tests for text-objects vim: set ft=vim :
STARTTEST
:so small.vim
:if !has('textobjects') | e! test.ok | wq! test.out | endif
-:set nocompatible
+:set nocp viminfo+=nviminfo
:"
:function SelectionOut(data)
: new
diff --git a/src/version.c b/src/version.c
index 9431180b11..5601c01449 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 */
/**/
+ 694,
+/**/
693,
/**/
692,