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, 1 insertions, 1 deletions

diff --git a/src/alloc.c b/src/alloc.c
index 7d1ff7625f2..0f425668a11 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -6015,7 +6015,7 @@ mark_object (Lisp_Object arg)
               /* Mark glyphs for leaf windows.  Marking window
                  matrices is sufficient because frame matrices
                  use the same glyph memory.  */
-              if (NILP (WVAR (w, hchild)) && NILP (WVAR (w, vchild))
+              if (NILP (WGET (w, hchild)) && NILP (WGET (w, vchild))
                   && w->current_matrix)
                 {
                   mark_glyph_matrix (w->current_matrix);