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

safe_run_hooks.

diff --git a/src/ChangeLog b/src/ChangeLog
index 69ab0fe6bdf844bdee7fce474ddb0f3e7ce48626..f1123f07a74ab3370e7c191b115d1de23fe3263b 100644 (file)
--- 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 3e5dc207c36cd5d05e3c35567007647fd4f1d810..e573069dcb194851950dbce6a71a4f4376e1bf29 100644 (file)
--- 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.  */