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.

diff --git a/src/os_unix.c b/src/os_unix.c
index e87331defc3b5eb83d6042d16e97b76df9fe57b2..eaf07f101aac6fdd5c7948230e7a71d3bceffa73 100644 (file)
--- 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 a49edb709ccf6bb0a58159eddc0838d89151bd4b..5852ce79e62578ff0a9229010b5431e06781f6f9 100644 (file)
--- 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,
 /**/