comparison src/option.c @ 5008:3717d569027d v7.3.1248

updated for version 7.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)
author Bram Moolenaar <bram@vim.org>
date Wed, 26 Jun 2013 19:18:05 +0200
parents 784e342ddcae
children a02575cd564a
comparison
equal deleted inserted replaced
5007:e285b27368d1 5008:3717d569027d
1423 #endif 1423 #endif
1424 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT}, 1424 {(char_u *)"", (char_u *)0L} SCRIPTID_INIT},
1425 {"ignorecase", "ic", P_BOOL|P_VI_DEF, 1425 {"ignorecase", "ic", P_BOOL|P_VI_DEF,
1426 (char_u *)&p_ic, PV_NONE, 1426 (char_u *)&p_ic, PV_NONE,
1427 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT}, 1427 {(char_u *)FALSE, (char_u *)0L} SCRIPTID_INIT},
1428 {"imactivatefunc","imaf",P_STRING|P_VI_DEF|P_SECURE,
1429 # if defined(FEAT_EVAL) && defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
1430 (char_u *)&p_imaf, PV_NONE,
1431 {(char_u *)"", (char_u *)NULL}
1432 # else
1433 (char_u *)NULL, PV_NONE,
1434 {(char_u *)NULL, (char_u *)0L}
1435 # endif
1436 SCRIPTID_INIT},
1428 {"imactivatekey","imak",P_STRING|P_VI_DEF, 1437 {"imactivatekey","imak",P_STRING|P_VI_DEF,
1429 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) 1438 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
1430 (char_u *)&p_imak, PV_NONE, 1439 (char_u *)&p_imak, PV_NONE,
1431 #else 1440 #else
1432 (char_u *)NULL, PV_NONE, 1441 (char_u *)NULL, PV_NONE,
1464 #ifdef B_IMODE_IM 1473 #ifdef B_IMODE_IM
1465 {(char_u *)B_IMODE_IM, (char_u *)0L} 1474 {(char_u *)B_IMODE_IM, (char_u *)0L}
1466 #else 1475 #else
1467 {(char_u *)B_IMODE_NONE, (char_u *)0L} 1476 {(char_u *)B_IMODE_NONE, (char_u *)0L}
1468 #endif 1477 #endif
1478 SCRIPTID_INIT},
1479 {"imstatusfunc","imse",P_STRING|P_VI_DEF|P_SECURE,
1480 # if defined(FEAT_EVAL) && defined(FEAT_XIM) && defined(FEAT_GUI_GTK)
1481 (char_u *)&p_imsf, PV_NONE,
1482 {(char_u *)"", (char_u *)NULL}
1483 # else
1484 (char_u *)NULL, PV_NONE,
1485 {(char_u *)NULL, (char_u *)0L}
1486 # endif
1469 SCRIPTID_INIT}, 1487 SCRIPTID_INIT},
1470 {"include", "inc", P_STRING|P_ALLOCED|P_VI_DEF, 1488 {"include", "inc", P_STRING|P_ALLOCED|P_VI_DEF,
1471 #ifdef FEAT_FIND_ID 1489 #ifdef FEAT_FIND_ID
1472 (char_u *)&p_inc, PV_INC, 1490 (char_u *)&p_inc, PV_INC,
1473 {(char_u *)"^\\s*#\\s*include", (char_u *)0L} 1491 {(char_u *)"^\\s*#\\s*include", (char_u *)0L}