From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 27 Jun 2013 20:36:03 +0000 (+0200)
Subject: updated for version 7.3.1255
X-Git-Tag: v7.3.1255
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6470de83f2be942dfbd05071a99a6f154e9f1d05;p=vim

updated for version 7.3.1255
Problem:    Clang warnings when building with Athena.
Solution:   Add type casts. (Dominique Pelle)
---

diff --git a/src/gui_at_fs.c b/src/gui_at_fs.c
index 25767c2c7..2d73885aa 100644
--- a/src/gui_at_fs.c
+++ b/src/gui_at_fs.c
@@ -2591,7 +2591,7 @@ SFcreateWidgets(toplevel, prompt, ok, cancel)
 		(XtCallbackProc)SFvFloatSliderMovedCallback,
 		(XtPointer)(long_u)n);
 	XtAddCallback(selFileVScrolls[n], XtNscrollProc,
-		(XtCallbackProc)SFvAreaSelectedCallback, (XtPointer)n);
+		(XtCallbackProc)SFvAreaSelectedCallback, (XtPointer)(long_u)n);
 
 	selFileHScrolls[n] = XtVaCreateManagedWidget("selFileHScroll",
 #ifdef FEAT_GUI_NEXTAW
@@ -2616,7 +2616,7 @@ SFcreateWidgets(toplevel, prompt, ok, cancel)
 		(XtCallbackProc)SFhSliderMovedCallback,
 		(XtPointer)(long_u)n);
 	XtAddCallback(selFileHScrolls[n], XtNscrollProc,
-		(XtCallbackProc)SFhAreaSelectedCallback, (XtPointer)n);
+		(XtCallbackProc)SFhAreaSelectedCallback, (XtPointer)(long_u)n);
     }
 
     selFileOK = XtVaCreateManagedWidget("selFileOK",
diff --git a/src/version.c b/src/version.c
index 6f0225325..b0855c1af 100644
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1255,
 /**/
     1254,
 /**/