From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 3 Nov 2021 12:57:51 +0000 (+0200)
Subject: Fix header-line and tab-line when mode-line-compact is set
X-Git-Tag: emacs-28.0.90~133
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4df9998;p=emacs.git

Fix header-line and tab-line when mode-line-compact is set

* src/xdisp.c (display_mode_line): Make 'mode-line-compact' apply
only to mode lines.  (Bug#51558)
---

diff --git a/src/xdisp.c b/src/xdisp.c
index 436153b2bae..c05e7edbc97 100644
--- a/src/xdisp.c
+++ b/src/xdisp.c
@@ -25592,7 +25592,8 @@ display_mode_line (struct window *w, enum face_id face_id, Lisp_Object format)
   push_kboard (FRAME_KBOARD (it.f));
   record_unwind_save_match_data ();
 
-  if (NILP (Vmode_line_compact))
+  if (NILP (Vmode_line_compact)
+      || face_id == HEADER_LINE_FACE_ID || face_id == TAB_LINE_FACE_ID)
     {
       mode_line_target = MODE_LINE_DISPLAY;
       display_mode_element (&it, 0, 0, 0, format, Qnil, false);