• R/O
  • SSH

vim: Commit

Mirror of the Vim source from https://github.com/vim/vim


Commit MetaInfo

Revisionc8568bc2db390972c94374a031bbd195c4403ffd (tree)
Time2008-06-05 04:35:35
Authorvimboss
Commitervimboss

Log Message

updated for version 7.1-311

Change Summary

Incremental Difference

diff -r 80b9076e9e17 -r c8568bc2db39 src/mbyte.c
--- a/src/mbyte.c Wed Jun 04 17:37:34 2008 +0000
+++ b/src/mbyte.c Wed Jun 04 19:35:35 2008 +0000
@@ -5520,13 +5520,13 @@
55205520 preedit_caret_cb.callback = (XIMProc)preedit_caret_cbproc;
55215521 preedit_done_cb.callback = (XIMProc)preedit_done_cbproc;
55225522 preedit_attr
5523- = XVaCreateNestedList (0,
5523+ = XVaCreateNestedList(0,
55245524 XNPreeditStartCallback, &preedit_start_cb,
55255525 XNPreeditDrawCallback, &preedit_draw_cb,
55265526 XNPreeditCaretCallback, &preedit_caret_cb,
55275527 XNPreeditDoneCallback, &preedit_done_cb,
5528- 0);
5529- XSetICValues (xxic, XNPreeditAttributes, preedit_attr, 0);
5528+ NULL);
5529+ XSetICValues(xxic, XNPreeditAttributes, preedit_attr, NULL);
55305530 XFree(preedit_attr);
55315531 }
55325532
@@ -5536,7 +5536,8 @@
55365536 {
55375537 #ifdef USE_X11R6_XIM
55385538 /* 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);
55405541 #endif
55415542 }
55425543
diff -r 80b9076e9e17 -r c8568bc2db39 src/version.c
--- a/src/version.c Wed Jun 04 17:37:34 2008 +0000
+++ b/src/version.c Wed Jun 04 19:35:35 2008 +0000
@@ -667,6 +667,8 @@
667667 static int included_patches[] =
668668 { /* Add new patch number below this line */
669669 /**/
670+ 311,
671+/**/
670672 310,
671673 /**/
672674 309,
Show on old repository browser