aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-07 22:03:36 -04:00
Code

updated for version 7.1-318

Browse Source
This commit is contained in:
Bram Moolenaar 2008-06-20 09:59:25 +00:00
parent 4678465a4b
commit e82080179b
3 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui_x11.c
View File

@ -1538,8 +1538,11 @@ gui_mch_init()
attr.depth = DefaultDepthOfScreen(scr); attr.depth = DefaultDepthOfScreen(scr);
if (!icon) if (!icon)
{
XpmCreatePixmapFromData(dsp, root_window, magick, &icon, XpmCreatePixmapFromData(dsp, root_window, magick, &icon,
&icon_mask, &attr); &icon_mask, &attr);
XpmFreeAttributes(&attr);
}
# ifdef FEAT_GUI_ATHENA # ifdef FEAT_GUI_ATHENA
XtVaSetValues(vimShell, XtNiconPixmap, icon, XtNiconMask, icon_mask, NULL); XtVaSetValues(vimShell, XtNiconPixmap, icon, XtNiconMask, icon_mask, NULL);

30
src/os_unix.c
View File

@ -209,6 +209,7 @@ typedef struct
{ {
SmcConn smcconn; /* The SM connection ID */ SmcConn smcconn; /* The SM connection ID */
IceConn iceconn; /* The ICE connection ID */ IceConn iceconn; /* The ICE connection ID */
char *clientid; /* The client ID for the current smc session */
Bool save_yourself; /* If we're in the middle of a save_yourself */ Bool save_yourself; /* If we're in the middle of a save_yourself */
Bool shutdown; /* If we're in shutdown mode */ Bool shutdown; /* If we're in shutdown mode */
} xsmp_config_T; } xsmp_config_T;
@ -2887,16 +2888,28 @@ mch_free_mem()
if (clip_plus.owned) if (clip_plus.owned)
clip_lose_selection(&clip_plus); clip_lose_selection(&clip_plus);
# endif # endif
# if (defined(FEAT_X11) && defined(FEAT_XCLIPBOARD)) || defined(PROTO) # if defined(FEAT_X11) && defined(FEAT_XCLIPBOARD)
if (xterm_Shell != (Widget)0) if (xterm_Shell != (Widget)0)
XtDestroyWidget(xterm_Shell); XtDestroyWidget(xterm_Shell);
# ifndef LESSTIF_VERSION
/* Lesstif crashes here, lose some memory */
if (xterm_dpy != NULL) if (xterm_dpy != NULL)
XtCloseDisplay(xterm_dpy); XtCloseDisplay(xterm_dpy);
if (app_context != (XtAppContext)NULL) if (app_context != (XtAppContext)NULL)
{
XtDestroyApplicationContext(app_context); XtDestroyApplicationContext(app_context);
# ifdef FEAT_X11
x11_display = NULL; /* freed by XtDestroyApplicationContext() */
# endif
}
# endif
# endif # endif
# ifdef FEAT_X11 # ifdef FEAT_X11
if (x11_display != NULL && x11_display != xterm_dpy) if (x11_display != NULL
# ifdef FEAT_XCLIPBOARD
&& x11_display != xterm_dpy
# endif
)
XCloseDisplay(x11_display); XCloseDisplay(x11_display);
# endif # endif
# if defined(HAVE_SIGALTSTACK) || defined(HAVE_SIGSTACK) # if defined(HAVE_SIGALTSTACK) || defined(HAVE_SIGSTACK)
@ -6290,22 +6303,22 @@ clear_xterm_clip()
} }
if (xterm_dpy != NULL) if (xterm_dpy != NULL)
{ {
#if 0 # if 0
/* Lesstif and Solaris crash here, lose some memory */ /* Lesstif and Solaris crash here, lose some memory */
XtCloseDisplay(xterm_dpy); XtCloseDisplay(xterm_dpy);
#endif # endif
if (x11_display == xterm_dpy) if (x11_display == xterm_dpy)
x11_display = NULL; x11_display = NULL;
xterm_dpy = NULL; xterm_dpy = NULL;
} }
#if 0 # if 0
if (app_context != (XtAppContext)NULL) if (app_context != (XtAppContext)NULL)
{ {
/* Lesstif and Solaris crash here, lose some memory */ /* Lesstif and Solaris crash here, lose some memory */
XtDestroyApplicationContext(app_context); XtDestroyApplicationContext(app_context);
app_context = (XtAppContext)NULL; app_context = (XtAppContext)NULL;
} }
#endif # endif
} }
# endif # endif
@ -6557,7 +6570,6 @@ static int dummy;
xsmp_init(void) xsmp_init(void)
{ {
char errorstring[80]; char errorstring[80];
char *clientid;
SmcCallbacks smcallbacks; SmcCallbacks smcallbacks;
#if 0 #if 0
SmPropValue smname; SmPropValue smname;
@ -6599,7 +6611,7 @@ xsmp_init(void)
| SmcSaveCompleteProcMask | SmcShutdownCancelledProcMask, | SmcSaveCompleteProcMask | SmcShutdownCancelledProcMask,
&smcallbacks, &smcallbacks,
NULL, NULL,
&clientid, &xsmp.clientid,
sizeof(errorstring), sizeof(errorstring),
errorstring); errorstring);
if (xsmp.smcconn == NULL) if (xsmp.smcconn == NULL)
@ -6638,6 +6650,8 @@ xsmp_close()
if (xsmp_icefd != -1) if (xsmp_icefd != -1)
{ {
SmcCloseConnection(xsmp.smcconn, 0, NULL); SmcCloseConnection(xsmp.smcconn, 0, NULL);
vim_free(xsmp.clientid);
xsmp.clientid = NULL;
xsmp_icefd = -1; xsmp_icefd = -1;
} }
} }

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 */
/**/
318,
/**/ /**/
317, 317,
/**/ /**/