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/xmenu.c | |
| parent | d02344322b0d2fea8dd9ad9dd0a6c70e058f967b (diff) | |
| parent | e757f1c6f393cf82057dbee0a4325b07f0fd55c4 (diff) | |
| download | emacs-5436d1df5e2ba0b4d4f72b03a1cd09b20403654b.tar.gz emacs-5436d1df5e2ba0b4d4f72b03a1cd09b20403654b.zip | |
upstream
Diffstat (limited to 'src/xmenu.c')
| -rw-r--r-- | src/xmenu.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/xmenu.c b/src/xmenu.c index ab790094f85..54a7849218a 100644 --- a/src/xmenu.c +++ b/src/xmenu.c | |||
| @@ -1008,7 +1008,7 @@ set_frame_menubar (FRAME_PTR f, int first_time, int deep_p) | |||
| 1008 | if (! NILP (Vlucid_menu_bar_dirty_flag)) | 1008 | if (! NILP (Vlucid_menu_bar_dirty_flag)) |
| 1009 | call0 (Qrecompute_lucid_menubar); | 1009 | call0 (Qrecompute_lucid_menubar); |
| 1010 | safe_run_hooks (Qmenu_bar_update_hook); | 1010 | safe_run_hooks (Qmenu_bar_update_hook); |
| 1011 | FSET (f, menu_bar_items, menu_bar_items (FRAME_MENU_BAR_ITEMS (f))); | 1011 | fset_menu_bar_items (f, menu_bar_items (FRAME_MENU_BAR_ITEMS (f))); |
| 1012 | 1012 | ||
| 1013 | items = FRAME_MENU_BAR_ITEMS (f); | 1013 | items = FRAME_MENU_BAR_ITEMS (f); |
| 1014 | 1014 | ||
| @@ -1100,7 +1100,7 @@ set_frame_menubar (FRAME_PTR f, int first_time, int deep_p) | |||
| 1100 | } | 1100 | } |
| 1101 | 1101 | ||
| 1102 | /* The menu items are different, so store them in the frame. */ | 1102 | /* The menu items are different, so store them in the frame. */ |
| 1103 | FSET (f, menu_bar_vector, menu_items); | 1103 | fset_menu_bar_vector (f, menu_items); |
| 1104 | f->menu_bar_items_used = menu_items_used; | 1104 | f->menu_bar_items_used = menu_items_used; |
| 1105 | 1105 | ||
| 1106 | /* This undoes save_menu_items. */ | 1106 | /* This undoes save_menu_items. */ |
| @@ -1283,7 +1283,7 @@ initialize_frame_menubar (FRAME_PTR f) | |||
| 1283 | { | 1283 | { |
| 1284 | /* This function is called before the first chance to redisplay | 1284 | /* This function is called before the first chance to redisplay |
| 1285 | the frame. It has to be, so the frame will have the right size. */ | 1285 | the frame. It has to be, so the frame will have the right size. */ |
| 1286 | FSET (f, menu_bar_items, menu_bar_items (FRAME_MENU_BAR_ITEMS (f))); | 1286 | fset_menu_bar_items (f, menu_bar_items (FRAME_MENU_BAR_ITEMS (f))); |
| 1287 | set_frame_menubar (f, 1, 1); | 1287 | set_frame_menubar (f, 1, 1); |
| 1288 | } | 1288 | } |
| 1289 | 1289 | ||