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/menu.c | |
| 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/menu.c')
| -rw-r--r-- | src/menu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/menu.c b/src/menu.c index 6fce5b91caf..44bb5a57317 100644 --- a/src/menu.c +++ b/src/menu.c @@ -1299,7 +1299,7 @@ no quit occurs and `x-popup-menu' returns nil. */) if (current_popup_menu) { discard_menu_items (); - FRAME_X_DISPLAY_INFO (f)->grabbed = 0; + FRAME_DISPLAY_INFO (f)->grabbed = 0; UNGCPRO; return Qnil; } @@ -1338,7 +1338,7 @@ no quit occurs and `x-popup-menu' returns nil. */) #endif #ifdef HAVE_NTGUI /* FIXME: Is it really w32-specific? --Stef */ - FRAME_X_DISPLAY_INFO (f)->grabbed = 0; + FRAME_DISPLAY_INFO (f)->grabbed = 0; #endif #endif /* HAVE_MENUS */ |