From: Gerd Moellmann <gerd@gnu.org>
Date: Mon, 19 Feb 2001 13:30:31 +0000 (+0000)
Subject: (update_menu_bar): Run activate-menu-bar-hook with
X-Git-Tag: emacs-pretest-21.0.99~295
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=65048e973339594bfdbdf354076af4b0071dbb22;p=emacs.git

(update_menu_bar): Run activate-menu-bar-hook with
safe_run_hooks.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 69ab0fe6bdf..f1123f07a74 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2001-02-19  Gerd Moellmann  <gerd@gnu.org>
 
+	* xmenu.c (set_frame_menubar): Run activate-menu-bar-hook with
+	safe_run_hooks.
+
+	* xdisp.c (update_menu_bar): Run activate-menu-bar-hook with
+	safe_run_hooks.
+
 	* emacs.c (malloc_initialize_hook): Handle case thet `environ'
 	is null.
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 3e5dc207c36..e573069dcb1 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -7033,7 +7033,7 @@ update_menu_bar (f, save_match_data)
 	    }
 
 	  /* Run the Lucid hook.  */
-	  call1 (Vrun_hooks, Qactivate_menubar_hook);
+	  safe_run_hooks (Qactivate_menubar_hook);
 	  
 	  /* If it has changed current-menubar from previous value,
 	     really recompute the menu-bar from the value.  */