Separate read and write access to Lisp_Object slots of struct window.

* window.h (WGET, WSET): New macros similar to AREF and ASET.
* alloc.c, buffer.c, composite.c, dispextern.h, dispnew.c, editfns.c:
* fileio.c, font.c, fontset.c, frame.c, frame.h, fringe.c, indent.c:
* insdel.c, keyboard.c, keymap.c, lisp.h, minibuf.c, msdos.c, nsfns.m:
* nsmenu.m, nsterm.m, print.c, textprop.c, w32fns.c, w32menu.c:
* w32term.c, window.c, xdisp.c, xfaces.c, xfns.c, xmenu.c, xterm.c:
Adjust users.

1 files changed, 7 insertions, 7 deletions

diff --git a/src/dispextern.h b/src/dispextern.h
index 47a3f971f25..09869501ad9 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1379,7 +1379,7 @@ struct glyph_string
       ? current_mode_line_height                                \
       : (MATRIX_MODE_LINE_HEIGHT ((W)->current_matrix)          \
          ? MATRIX_MODE_LINE_HEIGHT ((W)->current_matrix)        \
-         : estimate_mode_line_height (XFRAME (WVAR (W, frame)), \
+         : estimate_mode_line_height (XFRAME (WGET (W, frame)), \
                                       CURRENT_MODE_LINE_FACE_ID (W))))
 
 /* Return the current height of the header line of window W.  If not
@@ -1392,7 +1392,7 @@ struct glyph_string
        ? current_header_line_height                             \
        : (MATRIX_HEADER_LINE_HEIGHT ((W)->current_matrix)       \
           ? MATRIX_HEADER_LINE_HEIGHT ((W)->current_matrix)     \
-          : estimate_mode_line_height (XFRAME (WVAR (W, frame)),\
+          : estimate_mode_line_height (XFRAME (WGET (W, frame)),\
                                        HEADER_LINE_FACE_ID)))
 
 /* Return the height of the desired mode line of window W.  */
@@ -1411,8 +1411,8 @@ struct glyph_string
      (!MINI_WINDOW_P ((W))                                              \
       && !(W)->pseudo_window_p                                          \
       && FRAME_WANTS_MODELINE_P (XFRAME (WINDOW_FRAME ((W))))           \
-      && BUFFERP (WVAR (W, buffer))                                     \
-      && !NILP (BVAR (XBUFFER (WVAR (W, buffer)), mode_line_format))    \
+      && BUFFERP (WGET (W, buffer))                                     \
+      && !NILP (BVAR (XBUFFER (WGET (W, buffer)), mode_line_format))    \
       && WINDOW_TOTAL_LINES (W) > 1)
 
 /* Value is non-zero if window W wants a header line.  */
@@ -1421,10 +1421,10 @@ struct glyph_string
      (!MINI_WINDOW_P ((W))                                              \
       && !(W)->pseudo_window_p                                          \
       && FRAME_WANTS_MODELINE_P (XFRAME (WINDOW_FRAME ((W))))           \
-      && BUFFERP (WVAR (W, buffer))                                     \
-      && !NILP (BVAR (XBUFFER (WVAR (W, buffer)), header_line_format))  \
+      && BUFFERP (WGET (W, buffer))                                     \
+      && !NILP (BVAR (XBUFFER (WGET (W, buffer)), header_line_format))  \
       && WINDOW_TOTAL_LINES (W) > 1                                     \
-      + !NILP (BVAR (XBUFFER (WVAR (W, buffer)), mode_line_format)))
+      + !NILP (BVAR (XBUFFER (WGET (W, buffer)), mode_line_format)))
 
 
 /* Return proper value to be used as baseline offset of font that has