updated for version 7.1-153

diff --git a/src/eval.c b/src/eval.c
index ca9e2dcc13ef94c5238196bf98d8de89f4230a21..80b206a0d7caa38445f63d48d4f22d9d89c66bce 100644 (file)
--- 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 32de576105dd35e2d68fa5c7e5a17f2961e16fc0..ede122cc8a271a2cd38c19c891d9846f5111379b 100644 (file)
--- 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 01663890a06e7255452ea40ac647d3110c066292..f6a4da791ff38cc654589d921966d2b131c12e68 100644 (file)
--- 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 85f25cd0e122addd5b751196ad04a1dadfa848b3..77b59c240800e7cbb4218c995eb51cdc1c94ac94 100644 (file)
--- 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 19b99e2b460073a91ab07c1c549e456404408fd1..f22bf3f0fa8a4eefd638fdabb91d7627fa7720f4 100644 (file)
--- 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/version.c b/src/version.c
index 904e42f78b8103f932e24d3a470e4a9fe5034f58..156558ee41f299420dd8d24bf1575fbe3cf87dc6 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 */
+/**/
+    153,
 /**/
     152,
 /**/