diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2012-08-06 14:24:26 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2012-08-06 14:24:26 +0400 |
| commit | 077288cf3f654776ee44bc9b56954c4e26b10d96 (patch) | |
| tree | 00bbcb4dab9c879efde73a01786977b1c1364f67 /src/composite.c | |
| parent | 71688bd7f9169c12ea8be54e084470f19d44ce44 (diff) | |
| download | emacs-077288cf3f654776ee44bc9b56954c4e26b10d96.tar.gz | |
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.
Diffstat (limited to 'src/composite.c')
| -rw-r--r-- | src/composite.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/composite.c b/src/composite.c index 269bdc88bfe..16fa3cce684 100644 --- a/src/composite.c +++ b/src/composite.c @@ -909,7 +909,7 @@ static Lisp_Object autocmp_chars (Lisp_Object rule, ptrdiff_t charpos, ptrdiff_t bytepos, ptrdiff_t limit, struct window *win, struct face *face, Lisp_Object string) { ptrdiff_t count = SPECPDL_INDEX (); - FRAME_PTR f = XFRAME (WVAR (win, frame)); + FRAME_PTR f = XFRAME (WGET (win, frame)); Lisp_Object pos = make_number (charpos); ptrdiff_t to; ptrdiff_t pt = PT, pt_byte = PT_BYTE; @@ -945,7 +945,7 @@ autocmp_chars (Lisp_Object rule, ptrdiff_t charpos, ptrdiff_t bytepos, ptrdiff_t } else #endif /* not HAVE_WINDOW_SYSTEM */ - font_object = WVAR (win, frame); + font_object = WGET (win, frame); lgstring = Fcomposition_get_gstring (pos, make_number (to), font_object, string); if (NILP (LGSTRING_ID (lgstring))) |