(minibuf_selected_window): Renamed from Vminibuf_selected_window.

[bpt/emacs.git] / src / dispextern.h

diff --git a/src/dispextern.h b/src/dispextern.h
index ad8c70a..7777e56 100644 (file)
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -931,16 +931,15 @@ extern struct glyph_row scratch_glyph_row;
    selected_window, this macro needs three arguments: SELW which is
    compared against the current value of selected_window, MBW which is
    compared against minibuf_window (if SELW doesn't match), and SCRW
-   which is compared against Vminibuf_scroll_window (if MBW matches).  */
+   which is compared against minibuf_selected_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 (minibuf_selected_window)                  \
+           && (MBW) == XWINDOW (minibuf_window)                        \
+           && (SCRW) == XWINDOW (minibuf_selected_window)))    \
       ? MODE_LINE_FACE_ID                                      \
       : MODE_LINE_INACTIVE_FACE_ID)
 
@@ -2246,7 +2245,7 @@ void highlight_trailing_whitespace P_ ((struct frame *, struct glyph_row *));
 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));