commit 4cf56bbc85f77846aeb378cfb071677336dfad6d
author Bram Moolenaar <Bram@vim.org> Sat Sep 16 15:50:32 2017 +0200
committer Bram Moolenaar <Bram@vim.org> Sat Sep 16 15:50:32 2017 +0200
tree 8cf708785053605920262a97a7295dc7d93ca4be
parent eef9adddab4c7fc7bb1c54267e76849caf565edf

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)

src/option.c

diff --git a/src/option.c b/src/option.c
index a0367e7..828d9eb 100644
--- a/src/option.c
+++ b/src/option.c
@@ -1591,19 +1591,11 @@
 			    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)

src/version.c

diff --git a/src/version.c b/src/version.c
index 6ea93a0..90aa45c 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1114,
+/**/
     1113,
 /**/
     1112,