81c2858
To: vim-dev@vim.org
81c2858
Subject: Patch 7.2.237
81c2858
Fcc: outbox
81c2858
From: Bram Moolenaar <Bram@moolenaar.net>
81c2858
Mime-Version: 1.0
81c2858
Content-Type: text/plain; charset=UTF-8
81c2858
Content-Transfer-Encoding: 8bit
81c2858
------------
81c2858
81c2858
Patch 7.2.237
81c2858
Problem:    Crash on exit when window icon not set.
81c2858
Solution:   Copy terminal name when using it for the icon name.
81c2858
Files:	    src/os_unix.c
81c2858
81c2858
81c2858
*** ../vim-7.2.236/src/os_unix.c	2009-07-14 17:38:51.000000000 +0200
81c2858
--- src/os_unix.c	2009-07-14 18:30:04.000000000 +0200
81c2858
***************
81c2858
*** 1734,1742 ****
81c2858
      if (oldicon == NULL && !test_only)
81c2858
      {
81c2858
  	if (STRNCMP(T_NAME, "builtin_", 8) == 0)
81c2858
! 	    oldicon = T_NAME + 8;
81c2858
  	else
81c2858
! 	    oldicon = T_NAME;
81c2858
      }
81c2858
  
81c2858
      return retval;
81c2858
--- 1734,1742 ----
81c2858
      if (oldicon == NULL && !test_only)
81c2858
      {
81c2858
  	if (STRNCMP(T_NAME, "builtin_", 8) == 0)
81c2858
! 	    oldicon = vim_strsave(T_NAME + 8);
81c2858
  	else
81c2858
! 	    oldicon = vim_strsave(T_NAME);
81c2858
      }
81c2858
  
81c2858
      return retval;
81c2858
***************
81c2858
*** 1939,1947 ****
81c2858
      if (!test_only)
81c2858
      {
81c2858
  	if (STRNCMP(T_NAME, "builtin_", 8) == 0)
81c2858
! 	    oldicon = T_NAME + 8;
81c2858
  	else
81c2858
! 	    oldicon = T_NAME;
81c2858
      }
81c2858
      return FALSE;
81c2858
  }
81c2858
--- 1939,1947 ----
81c2858
      if (!test_only)
81c2858
      {
81c2858
  	if (STRNCMP(T_NAME, "builtin_", 8) == 0)
81c2858
! 	    oldicon = vim_strsave(T_NAME + 8);
81c2858
  	else
81c2858
! 	    oldicon = vim_strsave(T_NAME);
81c2858
      }
81c2858
      return FALSE;
81c2858
  }
81c2858
*** ../vim-7.2.236/src/version.c	2009-07-22 11:16:54.000000000 +0200
81c2858
--- src/version.c	2009-07-22 13:26:30.000000000 +0200
81c2858
***************
81c2858
*** 678,679 ****
81c2858
--- 678,681 ----
81c2858
  {   /* Add new patch number below this line */
81c2858
+ /**/
81c2858
+     237,
81c2858
  /**/
81c2858
81c2858
-- 
81c2858
Common sense is what tells you that the world is flat.
81c2858
81c2858
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
81c2858
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
81c2858
\\\        download, build and distribute -- http://www.A-A-P.org        ///
81c2858
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///