the next property change */
prop = Fget_char_property (position, Qinvisible,
(!NILP (window)
- && EQ (WVAR (XWINDOW (window), buffer), buffer))
+ && EQ (XWINDOW (window)->buffer, buffer))
? window : buffer);
inv_p = TEXT_PROP_MEANS_INVISIBLE (prop);
/* When counting columns (window == nil), don't skip over ellipsis text. */
width = window_body_cols (win);
/* We must make room for continuation marks if we don't have fringes. */
#ifdef HAVE_WINDOW_SYSTEM
- if (!FRAME_WINDOW_P (XFRAME (WVAR (win, frame))))
+ if (!FRAME_WINDOW_P (XFRAME (win->frame)))
#endif
width -= 1;
}
continuation_glyph_width = 1;
#ifdef HAVE_WINDOW_SYSTEM
- if (FRAME_WINDOW_P (XFRAME (WVAR (win, frame))))
+ if (FRAME_WINDOW_P (XFRAME (win->frame)))
continuation_glyph_width = 0; /* In the fringe. */
#endif
? (window_body_cols (w)
- (
#ifdef HAVE_WINDOW_SYSTEM
- FRAME_WINDOW_P (XFRAME (WVAR (w, frame))) ? 0 :
+ FRAME_WINDOW_P (XFRAME (w->frame)) ? 0 :
#endif
1))
: XINT (XCAR (topos))),
/* If the window contains this buffer, use it for getting text properties.
Otherwise use the current buffer as arg for doing that. */
- if (EQ (WVAR (w, buffer), Fcurrent_buffer ()))
+ if (EQ (w->buffer, Fcurrent_buffer ()))
text_prop_object = window;
else
text_prop_object = Fcurrent_buffer ();
old_buffer = Qnil;
GCPRO3 (old_buffer, old_charpos, old_bytepos);
- if (XBUFFER (WVAR (w, buffer)) != current_buffer)
+ if (XBUFFER (w->buffer) != current_buffer)
{
/* Set the window's buffer temporarily to the current buffer. */
- old_buffer = WVAR (w, buffer);
- old_charpos = XMARKER (WVAR (w, pointm))->charpos;
- old_bytepos = XMARKER (WVAR (w, pointm))->bytepos;
- XSETBUFFER (WVAR (w, buffer), current_buffer);
- set_marker_both (WVAR (w, pointm), WVAR (w, buffer),
+ old_buffer = w->buffer;
+ old_charpos = XMARKER (w->pointm)->charpos;
+ old_bytepos = XMARKER (w->pointm)->bytepos;
+ WSET (w, buffer, Fcurrent_buffer ());
+ set_marker_both (w->pointm, w->buffer,
BUF_PT (current_buffer), BUF_PT_BYTE (current_buffer));
}
}
move_it_in_display_line
(&it, ZV,
- (int)(cols * FRAME_COLUMN_WIDTH (XFRAME (WVAR (w, frame))) + 0.5),
+ (int)(cols * FRAME_COLUMN_WIDTH (XFRAME (w->frame)) + 0.5),
MOVE_TO_X);
}
if (BUFFERP (old_buffer))
{
- WVAR (w, buffer) = old_buffer;
- set_marker_both (WVAR (w, pointm), WVAR (w, buffer),
+ WSET (w, buffer, old_buffer);
+ set_marker_both (w->pointm, w->buffer,
old_charpos, old_bytepos);
}