3 files changed, 46 insertions, 16 deletions

diff --git a/src/dispextern.h b/src/dispextern.h
index 55f4118d676..16565b8ad18 100644
--- a/src/dispextern.h
+++ b/src/dispextern.h
@@ -1610,6 +1610,27 @@ struct glyph_string
          : estimate_mode_line_height                            \
          (XFRAME ((W)->frame), CURRENT_HEADER_LINE_ACTIVE_FACE_ID (W)))))
 
+/* Return the desired face id for the tab line of a window, depending
+   on whether the window is selected or not, or if the window is the
+   scrolling window for the currently active minibuffer window.  */
+
+#define CURRENT_TAB_LINE_ACTIVE_FACE_ID_3(SELW, MBW, SCRW)      \
+     ((!mode_line_in_non_selected_windows                       \
+       || (SELW) == XWINDOW (selected_window)                   \
+       || (minibuf_level > 0                                    \
+           && !NILP (minibuf_selected_window)                   \
+           && (MBW) == XWINDOW (minibuf_window)                 \
+           && (SCRW) == XWINDOW (minibuf_selected_window)))     \
+      ? TAB_LINE_ACTIVE_FACE_ID                                 \
+      : TAB_LINE_INACTIVE_FACE_ID)
+
+/* Return the desired face id for the tab line of window W.  */
+
+#define CURRENT_TAB_LINE_ACTIVE_FACE_ID(W)              \
+         CURRENT_TAB_LINE_ACTIVE_FACE_ID_3(W,           \
+                                           XWINDOW (selected_window), \
+                                           W)
+
 /* Return the current height of the tab line of window W.  If not known
    from W->tab_line_height, look at W's current glyph matrix, or return
    an estimation based on the height of the font of the face `tab-line'.  */
@@ -1621,7 +1642,7 @@ struct glyph_string
       = (MATRIX_TAB_LINE_HEIGHT ((W)->current_matrix)           \
          ? MATRIX_TAB_LINE_HEIGHT ((W)->current_matrix)         \
          : estimate_mode_line_height                            \
-             (XFRAME ((W)->frame), TAB_LINE_FACE_ID))))
+         (XFRAME ((W)->frame), CURRENT_TAB_LINE_ACTIVE_FACE_ID (W)))))
 
 /* Return the height of the desired mode line of window W.  */
 
@@ -1943,7 +1964,8 @@ enum face_id
   INTERNAL_BORDER_FACE_ID,
   CHILD_FRAME_BORDER_FACE_ID,
   TAB_BAR_FACE_ID,
-  TAB_LINE_FACE_ID,
+  TAB_LINE_ACTIVE_FACE_ID,
+  TAB_LINE_INACTIVE_FACE_ID,
   BASIC_FACE_ID_SENTINEL
 };
 
diff --git a/src/xdisp.c b/src/xdisp.c
index 370c3ec30c1..281f04e4132 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -1343,7 +1343,7 @@ window_box_height (struct window *w)
           if (tl_row && tl_row->mode_line_p)
             height -= tl_row->height;
           else
-            height -= estimate_mode_line_height (f, TAB_LINE_FACE_ID);
+            height -= estimate_mode_line_height (f, CURRENT_TAB_LINE_ACTIVE_FACE_ID (w));
         }
     }
 
@@ -1743,7 +1743,7 @@ pos_visible_p (struct window *w, ptrdiff_t charpos, int *x, int *y,
         = window_parameter (w, Qtab_line_format);
 
       w->tab_line_height
-        = display_mode_line (w, TAB_LINE_FACE_ID,
+        = display_mode_line (w, CURRENT_TAB_LINE_ACTIVE_FACE_ID (w),
                              NILP (window_tab_line_format)
                              ? BVAR (current_buffer, tab_line_format)
                              : window_tab_line_format);
@@ -3285,7 +3285,8 @@ init_iterator (struct it *it, struct window *w,
       if (base_face_id == MODE_LINE_ACTIVE_FACE_ID
           || base_face_id == MODE_LINE_INACTIVE_FACE_ID)
         row = MATRIX_MODE_LINE_ROW (w->desired_matrix);
-      else if (base_face_id == TAB_LINE_FACE_ID)
+      else if (base_face_id == TAB_LINE_ACTIVE_FACE_ID
+               || base_face_id == TAB_LINE_INACTIVE_FACE_ID)
         row = MATRIX_TAB_LINE_ROW (w->desired_matrix);
       else if (base_face_id == HEADER_LINE_ACTIVE_FACE_ID
                || base_face_id == HEADER_LINE_INACTIVE_FACE_ID)
@@ -11975,7 +11976,7 @@ window_text_pixel_size (Lisp_Object window, Lisp_Object from, Lisp_Object to,
       Lisp_Object window_tab_line_format
         = window_parameter (w, Qtab_line_format);
 
-      y = y + display_mode_line (w, TAB_LINE_FACE_ID,
+      y = y + display_mode_line (w, CURRENT_TAB_LINE_ACTIVE_FACE_ID (w),
                                  NILP (window_tab_line_format)
                                  ? BVAR (current_buffer, tab_line_format)
                                  : window_tab_line_format);
@@ -27946,7 +27947,7 @@ display_mode_lines (struct window *w)
       Lisp_Object window_tab_line_format
         = window_parameter (w, Qtab_line_format);
 
-      display_mode_line (w, TAB_LINE_FACE_ID,
+      display_mode_line (w, CURRENT_TAB_LINE_ACTIVE_FACE_ID_3 (sel_w, sel_w, w),
                          NILP (window_tab_line_format)
                          ? BVAR (current_buffer, tab_line_format)
                          : window_tab_line_format);
@@ -27975,10 +27976,10 @@ display_mode_lines (struct window *w)
 
 /* Display mode or header/tab line of window W.  FACE_ID specifies which
    line to display; it is either MODE_LINE_ACTIVE_FACE_ID,
-   HEADER_LINE_ACTIVE_FACE_ID, HEADER_LINE_INACTIVE_FACE_ID, or
-   TAB_LINE_FACE_ID.  FORMAT is the mode/header/tab line format to
-   display.  Value is the pixel height of the mode/header/tab line
-   displayed.  */
+   HEADER_LINE_ACTIVE_FACE_ID, HEADER_LINE_INACTIVE_FACE_ID,
+   TAB_LINE_ACTIVE_FACE_ID or TAB_LINE_INACTIVE_FACE_ID.
+   FORMAT is the mode/header/tab line format to display.
+   Value is the pixel height of the mode/header/tab line displayed.  */
 
 static int
 display_mode_line (struct window *w, enum face_id face_id, Lisp_Object format)
@@ -27994,7 +27995,8 @@ display_mode_line (struct window *w, enum face_id face_id, Lisp_Object format)
   prepare_desired_row (w, it.glyph_row, true);
 
   it.glyph_row->mode_line_p = true;
-  if (face_id == TAB_LINE_FACE_ID)
+  if (face_id == TAB_LINE_ACTIVE_FACE_ID
+      || face_id == TAB_LINE_INACTIVE_FACE_ID)
     {
       it.glyph_row->tab_line_p = true;
       w->desired_matrix->tab_line_p = true;
@@ -28021,7 +28023,8 @@ display_mode_line (struct window *w, enum face_id face_id, Lisp_Object format)
   if (NILP (Vmode_line_compact)
       || face_id == HEADER_LINE_ACTIVE_FACE_ID
       || face_id == HEADER_LINE_INACTIVE_FACE_ID
-      || face_id == TAB_LINE_FACE_ID)
+      || face_id == TAB_LINE_ACTIVE_FACE_ID
+      || face_id == TAB_LINE_INACTIVE_FACE_ID)
     {
       mode_line_target = MODE_LINE_DISPLAY;
       display_mode_element (&it, 0, 0, 0, format, Qnil, false);
@@ -28879,7 +28882,8 @@ are the selected window and the WINDOW's buffer).  */)
     : EQ (face, Qmode_line_inactive) ? MODE_LINE_INACTIVE_FACE_ID
     : EQ (face, Qheader_line_active) ? HEADER_LINE_ACTIVE_FACE_ID
     : EQ (face, Qheader_line_inactive) ? HEADER_LINE_INACTIVE_FACE_ID
-    : EQ (face, Qtab_line) ? TAB_LINE_FACE_ID
+    : EQ (face, Qtab_line_active) ? TAB_LINE_ACTIVE_FACE_ID
+    : EQ (face, Qtab_line_inactive) ? TAB_LINE_INACTIVE_FACE_ID
     : EQ (face, Qtab_bar) ? TAB_BAR_FACE_ID
     : EQ (face, Qtool_bar) ? TOOL_BAR_FACE_ID
     : DEFAULT_FACE_ID;
diff --git a/src/xfaces.c b/src/xfaces.c
index ab0934abde2..6c4267b8afa 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -5195,7 +5195,8 @@ lookup_basic_face (struct window *w, struct frame *f, int face_id)
     case MODE_LINE_INACTIVE_FACE_ID:    name = Qmode_line_inactive;     break;
     case HEADER_LINE_ACTIVE_FACE_ID:    name = Qheader_line_active;     break;
     case HEADER_LINE_INACTIVE_FACE_ID:  name = Qheader_line_inactive;   break;
-    case TAB_LINE_FACE_ID:              name = Qtab_line;               break;
+    case TAB_LINE_ACTIVE_FACE_ID:       name = Qtab_line_active;        break;
+    case TAB_LINE_INACTIVE_FACE_ID:     name = Qtab_line_inactive;      break;
     case TAB_BAR_FACE_ID:               name = Qtab_bar;                break;
     case TOOL_BAR_FACE_ID:              name = Qtool_bar;               break;
     case FRINGE_FACE_ID:                name = Qfringe;                 break;
@@ -5975,7 +5976,8 @@ realize_basic_faces (struct frame *f)
       realize_named_face (f, Qinternal_border, INTERNAL_BORDER_FACE_ID);
       realize_named_face (f, Qchild_frame_border, CHILD_FRAME_BORDER_FACE_ID);
       realize_named_face (f, Qtab_bar, TAB_BAR_FACE_ID);
-      realize_named_face (f, Qtab_line, TAB_LINE_FACE_ID);
+      realize_named_face (f, Qtab_line_active, TAB_LINE_ACTIVE_FACE_ID);
+      realize_named_face (f, Qtab_line_inactive, TAB_LINE_INACTIVE_FACE_ID);
       unbind_to (count, Qnil);
 
       /* Reflect changes in the `menu' face in menu bars.  */
@@ -7534,6 +7536,8 @@ syms_of_xfaces (void)
   DEFSYM (Qtab_bar, "tab-bar");
   DEFSYM (Qfringe, "fringe");
   DEFSYM (Qtab_line, "tab-line");
+  DEFSYM (Qtab_line_inactive, "tab-line-inactive");
+  DEFSYM (Qtab_line_active, "tab-line-active");
   DEFSYM (Qheader_line, "header-line");
   DEFSYM (Qheader_line_inactive, "header-line-inactive");
   DEFSYM (Qheader_line_active, "header-line-active");