From 01e51e5b305c13c68b5ea2b9e14779e1e88664ef Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 29 Dec 2018 13:09:46 +0100 Subject: [PATCH] patch 8.1.0657: get error for using regexp recursively Problem: Get error for using regexp recursively. (Dominique Pelle) Solution: Do no check if connection is desired. --- src/os_unix.c | 4 ++-- src/version.c | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/os_unix.c b/src/os_unix.c index e87331def..eaf07f101 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -1742,8 +1742,8 @@ x_IOerror_handler(Display *dpy UNUSED) static void may_restore_clipboard(void) { - // Only try restoring if we want the connection. - if (x_connect_to_server() && xterm_dpy_retry_count > 0) + // No point in restoring the connecting if we are exiting or dying. + if (!exiting && !v_dying && xterm_dpy_retry_count > 0) { --xterm_dpy_retry_count; diff --git a/src/version.c b/src/version.c index a49edb709..5852ce79e 100644 --- a/src/version.c +++ b/src/version.c @@ -799,6 +799,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 657, /**/ 656, /**/ -- 2.50.1