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

updated for version 7.4.558

Browse Source 
Problem:    When the X server restarts Vim may get stuck.
Solution:   Destroy the application context and create it again.  (Issue 203)
This commit is contained in:
Bram Moolenaar
2014-12-17 17:59:31 +01:00
parent 140e995ed5
commit 527a6785c7
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/os_unix.c
View File

@@ -1617,6 +1617,17 @@ may_restore_clipboard()
if (xterm_dpy_was_reset) if (xterm_dpy_was_reset)
{ {
xterm_dpy_was_reset = FALSE; xterm_dpy_was_reset = FALSE;
# ifndef LESSTIF_VERSION
/* This has been reported to avoid Vim getting stuck. */
if (app_context != (XtAppContext)NULL)
{
XtDestroyApplicationContext(app_context);
app_context = (XtAppContext)NULL;
x11_display = NULL; /* freed by XtDestroyApplicationContext() */
}
# endif
setup_term_clip(); setup_term_clip();
get_x11_title(FALSE); get_x11_title(FALSE);
} }

2
src/version.c
View File

@@ -741,6 +741,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 */
/**/
558,
/**/ /**/
557, 557,
/**/ /**/