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