aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

updated for version 7.1-311

Browse Source
This commit is contained in:
Bram Moolenaar
2008-06-04 19:35:35 +00:00
parent f453d35dbe
commit 847abc2747
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/mbyte.c
View File

@@ -5520,13 +5520,13 @@ preedit_callback_setup(GdkIC *ic)
preedit_caret_cb.callback = (XIMProc)preedit_caret_cbproc; preedit_caret_cb.callback = (XIMProc)preedit_caret_cbproc;
preedit_done_cb.callback = (XIMProc)preedit_done_cbproc; preedit_done_cb.callback = (XIMProc)preedit_done_cbproc;
preedit_attr preedit_attr
= XVaCreateNestedList (0, = XVaCreateNestedList(0,
XNPreeditStartCallback, &preedit_start_cb, XNPreeditStartCallback, &preedit_start_cb,
XNPreeditDrawCallback, &preedit_draw_cb, XNPreeditDrawCallback, &preedit_draw_cb,
XNPreeditCaretCallback, &preedit_caret_cb, XNPreeditCaretCallback, &preedit_caret_cb,
XNPreeditDoneCallback, &preedit_done_cb, XNPreeditDoneCallback, &preedit_done_cb,
0); NULL);
XSetICValues (xxic, XNPreeditAttributes, preedit_attr, 0); XSetICValues(xxic, XNPreeditAttributes, preedit_attr, NULL);
XFree(preedit_attr); XFree(preedit_attr);
} }
@@ -5536,7 +5536,8 @@ reset_state_setup(GdkIC *ic)
{ {
#ifdef USE_X11R6_XIM #ifdef USE_X11R6_XIM
/* don't change the input context when we call reset */ /* 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 #endif
} }

2
src/version.c
View File

@@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
311,
/**/ /**/
310, 310,
/**/ /**/