summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/option.c10
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 9 deletions
diff --git a/src/option.c b/src/option.c
index a0367e73f..828d9eb46 100644
--- 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 6ea93a0dc..90aa45c0f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1114,
+/**/
1113,
/**/
1112,