summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvimboss <devnull@localhost>2008-02-20 09:58:18 +0000
committervimboss <devnull@localhost>2008-02-20 09:58:18 +0000
commit2a1fa18a2425f1247957349383266ed96afec3e2 (patch)
treedb003e88fb89a082ca5802d0cad9fef86768c709
parent7ec028955e4ca5c039b831a97742c02c7cbae7f1 (diff)
downloadvim-2a1fa18a2425f1247957349383266ed96afec3e2.tar.gz
updated for version 7.1-254v7.1.254v7-1-254
-rw-r--r--src/testdir/test49.in1
-rw-r--r--src/testdir/test55.in2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 1 deletions
diff --git a/src/testdir/test49.in b/src/testdir/test49.in
index 22191b21..bd6cb4ca 100644
--- a/src/testdir/test49.in
+++ b/src/testdir/test49.in
@@ -6,6 +6,7 @@ test49.failed, try to add one ore more "G"s at the line ending in "test.out"
STARTTEST
:so small.vim
:se nocp nomore viminfo+=nviminfo
+:lang mess C
:so test49.vim
GGGGGGGGGGGGGG"rp:.-,$w! test.out
:"
diff --git a/src/testdir/test55.in b/src/testdir/test55.in
index 22437625..7d0008e7 100644
--- a/src/testdir/test55.in
+++ b/src/testdir/test55.in
@@ -146,7 +146,7 @@ let l = [0, 1, 2, 3]
:try
: let n = d[1500]
:catch
-: $put =v:exception[:14] . v:exception[-4:-1]
+: $put =substitute(v:exception, '\v(.{14}).*( \d{4}).*', '\1\2', '')
:endtry
:" lookup each items
:for i in range(1500)
diff --git a/src/version.c b/src/version.c
index dc7a05a3..02e108e4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 254,
+/**/
253,
/**/
252,