3ef2ca
To: vim_dev@googlegroups.com
3ef2ca
Subject: Patch 7.4.558
3ef2ca
Fcc: outbox
3ef2ca
From: Bram Moolenaar <Bram@moolenaar.net>
3ef2ca
Mime-Version: 1.0
3ef2ca
Content-Type: text/plain; charset=UTF-8
3ef2ca
Content-Transfer-Encoding: 8bit
3ef2ca
------------
3ef2ca
3ef2ca
Patch 7.4.558
3ef2ca
Problem:    When the X server restarts Vim may get stuck.
3ef2ca
Solution:   Destroy the application context and create it again.  (Issue 203)
3ef2ca
Files:	    src/os_unix.c
3ef2ca
3ef2ca
3ef2ca
*** ../vim-7.4.557/src/os_unix.c	2014-12-17 14:36:10.367090935 +0100
3ef2ca
--- src/os_unix.c	2014-12-17 17:55:23.187644328 +0100
3ef2ca
***************
3ef2ca
*** 1617,1622 ****
3ef2ca
--- 1617,1633 ----
3ef2ca
      if (xterm_dpy_was_reset)
3ef2ca
      {
3ef2ca
  	xterm_dpy_was_reset = FALSE;
3ef2ca
+ 
3ef2ca
+ # ifndef LESSTIF_VERSION
3ef2ca
+ 	/* This has been reported to avoid Vim getting stuck. */
3ef2ca
+ 	if (app_context != (XtAppContext)NULL)
3ef2ca
+ 	{
3ef2ca
+ 	    XtDestroyApplicationContext(app_context);
3ef2ca
+ 	    app_context = (XtAppContext)NULL;
3ef2ca
+ 	    x11_display = NULL; /* freed by XtDestroyApplicationContext() */
3ef2ca
+ 	}
3ef2ca
+ # endif
3ef2ca
+ 
3ef2ca
  	setup_term_clip();
3ef2ca
  	get_x11_title(FALSE);
3ef2ca
      }
3ef2ca
*** ../vim-7.4.557/src/version.c	2014-12-17 14:47:52.870412129 +0100
3ef2ca
--- src/version.c	2014-12-17 17:57:10.026323560 +0100
3ef2ca
***************
3ef2ca
*** 743,744 ****
3ef2ca
--- 743,746 ----
3ef2ca
  {   /* Add new patch number below this line */
3ef2ca
+ /**/
3ef2ca
+     558,
3ef2ca
  /**/
3ef2ca
3ef2ca
-- 
3ef2ca
hundred-and-one symptoms of being an internet addict:
3ef2ca
14. You start introducing yourself as "Jim at I-I-Net dot net dot au"
3ef2ca
3ef2ca
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
3ef2ca
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
3ef2ca
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
3ef2ca
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///