changeset 15298:4aea6c2f56a8 v8.1.0657

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.
author Bram Moolenaar <Bram@vim.org>
date Sat, 29 Dec 2018 13:15:05 +0100
parents 137d5ee732e0
children cd393ed9f3ff
files src/os_unix.c src/version.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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;
 
--- 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,