# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1546085705 -3600
# Node ID 4aea6c2f56a8b43d37e4747af48460de6a221bd2
# Parent  137d5ee732e0b937544e7f9f20a6c7b64512dae8
patch 8.1.0657: get error for using regexp recursively

commit https://github.com/vim/vim/commit/01e51e5b305c13c68b5ea2b9e14779e1e88664ef
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Dec 29 13:09:46 2018 +0100

    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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -800,6 +800,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    657,
+/**/
     656,
 /**/
     655,