From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 4 Jun 2008 19:35:35 +0000 (+0000)
Subject: updated for version 7.1-311
X-Git-Tag: v7.1.311
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=847abc274795104eea3c3345caa45f63b75ca232;p=vim

updated for version 7.1-311
---

diff --git a/src/mbyte.c b/src/mbyte.c
index 65f796fc4..6ab73f2b6 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 ade4d7367..045814028 100644
--- 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,
 /**/