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

diff --git a/src/font.c b/src/font.c
index ca0ccc171eb..db1d12de8a2 100644
--- a/src/font.c
+++ b/src/font.c
@@ -3665,7 +3665,7 @@ font_at (int c, ptrdiff_t pos, struct face *face, struct window *w,
         }
     }
 
-  f = XFRAME (WVAR (w, frame));
+  f = XFRAME (WGET (w, frame));
   if (! FRAME_WINDOW_P (f))
     return Qnil;
   if (! face)
@@ -3723,7 +3723,7 @@ font_range (ptrdiff_t pos, ptrdiff_t *limit, struct window *w, struct face *face
 
           face_id = face_at_buffer_position (w, pos, 0, 0, &ignore,
                                              *limit, 0, -1);
-          face = FACE_FROM_ID (XFRAME (WVAR (w, frame)), face_id);
+          face = FACE_FROM_ID (XFRAME (WGET (w, frame)), face_id);
         }
     }
   else