updated for version 7.1-022

diff --git a/src/digraph.c b/src/digraph.c
index 79960f7b3754277ac9a026a9844c8a1b7fc88185..e557680ec78a20a45391a17816558e197630f983 100644 (file)
--- a/src/digraph.c
+++ b/src/digraph.c
@@ -2349,8 +2349,10 @@ keymap_init()
 
     if (*curbuf->b_p_keymap == NUL)
     {
-       /* Stop any active keymap and clear the table. */
+       /* Stop any active keymap and clear the table.  Also remove
+        * b:keymap_unload, as no keymap is active now. */
        keymap_unload();
+       do_cmdline_cmd((char_u *)"unlet! b:keymap_name");
     }
     else
     {
@@ -2500,7 +2502,6 @@ keymap_unload()
 
     ga_clear(&curbuf->b_kmap_ga);
     curbuf->b_kmap_state &= ~KEYMAP_LOADED;
-    do_cmdline_cmd((char_u *)"unlet! b:keymap_name");
 #ifdef FEAT_WINDOWS
     status_redraw_curbuf();
 #endif

diff --git a/src/version.c b/src/version.c
index 3772ef6cb38713f27cd25a601e1ccbce17ccb52b..3a14e6402a724eecc08aef64dd79fcde770da033 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    22,
 /**/
     21,
 /**/