diff options
| author | Bram Moolenaar <Bram@vim.org> | 2008-06-04 19:35:35 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2008-06-04 19:35:35 +0000 |
| commit | 847abc274795104eea3c3345caa45f63b75ca232 (patch) | |
| tree | 5df040ee6f67648d4a6e62512eff6cef877b8a4b | |
| parent | f453d35dbed66362221b6871c076e945e9d955b4 (diff) | |
updated for version 7.1-311v7.1.311
| -rw-r--r-- | src/mbyte.c | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/mbyte.c b/src/mbyte.c index 65f796fc4e..6ab73f2b67 100644 --- a/src/mbyte.c +++ b/src/mbyte.c @@ -5520,13 +5520,13 @@ preedit_callback_setup(GdkIC *ic) preedit_caret_cb.callback = (XIMProc)preedit_caret_cbproc; preedit_done_cb.callback = (XIMProc)preedit_done_cbproc; preedit_attr - = XVaCreateNestedList (0, + = XVaCreateNestedList(0, XNPreeditStartCallback, &preedit_start_cb, XNPreeditDrawCallback, &preedit_draw_cb, XNPreeditCaretCallback, &preedit_caret_cb, XNPreeditDoneCallback, &preedit_done_cb, - 0); - XSetICValues (xxic, XNPreeditAttributes, preedit_attr, 0); + NULL); + XSetICValues(xxic, XNPreeditAttributes, preedit_attr, NULL); XFree(preedit_attr); } @@ -5536,7 +5536,8 @@ reset_state_setup(GdkIC *ic) { #ifdef USE_X11R6_XIM /* don't change the input context when we call reset */ - XSetICValues(((GdkICPrivate*)ic)->xic, XNResetState, XIMPreserveState, 0); + XSetICValues(((GdkICPrivate *)ic)->xic, XNResetState, XIMPreserveState, + NULL); #endif } diff --git a/src/version.c b/src/version.c index ade4d7367e..045814028b 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 311, +/**/ 310, /**/ 309, |