summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2011-01-04 17:49:32 +0100
committerBram Moolenaar <Bram@vim.org>2011-01-04 17:49:32 +0100
commitd91f704b030647fbaf6eedcb6492f2c231ad635a (patch)
treed22f465767dd01d1a1d8aebfeedc6d24ea6373c6
parent7eb4652e745b44fdbf618210395f1b8be4d3f7e9 (diff)
downloadvim-git-d91f704b030647fbaf6eedcb6492f2c231ad635a.tar.gz
updated for version 7.3.095v7.3.095
Problem: Win32: In Chinese tear-off menu doesn't work. (Weasley) Solution: Use menu_name_equal(). (Alex Jakushev)
-rw-r--r--src/menu.c6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
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
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 95,
+/**/
94,
/**/
93,