summaryrefslogtreecommitdiff
path: root/src/testdir
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-09-05 21:15:44 +0200
committerBram Moolenaar <Bram@vim.org>2013-09-05 21:15:44 +0200
commit9be44818921a9255b3a26bf5566f1939bf38804e (patch)
treecd2a5c6c48160403089fd5f764b94c071ee7f96d /src/testdir
parent78c93e4b6a87720a50ac14c40aa077ed6b86145b (diff)
downloadvim-9be44818921a9255b3a26bf5566f1939bf38804e.zip
updated for version 7.4.021
Problem: NFA regexp: Using \ze in one branch which doesn't match may cause end of another branch to be wrong. (William Fugh) Solution: Set end position if it wasn't set yet.
Diffstat (limited to 'src/testdir')
-rw-r--r--src/testdir/test64.in1
-rw-r--r--src/testdir/test64.ok3
2 files changed, 4 insertions, 0 deletions
diff --git a/src/testdir/test64.in b/src/testdir/test64.in
index 8f7008c1a..e694995cf 100644
--- a/src/testdir/test64.in
+++ b/src/testdir/test64.in
@@ -328,6 +328,7 @@ STARTTEST
:call add(tl, [2, 'abc \zsmatch\ze abc', 'abc abc abc match abc abc', 'match'])
:call add(tl, [2, '\v(a \zsif .*){2}', 'a if then a if last', 'if last', 'a if last'])
:call add(tl, [2, '\>\zs.', 'aword. ', '.'])
+:call add(tl, [2, '\s\+\ze\[/\|\s\zs\s\+', 'is [a t', ' '])
:"
:"""" Tests for \@= and \& features
:call add(tl, [2, 'abc\@=', 'abc', 'ab'])
diff --git a/src/testdir/test64.ok b/src/testdir/test64.ok
index fa83f91af..3d117b995 100644
--- a/src/testdir/test64.ok
+++ b/src/testdir/test64.ok
@@ -752,6 +752,9 @@ OK 2 - \v(a \zsif .*){2}
OK 0 - \>\zs.
OK 1 - \>\zs.
OK 2 - \>\zs.
+OK 0 - \s\+\ze\[/\|\s\zs\s\+
+OK 1 - \s\+\ze\[/\|\s\zs\s\+
+OK 2 - \s\+\ze\[/\|\s\zs\s\+
OK 0 - abc\@=
OK 1 - abc\@=
OK 2 - abc\@=