diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2016-02-20 10:52:18 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-02-20 10:52:18 -0500 |
| commit | 44024f2c65d98bb0956e7d126a695247ecca023b (patch) | |
| tree | e60fe8934e55dec9da2a223970b4ff0dffd989d4 /src | |
| parent | 3e3db580fdd397678c613009bd348e9a3ea38eaa (diff) | |
| parent | 1b8caf3d75872492bada77966f86957f850edc8e (diff) | |
| download | rneovim-44024f2c65d98bb0956e7d126a695247ecca023b.tar.gz rneovim-44024f2c65d98bb0956e7d126a695247ecca023b.tar.bz2 rneovim-44024f2c65d98bb0956e7d126a695247ecca023b.zip | |
Merge #4249 'tests: migrate charsearch'
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/testdir/Makefile | 1 | ||||
| -rw-r--r-- | src/nvim/testdir/test_charsearch.in | 25 | ||||
| -rw-r--r-- | src/nvim/testdir/test_charsearch.ok | 3 | ||||
| -rw-r--r-- | src/nvim/version.c | 4 |
4 files changed, 3 insertions, 30 deletions
diff --git a/src/nvim/testdir/Makefile b/src/nvim/testdir/Makefile index f077414e18..9dd18ab63e 100644 --- a/src/nvim/testdir/Makefile +++ b/src/nvim/testdir/Makefile @@ -25,7 +25,6 @@ SCRIPTS := \ test88.out \ test_listlbr.out \ test_breakindent.out \ - test_charsearch.out \ test_close_count.out \ test_marks.out \ test_match_conceal.out \ diff --git a/src/nvim/testdir/test_charsearch.in b/src/nvim/testdir/test_charsearch.in deleted file mode 100644 index 5085cb39bc..0000000000 --- a/src/nvim/testdir/test_charsearch.in +++ /dev/null @@ -1,25 +0,0 @@ -Test for character searches - -STARTTEST -:so small.vim -:" check that "fe" and ";" work -/^X -ylfep;;p,,p: -:" check that save/restore works -/^Y -ylfep:let csave = getcharsearch() -fip:call setcharsearch(csave) -;p;p: -:" check that setcharsearch() changes the settins. -/^Z -ylfep:call setcharsearch({'char': 'k'}) -;p:call setcharsearch({'forward': 0}) -$;p:call setcharseearch({'until'}: 1}) -;;p: -:/^X/,$w! test.out -:qa! -ENDTEST - -Xabcdefghijkemnopqretuvwxyz -Yabcdefghijkemnopqretuvwxyz -Zabcdefghijkemnokqretkvwxyz diff --git a/src/nvim/testdir/test_charsearch.ok b/src/nvim/testdir/test_charsearch.ok deleted file mode 100644 index a0c90e24f9..0000000000 --- a/src/nvim/testdir/test_charsearch.ok +++ /dev/null @@ -1,3 +0,0 @@ -XabcdeXfghijkeXmnopqreXtuvwxyz -YabcdeYfghiYjkeYmnopqreYtuvwxyz -ZabcdeZfghijkZemnokZqretkZvwxyz 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, |