summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 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
@@ -793,6 +793,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 546,
+/**/
545,
/**/
544,