updated for version 7.2-131

diff --git a/src/option.c b/src/option.c
index 87497ea6a4c7892d0c5bf5eafa28c64814e64f0c..d3912f83b3ee1f894acccf55d6802907bd7b0a57 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -5797,14 +5797,28 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf,
        /* load or unload key mapping tables */
        errmsg = keymap_init();
 
-       /* When successfully installed a new keymap switch on using it. */
-       if (*curbuf->b_p_keymap != NUL && errmsg == NULL)
-       {
-           curbuf->b_p_iminsert = B_IMODE_LMAP;
-           if (curbuf->b_p_imsearch != B_IMODE_USE_INSERT)
-               curbuf->b_p_imsearch = B_IMODE_LMAP;
-           set_iminsert_global();
-           set_imsearch_global();
+       if (errmsg == NULL)
+       {
+           if (*curbuf->b_p_keymap != NUL)
+           {
+               /* Installed a new keymap, switch on using it. */
+               curbuf->b_p_iminsert = B_IMODE_LMAP;
+               if (curbuf->b_p_imsearch != B_IMODE_USE_INSERT)
+                   curbuf->b_p_imsearch = B_IMODE_LMAP;
+           }
+           else
+           {
+               /* Cleared the keymap, may reset 'iminsert' and 'imsearch'. */
+               if (curbuf->b_p_iminsert == B_IMODE_LMAP)
+                   curbuf->b_p_iminsert = B_IMODE_NONE;
+               if (curbuf->b_p_imsearch == B_IMODE_LMAP)
+                   curbuf->b_p_imsearch = B_IMODE_USE_INSERT;
+           }
+           if ((opt_flags & OPT_LOCAL) == 0)
+           {
+               set_iminsert_global();
+               set_imsearch_global();
+           }
 # ifdef FEAT_WINDOWS
            status_redraw_curbuf();
 # endif

diff --git a/src/version.c b/src/version.c
index b0022781877ebf1c9898dabf9c62174e137b3881..a8783b9cee9b78163c371e0a77f51538cedbe2f0 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    131,
 /**/
     130,
 /**/