summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2013-06-26 21:56:36 +0200
committerBram Moolenaar <bram@vim.org>2013-06-26 21:56:36 +0200
commit297ac998173ccb0a0199d417910762efff538b4a (patch)
treec39583dc09b4d53fc06a377cae4197a66a06acbe
parent43a6b2d760509fb2f039455a000f5b318c7cc36b (diff)
downloadvim-297ac998173ccb0a0199d417910762efff538b4a.tar.gz
updated for version 7.3.1251v7.3.1251v7-3-1251
Problem: Test 61 messes up viminfo. Solution: Specify a separate viminfo file.
-rw-r--r--src/testdir/test61.in2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test61.in b/src/testdir/test61.in
index 2602e975..422adb89 100644
--- a/src/testdir/test61.in
+++ b/src/testdir/test61.in
@@ -85,7 +85,7 @@ ggO---:0put b
ggO---:0put a
ggO---:w >>test.out
:so small.vim
-:set nocp
+:set nocp viminfo+=nviminfo
:enew!
oa
:set ul=100
diff --git a/src/version.c b/src/version.c
index 365deedf..a83e923b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1251,
+/**/
1250,
/**/
1249,