From bf4441798722b0eaf9010b6f5f37bdb0cd320404 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Sat, 7 Jul 2007 11:58:28 +0000
Subject: [PATCH] updated for version 7.1-022

---
 src/digraph.c | 5 +++--
 src/version.c | 2 ++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/digraph.c b/src/digraph.c
index 79960f7b37..e557680ec7 100644
--- 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 3772ef6cb3..3a14e6402a 100644
--- 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,
 /**/