Commit e8c17b81 authored by Paul Eggert's avatar Paul Eggert
Browse files

* window.h (WSET): Remove.

Replace all uses with calls to new setter functions.
Use INLINE_HEADER_BEGIN, INLINE_HEADER_END.
(WINDOW_INLINE): New macro.
(wset_buffer, wset_frame, wset_left_col, wset_next, wset_prev)
(wset_redisplay_end_trigger, wset_top_line, wset_total_cols)
(wset_total_lines, wset_vertical_scroll_bar)
(wset_window_end_pos, wset_window_end_valid)
(wset_window_end_vpos): New setter functions.
* window.c (WINDOW_INLINE):
Define to EXTERN_INLINE, so that the corresponding functions
are compiled into code.
(wset_combination_limit, wset_dedicated, wset_display_table)
(wset_hchild, wset_left_fringe_width, wset_left_margin_cols)
(wset_new_normal, wset_new_total, wset_next_buffers)
(wset_normal_cols, wset_normal_lines, wset_parent, wset_pointm)
(wset_prev_buffers, wset_right_fringe_width)
(wset_right_margin_cols, wset_scroll_bar_width, wset_start)
(wset_temslot, wset_vchild, wset_vertical_scroll_bar_type)
(wset_window_parameters):
* xdisp.c (wset_base_line_number, wset_base_line_pos)
(wset_column_number_displayed, wset_region_showing):
New setter functions.

Fixes: debbugs:12215
parent 3f22b86f
2012-08-18 Paul Eggert <eggert@cs.ucla.edu>
 
* window.h (WSET): Remove (Bug#12215).
Replace all uses with calls to new setter functions.
Use INLINE_HEADER_BEGIN, INLINE_HEADER_END.
(WINDOW_INLINE): New macro.
(wset_buffer, wset_frame, wset_left_col, wset_next, wset_prev)
(wset_redisplay_end_trigger, wset_top_line, wset_total_cols)
(wset_total_lines, wset_vertical_scroll_bar)
(wset_window_end_pos, wset_window_end_valid)
(wset_window_end_vpos): New setter functions.
* window.c (WINDOW_INLINE):
Define to EXTERN_INLINE, so that the corresponding functions
are compiled into code.
(wset_combination_limit, wset_dedicated, wset_display_table)
(wset_hchild, wset_left_fringe_width, wset_left_margin_cols)
(wset_new_normal, wset_new_total, wset_next_buffers)
(wset_normal_cols, wset_normal_lines, wset_parent, wset_pointm)
(wset_prev_buffers, wset_right_fringe_width)
(wset_right_margin_cols, wset_scroll_bar_width, wset_start)
(wset_temslot, wset_vchild, wset_vertical_scroll_bar_type)
(wset_window_parameters):
* xdisp.c (wset_base_line_number, wset_base_line_pos)
(wset_column_number_displayed, wset_region_showing):
New setter functions.
* termhooks.h (TSET): Remove (Bug#12215).
Replace all uses with calls to new setter functions.
Use INLINE_HEADER_BEGIN, INLINE_HEADER_END.
......
......@@ -621,7 +621,7 @@ adjust_glyph_matrix (struct window *w, struct glyph_matrix *matrix, int x, int y
are invalidated below. */
if (INTEGERP (w->window_end_vpos)
&& XFASTINT (w->window_end_vpos) >= i)
WSET (w, window_end_valid, Qnil);
wset_window_end_valid (w, Qnil);
while (i < matrix->nrows)
matrix->rows[i++].enabled_p = 0;
......@@ -878,7 +878,7 @@ clear_window_matrices (struct window *w, int desired_p)
else
{
clear_glyph_matrix (w->current_matrix);
WSET (w, window_end_valid, Qnil);
wset_window_end_valid (w, Qnil);
}
}
......@@ -1887,14 +1887,14 @@ adjust_frame_glyphs_initially (void)
int top_margin = FRAME_TOP_MARGIN (sf);
/* Do it for the root window. */
WSET (root, top_line, make_number (top_margin));
WSET (root, total_lines, make_number (frame_lines - 1 - top_margin));
WSET (root, total_cols, make_number (frame_cols));
wset_top_line (root, make_number (top_margin));
wset_total_lines (root, make_number (frame_lines - 1 - top_margin));
wset_total_cols (root, make_number (frame_cols));
/* Do it for the mini-buffer window. */
WSET (mini, top_line, make_number (frame_lines - 1));
WSET (mini, total_lines, make_number (1));
WSET (mini, total_cols, make_number (frame_cols));
wset_top_line (mini, make_number (frame_lines - 1));
wset_total_lines (mini, make_number (1));
wset_total_cols (mini, make_number (frame_cols));
adjust_frame_glyphs (sf);
glyphs_initialized_initially_p = 1;
......@@ -2169,7 +2169,7 @@ adjust_frame_glyphs_for_window_redisplay (struct frame *f)
fset_menu_bar_window (f, make_window ());
w = XWINDOW (f->menu_bar_window);
XSETFRAME (frame, f);
WSET (w, frame, frame);
wset_frame (w, frame);
w->pseudo_window_p = 1;
}
else
......@@ -2177,10 +2177,10 @@ adjust_frame_glyphs_for_window_redisplay (struct frame *f)
/* Set window dimensions to frame dimensions and allocate or
adjust glyph matrices of W. */
WSET (w, top_line, make_number (0));
WSET (w, left_col, make_number (0));
WSET (w, total_lines, make_number (FRAME_MENU_BAR_LINES (f)));
WSET (w, total_cols, make_number (FRAME_TOTAL_COLS (f)));
wset_top_line (w, make_number (0));
wset_left_col (w, make_number (0));
wset_total_lines (w, make_number (FRAME_MENU_BAR_LINES (f)));
wset_total_cols (w, make_number (FRAME_TOTAL_COLS (f)));
allocate_matrices_for_window_redisplay (w);
}
#endif /* not USE_X_TOOLKIT && not USE_GTK */
......@@ -2197,16 +2197,16 @@ adjust_frame_glyphs_for_window_redisplay (struct frame *f)
fset_tool_bar_window (f, make_window ());
w = XWINDOW (f->tool_bar_window);
XSETFRAME (frame, f);
WSET (w, frame, frame);
wset_frame (w, frame);
w->pseudo_window_p = 1;
}
else
w = XWINDOW (f->tool_bar_window);
WSET (w, top_line, make_number (FRAME_MENU_BAR_LINES (f)));
WSET (w, left_col, make_number (0));
WSET (w, total_lines, make_number (FRAME_TOOL_BAR_LINES (f)));
WSET (w, total_cols, make_number (FRAME_TOTAL_COLS (f)));
wset_top_line (w, make_number (FRAME_MENU_BAR_LINES (f)));
wset_left_col (w, make_number (0));
wset_total_lines (w, make_number (FRAME_TOOL_BAR_LINES (f)));
wset_total_cols (w, make_number (FRAME_TOTAL_COLS (f)));
allocate_matrices_for_window_redisplay (w);
}
#endif
......@@ -5744,7 +5744,7 @@ change_frame_size_1 (register struct frame *f, int newheight, int newwidth, int
FrameCols (FRAME_TTY (f)) = newwidth;
if (WINDOWP (f->tool_bar_window))
WSET (XWINDOW (f->tool_bar_window), total_cols, make_number (newwidth));
wset_total_cols (XWINDOW (f->tool_bar_window), make_number (newwidth));
}
FRAME_LINES (f) = newheight;
......
......@@ -148,8 +148,8 @@ set_menu_bar_lines_1 (Lisp_Object window, int n)
struct window *w = XWINDOW (window);
w->last_modified = 0;
WSET (w, top_line, make_number (XFASTINT (w->top_line) + n));
WSET (w, total_lines, make_number (XFASTINT (w->total_lines) - n));
wset_top_line (w, make_number (XFASTINT (w->top_line) + n));
wset_total_lines (w, make_number (XFASTINT (w->total_lines) - n));
/* Handle just the top child in a vertical split. */
if (!NILP (w->vchild))
......@@ -305,20 +305,20 @@ make_frame (int mini_p)
if (mini_p)
{
mini_window = make_window ();
WSET (XWINDOW (root_window), next, mini_window);
WSET (XWINDOW (mini_window), prev, root_window);
wset_next (XWINDOW (root_window), mini_window);
wset_prev (XWINDOW (mini_window), root_window);
XWINDOW (mini_window)->mini = 1;
WSET (XWINDOW (mini_window), frame, frame);
wset_frame (XWINDOW (mini_window), frame);
fset_minibuffer_window (f, mini_window);
}
else
{
mini_window = Qnil;
WSET (XWINDOW (root_window), next, Qnil);
wset_next (XWINDOW (root_window), Qnil);
fset_minibuffer_window (f, Qnil);
}
WSET (XWINDOW (root_window), frame, frame);
wset_frame (XWINDOW (root_window), frame);
/* 10 is arbitrary,
just so that there is "something there."
......@@ -327,21 +327,21 @@ make_frame (int mini_p)
SET_FRAME_COLS (f, 10);
FRAME_LINES (f) = 10;
WSET (XWINDOW (root_window), total_cols, make_number (10));
WSET (XWINDOW (root_window), total_lines, make_number (mini_p ? 9 : 10));
wset_total_cols (XWINDOW (root_window), make_number (10));
wset_total_lines (XWINDOW (root_window), make_number (mini_p ? 9 : 10));
if (mini_p)
{
WSET (XWINDOW (mini_window), total_cols, make_number (10));
WSET (XWINDOW (mini_window), top_line, make_number (9));
WSET (XWINDOW (mini_window), total_lines, make_number (1));
wset_total_cols (XWINDOW (mini_window), make_number (10));
wset_top_line (XWINDOW (mini_window), make_number (9));
wset_total_lines (XWINDOW (mini_window), make_number (1));
}
/* Choose a buffer for the frame's root window. */
{
Lisp_Object buf;
WSET (XWINDOW (root_window), buffer, Qt);
wset_buffer (XWINDOW (root_window), Qt);
buf = Fcurrent_buffer ();
/* If buf is a 'hidden' buffer (i.e. one whose name starts with
a space), try to find another one. */
......@@ -360,7 +360,7 @@ make_frame (int mini_p)
if (mini_p)
{
WSET (XWINDOW (mini_window), buffer, Qt);
wset_buffer (XWINDOW (mini_window), Qt);
set_window_buffer (mini_window,
(NILP (Vminibuffer_list)
? get_minibuffer (0)
......@@ -458,9 +458,9 @@ make_minibuffer_frame (void)
mini_window = f->root_window;
fset_minibuffer_window (f, mini_window);
XWINDOW (mini_window)->mini = 1;
WSET (XWINDOW (mini_window), next, Qnil);
WSET (XWINDOW (mini_window), prev, Qnil);
WSET (XWINDOW (mini_window), frame, frame);
wset_next (XWINDOW (mini_window), Qnil);
wset_prev (XWINDOW (mini_window), Qnil);
wset_frame (XWINDOW (mini_window), frame);
/* Put the proper buffer in that window. */
......
......@@ -2003,7 +2003,7 @@ whether or not it is currently displayed in some window. */)
old_buffer = w->buffer;
old_charpos = XMARKER (w->pointm)->charpos;
old_bytepos = XMARKER (w->pointm)->bytepos;
WSET (w, buffer, Fcurrent_buffer ());
wset_buffer (w, Fcurrent_buffer ());
set_marker_both (w->pointm, w->buffer,
BUF_PT (current_buffer), BUF_PT_BYTE (current_buffer));
}
......@@ -2146,7 +2146,7 @@ whether or not it is currently displayed in some window. */)
if (BUFFERP (old_buffer))
{
WSET (w, buffer, old_buffer);
wset_buffer (w, old_buffer);
set_marker_both (w->pointm, w->buffer,
old_charpos, old_bytepos);
}
......
......@@ -3698,7 +3698,7 @@ overwriting cursor (usually when cursor on a tab) */
{
bar = XNS_SCROLL_BAR (window->vertical_scroll_bar);
[bar removeFromSuperview];
WSET (window, vertical_scroll_bar, Qnil);
wset_vertical_scroll_bar (window, Qnil);
}
ns_clear_frame_area (f, sb_left, top, width, height);
UNBLOCK_INPUT;
......@@ -3709,7 +3709,7 @@ overwriting cursor (usually when cursor on a tab) */
{
ns_clear_frame_area (f, sb_left, top, width, height);
bar = [[EmacsScroller alloc] initFrame: r window: win];
WSET (window, vertical_scroll_bar, make_save_value (bar, 0));
wset_vertical_scroll_bar (window, make_save_value (bar, 0));
}
else
{
......@@ -6388,7 +6388,7 @@ - (void)dealloc
{
NSTRACE (EmacsScroller_dealloc);
if (!NILP (win))
WSET (XWINDOW (win), vertical_scroll_bar, Qnil);
wset_vertical_scroll_bar (XWINDOW (win), Qnil);
[super dealloc];
}
......
......@@ -5647,8 +5647,8 @@ Text larger than the specified size is clipped. */)
/* Set up the frame's root window. */
w = XWINDOW (FRAME_ROOT_WINDOW (f));
WSET (w, left_col, make_number (0));
WSET (w, top_line, make_number (0));
wset_left_col (w, make_number (0));
wset_top_line (w, make_number (0));
if (CONSP (Vx_max_tooltip_size)
&& INTEGERP (XCAR (Vx_max_tooltip_size))
......@@ -5656,13 +5656,13 @@ Text larger than the specified size is clipped. */)
&& INTEGERP (XCDR (Vx_max_tooltip_size))
&& XINT (XCDR (Vx_max_tooltip_size)) > 0)
{
WSET (w, total_cols, XCAR (Vx_max_tooltip_size));
WSET (w, total_lines, XCDR (Vx_max_tooltip_size));
wset_total_cols (w, XCAR (Vx_max_tooltip_size));
wset_total_lines (w, XCDR (Vx_max_tooltip_size));
}
else
{
WSET (w, total_cols, make_number (80));
WSET (w, total_lines, make_number (40));
wset_total_cols (w, make_number (80));
wset_total_lines (w, make_number (40));
}
FRAME_TOTAL_COLS (f) = XINT (w->total_cols);
......@@ -5733,7 +5733,7 @@ Text larger than the specified size is clipped. */)
/* w->total_cols and FRAME_TOTAL_COLS want the width in columns,
not in pixels. */
width /= WINDOW_FRAME_COLUMN_WIDTH (w);
WSET (w, total_cols, make_number (width));
wset_total_cols (w, make_number (width));
FRAME_TOTAL_COLS (f) = width;
adjust_glyphs (f);
w->pseudo_window_p = 1;
......
......@@ -3670,7 +3670,7 @@ x_scroll_bar_remove (struct scroll_bar *bar)
my_destroy_window (f, SCROLL_BAR_W32_WINDOW (bar));
/* Dissociate this scroll bar from its window. */
WSET (XWINDOW (bar->window), vertical_scroll_bar, Qnil);
wset_vertical_scroll_bar (XWINDOW (bar->window), Qnil);
UNBLOCK_INPUT;
}
......@@ -3808,7 +3808,7 @@ w32_set_vertical_scroll_bar (struct window *w,
w32_set_scroll_bar_thumb (bar, portion, position, whole);
XSETVECTOR (barobj, bar);
WSET (w, vertical_scroll_bar, barobj);
wset_vertical_scroll_bar (w, barobj);
}
......
......@@ -19,6 +19,9 @@ You should have received a copy of the GNU General Public License
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#define WINDOW_INLINE EXTERN_INLINE
#include <stdio.h>
#include <setjmp.h>
......@@ -130,6 +133,118 @@ static int window_scroll_pixel_based_preserve_y;
static EMACS_INT window_scroll_preserve_hpos;
static EMACS_INT window_scroll_preserve_vpos;
/* These setters are used only in this file, so they can be private. */
static inline void
wset_combination_limit (struct window *w, Lisp_Object val)
{
w->combination_limit = val;
}
static inline void
wset_dedicated (struct window *w, Lisp_Object val)
{
w->dedicated = val;
}
static inline void
wset_display_table (struct window *w, Lisp_Object val)
{
w->display_table = val;
}
static inline void
wset_hchild (struct window *w, Lisp_Object val)
{
w->hchild = val;
}
static inline void
wset_left_fringe_width (struct window *w, Lisp_Object val)
{
w->left_fringe_width = val;
}
static inline void
wset_left_margin_cols (struct window *w, Lisp_Object val)
{
w->left_margin_cols = val;
}
static inline void
wset_new_normal (struct window *w, Lisp_Object val)
{
w->new_normal = val;
}
static inline void
wset_new_total (struct window *w, Lisp_Object val)
{
w->new_total = val;
}
static inline void
wset_next_buffers (struct window *w, Lisp_Object val)
{
w->next_buffers = val;
}
static inline void
wset_normal_cols (struct window *w, Lisp_Object val)
{
w->normal_cols = val;
}
static inline void
wset_normal_lines (struct window *w, Lisp_Object val)
{
w->normal_lines = val;
}
static inline void
wset_parent (struct window *w, Lisp_Object val)
{
w->parent = val;
}
static inline void
wset_pointm (struct window *w, Lisp_Object val)
{
w->pointm = val;
}
static inline void
wset_prev_buffers (struct window *w, Lisp_Object val)
{
w->prev_buffers = val;
}
static inline void
wset_right_fringe_width (struct window *w, Lisp_Object val)
{
w->right_fringe_width = val;
}
static inline void
wset_right_margin_cols (struct window *w, Lisp_Object val)
{
w->right_margin_cols = val;
}
static inline void
wset_scroll_bar_width (struct window *w, Lisp_Object val)
{
w->scroll_bar_width = val;
}
static inline void
wset_start (struct window *w, Lisp_Object val)
{
w->start = val;
}
static inline void
wset_temslot (struct window *w, Lisp_Object val)
{
w->temslot = val;
}
static inline void
wset_vchild (struct window *w, Lisp_Object val)
{
w->vchild = val;
}
static inline void
wset_vertical_scroll_bar_type (struct window *w, Lisp_Object val)
{
w->vertical_scroll_bar_type = val;
}
static inline void
wset_window_parameters (struct window *w, Lisp_Object val)
{
w->window_parameters = val;
}
struct window *
decode_live_window (register Lisp_Object window)
{
......@@ -514,7 +629,8 @@ never \(re-)combined with WINDOW's siblings. Other values are reserved
for future use. */)
(Lisp_Object window, Lisp_Object limit)
{
return WSET (decode_valid_window (window), combination_limit, limit);
wset_combination_limit (decode_valid_window (window), limit);
return limit;
}
DEFUN ("window-use-time", Fwindow_use_time, Swindow_use_time, 0, 1, 0,
......@@ -753,7 +869,8 @@ with two arguments: WINDOW, and the end trigger value. Afterwards the
end-trigger value is reset to nil. */)
(register Lisp_Object window, Lisp_Object value)
{
return WSET (decode_live_window (window), redisplay_end_trigger, value);
wset_redisplay_end_trigger (decode_live_window (window), value);
return value;
}
DEFUN ("window-edges", Fwindow_edges, Swindow_edges, 0, 1, 0,
......@@ -1674,7 +1791,8 @@ buffer. If and when `set-window-buffer' displays another buffer in a
window, it also makes sure that the window is no more dedicated. */)
(Lisp_Object window, Lisp_Object flag)
{
return WSET (decode_live_window (window), dedicated, flag);
wset_dedicated (decode_live_window (window), flag);
return flag;
}
DEFUN ("window-prev-buffers", Fwindow_prev_buffers, Swindow_prev_buffers,
......@@ -1700,7 +1818,8 @@ where BUFFER is a buffer, WINDOW-START is the start position of the
window for that buffer, and POS is a window-specific point value. */)
(Lisp_Object window, Lisp_Object prev_buffers)
{
return WSET (decode_live_window (window), prev_buffers, prev_buffers);
wset_prev_buffers (decode_live_window (window), prev_buffers);
return prev_buffers;
}
DEFUN ("window-next-buffers", Fwindow_next_buffers, Swindow_next_buffers,
......@@ -1719,7 +1838,8 @@ WINDOW must be a live window and defaults to the selected one.
NEXT-BUFFERS should be a list of buffers. */)
(Lisp_Object window, Lisp_Object next_buffers)
{
return WSET (decode_live_window (window), next_buffers, next_buffers);
wset_next_buffers (decode_live_window (window), next_buffers);
return next_buffers;
}
DEFUN ("window-parameters", Fwindow_parameters, Swindow_parameters,
......@@ -1756,8 +1876,8 @@ Return VALUE. */)
old_alist_elt = Fassq (parameter, w->window_parameters);
if (NILP (old_alist_elt))
WSET (w, window_parameters,
Fcons (Fcons (parameter, value), w->window_parameters));
wset_window_parameters
(w, Fcons (Fcons (parameter, value), w->window_parameters));
else
Fsetcdr (old_alist_elt, value);
return value;
......@@ -1802,7 +1922,8 @@ DEFUN ("set-window-display-table", Fset_window_display_table, Sset_window_displa
WINDOW must be a live window and defaults to the selected one. */)
(register Lisp_Object window, Lisp_Object table)
{
return WSET (decode_live_window (window), display_table, table);
wset_display_table (decode_live_window (window), table);
return table;
}
/* Record info on buffer window W is displaying
......@@ -1870,14 +1991,14 @@ replace_window (Lisp_Object old, Lisp_Object new, int setflag)
if (setflag)
{
WSET (n, left_col, o->left_col);
WSET (n, top_line, o->top_line);
WSET (n, total_cols, o->total_cols);
WSET (n, total_lines, o->total_lines);
WSET (n, normal_cols, o->normal_cols);
WSET (o, normal_cols, make_float (1.0));
WSET (n, normal_lines, o->normal_lines);
WSET (o, normal_lines, make_float (1.0));
wset_left_col (n, o->left_col);
wset_top_line (n, o->top_line);
wset_total_cols (n, o->total_cols);
wset_total_lines (n, o->total_lines);
wset_normal_cols (n, o->normal_cols);
wset_normal_cols (o, make_float (1.0));
wset_normal_lines (n, o->normal_lines);
wset_normal_lines (o, make_float (1.0));
n->desired_matrix = n->current_matrix = 0;
n->vscroll = 0;
memset (&n->cursor, 0, sizeof (n->cursor));
......@@ -1887,30 +2008,30 @@ replace_window (Lisp_Object old, Lisp_Object new, int setflag)
n->phys_cursor_width = -1;
n->must_be_updated_p = 0;
n->pseudo_window_p = 0;
WSET (n, window_end_vpos, make_number (0));
WSET (n, window_end_pos, make_number (0));
WSET (n, window_end_valid, Qnil);
wset_window_end_vpos (n, make_number (0));
wset_window_end_pos (n, make_number (0));
wset_window_end_valid (n, Qnil);
n->frozen_window_start_p = 0;
}
tem = o->next;
WSET (n, next, tem);
wset_next (n, tem);
if (!NILP (tem))
WSET (XWINDOW (tem), prev, new);
wset_prev (XWINDOW (tem), new);
tem = o->prev;
WSET (n, prev, tem);
wset_prev (n, tem);
if (!NILP (tem))
WSET (XWINDOW (tem), next, new);
wset_next (XWINDOW (tem), new);
tem = o->parent;
WSET (n, parent, tem);
wset_parent (n, tem);
if (!NILP (tem))
{
if (EQ (XWINDOW (tem)->vchild, old))
WSET (XWINDOW (tem), vchild, new);
wset_vchild (XWINDOW (tem), new);
if (EQ (XWINDOW (tem)->hchild, old))
WSET (XWINDOW (tem), hchild, new);
wset_hchild (XWINDOW (tem), new);
}
}
......@@ -1943,34 +2064,34 @@ recombine_windows (Lisp_Object window)
assign new normal sizes. */
if (NILP (w->prev))
if (horflag)
WSET (p, hchild, child);
wset_hchild (p, child);
else
WSET (p, vchild, child);
wset_vchild (p, child);
else
{
WSET (c, prev, w->prev);
WSET (XWINDOW (w->prev), next, child);
wset_prev (c, w->prev);
wset_next (XWINDOW (w->prev), child);
}
while (c)
{
WSET (c, parent, parent);
wset_parent (c, parent);
if (horflag)
WSET (c, normal_cols,
make_float (XFLOATINT (c->total_cols)
/ XFLOATINT (p->total_cols)));
wset_normal_cols (c,
make_float (XFLOATINT (c->total_cols)
/ XFLOATINT (p->total_cols)));
else
WSET (c, normal_lines,
make_float (XFLOATINT (c->total_lines)
/ XFLOATINT (p->total_lines)));
wset_normal_lines (c,
make_float (XFLOATINT (c->total_lines)
/ XFLOATINT (p->total_lines)));
if (NILP (c->next))
{
if (!NILP (w->next))
{
WSET (c, next, w->next);
WSET (XWINDOW (c->next), prev, child);
wset_next (c, w->next);
wset_prev (XWINDOW (c->next), child);
}
c = 0;
......@@ -1983,8 +2104,8 @@ recombine_windows (Lisp_Object window)
}
/* WINDOW can be deleted now. */
WSET (w, vchild, Qnil);
WSET (w, hchild, Qnil);
wset_vchild (w, Qnil);
wset_hchild (w, Qnil);
}
}
}
......@@ -2505,7 +2626,7 @@ window_loop (enum window_loop type, Lisp_Object obj, int mini, Lisp_Object frame
if (EQ (w->buffer, obj))
{
/* Undedicate WINDOW. */
WSET (w, dedicated, Qnil);
wset_dedicated (w, Qnil);
/* Make WINDOW show the buffer returned by
other_buffer_safely, don't run any hooks. */
set_window_buffer
......@@ -2727,7 +2848,7 @@ window-start value is reasonable when this function is called. */)
/* Resize child windows vertically. */
XSETINT (delta, XINT (r->total_lines)
- XINT (w->total_lines));
WSET (w, top_line, r->top_line);
wset_top_line (w, r->top_line);
resize_root_window (window, delta, Qnil, Qnil);
if (window_resize_check (w, 0))
window_resize_apply (w, 0);
......@@ -2743,10 +2864,10 @@ window-start value is reasonable when this function is called. */)
/* Resize child windows horizontally. */
if (!resize_failed)
{
WSET (w, left_col, r->left_col);
wset_left_col (w, r->left_col);
XSETINT (delta,
XINT (r->total_cols) - XINT (w->total_cols));
WSET (w, left_col, r->left_col);
wset_left_col (w, r->left_col);
resize_root_window (window, delta, Qt, Qnil);
if (window_resize_check (w, 1))
window_resize_apply (w, 1);
......@@ -2774,32 +2895,32 @@ window-start value is reasonable when this function is called. */)
{
sibling = w->prev;
s = XWINDOW (sibling);
WSET (s, next, w->next);
wset_next (s, w->next);
if (!NILP (s->next))
WSET (XWINDOW (s->next), prev, sibling);
wset_prev (XWINDOW (s->next), sibling);