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/w32term.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/w32term.c')
| -rw-r--r-- | src/w32term.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/w32term.c b/src/w32term.c index 7da9433d3f1..a74dfbc3bd2 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -2972,7 +2972,7 @@ x_frame_rehighlight (struct w32_display_info *dpyinfo) : dpyinfo->w32_focus_frame); if (! FRAME_LIVE_P (dpyinfo->x_highlight_frame)) { - FSET (dpyinfo->w32_focus_frame, focus_frame, Qnil); + fset_focus_frame (dpyinfo->w32_focus_frame, Qnil); dpyinfo->x_highlight_frame = dpyinfo->w32_focus_frame; } } @@ -3646,7 +3646,7 @@ x_scroll_bar_create (struct window *w, int top, int left, int width, int height) bar->next = FRAME_SCROLL_BARS (f); bar->prev = Qnil; XSETVECTOR (barobj, bar); - FSET (f, scroll_bars, barobj); + fset_scroll_bars (f, barobj); if (! NILP (bar->next)) XSETVECTOR (XSCROLL_BAR (bar->next)->prev, bar); @@ -3832,12 +3832,12 @@ w32_condemn_scroll_bars (FRAME_PTR frame) { Lisp_Object bar; bar = FRAME_SCROLL_BARS (frame); - FSET (frame, scroll_bars, XSCROLL_BAR (bar)->next); + fset_scroll_bars (frame, XSCROLL_BAR (bar)->next); XSCROLL_BAR (bar)->next = FRAME_CONDEMNED_SCROLL_BARS (frame); XSCROLL_BAR (bar)->prev = Qnil; if (! NILP (FRAME_CONDEMNED_SCROLL_BARS (frame))) XSCROLL_BAR (FRAME_CONDEMNED_SCROLL_BARS (frame))->prev = bar; - FSET (frame, condemned_scroll_bars, bar); + fset_condemned_scroll_bars (frame, bar); } } @@ -3869,7 +3869,7 @@ w32_redeem_scroll_bar (struct window *window) return; else if (EQ (FRAME_CONDEMNED_SCROLL_BARS (f), window->vertical_scroll_bar)) - FSET (f, condemned_scroll_bars, bar->next); + fset_condemned_scroll_bars (f, bar->next); else /* If its prev pointer is nil, it must be at the front of one or the other! */ @@ -3884,7 +3884,7 @@ w32_redeem_scroll_bar (struct window *window) bar->next = FRAME_SCROLL_BARS (f); bar->prev = Qnil; XSETVECTOR (barobj, bar); - FSET (f, scroll_bars, barobj); + fset_scroll_bars (f, barobj); if (! NILP (bar->next)) XSETVECTOR (XSCROLL_BAR (bar->next)->prev, bar); } @@ -3901,7 +3901,7 @@ w32_judge_scroll_bars (FRAME_PTR f) /* Clear out the condemned list now so we won't try to process any more events on the hapless scroll bars. */ - FSET (f, condemned_scroll_bars, Qnil); + fset_condemned_scroll_bars (f, Qnil); for (; ! NILP (bar); bar = next) { |