diff options
| author | Bram Moolenaar <Bram@vim.org> | 2007-11-08 19:49:02 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2007-11-08 19:49:02 +0000 |
| commit | 6f1924547b30753738ea0eb41ab31513894fde83 (patch) | |
| tree | 96f66ba95fffc6689f546ec87d4054853be3fab3 | |
| parent | a443af88a48d74b56ea9aa2aa486f52f340bbf77 (diff) | |
| download | vim-git-6f1924547b30753738ea0eb41ab31513894fde83.tar.gz | |
updated for version 7.1-153v7.1.153
| -rw-r--r-- | src/eval.c | 2 | ||||
| -rw-r--r-- | src/ex_cmds.c | 3 | ||||
| -rw-r--r-- | src/fileio.c | 3 | ||||
| -rw-r--r-- | src/gui_xmebw.c | 6 | ||||
| -rw-r--r-- | src/misc2.c | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
6 files changed, 16 insertions, 4 deletions
diff --git a/src/eval.c b/src/eval.c index ca9e2dcc1..80b206a0d 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 32de57610..ede122cc8 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 01663890a..f6a4da791 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 85f25cd0e..77b59c240 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 19b99e2b4..f22bf3f0f 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/version.c b/src/version.c index 904e42f78..156558ee4 100644 --- a/src/version.c +++ b/src/version.c @@ -667,6 +667,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 153, +/**/ 152, /**/ 151, |