diff options
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/w32menu.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 96d5c774339..df0b500c485 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -8,6 +8,8 @@ | |||
| 8 | 8 | ||
| 9 | 2010-08-19 Jason Rumney <jasonr@gnu.org> | 9 | 2010-08-19 Jason Rumney <jasonr@gnu.org> |
| 10 | 10 | ||
| 11 | * w32menu.c (set_frame_menubar): Remove call to undefined function. | ||
| 12 | |||
| 11 | * w32fns.c (w32_wnd_proc): Don't check context before initializing. | 13 | * w32fns.c (w32_wnd_proc): Don't check context before initializing. |
| 12 | 14 | ||
| 13 | 2010-08-19 Jan Djärv <jan.h.d@swipnet.se> | 15 | 2010-08-19 Jan Djärv <jan.h.d@swipnet.se> |
diff --git a/src/w32menu.c b/src/w32menu.c index 1146843bec8..0ed9bffe70c 100644 --- a/src/w32menu.c +++ b/src/w32menu.c | |||
| @@ -420,12 +420,8 @@ set_frame_menubar (FRAME_PTR f, int first_time, int deep_p) | |||
| 420 | 420 | ||
| 421 | set_buffer_internal_1 (XBUFFER (buffer)); | 421 | set_buffer_internal_1 (XBUFFER (buffer)); |
| 422 | 422 | ||
| 423 | /* Run the Lucid hook. */ | 423 | /* Run the hooks. */ |
| 424 | safe_run_hooks (Qactivate_menubar_hook); | 424 | safe_run_hooks (Qactivate_menubar_hook); |
| 425 | /* If it has changed current-menubar from previous value, | ||
| 426 | really recompute the menubar from the value. */ | ||
| 427 | if (! NILP (Vlucid_menu_bar_dirty_flag)) | ||
| 428 | call0 (Qrecompute_lucid_menubar); | ||
| 429 | safe_run_hooks (Qmenu_bar_update_hook); | 425 | safe_run_hooks (Qmenu_bar_update_hook); |
| 430 | FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f)); | 426 | FRAME_MENU_BAR_ITEMS (f) = menu_bar_items (FRAME_MENU_BAR_ITEMS (f)); |
| 431 | 427 | ||