(update_menu_bar) [MAC_OS]: Don't set

w->update_mode_line if arg F is not the selected frame.

diff --git a/src/ChangeLog b/src/ChangeLog
index edaa7af421962affa708078df1b0bbfedd9b657f..f42c2ab25f93b03e5e2ebd3c0c26c69b69f1ab06 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,23 @@
+2006-02-19  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+       * xdisp.c (update_menu_bar) [MAC_OS]: Don't set
+       w->update_mode_line if arg F is not the selected frame.
+
+       * macmenu.c (popup_activated_flag, submenu_id)
+       (next_menubar_widget_id): Remove variables.
+       (initialize_frame_menubar): Remove function.
+       (pop_down_menu, mac_menu_show): Simplify save value.
+       (dispose_menus): New function.
+       (pop_down_menu, fill_menubar): Use it.
+       (fill_submenu): Remove function.  All uses changed to fill_menu.
+       (add_menu_item): Remove args SUBMENU and FORCE_DISABLE.  New arg
+       POS.  Don't call SetMenuItemHierarchicalID here.
+       (fill_menu): Add arg SUBMENU_ID.  Return submenu_id that is to be
+       used next.  Call SetMenuItemHierarchicalID here.
+       (fill_menubar): Add arg DEEP_P.  All uses changed.  Clean up menu
+       objects if needed.  Reuse existing menu bar titles if possible.
+       (set_frame_menubar): Don't clean up menu objects here.
+
 2006-02-18  Chong Yidong  <cyd@stupidchicken.com>
 
        * window.c (window_min_size_1): Ensure room for the scroll bar and

diff --git a/src/xdisp.c b/src/xdisp.c
index 9006687cd36e81927469c1fb514613700b4f41d5..bcd28d4338409f9d834256642cca01d4c78de22c 100644 (file)
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -9052,14 +9052,15 @@ update_menu_bar (f, save_match_data)
          /* Redisplay the menu bar in case we changed it.  */
 #if defined (USE_X_TOOLKIT) || defined (HAVE_NTGUI) || defined (MAC_OS) \
     || defined (USE_GTK)
-         if (FRAME_WINDOW_P (f)
-#if defined (MAC_OS)
-              /* All frames on Mac OS share the same menubar.  So only the
-                 selected frame should be allowed to set it.  */
-              && f == SELECTED_FRAME ()
+         if (FRAME_WINDOW_P (f))
+           {
+#ifdef MAC_OS
+              /* All frames on Mac OS share the same menubar.  So only
+                 the selected frame should be allowed to set it.  */
+              if (f == SELECTED_FRAME ())
 #endif
-            )
-           set_frame_menubar (f, 0, 0);
+               set_frame_menubar (f, 0, 0);
+           }
          else
            /* On a terminal screen, the menu bar is an ordinary screen
               line, and this makes it get updated.  */