changeset 43282:4e1019bea048

(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.
author Kim F. Storm <storm@cua.dk>
date Wed, 13 Feb 2002 22:42:03 +0000
parents a4ea76de57c9
children 1124d2e7429a
files src/dispextern.h
diffstat 1 files changed, 6 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/src/dispextern.h	Wed Feb 13 22:41:12 2002 +0000
+++ b/src/dispextern.h	Wed Feb 13 22:42:03 2002 +0000
@@ -934,13 +934,12 @@
    which is compared against Vminibuf_scroll_window (if MBW matches).  */
 
 #define CURRENT_MODE_LINE_FACE_ID_3(SELW, MBW, SCRW)		\
-     ((NILP (Vmode_line_in_non_selected_windows)		\
+     ((!mode_line_in_non_selected_windows			\
        || (SELW) == XWINDOW (selected_window)			\
-       || (EQ (Vmode_line_in_non_selected_windows, Qt)		\
-	   && !NILP (Vminibuf_scroll_window)			\
-	   && minibuf_level					\
-	   && (MBW) == XWINDOW (minibuf_window)			\
-	   && (SCRW) == XWINDOW (Vminibuf_scroll_window)))	\
+       || (minibuf_level > 0					\
+           && !NILP (Vminibuf_scroll_window)			\
+           && (MBW) == XWINDOW (minibuf_window)			\
+           && (SCRW) == XWINDOW (Vminibuf_scroll_window)))	\
       ? MODE_LINE_FACE_ID					\
       : MODE_LINE_INACTIVE_FACE_ID)
 
@@ -2246,7 +2245,7 @@
 int tool_bar_item_info P_ ((struct frame *, struct glyph *, int *));
 extern Lisp_Object Qtool_bar;
 extern Lisp_Object Vshow_trailing_whitespace;
-extern Lisp_Object Vmode_line_in_non_selected_windows;
+extern int mode_line_in_non_selected_windows;
 extern int redisplaying_p;
 extern Lisp_Object Vimage_types;
 extern void add_to_log P_ ((char *, Lisp_Object, Lisp_Object));