updated for version 7.3.335

Problem:    When 'imdisable' is reset from an autocommand in Insert mode it
            doesn't take effect.
Solution:   Call im_set_active() in Insert mode. (Taro Muraoka)

diff --git a/src/option.c b/src/option.c
index 977d83802be4499b2fadc4def988e21016adf601..f76b0f9ee4eae70f99b4628a387baed637189187 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -7806,6 +7806,10 @@ set_bool_option(opt_idx, varp, value, opt_flags)
        /* Only de-activate it here, it will be enabled when changing mode. */
        if (p_imdisable)
            im_set_active(FALSE);
+       else if (State & INSERT)
+           /* When the option is set from an autocommand, it may need to take
+            * effect right away. */
+           im_set_active(curbuf->b_p_iminsert == B_IMODE_IM);
     }
 #endif
 

diff --git a/src/version.c b/src/version.c
index f63a90888b2372d88ce51460aeca687bfb5c2f6f..15d461f4b40a945fab0eec4c3679b5573a8824e0 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -709,6 +709,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    335,
 /**/
     334,
 /**/