updated for version 7.1-311

diff --git a/src/mbyte.c b/src/mbyte.c
index 65f796fc4e93612bb0a42b2e3a86d0c3e1de0447..6ab73f2b67fb65914f663a32d5783d2c23bd0b2f 100644 (file)
--- 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 ade4d7367e6cf7396d12dfd0e77e170cb433d484..045814028bfe876b1ec79c50cbeabc58eaf18dac 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    311,
 /**/
     310,
 /**/