aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog6
-rw-r--r--src/xdisp.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 69ab0fe6bdf..f1123f07a74 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
12001-02-19 Gerd Moellmann <gerd@gnu.org> 12001-02-19 Gerd Moellmann <gerd@gnu.org>
2 2
3 * xmenu.c (set_frame_menubar): Run activate-menu-bar-hook with
4 safe_run_hooks.
5
6 * xdisp.c (update_menu_bar): Run activate-menu-bar-hook with
7 safe_run_hooks.
8
3 * emacs.c (malloc_initialize_hook): Handle case thet `environ' 9 * emacs.c (malloc_initialize_hook): Handle case thet `environ'
4 is null. 10 is null.
5 11
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)
7033 } 7033 }
7034 7034
7035 /* Run the Lucid hook. */ 7035 /* Run the Lucid hook. */
7036 call1 (Vrun_hooks, Qactivate_menubar_hook); 7036 safe_run_hooks (Qactivate_menubar_hook);
7037 7037
7038 /* If it has changed current-menubar from previous value, 7038 /* If it has changed current-menubar from previous value,
7039 really recompute the menu-bar from the value. */ 7039 really recompute the menu-bar from the value. */