Drop WGET and revert read access to Lisp_Objects slots of struct window.

[bpt/emacs.git] / src / font.c

diff --git a/src/font.c b/src/font.c
index db1d12d..4520d9b 100644 (file)
--- 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 (WGET (w, frame));
+  f = XFRAME (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 (WGET (w, frame)), face_id);
+         face = FACE_FROM_ID (XFRAME (w->frame), face_id);
        }
     }
   else