summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-02-20 15:10:50 +0100
committerBram Moolenaar <Bram@vim.org>2016-02-20 15:10:50 +0100
commit663128270e6ea6b529c45ceee4b369734b8b2fdb (patch)
treeda81a5ce0b11312637070df76974fb6b4436a116
parentbefb366affa6309c6b4a469ec7f729821e3a36fa (diff)
patch 7.4.1366v7.4.1366
Problem: Typo in test and resulting error in test result. Solution: Fix the typo and correct the result. (James McCoy, close #650)
-rw-r--r--src/testdir/test_charsearch.in3
-rw-r--r--src/testdir/test_charsearch.ok2
-rw-r--r--src/version.c2
3 files changed, 5 insertions, 2 deletions
diff --git a/src/testdir/test_charsearch.in b/src/testdir/test_charsearch.in
index df53107e0e..4643a55a71 100644
--- a/src/testdir/test_charsearch.in
+++ b/src/testdir/test_charsearch.in
@@ -14,7 +14,8 @@ fip:call setcharsearch(csave)
/^Z
ylfep:call setcharsearch({'char': 'k'})
;p:call setcharsearch({'forward': 0})
-$;p:call setcharseearch({'until'}: 1})
+$;p:call setcharsearch({'until': 1})
+:set cpo-=;
;;p:
:/^X/,$w! test.out
:qa!
diff --git a/src/testdir/test_charsearch.ok b/src/testdir/test_charsearch.ok
index a0c90e24f9..3b1843e5a0 100644
--- a/src/testdir/test_charsearch.ok
+++ b/src/testdir/test_charsearch.ok
@@ -1,3 +1,3 @@
XabcdeXfghijkeXmnopqreXtuvwxyz
YabcdeYfghiYjkeYmnopqreYtuvwxyz
-ZabcdeZfghijkZemnokZqretkZvwxyz
+ZabcdeZfghijkZZemnokqretkZvwxyz
diff --git a/src/version.c b/src/version.c
index b3a9eec1a0..19cd69cc8e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -748,6 +748,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1366,
+/**/
1365,
/**/
1364,