aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLucas Hoffmann <l-m-h@web.de>2016-02-13 11:40:03 +0100
committerJustin M. Keyes <justinkz@gmail.com>2016-02-20 10:52:02 -0500
commit1b8caf3d75872492bada77966f86957f850edc8e (patch)
treee60fe8934e55dec9da2a223970b4ff0dffd989d4
parent4a02dc082805fa8eb5b2a72d36c5d82a3a742aca (diff)
downloadrneovim-1b8caf3d75872492bada77966f86957f850edc8e.tar.gz
rneovim-1b8caf3d75872492bada77966f86957f850edc8e.tar.bz2
rneovim-1b8caf3d75872492bada77966f86957f850edc8e.zip
test: charsearch: Fix error/typo in legacy test.
Error was reported upstream in vim/vim#650, fixed in 7.4.1366. Typo was fixed upstream in 7.4.1041.
-rw-r--r--src/nvim/version.c4
-rw-r--r--test/functional/legacy/charsearch_spec.lua6
2 files changed, 6 insertions, 4 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 3b75135b72..7d4b8982cd 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -69,6 +69,8 @@ static char *features[] = {
// clang-format off
static int included_patches[] = {
+ 1366,
+
// 1219 NA
// 1218 NA
// 1217 NA
@@ -247,7 +249,7 @@ static int included_patches[] = {
// 1044 NA,
// 1043 NA,
// 1042,
- // 1041,
+ 1041,
// 1040 NA,
// 1039,
// 1038 NA,
diff --git a/test/functional/legacy/charsearch_spec.lua b/test/functional/legacy/charsearch_spec.lua
index 36682a9ce3..4a83801cfc 100644
--- a/test/functional/legacy/charsearch_spec.lua
+++ b/test/functional/legacy/charsearch_spec.lua
@@ -23,20 +23,20 @@ describe('charsearch', function()
feed('fip')
execute('call setcharsearch(csave)')
feed(';p;p')
- -- Check that setcharsearch() changes the settins.
+ -- Check that setcharsearch() changes the settings.
execute('/^Z')
feed('ylfep')
execute("call setcharsearch({'char': 'k'})")
feed(';p')
execute("call setcharsearch({'forward': 0})")
feed('$;p')
- execute("call setcharseearch({'until'}: 1})")
+ execute("call setcharsearch({'until': 1})")
feed(';;p')
-- Assert buffer contents.
expect([[
XabcdeXfghijkeXmnopqreXtuvwxyz
YabcdeYfghiYjkeYmnopqreYtuvwxyz
- ZabcdeZfghijkZemnokZqretkZvwxyz]])
+ ZabcdeZfghijkZZemnokqretkZvwxyz]])
end)
end)