merging macmenu.c change

[Miles Bader]

When merging changes from the Emacs release branch to the trunk, the
following change to src/macmenu.c did not apply, so I have dropped them.  If
they are needed, you should apply an equivalent change to the Emacs trunk.

Thanks,

-Miles


2007-12-23  YAMAMOTO Mitsuharu  <address@hidden>

        * macmenu.c (fill_menubar) [MAC_OSX]: Add workaround for Mac OS X 10.5
        about not changing Help menu title.

--- orig/src/macmenu.c
+++ mod/src/macmenu.c
@@ -3174,7 +3174,22 @@
 
          GetMenuTitle (menu, old_title);
          if (!EqualString (title, old_title, false, false))
-           SetMenuTitle (menu, title);
+           {
+#ifdef MAC_OSX
+             if (id + 1 == min_menu_id[MAC_MENU_MENU_BAR + 1]
+                 || GetMenuRef (id + 1) == NULL)
+               {
+                 /* This is a workaround for Mac OS X 10.5 where just
+                    calling SetMenuTitle fails to change the title of
+                    the last (Help) menu in the menu bar.  */
+                 DeleteMenu (id);
+                 DisposeMenu (menu);
+                 menu = NULL;
+               }
+             else
+#endif /* MAC_OSX */
+               SetMenuTitle (menu, title);
+           }
 #else  /* !TARGET_API_MAC_CARBON */
          if (!EqualString (title, (*menu)->menuData, false, false))
            {