From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 4 Jan 2011 16:49:32 +0000 (+0100)
Subject: updated for version 7.3.095
X-Git-Tag: v7.3.095
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d91f704b030647fbaf6eedcb6492f2c231ad635a;p=vim

updated for version 7.3.095
Problem:    Win32: In Chinese tear-off menu doesn't work. (Weasley)
Solution:   Use menu_name_equal().  (Alex Jakushev)
---

diff --git a/src/menu.c b/src/menu.c
index 10becdbda..4d2bce18b 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -1512,8 +1512,8 @@ menu_name_equal(name, menu)
 {
 #ifdef FEAT_MULTI_LANG
     if (menu->en_name != NULL
-	    && (menu_namecmp(name,menu->en_name)
-		|| menu_namecmp(name,menu->en_dname)))
+	    && (menu_namecmp(name, menu->en_name)
+		|| menu_namecmp(name, menu->en_dname)))
 	return TRUE;
 #endif
     return menu_namecmp(name, menu->name) || menu_namecmp(name, menu->dname);
@@ -2342,7 +2342,7 @@ gui_find_menu(path_name)
 
 	while (menu != NULL)
 	{
-	    if (STRCMP(name, menu->name) == 0 || STRCMP(name, menu->dname) == 0)
+	    if (menu_name_equal(name, menu))
 	    {
 		if (menu->children == NULL)
 		{
diff --git a/src/version.c b/src/version.c
index 5bd8dcf98..2873adb51 100644
--- a/src/version.c
+++ b/src/version.c
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    95,
 /**/
     94,
 /**/