diff options
| author | Joakim Verona | 2012-08-19 02:44:11 +0200 |
|---|---|---|
| committer | Joakim Verona | 2012-08-19 02:44:11 +0200 |
| commit | 5436d1df5e2ba0b4d4f72b03a1cd09b20403654b (patch) | |
| tree | 532faa27319b3bb199d414dc85e63a58246d30b0 /src/nsmenu.m | |
| parent | d02344322b0d2fea8dd9ad9dd0a6c70e058f967b (diff) | |
| parent | e757f1c6f393cf82057dbee0a4325b07f0fd55c4 (diff) | |
| download | emacs-5436d1df5e2ba0b4d4f72b03a1cd09b20403654b.tar.gz emacs-5436d1df5e2ba0b4d4f72b03a1cd09b20403654b.zip | |
upstream
Diffstat (limited to 'src/nsmenu.m')
| -rw-r--r-- | src/nsmenu.m | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nsmenu.m b/src/nsmenu.m index 657b9306942..e8a0b43a01b 100644 --- a/src/nsmenu.m +++ b/src/nsmenu.m | |||
| @@ -214,7 +214,7 @@ ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu) | |||
| 214 | if (! NILP (Vlucid_menu_bar_dirty_flag)) | 214 | if (! NILP (Vlucid_menu_bar_dirty_flag)) |
| 215 | call0 (Qrecompute_lucid_menubar); | 215 | call0 (Qrecompute_lucid_menubar); |
| 216 | safe_run_hooks (Qmenu_bar_update_hook); | 216 | safe_run_hooks (Qmenu_bar_update_hook); |
| 217 | FSET (f, menu_bar_items, menu_bar_items (FRAME_MENU_BAR_ITEMS (f))); | 217 | fset_menu_bar_items (f, menu_bar_items (FRAME_MENU_BAR_ITEMS (f))); |
| 218 | 218 | ||
| 219 | /* Now ready to go */ | 219 | /* Now ready to go */ |
| 220 | items = FRAME_MENU_BAR_ITEMS (f); | 220 | items = FRAME_MENU_BAR_ITEMS (f); |
| @@ -340,7 +340,7 @@ ns_update_menubar (struct frame *f, int deep_p, EmacsMenu *submenu) | |||
| 340 | } | 340 | } |
| 341 | /* The menu items are different, so store them in the frame */ | 341 | /* The menu items are different, so store them in the frame */ |
| 342 | /* FIXME: this is not correct for single-submenu case */ | 342 | /* FIXME: this is not correct for single-submenu case */ |
| 343 | FSET (f, menu_bar_vector, menu_items); | 343 | fset_menu_bar_vector (f, menu_items); |
| 344 | f->menu_bar_items_used = menu_items_used; | 344 | f->menu_bar_items_used = menu_items_used; |
| 345 | 345 | ||
| 346 | /* Calls restore_menu_items, etc., as they were outside */ | 346 | /* Calls restore_menu_items, etc., as they were outside */ |