summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-07-15 13:33:21 +0200
committerBram Moolenaar <Bram@vim.org>2011-07-15 13:33:21 +0200
commit37a02ca1c2ecd5cbc5678d901c7bc55e8da0604f (patch)
tree527eecc9b8c7ba525b8b64c91f78a52d4fa813e1
parent19fd09a78fd0959ad60ff03a2324c974e0f5cc44 (diff)
updated for version 7.3.247v7.3.247
Problem: Running tests changes the users viminfo file. Test for patch 7.3.245 missing. Solution: Add "nviminfo" to the 'viminfo' option. Include the test.
-rw-r--r--src/testdir/test78.in2
-rw-r--r--src/testdir/test81.in6
-rw-r--r--src/version.c2
3 files changed, 8 insertions, 2 deletions
diff --git a/src/testdir/test78.in b/src/testdir/test78.in
index bcbc972432..1850bd9236 100644
--- a/src/testdir/test78.in
+++ b/src/testdir/test78.in
@@ -6,7 +6,7 @@ blocks.
STARTTEST
:so small.vim
-:set nocp fileformat=unix undolevels=-1
+:set nocp fileformat=unix undolevels=-1 viminfo+=nviminfo
:e! Xtest
ggdG
:let text = "\tabcdefghijklmnoparstuvwxyz0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789abcdefghijklmnoparstuvwxyz0123456789"
diff --git a/src/testdir/test81.in b/src/testdir/test81.in
index e47653fd9e..82a6892a1d 100644
--- a/src/testdir/test81.in
+++ b/src/testdir/test81.in
@@ -1,10 +1,12 @@
Test for t movement command and 'cpo-;' setting
STARTTEST
-:set nocompatible
+:set nocompatible viminfo+=nviminfo
:set cpo-=;
/firstline/
j0tt;D
+0fz;D
+$Fy;D
$Ty;D:set cpo+=;
j0tt;;D
$Ty;;D:?firstline?+1,$w! test.out
@@ -13,6 +15,8 @@ ENDTEST
firstline
aaa two three four
+ zzz
+yyy
bbb yee yoo four
ccc two three four
ddd yee yoo four
diff --git a/src/version.c b/src/version.c
index 2f4e229d83..fcc37ccb0d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 247,
+/**/
246,
/**/
245,