summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvimboss <devnull@localhost>2007-07-07 11:58:28 +0000
committervimboss <devnull@localhost>2007-07-07 11:58:28 +0000
commit2a24f6054ce760b8eb5e61fbea590b46bf769124 (patch)
tree9f52ec3a98af84c4568324800a1dd3cadadc07d3
parent57d16fabe30ebb72f6859dcae08a6f449a5596bb (diff)
downloadvim-2a24f6054ce760b8eb5e61fbea590b46bf769124.tar.gz
updated for version 7.1-022v7.1.022v7-1-022
-rw-r--r--src/digraph.c5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/digraph.c b/src/digraph.c
index 79960f7b..e557680e 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 3772ef6c..3a14e640 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 22,
+/**/
21,
/**/
20,