732303d
To: vim_dev@googlegroups.com
732303d
Subject: Patch 7.3.095
732303d
Fcc: outbox
732303d
From: Bram Moolenaar <Bram@moolenaar.net>
732303d
Mime-Version: 1.0
732303d
Content-Type: text/plain; charset=UTF-8
732303d
Content-Transfer-Encoding: 8bit
732303d
------------
732303d
732303d
Patch 7.3.095
732303d
Problem:    Win32: In Chinese tear-off menu doesn't work. (Weasley)
732303d
Solution:   Use menu_name_equal().  (Alex Jakushev)
732303d
Files:	    src/menu.c
732303d
732303d
732303d
*** ../vim-7.3.094/src/menu.c	2010-08-15 21:57:25.000000000 +0200
732303d
--- src/menu.c	2011-01-04 17:41:38.000000000 +0100
732303d
***************
732303d
*** 1512,1519 ****
732303d
  {
732303d
  #ifdef FEAT_MULTI_LANG
732303d
      if (menu->en_name != NULL
732303d
! 	    && (menu_namecmp(name,menu->en_name)
732303d
! 		|| menu_namecmp(name,menu->en_dname)))
732303d
  	return TRUE;
732303d
  #endif
732303d
      return menu_namecmp(name, menu->name) || menu_namecmp(name, menu->dname);
732303d
--- 1512,1519 ----
732303d
  {
732303d
  #ifdef FEAT_MULTI_LANG
732303d
      if (menu->en_name != NULL
732303d
! 	    && (menu_namecmp(name, menu->en_name)
732303d
! 		|| menu_namecmp(name, menu->en_dname)))
732303d
  	return TRUE;
732303d
  #endif
732303d
      return menu_namecmp(name, menu->name) || menu_namecmp(name, menu->dname);
732303d
***************
732303d
*** 2342,2348 ****
732303d
  
732303d
  	while (menu != NULL)
732303d
  	{
732303d
! 	    if (STRCMP(name, menu->name) == 0 || STRCMP(name, menu->dname) == 0)
732303d
  	    {
732303d
  		if (menu->children == NULL)
732303d
  		{
732303d
--- 2342,2348 ----
732303d
  
732303d
  	while (menu != NULL)
732303d
  	{
732303d
! 	    if (menu_name_equal(name, menu))
732303d
  	    {
732303d
  		if (menu->children == NULL)
732303d
  		{
732303d
*** ../vim-7.3.094/src/version.c	2010-12-30 14:57:03.000000000 +0100
732303d
--- src/version.c	2011-01-04 17:43:41.000000000 +0100
732303d
***************
732303d
*** 716,717 ****
732303d
--- 716,719 ----
732303d
  {   /* Add new patch number below this line */
732303d
+ /**/
732303d
+     95,
732303d
  /**/
732303d
732303d
-- 
732303d
If your nose runs, and your feet smell, you might be upside down.
732303d
732303d
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
732303d
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
732303d
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
732303d
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///