aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-06 05:44:14 -04:00
Code Activity

updated for version 7.1-153

Browse Source
This commit is contained in:
Bram Moolenaar
2007-11-08 19:49:02 +00:00
parent a443af88a4
commit 6f1924547b
6 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/eval.c
View File

@@ -8729,7 +8729,7 @@ f_diff_hlID(argvars, rettv)
static int fnum = 0; static int fnum = 0;
static int change_start = 0; static int change_start = 0;
static int change_end = 0; static int change_end = 0;
static hlf_T hlID = 0; static hlf_T hlID = (hlf_T)0;
int filler_lines; int filler_lines;
int col; int col;

3
src/ex_cmds.c
View File

@@ -1774,7 +1774,8 @@ write_viminfo(file, forceit)
* overwrite a user's viminfo file after a "su root", with a * overwrite a user's viminfo file after a "su root", with a
* viminfo file that the user can't read. * 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; st_old.st_mode = 0600;
if (mch_stat((char *)fname, &st_old) == 0 if (mch_stat((char *)fname, &st_old) == 0
&& getuid() != ROOT_UID && getuid() != ROOT_UID

3
src/fileio.c
View File

@@ -3209,7 +3209,8 @@ buf_write(buf, fname, sfname, start, end, eap, append, forceit,
* Get information about original file (if there is one). * Get information about original file (if there is one).
*/ */
#if defined(UNIX) && !defined(ARCHIE) #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; perm = -1;
if (mch_stat((char *)fname, &st_old) < 0) if (mch_stat((char *)fname, &st_old) < 0)
newfile = TRUE; newfile = TRUE;

6
src/gui_xmebw.c
View File

@@ -395,11 +395,15 @@ set_pixmap(XmEnhancedButtonWidget eb)
/* Create the "highlight" pixmap. */ /* Create the "highlight" pixmap. */
color[4].pixel = eb->primitive.bottom_shadow_color; color[4].pixel = eb->primitive.bottom_shadow_color;
#ifdef XpmAllocColor /* SGI doesn't have it */
attr.valuemask = XpmColorSymbols | XpmCloseness | XpmAllocColor; attr.valuemask = XpmColorSymbols | XpmCloseness | XpmAllocColor;
attr.alloc_color = alloc_color;
#else
attr.valuemask = XpmColorSymbols | XpmCloseness;
#endif
attr.closeness = 65535; /* accuracy isn't crucial */ attr.closeness = 65535; /* accuracy isn't crucial */
attr.colorsymbols = color; attr.colorsymbols = color;
attr.numsymbols = XtNumber(color); attr.numsymbols = XtNumber(color);
attr.alloc_color = alloc_color;
status = XpmCreatePixmapFromData(dpy, root, data, &pix, NULL, &attr); status = XpmCreatePixmapFromData(dpy, root, data, &pix, NULL, &attr);
XpmFreeAttributes(&attr); XpmFreeAttributes(&attr);

4
src/misc2.c
View File

@@ -5924,7 +5924,11 @@ emsg3(s, a1, a2)
{ {
if (emsg_not_now()) if (emsg_not_now())
return TRUE; /* no error messages at the moment */ 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); vim_snprintf((char *)IObuff, IOSIZE, (char *)s, (long_u)a1, (long_u)a2);
#endif
return emsg(IObuff); return emsg(IObuff);
} }

2
src/version.c
View File

@@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
153,
/**/ /**/
152, 152,
/**/ /**/