aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlonerover <pathfinder1644@yahoo.com>2017-01-04 12:53:32 +0800
committerJames McCoy <jamessan@jamessan.com>2017-02-09 22:14:04 -0500
commitc69bbc09642a579bfb5f9db6899b4f2454d32f9d (patch)
treef201af9977bc9feecb0604a0b653b4d6363e30f5
parent1861f12a5fe2efd4c1747b1870d7d0740fef55f5 (diff)
downloadrneovim-c69bbc09642a579bfb5f9db6899b4f2454d32f9d.tar.gz
rneovim-c69bbc09642a579bfb5f9db6899b4f2454d32f9d.tar.bz2
rneovim-c69bbc09642a579bfb5f9db6899b4f2454d32f9d.zip
vim-patch:7.4.2088
Problem: Keymap test fails with normal features. Solution: Bail out if the keymap feature is not supported. https://github.com/vim/vim/commit/f36213597d737ab500771e87edcf121acd55e277
-rw-r--r--src/nvim/testdir/test_digraph.vim3
-rw-r--r--src/nvim/version.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/nvim/testdir/test_digraph.vim b/src/nvim/testdir/test_digraph.vim
index 2840229007..95500853f2 100644
--- a/src/nvim/testdir/test_digraph.vim
+++ b/src/nvim/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/nvim/version.c b/src/nvim/version.c
index d8292a9aae..73b5c96be0 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -352,7 +352,7 @@ static int included_patches[] = {
// 2091 NA
// 2090,
// 2089 NA
- // 2088,
+ 2088,
2087,
2086,
2085,