diff options
| author | Kim F. Storm | 2002-02-13 22:42:03 +0000 |
|---|---|---|
| committer | Kim F. Storm | 2002-02-13 22:42:03 +0000 |
| commit | 5f380a5baae9b009bac43a4a87869b1cbd4f440c (patch) | |
| tree | d0205eb5c402f6c5328774144e1a88ed098978ac /src | |
| parent | cc91894c70d24a0b78528197000551a0237a29de (diff) | |
| download | emacs-5f380a5baae9b009bac43a4a87869b1cbd4f440c.tar.gz emacs-5f380a5baae9b009bac43a4a87869b1cbd4f440c.zip | |
(CURRENT_MODE_LINE_FACE_ID_3): Use mode_line_in_non_selected_windows.
(mode_line_in_non_selected_windows): Declare extern.
(Vmode_line_in_non_selected_windows): Removed extern.
Diffstat (limited to 'src')
| -rw-r--r-- | src/dispextern.h | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/dispextern.h b/src/dispextern.h index ad8c70afe6b..8b7406875c7 100644 --- a/src/dispextern.h +++ b/src/dispextern.h | |||
| @@ -934,13 +934,12 @@ extern struct glyph_row scratch_glyph_row; | |||
| 934 | which is compared against Vminibuf_scroll_window (if MBW matches). */ | 934 | which is compared against Vminibuf_scroll_window (if MBW matches). */ |
| 935 | 935 | ||
| 936 | #define CURRENT_MODE_LINE_FACE_ID_3(SELW, MBW, SCRW) \ | 936 | #define CURRENT_MODE_LINE_FACE_ID_3(SELW, MBW, SCRW) \ |
| 937 | ((NILP (Vmode_line_in_non_selected_windows) \ | 937 | ((!mode_line_in_non_selected_windows \ |
| 938 | || (SELW) == XWINDOW (selected_window) \ | 938 | || (SELW) == XWINDOW (selected_window) \ |
| 939 | || (EQ (Vmode_line_in_non_selected_windows, Qt) \ | 939 | || (minibuf_level > 0 \ |
| 940 | && !NILP (Vminibuf_scroll_window) \ | 940 | && !NILP (Vminibuf_scroll_window) \ |
| 941 | && minibuf_level \ | 941 | && (MBW) == XWINDOW (minibuf_window) \ |
| 942 | && (MBW) == XWINDOW (minibuf_window) \ | 942 | && (SCRW) == XWINDOW (Vminibuf_scroll_window))) \ |
| 943 | && (SCRW) == XWINDOW (Vminibuf_scroll_window))) \ | ||
| 944 | ? MODE_LINE_FACE_ID \ | 943 | ? MODE_LINE_FACE_ID \ |
| 945 | : MODE_LINE_INACTIVE_FACE_ID) | 944 | : MODE_LINE_INACTIVE_FACE_ID) |
| 946 | 945 | ||
| @@ -2246,7 +2245,7 @@ void highlight_trailing_whitespace P_ ((struct frame *, struct glyph_row *)); | |||
| 2246 | int tool_bar_item_info P_ ((struct frame *, struct glyph *, int *)); | 2245 | int tool_bar_item_info P_ ((struct frame *, struct glyph *, int *)); |
| 2247 | extern Lisp_Object Qtool_bar; | 2246 | extern Lisp_Object Qtool_bar; |
| 2248 | extern Lisp_Object Vshow_trailing_whitespace; | 2247 | extern Lisp_Object Vshow_trailing_whitespace; |
| 2249 | extern Lisp_Object Vmode_line_in_non_selected_windows; | 2248 | extern int mode_line_in_non_selected_windows; |
| 2250 | extern int redisplaying_p; | 2249 | extern int redisplaying_p; |
| 2251 | extern Lisp_Object Vimage_types; | 2250 | extern Lisp_Object Vimage_types; |
| 2252 | extern void add_to_log P_ ((char *, Lisp_Object, Lisp_Object)); | 2251 | extern void add_to_log P_ ((char *, Lisp_Object, Lisp_Object)); |