summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2018-11-25 05:06:48 +0100
committerBram Moolenaar <Bram@vim.org>2018-11-25 05:06:48 +0100
commit3067a4dd0d768d1e4a47cf3c100f3e2b462717d7 (patch)
tree29efcafdadeb416b9883250d6522455cb8eaf636
parent4ace6ab7e72151d78f1563b23b498ed20fa00211 (diff)
downloadvim-git-3067a4dd0d768d1e4a47cf3c100f3e2b462717d7.tar.gz
patch 8.1.0547: modeline test with keymap still failsv8.1.0547
Problem: Modeline test with keymap still fails. Solution: Check that the keymap feature is available for the failure assert.
-rw-r--r--src/testdir/test_modeline.vim3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/testdir/test_modeline.vim b/src/testdir/test_modeline.vim
index d29bbb50b..e0f97c443 100644
--- a/src/testdir/test_modeline.vim
+++ b/src/testdir/test_modeline.vim
@@ -87,5 +87,8 @@ func Test_modeline_syntax_fails()
endfunc
func Test_modeline_keymap_fails()
+ if !has('keymap')
+ return
+ endif
call s:modeline_fails('keymap', 'keymap=evil$CMD')
endfunc
diff --git a/src/version.c b/src/version.c
index ce8595e3c..3207af3b4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -793,6 +793,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 547,
+/**/
546,
/**/
545,