diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-06-26 19:18:05 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-06-26 19:18:05 +0200 |
| commit | abab85a4994fec3e95ab79c5cdf94a7f893c1aeb (patch) | |
| tree | cc4050290198250d686a91d7395b9d85f662845e /src/option.c | |
| parent | a0169128d98669c753c899353127263e1ea289f9 (diff) | |
| download | vim-git-abab85a4994fec3e95ab79c5cdf94a7f893c1aeb.tar.gz | |
updated for version 7.3.1248v7.3.1248
Problem: Still have old hacking code for Input Method.
Solution: Add 'imactivatefunc' and 'imstatusfunc' as a generic solution to
Input Method activation. (Yukihiro Nakadaira)
Diffstat (limited to 'src/option.c')
| -rw-r--r-- | src/option.c | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/src/option.c b/src/option.c index f691f506c..0932bb864 100644 --- a/src/option.c +++ b/src/option.c @@ -1425,6 +1425,15 @@ static struct vimoption {"ignorecase", "ic", P_BOOL|P_VI_DEF, (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(FEAT_XIM) && defined(FEAT_GUI_GTK) + (char_u *)&p_imaf, PV_NONE, + {(char_u *)"", (char_u *)NULL} +# else + (char_u *)NULL, PV_NONE, + {(char_u *)NULL, (char_u *)0L} +# endif + SCRIPTID_INIT}, {"imactivatekey","imak",P_STRING|P_VI_DEF, #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) (char_u *)&p_imak, PV_NONE, @@ -1467,6 +1476,15 @@ static struct vimoption {(char_u *)B_IMODE_NONE, (char_u *)0L} #endif SCRIPTID_INIT}, + {"imstatusfunc","imse",P_STRING|P_VI_DEF|P_SECURE, +# if defined(FEAT_EVAL) && defined(FEAT_XIM) && defined(FEAT_GUI_GTK) + (char_u *)&p_imsf, PV_NONE, + {(char_u *)"", (char_u *)NULL} +# else + (char_u *)NULL, PV_NONE, + {(char_u *)NULL, (char_u *)0L} +# endif + SCRIPTID_INIT}, {"include", "inc", P_STRING|P_ALLOCED|P_VI_DEF, #ifdef FEAT_FIND_ID (char_u *)&p_inc, PV_INC, |