From: Karl Heuer <kwzh@gnu.org>
Date: Fri, 9 Jun 1995 00:51:32 +0000 (+0000)
Subject: (update_menu_bar): Run activate-menubar-hook
X-Git-Tag: emacs-19.34~3718
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=34acc8e6e51c4711574b84400aee8311b0bb3fb9;p=emacs.git

(update_menu_bar): Run activate-menubar-hook
and call recompute-lucid-menubar.
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 6777ae9fea4..8d3a6321f30 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1262,6 +1262,12 @@ update_menu_bar (f, save_match_data)
 	  if (save_match_data)
 	    record_unwind_protect (Fstore_match_data, Fmatch_data ());
 
+	  /* Run the Lucid hook.  */
+	  call1 (Vrun_hooks, Qactivate_menubar_hook);
+	  /* If it has changed current-menubar from previous value,
+	     really recompute the menubar from the value.  */
+	  if (! NILP (Vlucid_menu_bar_dirty_flag))
+	    call0 (Qrecompute_lucid_menubar);
 	  call1 (Vrun_hooks, Qmenu_bar_update_hook);
 	  current_buffer = XBUFFER (w->buffer);
 	  FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f));