From ed0928113d50d39cddc1c9ebd93763c452cf2e0a Mon Sep 17 00:00:00 2001
From: edyfox <edyfox@2a77ed30-b011-0410-a7ad-c7884a0aa172>
Date: Fri, 9 Nov 2007 01:42:38 +0000
Subject: [PATCH] Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@650 2a77ed30-b011-0410-a7ad-c7884a0aa172
---
 src/eval.c      | 2 +-
 src/ex_cmds.c   | 3 ++-
 src/fileio.c    | 3 ++-
 src/gui_xmebw.c | 6 +++++-
 src/misc2.c     | 4 ++++
 src/screen.c    | 2 +-
 src/version.c   | 4 ++++
 7 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/src/eval.c b/src/eval.c
index ca9e2dcc..80b206a0 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -8729,7 +8729,7 @@ f_diff_hlID(argvars, rettv)
     static int		fnum = 0;
     static int		change_start = 0;
     static int		change_end = 0;
-    static hlf_T	hlID = 0;
+    static hlf_T	hlID = (hlf_T)0;
     int			filler_lines;
     int			col;
 
diff --git a/src/ex_cmds.c b/src/ex_cmds.c
index 32de5761..ede122cc 100644
--- a/src/ex_cmds.c
+++ b/src/ex_cmds.c
@@ -1774,7 +1774,8 @@ write_viminfo(file, forceit)
 	 * overwrite a user's viminfo file after a "su root", with a
 	 * viminfo file that the user can't read.
 	 */
-	st_old.st_dev = st_old.st_ino = 0;
+	st_old.st_dev = 0;
+	st_old.st_ino = 0;
 	st_old.st_mode = 0600;
 	if (mch_stat((char *)fname, &st_old) == 0
 		&& getuid() != ROOT_UID
diff --git a/src/fileio.c b/src/fileio.c
index 01663890..f6a4da79 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -3209,7 +3209,8 @@ buf_write(buf, fname, sfname, start, end, eap, append, forceit,
      * Get information about original file (if there is one).
      */
 #if defined(UNIX) && !defined(ARCHIE)
-    st_old.st_dev = st_old.st_ino = 0;
+    st_old.st_dev = 0;
+    st_old.st_ino = 0;
     perm = -1;
     if (mch_stat((char *)fname, &st_old) < 0)
 	newfile = TRUE;
diff --git a/src/gui_xmebw.c b/src/gui_xmebw.c
index 85f25cd0..77b59c24 100644
--- a/src/gui_xmebw.c
+++ b/src/gui_xmebw.c
@@ -395,11 +395,15 @@ set_pixmap(XmEnhancedButtonWidget eb)
 
     /* Create the "highlight" pixmap. */
     color[4].pixel = eb->primitive.bottom_shadow_color;
+#ifdef XpmAllocColor /* SGI doesn't have it */
     attr.valuemask = XpmColorSymbols | XpmCloseness | XpmAllocColor;
+    attr.alloc_color = alloc_color;
+#else
+    attr.valuemask = XpmColorSymbols | XpmCloseness;
+#endif
     attr.closeness = 65535;	/* accuracy isn't crucial */
     attr.colorsymbols = color;
     attr.numsymbols = XtNumber(color);
-    attr.alloc_color = alloc_color;
 
     status = XpmCreatePixmapFromData(dpy, root, data, &pix, NULL, &attr);
     XpmFreeAttributes(&attr);
diff --git a/src/misc2.c b/src/misc2.c
index 19b99e2b..f22bf3f0 100644
--- a/src/misc2.c
+++ b/src/misc2.c
@@ -5924,7 +5924,11 @@ emsg3(s, a1, a2)
 {
     if (emsg_not_now())
 	return TRUE;		/* no error messages at the moment */
+#ifdef HAVE_STDARG_H
+    vim_snprintf((char *)IObuff, IOSIZE, (char *)s, a1, a2);
+#else
     vim_snprintf((char *)IObuff, IOSIZE, (char *)s, (long_u)a1, (long_u)a2);
+#endif
     return emsg(IObuff);
 }
 
diff --git a/src/screen.c b/src/screen.c
index 5b361e9b..f85bd082 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -4315,7 +4315,7 @@ win_line(wp, lnum, startrow, endrow, nochange)
 	    long prevcol = (long)(ptr - line) - (c == NUL);
 
 	    /* we're not really at that column when skipping some text */
-	    if ((wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol)
+	    if ((long)(wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol)
 		++prevcol;
 #endif
 
diff --git a/src/version.c b/src/version.c
index 904e42f7..fde9d207 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,10 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    154,
+/**/
+    153,
+/**/
     152,
 /**/
     151,
-- 
2.11.4.GIT