From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 17 Dec 2014 16:59:31 +0000 (+0100)
Subject: updated for version 7.4.558
X-Git-Tag: v7.4.558
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=527a6785c73306ff72d83cbc2d1ea14f37aca142;p=vim

updated for version 7.4.558
Problem:    When the X server restarts Vim may get stuck.
Solution:   Destroy the application context and create it again.  (Issue 203)
---

diff --git a/src/os_unix.c b/src/os_unix.c
index ff8834527..bcf11ddc7 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -1617,6 +1617,17 @@ may_restore_clipboard()
     if (xterm_dpy_was_reset)
     {
 	xterm_dpy_was_reset = FALSE;
+
+# ifndef LESSTIF_VERSION
+	/* This has been reported to avoid Vim getting stuck. */
+	if (app_context != (XtAppContext)NULL)
+	{
+	    XtDestroyApplicationContext(app_context);
+	    app_context = (XtAppContext)NULL;
+	    x11_display = NULL; /* freed by XtDestroyApplicationContext() */
+	}
+# endif
+
 	setup_term_clip();
 	get_x11_title(FALSE);
     }
diff --git a/src/version.c b/src/version.c
index 514193a93..4efee6ae8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    558,
 /**/
     557,
 /**/