diff options
| author | Gerd Moellmann | 2001-02-19 13:30:31 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2001-02-19 13:30:31 +0000 |
| commit | 65048e973339594bfdbdf354076af4b0071dbb22 (patch) | |
| tree | 7596824656b75f44ea29057921c8f60808776c69 | |
| parent | 950eaee7c6b0b78087d80e544053f8bc06f1eec4 (diff) | |
| download | emacs-65048e973339594bfdbdf354076af4b0071dbb22.tar.gz emacs-65048e973339594bfdbdf354076af4b0071dbb22.zip | |
(update_menu_bar): Run activate-menu-bar-hook with
safe_run_hooks.
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/xdisp.c | 2 |
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 @@ | |||
| 1 | 2001-02-19 Gerd Moellmann <gerd@gnu.org> | 1 | 2001-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. */ |