summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-06-17 22:04:38 +0200
committerBram Moolenaar <Bram@vim.org>2013-06-17 22:04:38 +0200
commita0c85c7ae1be04bcf5850fc88e5e42ab96b518a2 (patch)
treec063e9180d067b370ef0a0308ae3738b96456472 /src
parent555d2a83402a4dd21f0b353c757b3cde4a4e47de (diff)
downloadvim-git-a0c85c7ae1be04bcf5850fc88e5e42ab96b518a2.tar.gz
updated for version 7.3.1219v7.3.1219
Problem: No test for using []] inside \%[]. Solution: Add a test.
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test64.in1
-rw-r--r--src/testdir/test64.ok3
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/src/testdir/test64.in b/src/testdir/test64.in
index 061f1f1e7..7c141797d 100644
--- a/src/testdir/test64.in
+++ b/src/testdir/test64.in
@@ -367,6 +367,7 @@ STARTTEST
:call add(tl, [2, '\%[bar]x', 'bxx', 'bx'])
:call add(tl, [2, '\%[bar]x', 'xxx', 'x'])
:call add(tl, [2, 'b\%[[ao]r]', 'bar bor', 'bar'])
+:call add(tl, [2, 'b\%[[]]r]', 'b]r bor', 'b]r'])
:"
:"""" Alternatives, must use first longest match
:call add(tl, [2, 'goo\|go', 'google', 'goo'])
diff --git a/src/testdir/test64.ok b/src/testdir/test64.ok
index 7021d18b5..fa31c8a84 100644
--- a/src/testdir/test64.ok
+++ b/src/testdir/test64.ok
@@ -839,6 +839,9 @@ OK 2 - \%[bar]x
OK 0 - b\%[[ao]r]
OK 1 - b\%[[ao]r]
OK 2 - b\%[[ao]r]
+OK 0 - b\%[[]]r]
+OK 1 - b\%[[]]r]
+OK 2 - b\%[[]]r]
OK 0 - goo\|go
OK 1 - goo\|go
OK 2 - goo\|go
diff --git a/src/version.c b/src/version.c
index 09f58715f..883962daa 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 */
/**/
+ 1219,
+/**/
1218,
/**/
1217,