diff options
| author | Dmitry Antipov | 2013-09-13 19:03:51 +0400 |
|---|---|---|
| committer | Dmitry Antipov | 2013-09-13 19:03:51 +0400 |
| commit | aad3612f9eb7280bd4db8ee697186e75b1e82765 (patch) | |
| tree | fd251b7978e9a570a6b66c93a43b0021bac0c7b7 /src/msdos.c | |
| parent | 7830899f39515bcb4938715ebf58d1ba855deb41 (diff) | |
| download | emacs-aad3612f9eb7280bd4db8ee697186e75b1e82765.tar.gz emacs-aad3612f9eb7280bd4db8ee697186e75b1e82765.zip | |
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/msdos.c')
| -rw-r--r-- | src/msdos.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/msdos.c b/src/msdos.c index 7142c3ada77..3a74846f8ea 100644 --- a/src/msdos.c +++ b/src/msdos.c | |||
| @@ -1222,7 +1222,7 @@ IT_cmgoto (struct frame *f) | |||
| 1222 | static void | 1222 | static void |
| 1223 | IT_update_begin (struct frame *f) | 1223 | IT_update_begin (struct frame *f) |
| 1224 | { | 1224 | { |
| 1225 | struct tty_display_info *display_info = FRAME_X_DISPLAY_INFO (f); | 1225 | struct tty_display_info *display_info = FRAME_DISPLAY_INFO (f); |
| 1226 | Mouse_HLInfo *hlinfo = &display_info->mouse_highlight; | 1226 | Mouse_HLInfo *hlinfo = &display_info->mouse_highlight; |
| 1227 | struct frame *mouse_face_frame = hlinfo->mouse_face_mouse_frame; | 1227 | struct frame *mouse_face_frame = hlinfo->mouse_face_mouse_frame; |
| 1228 | 1228 | ||
| @@ -1279,7 +1279,7 @@ IT_update_begin (struct frame *f) | |||
| 1279 | static void | 1279 | static void |
| 1280 | IT_update_end (struct frame *f) | 1280 | IT_update_end (struct frame *f) |
| 1281 | { | 1281 | { |
| 1282 | struct tty_display_info *dpyinfo = FRAME_X_DISPLAY_INFO (f); | 1282 | struct tty_display_info *dpyinfo = FRAME_DISPLAY_INFO (f); |
| 1283 | 1283 | ||
| 1284 | if (dpyinfo->termscript) | 1284 | if (dpyinfo->termscript) |
| 1285 | fprintf (dpyinfo->termscript, "\n<UPDATE_END\n"); | 1285 | fprintf (dpyinfo->termscript, "\n<UPDATE_END\n"); |