Mercurial > vim
changeset 1438:c7654c4db8fd v7.1.153
updated for version 7.1-153
| author | vimboss |
|---|---|
| date | Thu, 08 Nov 2007 19:49:02 +0000 |
| parents | 8b2e9257cc11 |
| children | a5b3a7fb6a5a |
| files | src/eval.c src/ex_cmds.c src/fileio.c src/gui_xmebw.c src/misc2.c src/version.c |
| diffstat | 6 files changed, 16 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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;
--- 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
--- a/src/fileio.c +++ b/src/fileio.c @@ -3209,7 +3209,8 @@ buf_write(buf, fname, sfname, start, end * 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;
--- 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);
--- 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); }