diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-08-17 14:52:15 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-08-17 14:52:15 -0700 |
| commit | f00af5b1c24515f20f96cfd8d59983ab62fb3f25 (patch) | |
| tree | fbb0f748b8de748ee3e722c9cc3647caea32fe1c /src/xmenu.c | |
| parent | 0c94c8d603031f6b665ae7f3136ca77fb573fd7e (diff) | |
| download | emacs-f00af5b1c24515f20f96cfd8d59983ab62fb3f25.tar.gz | |
* frame.h (FSET): Remove (Bug#12215).
Replace all uses with calls to new setter functions.
Use INLINE_HEADER_BEGIN, INLINE_HEADER_END.
(FRAME_INLINE): New macro.
(fset_buffer_list, fset_buried_buffer_list, fset_condemned_scroll_bars)
(fset_current_tool_bar_string, fset_desired_tool_bar_string)
(fset_face_alist, fset_focus_frame, fset_icon_name, fset_menu_bar_items)
(fset_menu_bar_vector, fset_menu_bar_window, fset_name)
(fset_param_alist, fset_root_window, fset_scroll_bars)
(fset_selected_window, fset_title, fset_tool_bar_items)
(fset_tool_bar_position, fset_tool_bar_window): New functions.
* frame.c (FRAME_INLINE):
Define to EXTERN_INLINE, so that the corresponding functions
are compiled into code.
(fset_buffer_predicate, fset_minibuffer_window): New setter functions.
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) if (! NILP (Vlucid_menu_bar_dirty_flag)) call0 (Qrecompute_lucid_menubar); safe_run_hooks (Qmenu_bar_update_hook); - FSET (f, menu_bar_items, menu_bar_items (FRAME_MENU_BAR_ITEMS (f))); + fset_menu_bar_items (f, menu_bar_items (FRAME_MENU_BAR_ITEMS (f))); items = FRAME_MENU_BAR_ITEMS (f); @@ -1100,7 +1100,7 @@ set_frame_menubar (FRAME_PTR f, int first_time, int deep_p) } /* The menu items are different, so store them in the frame. */ - FSET (f, menu_bar_vector, menu_items); + fset_menu_bar_vector (f, menu_items); f->menu_bar_items_used = menu_items_used; /* This undoes save_menu_items. */ @@ -1283,7 +1283,7 @@ initialize_frame_menubar (FRAME_PTR f) { /* This function is called before the first chance to redisplay the frame. It has to be, so the frame will have the right size. */ - FSET (f, menu_bar_items, menu_bar_items (FRAME_MENU_BAR_ITEMS (f))); + fset_menu_bar_items (f, menu_bar_items (FRAME_MENU_BAR_ITEMS (f))); set_frame_menubar (f, 1, 1); } |