From: Bram Moolenaar <Bram@vim.org>
Date: Sun, 25 Nov 2018 03:25:58 +0000 (+0100)
Subject: patch 8.1.0546: modeline test with keymap fails
X-Git-Tag: v8.1.0546
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ace6ab7e72151d78f1563b23b498ed20fa00211;p=vim

patch 8.1.0546: modeline test with keymap fails

Problem:    Modeline test with keymap fails.
Solution:   Check that the keymap feature is available.
---

diff --git a/src/testdir/test_modeline.vim b/src/testdir/test_modeline.vim
index c1eb99153..d29bbb50b 100644
--- a/src/testdir/test_modeline.vim
+++ b/src/testdir/test_modeline.vim
@@ -44,6 +44,9 @@ func Test_modeline_syntax()
 endfunc
 
 func Test_modeline_keymap()
+  if !has('keymap')
+    return
+  endif
   call writefile(['vim: set keymap=greek :', 'nothing'], 'Xmodeline_keymap')
   let modeline = &modeline
   set modeline
diff --git a/src/version.c b/src/version.c
index 42ce472dc..ce8595e3c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -792,6 +792,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    546,
 /**/
     545,
 /**/