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

patch 8.1.0656: trying to reconnect to X server may cause problems

Browse Source 
Problem:    Trying to reconnect to X server may cause problems.
Solution:   Do no try reconnecting when exiting. (James McCoy)
This commit is contained in:
Bram Moolenaar
2018-12-29 11:03:23 +01:00
parent b56ac049ea
commit c0c7549687
2 changed files with 30 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/os_unix.c
View File

@@ -1671,6 +1671,32 @@ x_error_check(Display *dpy UNUSED, XErrorEvent *error_event UNUSED)
return 0;
}
/*
* Return TRUE when connection to the X server is desired.
*/
static int
x_connect_to_server(void)
{
// No point in connecting if we are exiting or dying.
if (exiting || v_dying)
return FALSE;
#if defined(FEAT_CLIENTSERVER)
if (x_force_connect)
return TRUE;
#endif
if (x_no_connect)
return FALSE;
/* Check for a match with "exclude:" from 'clipboard'. */
if (clip_exclude_prog != NULL)
{
if (vim_regexec_prog(&clip_exclude_prog, FALSE, T_NAME, (colnr_T)0))
return FALSE;
}
return TRUE;
}
#if defined(FEAT_X11) && defined(FEAT_XCLIPBOARD)
# if defined(HAVE_SETJMP_H)
/*
@@ -1716,7 +1742,8 @@ x_IOerror_handler(Display *dpy UNUSED)
static void
may_restore_clipboard(void)
{
if (xterm_dpy_retry_count > 0)
// Only try restoring if we want the connection.
if (x_connect_to_server() && xterm_dpy_retry_count > 0)
{
--xterm_dpy_retry_count;
@@ -1736,28 +1763,6 @@ may_restore_clipboard(void)
}
#endif
/*
* Return TRUE when connection to the X server is desired.
*/
static int
x_connect_to_server(void)
{
#if defined(FEAT_CLIENTSERVER)
if (x_force_connect)
return TRUE;
#endif
if (x_no_connect)
return FALSE;
/* Check for a match with "exclude:" from 'clipboard'. */
if (clip_exclude_prog != NULL)
{
if (vim_regexec_prog(&clip_exclude_prog, FALSE, T_NAME, (colnr_T)0))
return FALSE;
}
return TRUE;
}
/*
* Test if "dpy" and x11_window are valid by getting the window title.
* I don't actually want it yet, so there may be a simpler call to use, but