Mirror of the Vim source from https://github.com/vim/vim
Revision | c8568bc2db390972c94374a031bbd195c4403ffd (tree) |
---|---|
Time | 2008-06-05 04:35:35 |
Author | vimboss |
Commiter | vimboss |
updated for version 7.1-311
@@ -5520,13 +5520,13 @@ | ||
5520 | 5520 | preedit_caret_cb.callback = (XIMProc)preedit_caret_cbproc; |
5521 | 5521 | preedit_done_cb.callback = (XIMProc)preedit_done_cbproc; |
5522 | 5522 | preedit_attr |
5523 | - = XVaCreateNestedList (0, | |
5523 | + = XVaCreateNestedList(0, | |
5524 | 5524 | XNPreeditStartCallback, &preedit_start_cb, |
5525 | 5525 | XNPreeditDrawCallback, &preedit_draw_cb, |
5526 | 5526 | XNPreeditCaretCallback, &preedit_caret_cb, |
5527 | 5527 | XNPreeditDoneCallback, &preedit_done_cb, |
5528 | - 0); | |
5529 | - XSetICValues (xxic, XNPreeditAttributes, preedit_attr, 0); | |
5528 | + NULL); | |
5529 | + XSetICValues(xxic, XNPreeditAttributes, preedit_attr, NULL); | |
5530 | 5530 | XFree(preedit_attr); |
5531 | 5531 | } |
5532 | 5532 |
@@ -5536,7 +5536,8 @@ | ||
5536 | 5536 | { |
5537 | 5537 | #ifdef USE_X11R6_XIM |
5538 | 5538 | /* don't change the input context when we call reset */ |
5539 | - XSetICValues(((GdkICPrivate*)ic)->xic, XNResetState, XIMPreserveState, 0); | |
5539 | + XSetICValues(((GdkICPrivate *)ic)->xic, XNResetState, XIMPreserveState, | |
5540 | + NULL); | |
5540 | 5541 | #endif |
5541 | 5542 | } |
5542 | 5543 |
@@ -667,6 +667,8 @@ | ||
667 | 667 | static int included_patches[] = |
668 | 668 | { /* Add new patch number below this line */ |
669 | 669 | /**/ |
670 | + 311, | |
671 | +/**/ | |
670 | 672 | 310, |
671 | 673 | /**/ |
672 | 674 | 309, |