thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.2-125

Browse Source
This commit is contained in:
Bram Moolenaar
2009-02-24 03:12:40 +00:00
parent f08fa44a1a
commit e4bfca808d
2 changed files with 28 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/gui_x11.c
View File

@@ -1587,6 +1587,8 @@ gui_mch_uninit()
XtCloseDisplay(gui.dpy); XtCloseDisplay(gui.dpy);
gui.dpy = NULL; gui.dpy = NULL;
vimShell = (Widget)0; vimShell = (Widget)0;
vim_free(gui_argv);
gui_argv = NULL;
} }
/* /*
@@ -1761,6 +1763,8 @@ gui_mch_exit(rc)
* says that this isn't needed when exiting, so just skip it. */ * says that this isn't needed when exiting, so just skip it. */
XtCloseDisplay(gui.dpy); XtCloseDisplay(gui.dpy);
#endif #endif
vim_free(gui_argv);
gui_argv = NULL;
} }
/* /*
@@ -3439,47 +3443,37 @@ gui_mch_register_sign(signfile)
char_u *signfile; char_u *signfile;
{ {
XpmAttributes attrs; XpmAttributes attrs;
XImage *sign; XImage *sign = NULL;
int status; int status;
/* /*
* Setup the color substitution table. * Setup the color substitution table.
*/ */
sign = NULL;
if (signfile[0] != NUL && signfile[0] != '-') if (signfile[0] != NUL && signfile[0] != '-')
{ {
sign = (XImage *)alloc(sizeof(XImage)); XpmColorSymbol color[5] =
if (sign != NULL)
{ {
XpmColorSymbol color[5] = {"none", NULL, 0},
{ {"iconColor1", NULL, 0},
{"none", NULL, 0}, {"bottomShadowColor", NULL, 0},
{"iconColor1", NULL, 0}, {"topShadowColor", NULL, 0},
{"bottomShadowColor", NULL, 0}, {"selectColor", NULL, 0}
{"topShadowColor", NULL, 0}, };
{"selectColor", NULL, 0} attrs.valuemask = XpmColorSymbols;
}; attrs.numsymbols = 2;
attrs.valuemask = XpmColorSymbols; attrs.colorsymbols = color;
attrs.numsymbols = 2; attrs.colorsymbols[0].pixel = gui.back_pixel;
attrs.colorsymbols = color; attrs.colorsymbols[1].pixel = gui.norm_pixel;
attrs.colorsymbols[0].pixel = gui.back_pixel; status = XpmReadFileToImage(gui.dpy, (char *)signfile,
attrs.colorsymbols[1].pixel = gui.norm_pixel;
status = XpmReadFileToImage(gui.dpy, (char *)signfile,
&sign, NULL, &attrs); &sign, NULL, &attrs);
if (status == 0)
if (status == 0) {
{ /* Sign width is fixed at two columns now.
/* Sign width is fixed at two columns now. if (sign->width > gui.sign_width)
if (sign->width > gui.sign_width) gui.sign_width = sign->width + 8; */
gui.sign_width = sign->width + 8; */
}
else
{
vim_free(sign);
sign = NULL;
EMSG(_(e_signdata));
}
} }
else
EMSG(_(e_signdata));
} }
return (void *)sign; return (void *)sign;
@@ -3489,8 +3483,7 @@ gui_mch_register_sign(signfile)
gui_mch_destroy_sign(sign) gui_mch_destroy_sign(sign)
void *sign; void *sign;
{ {
XFree(((XImage *)sign)->data); XDestroyImage((XImage*)sign);
vim_free(sign);
} }
#endif #endif

2
src/version.c
View File

@@ -676,6 +676,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 */
/**/
125,
/**/ /**/
124, 124,
/**/ /**/