[Emacs-diffs] Changes to emacs/src/dispextern.h

[Kim F. Storm]

Index: emacs/src/dispextern.h
diff -c emacs/src/dispextern.h:1.126 emacs/src/dispextern.h:1.127
*** emacs/src/dispextern.h:1.126        Mon Feb 11 09:42:56 2002
--- emacs/src/dispextern.h      Wed Feb 13 17:42:03 2002
***************
*** 934,946 ****
     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)              \
         || (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)))      \
        ? MODE_LINE_FACE_ID                                     \
        : MODE_LINE_INACTIVE_FACE_ID)
  
--- 934,945 ----
     which is compared against Vminibuf_scroll_window (if MBW matches).  */
  
  #define CURRENT_MODE_LINE_FACE_ID_3(SELW, MBW, SCRW)          \
!      ((!mode_line_in_non_selected_windows                     \
         || (SELW) == XWINDOW (selected_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,2252 ****
  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 redisplaying_p;
  extern Lisp_Object Vimage_types;
  extern void add_to_log P_ ((char *, Lisp_Object, Lisp_Object));
--- 2245,2251 ----
  int tool_bar_item_info P_ ((struct frame *, struct glyph *, int *));
  extern Lisp_Object Qtool_bar;
  extern Lisp_Object Vshow_trailing_whitespace;
! 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));