diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-11-25 17:14:33 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-11-25 17:14:33 +0100 |
| commit | 819edbe078c8579f3620d12dac830f12ccdc5a45 (patch) | |
| tree | 9aeaacf944c52f62fb2caaed49c8319746e3dae6 /src/option.c | |
| parent | 50d43153a7e3e452cd166cde0d84ecacd316321f (diff) | |
patch 8.0.1338: USE_IM_CONTROL is confusing and incompletev8.0.1338
Problem: USE_IM_CONTROL is confusing and incomplete.
Solution: Just use FEAT_MBYTE. Call 'imactivatefunc' also without GUI.
Diffstat (limited to 'src/option.c')
| -rw-r--r-- | src/option.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/option.c b/src/option.c index ac0918dacc..a867608606 100644 --- a/src/option.c +++ b/src/option.c @@ -1539,7 +1539,7 @@ static struct vimoption options[] = (char_u *)&p_ic, PV_NONE, {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"imactivatefunc","imaf",P_STRING|P_VI_DEF|P_SECURE, -#if defined(FEAT_EVAL) && defined(USE_IM_CONTROL) +#if defined(FEAT_EVAL) && defined(FEAT_MBYTE) (char_u *)&p_imaf, PV_NONE, {(char_u *)"", (char_u *)NULL} # else @@ -1555,14 +1555,14 @@ static struct vimoption options[] = #endif {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, {"imcmdline", "imc", P_BOOL|P_VI_DEF, -#ifdef USE_IM_CONTROL +#ifdef FEAT_MBYTE (char_u *)&p_imcmdline, PV_NONE, #else (char_u *)NULL, PV_NONE, #endif {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, {"imdisable", "imd", P_BOOL|P_VI_DEF, -#ifdef USE_IM_CONTROL +#ifdef FEAT_MBYTE (char_u *)&p_imdisable, PV_NONE, #else (char_u *)NULL, PV_NONE, @@ -1582,7 +1582,7 @@ static struct vimoption options[] = {(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(USE_IM_CONTROL) +#if defined(FEAT_EVAL) && defined(FEAT_MBYTE) (char_u *)&p_imsf, PV_NONE, {(char_u *)"", (char_u *)NULL} #else @@ -8469,7 +8469,7 @@ set_bool_option( } #endif -#ifdef USE_IM_CONTROL +#ifdef FEAT_MBYTE /* 'imdisable' */ else if ((int *)varp == &p_imdisable) { |