patch 8.0.1114: default for 'iminsert' is annoying

Problem:    Default for 'iminsert' is annoying.
Solution:   Make the default always zero. (Yasuhiro Matsumoto, closes #2071)

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 859fbe8f75c8e741467d9f8516aae48aa1768557..3072793b72da9ab0fd1fa7738b1c63bc0d7c4964 100644 (file)
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4299,7 +4299,7 @@ A jump table for the options with a short description can be found at |Q_op|.
        may change in later releases.
 
                                                *'iminsert'* *'imi'*
-'iminsert' 'imi'       number (default 0, 2 when an input method is supported)
+'iminsert' 'imi'       number (default 0)
                        local to buffer
                        {not in Vi}
        Specifies whether :lmap or an Input Method (IM) is to be used in
@@ -4322,7 +4322,7 @@ A jump table for the options with a short description can be found at |Q_op|.
        methods.  Use 'imdisable' to disable XIM then.
 
                                                *'imsearch'* *'ims'*
-'imsearch' 'ims'       number (default 0, 2 when an input method is supported)
+'imsearch' 'ims'       number (default -1)
                        local to buffer
                        {not in Vi}
        Specifies whether :lmap or an Input Method (IM) is to be used when

diff --git a/src/option.c b/src/option.c
index a0367e73f49662e254fc15431b49c835095a8c1f..828d9eb46464903eb26031a47d1f3523ba2ec07b 100644 (file)
--- a/src/option.c
+++ b/src/option.c
@@ -1591,19 +1591,11 @@ static struct vimoption options[] =
                            SCRIPTID_INIT},
     {"iminsert",    "imi",  P_NUM|P_VI_DEF,
                            (char_u *)&p_iminsert, PV_IMI,
-#ifdef B_IMODE_IM
-                           {(char_u *)B_IMODE_IM, (char_u *)0L}
-#else
                            {(char_u *)B_IMODE_NONE, (char_u *)0L}
-#endif
                            SCRIPTID_INIT},
     {"imsearch",    "ims",  P_NUM|P_VI_DEF,
                            (char_u *)&p_imsearch, PV_IMS,
-#ifdef B_IMODE_IM
-                           {(char_u *)B_IMODE_IM, (char_u *)0L}
-#else
-                           {(char_u *)B_IMODE_NONE, (char_u *)0L}
-#endif
+                           {(char_u *)B_IMODE_USE_INSERT, (char_u *)0L}
                            SCRIPTID_INIT},
     {"imstatusfunc","imsf",P_STRING|P_VI_DEF|P_SECURE,
 #if defined(FEAT_EVAL) && defined(FEAT_XIM) && defined(FEAT_GUI_GTK)

diff --git a/src/version.c b/src/version.c
index 6ea93a0dcb1dfbc5b10f1804cf8e6a9910b7a4e6..90aa45c0f46e24ac1da58399c1c5d14596753065 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1114,
 /**/
     1113,
 /**/