diff options
| author | Dmitry Antipov | 2012-08-07 11:33:18 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2012-08-07 11:33:18 +0400 |
| commit | d3d50620ed3a8066c15ae3d3701b83371ca5382a (patch) | |
| tree | 817b59ba17d232cd087b0b24d84683c8ff094f62 /src/font.c | |
| parent | d10a51dcdfab2d9283bd2e3229330c511d5af193 (diff) | |
| download | emacs-d3d50620ed3a8066c15ae3d3701b83371ca5382a.tar.gz emacs-d3d50620ed3a8066c15ae3d3701b83371ca5382a.zip | |
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.
Diffstat (limited to 'src/font.c')
| -rw-r--r-- | src/font.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/font.c b/src/font.c index db1d12de8a2..4520d9bc9a2 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, | |||
| 3665 | } | 3665 | } |
| 3666 | } | 3666 | } |
| 3667 | 3667 | ||
| 3668 | f = XFRAME (WGET (w, frame)); | 3668 | f = XFRAME (w->frame); |
| 3669 | if (! FRAME_WINDOW_P (f)) | 3669 | if (! FRAME_WINDOW_P (f)) |
| 3670 | return Qnil; | 3670 | return Qnil; |
| 3671 | if (! face) | 3671 | if (! face) |
| @@ -3723,7 +3723,7 @@ font_range (ptrdiff_t pos, ptrdiff_t *limit, struct window *w, struct face *face | |||
| 3723 | 3723 | ||
| 3724 | face_id = face_at_buffer_position (w, pos, 0, 0, &ignore, | 3724 | face_id = face_at_buffer_position (w, pos, 0, 0, &ignore, |
| 3725 | *limit, 0, -1); | 3725 | *limit, 0, -1); |
| 3726 | face = FACE_FROM_ID (XFRAME (WGET (w, frame)), face_id); | 3726 | face = FACE_FROM_ID (XFRAME (w->frame), face_id); |
| 3727 | } | 3727 | } |
| 3728 | } | 3728 | } |
| 3729 | else | 3729 | else |