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/fontset.c b/src/fontset.c
index 7f6fdeda36f..7a2c0912d6f 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -1841,7 +1841,7 @@ DEFUN ("internal-char-font", Finternal_char_font, Sinternal_char_font, 1, 2, 0,
       if (NILP (window))
         return Qnil;
       w = XWINDOW (window);
-      f = XFRAME (WVAR (w, frame));
+      f = XFRAME (WGET (w, frame));
       face_id = face_at_buffer_position (w, pos, -1, -1, &dummy,
                                          pos + 100, 0, -1);
     }