diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2010-11-05 20:07:42 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2010-11-05 20:07:42 +0200 |
| commit | 8e5ba371f2679f97217842b598191fef43e11856 (patch) | |
| tree | 893711ae6014708ee9e0ed81324913d21fab711e /src/frame.h | |
| parent | 7ac5dac91307a99913c558898c520da649dbf4ea (diff) | |
| download | emacs-8e5ba371f2679f97217842b598191fef43e11856.tar.gz | |
Fix unified mouse highlight after compiling on Unix.
xdisp.c (x_consider_frame_title, tool_bar_lines_needed): Move
prototypes to HAVE_WINDOW_SYSTEM-only part.
frame.h (MOUSE_HL_INFO): Fix definition to work both for
TTY-only and GUI builds.
Diffstat (limited to 'src/frame.h')
| -rw-r--r-- | src/frame.h | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/src/frame.h b/src/frame.h index 72c0f6be2d7..31f601737c8 100644 --- a/src/frame.h +++ b/src/frame.h @@ -546,11 +546,17 @@ typedef struct frame *FRAME_PTR; /* Return a pointer to the structure holding information about the region of text, if any, that is currently shown in mouse-face on - frame F. */ -#define MOUSE_HL_INFO(F) \ - (FRAME_WINDOW_P(F) \ - ? &(FRAME_X_DISPLAY_INFO(F)->mouse_highlight) \ - : &(((F)->output_data.tty->display_info)->mouse_highlight)) + frame F. We need to define two versions because a TTY-only build + does not have FRAME_X_DISPLAY_INFO. */ +#ifdef HAVE_WINDOW_SYSTEM +# define MOUSE_HL_INFO(F) \ + (FRAME_WINDOW_P(F) \ + ? &(FRAME_X_DISPLAY_INFO(F)->mouse_highlight) \ + : &(((F)->output_data.tty->display_info)->mouse_highlight)) +#else +# define MOUSE_HL_INFO(F) \ + (&(((F)->output_data.tty->display_info)->mouse_highlight)) +#endif /* Nonzero if frame F is still alive (not deleted). */ #define FRAME_LIVE_P(f) ((f)->terminal != 0) |