summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-07-21 22:03:02 +0200
committerBram Moolenaar <Bram@vim.org>2016-07-21 22:03:02 +0200
commitf36213597d737ab500771e87edcf121acd55e277 (patch)
tree44b39891cddc08432c086862738a6e01fca412c1
parente25bc5abb4621c6263b0248988a207d53b57fc54 (diff)
patch 7.4.2088v7.4.2088
Problem: Keymap test fails with normal features. Solution: Bail out if the keymap feature is not supported.
-rw-r--r--src/testdir/test_digraph.vim3
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/src/testdir/test_digraph.vim b/src/testdir/test_digraph.vim
index 2840229007..95500853f2 100644
--- a/src/testdir/test_digraph.vim
+++ b/src/testdir/test_digraph.vim
@@ -437,6 +437,9 @@ func! Test_digraphs_output()
endfunc
func! Test_loadkeymap()
+ if !has('keymap')
+ return
+ endif
new
set keymap=czech
set iminsert=0
diff --git a/src/version.c b/src/version.c
index 8f60ccd411..8883c29f08 100644
--- a/src/version.c
+++ b/src/version.c
@@ -759,6 +759,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2088,
+/**/
2087,
/**/
2086,