summaryrefslogtreecommitdiff
path: root/src/option.h
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-11-25 17:14:33 +0100
committerBram Moolenaar <Bram@vim.org>2017-11-25 17:14:33 +0100
commit819edbe078c8579f3620d12dac830f12ccdc5a45 (patch)
tree9aeaacf944c52f62fb2caaed49c8319746e3dae6 /src/option.h
parent50d43153a7e3e452cd166cde0d84ecacd316321f (diff)
downloadvim-819edbe078c8579f3620d12dac830f12ccdc5a45.zip
patch 8.0.1338: USE_IM_CONTROL is confusing and incomplete
Problem: USE_IM_CONTROL is confusing and incomplete. Solution: Just use FEAT_MBYTE. Call 'imactivatefunc' also without GUI.
Diffstat (limited to 'src/option.h')
-rw-r--r--src/option.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/option.h b/src/option.h
index 57126a31b..c9fa4d35f 100644
--- a/src/option.h
+++ b/src/option.h
@@ -585,11 +585,11 @@ EXTERN char_u *p_imak; /* 'imactivatekey' */
#define IM_OVER_THE_SPOT 1L
EXTERN long p_imst; /* 'imstyle' */
#endif
-#if defined(FEAT_EVAL) && defined(USE_IM_CONTROL)
+#if defined(FEAT_EVAL) && defined(FEAT_MBYTE)
EXTERN char_u *p_imaf; /* 'imactivatefunc' */
EXTERN char_u *p_imsf; /* 'imstatusfunc' */
#endif
-#ifdef USE_IM_CONTROL
+#ifdef FEAT_MBYTE
EXTERN int p_imcmdline; /* 'imcmdline' */
EXTERN int p_imdisable; /* 'imdisable' */
#endif