Use INTERNAL_FIELD for windows.

* src/window.h (WVAR): New macro.
(struct window): Change Lisp_Object members to INTERNAL_FIELD.
* src/alloc.c, src/buffer.c, src/composite.c, src/dispextern.h:
* src/dispnew.c, src/editfns.c, src/fileio.c, src/font.c, src/fontset.c:
* src/frame.c, src/frame.h, src/fringe.c, src/indent.c, src/insdel.c:
* src/keyboard.c, src/keymap.c, src/lisp.h, src/minibuf.c, src/nsterm.m:
* src/print.c, src/textprop.c, src/w32fns.c, src/w32menu.c, src/w32term.c:
* src/window.c, src/xdisp.c, src/xfaces.c, src/xfns.c, src/xmenu.c:
* src/xterm.c: Users changed.
* admin/coccinelle/window.cocci: Semantic patch to replace direct
access to Lisp_Object members of struct window to WVAR.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/font.c b/src/font.c
index 2c0296aa8c5..db454dd6a23 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 (w->frame);
+  f = XFRAME (WVAR (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 (w->frame), face_id);
+          face = FACE_FROM_ID (XFRAME (WVAR (w, frame)), face_id);
         }
     }
   else