diff src/option.c @ 12469:61d910f0999d v8.0.1114

patch 8.0.1114: default for 'iminsert' is annoying commit https://github.com/vim/vim/commit/4cf56bbc85f77846aeb378cfb071677336dfad6d Author: Bram Moolenaar <Bram@vim.org> Date: Sat Sep 16 15:50:32 2017 +0200 patch 8.0.1114: default for 'iminsert' is annoying Problem: Default for 'iminsert' is annoying. Solution: Make the default always zero. (Yasuhiro Matsumoto, closes https://github.com/vim/vim/issues/2071)
author Christian Brabandt <cb@256bit.org>
date Sat, 16 Sep 2017 16:00:04 +0200
parents 1890536614ea
children 68d7bc045dbe
line wrap: on
line diff
--- 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)