From d3d50620ed3a8066c15ae3d3701b83371ca5382a Mon Sep 17 00:00:00 2001 From: Dmitry Antipov Date: Tue, 7 Aug 2012 11:33:18 +0400 Subject: Drop WGET and revert read access to Lisp_Objects slots of struct window. * window.h (WGET): Remove. (struct window): Do not use INTERNAL_FIELD. * 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. --- src/font.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/font.c') diff --git a/src/font.c b/src/font.c index db1d12de8a..4520d9bc9a 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 (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 -- cgit v1.2.3