From 6315a9ae924d2104b61d1667ea71af3ac7cf48fa Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 25 Nov 2017 15:20:02 +0100 Subject: patch 8.0.1336: cannot use imactivatefunc() unless compiled with +xim Problem: Cannot use imactivatefunc() unless compiled with +xim. Solution: Allow using imactivatefunc() when not compiled with +xim. (Yasuhiro Matsumoto, closes #2349) --- src/option.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/option.h') diff --git a/src/option.h b/src/option.h index d963c1f39..57126a31b 100644 --- a/src/option.h +++ b/src/option.h @@ -581,11 +581,13 @@ EXTERN char_u *p_iconstring; /* 'iconstring' */ EXTERN int p_ic; /* 'ignorecase' */ #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) EXTERN char_u *p_imak; /* 'imactivatekey' */ +#define IM_ON_THE_SPOT 0L +#define IM_OVER_THE_SPOT 1L +EXTERN long p_imst; /* 'imstyle' */ +#endif +#if defined(FEAT_EVAL) && defined(USE_IM_CONTROL) EXTERN char_u *p_imaf; /* 'imactivatefunc' */ EXTERN char_u *p_imsf; /* 'imstatusfunc' */ -EXTERN long p_imst; /* 'imstyle' */ -# define IM_ON_THE_SPOT 0L -# define IM_OVER_THE_SPOT 1L #endif #ifdef USE_IM_CONTROL EXTERN int p_imcmdline; /* 'imcmdline' */ -- cgit v1.2.1