From c69bbc09642a579bfb5f9db6899b4f2454d32f9d Mon Sep 17 00:00:00 2001
From: lonerover <pathfinder1644@yahoo.com>
Date: Wed, 4 Jan 2017 12:53:32 +0800
Subject: 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
---
 src/nvim/testdir/test_digraph.vim | 3 +++
 src/nvim/version.c                | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

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,
-- 
cgit