diff options
| author | Dmitry Antipov <dmantipov@yandex.ru> | 2013-09-13 19:03:51 +0400 |
|---|---|---|
| committer | Dmitry Antipov <dmantipov@yandex.ru> | 2013-09-13 19:03:51 +0400 |
| commit | aad3612f9eb7280bd4db8ee697186e75b1e82765 (patch) | |
| tree | fd251b7978e9a570a6b66c93a43b0021bac0c7b7 /src/nsfont.m | |
| parent | 7830899f39515bcb4938715ebf58d1ba855deb41 (diff) | |
| download | emacs-aad3612f9eb7280bd4db8ee697186e75b1e82765.tar.gz | |
Unify FRAME_window_system_DISPLAY_INFO macros between all ports.
All of them are replaced with FRAME_DISPLAY_INFO, defined in
each port to reference the port-specific window system data.
* msdos.h (FRAME_X_DISPLAY_INFO): Remove.
(FRAME_DISPLAY_INFO): Define.
* w32term.h (FRAME_W32_DISPLAY_INFO, FRAME_X_DISPLAY_INFO): Remove.
(FRAME_DISPLAY_INFO): Define. Adjust users.
* xterm.h (FRAME_X_DISPLAY_INFO): Remove.
(FRAME_DISPLAY_INFO): Define. Adjust users.
* frame.h (FRAME_RES_X, FRAME_RES_Y): Unify.
* font.c, frame.c, gtkutil.c, image.c, menu.c, msdos.c, nsfns.m:
* nsfont.m, nsterm.m, w32fns.c, w32font.c, w32menu.c, w32term.c:
* w32xfns.c, widget.c, xdisp.c, xfaces.c, xfns.c, xfont.c, xmenu.c:
* xselect.c, xterm.c: All related users changed.
Diffstat (limited to 'src/nsfont.m')
| -rw-r--r-- | src/nsfont.m | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nsfont.m b/src/nsfont.m index e1c7d32dde0..b61147d66c4 100644 --- a/src/nsfont.m +++ b/src/nsfont.m @@ -662,7 +662,7 @@ struct font_driver nsfont_driver = static Lisp_Object nsfont_get_cache (struct frame *frame) { - Display_Info *dpyinfo = FRAME_NS_DISPLAY_INFO (frame); + Display_Info *dpyinfo = FRAME_DISPLAY_INFO (frame); return (dpyinfo->name_list_element); } @@ -1175,7 +1175,7 @@ nsfont_draw (struct glyph_string *s, int from, int to, int x, int y, : FRAME_BACKGROUND_COLOR (s->f)) set]; else { - struct ns_display_info *dpyinfo = FRAME_NS_DISPLAY_INFO (s->f); + struct ns_display_info *dpyinfo = FRAME_DISPLAY_INFO (s->f); [[dpyinfo->bitmaps[face->stipple-1].img stippleMask] set]; } NSRectFill (br); |