Mercurial > vim

comparison src/option.c @ 12920:327e1264b9bf v8.0.1336

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.0.1336: cannot use imactivatefunc() unless compiled with +xim commit https://github.com/vim/vim/commit/6315a9ae924d2104b61d1667ea71af3ac7cf48fa Author: Bram Moolenaar <Bram@vim.org> Date: Sat Nov 25 15:20:02 2017 +0100 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)
author Christian Brabandt <cb@256bit.org>
date Sat, 25 Nov 2017 15:30:06 +0100
parents 1a450ce6980c
children 85a601f985ab
comparison
equal deleted inserted replaced
12919:ddb76d6af5de 12920:327e1264b9bf
1537 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, 1537 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
1538 {"ignorecase", "ic", P_BOOL|P_VI_DEF, 1538 {"ignorecase", "ic", P_BOOL|P_VI_DEF,
1539 (char_u *)&p_ic, PV_NONE, 1539 (char_u *)&p_ic, PV_NONE,
1540 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, 1540 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
1541 {"imactivatefunc","imaf",P_STRING|P_VI_DEF|P_SECURE, 1541 {"imactivatefunc","imaf",P_STRING|P_VI_DEF|P_SECURE,
1542 # if defined(FEAT_EVAL) && defined(FEAT_XIM) && defined(FEAT_GUI_GTK) 1542 #if defined(FEAT_EVAL) && defined(USE_IM_CONTROL)
1543 (char_u *)&p_imaf, PV_NONE, 1543 (char_u *)&p_imaf, PV_NONE,
1544 {(char_u *)"", (char_u *)NULL} 1544 {(char_u *)"", (char_u *)NULL}
1545 # else 1545 # else
1546 (char_u *)NULL, PV_NONE, 1546 (char_u *)NULL, PV_NONE,
1547 {(char_u *)NULL, (char_u *)0L} 1547 {(char_u *)NULL, (char_u *)0L}
1580 {"imsearch", "ims", P_NUM|P_VI_DEF, 1580 {"imsearch", "ims", P_NUM|P_VI_DEF,
1581 (char_u *)&p_imsearch, PV_IMS, 1581 (char_u *)&p_imsearch, PV_IMS,
1582 {(char_u *)B_IMODE_USE_INSERT, (char_u *)0L} 1582 {(char_u *)B_IMODE_USE_INSERT, (char_u *)0L}
1583 SCRIPTID_INIT}, 1583 SCRIPTID_INIT},
1584 {"imstatusfunc","imsf",P_STRING|P_VI_DEF|P_SECURE, 1584 {"imstatusfunc","imsf",P_STRING|P_VI_DEF|P_SECURE,
1585 #if defined(FEAT_EVAL) && defined(FEAT_XIM) && defined(FEAT_GUI_GTK) 1585 #if defined(FEAT_EVAL) && defined(USE_IM_CONTROL)
1586 (char_u *)&p_imsf, PV_NONE, 1586 (char_u *)&p_imsf, PV_NONE,
1587 {(char_u *)"", (char_u *)NULL} 1587 {(char_u *)"", (char_u *)NULL}
1588 #else 1588 #else
1589 (char_u *)NULL, PV_NONE, 1589 (char_u *)NULL, PV_NONE,
1590 {(char_u *)NULL, (char_u *)0L} 1590 {(char_u *)NULL, (char_u *)0L}