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 ff8834527f672a32ad566432d79dd03df893a115..bcf11ddc7636d44eedafcfa5707251b8deadb656 100644 (file)
--- 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 514193a93ac09d0137c21b8298f79ceb7458a5f3..4efee6ae8c71f6a77a62aac4d04528ac63f60c65 100644 (file)
--- 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,
 /**/