diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-11-25 15:20:02 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-11-25 15:20:02 +0100 |
| commit | 6315a9ae924d2104b61d1667ea71af3ac7cf48fa (patch) | |
| tree | de56592e8f6642707a93414b79c66586faea052d /src/option.h | |
| parent | 291a9d15ed1eb1094edc8ad6dda00a6da3bd7072 (diff) | |
| download | vim-git-8.0.1336.tar.gz | |
patch 8.0.1336: cannot use imactivatefunc() unless compiled with +ximv8.0.1336
Problem: Cannot use imactivatefunc() unless compiled with +xim.
Solution: Allow using imactivatefunc() when not compiled with +xim.
(Yasuhiro Matsumoto, closes #2349)
Diffstat (limited to 'src/option.h')
| -rw-r--r-- | src/option.h | 8 |
1 files changed, 5 insertions, 3 deletions
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' */ |