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