diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2021-11-03 20:26:28 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2021-11-03 20:26:29 +0200 |
| commit | f78c819d9569ad18cc048554ddeb331a27a58989 (patch) | |
| tree | bd9e61206672a71af7724a079305b07cc11e49fa /src/xdisp.c | |
| parent | d8523060e5dcf285a5468377720bed6a34599df6 (diff) | |
| parent | 3e4eb54db49e23b593664e4a3de3d3d744de61b7 (diff) | |
| download | emacs-f78c819d9569ad18cc048554ddeb331a27a58989.tar.gz emacs-f78c819d9569ad18cc048554ddeb331a27a58989.tar.bz2 emacs-f78c819d9569ad18cc048554ddeb331a27a58989.zip | |
Merge from origin/emacs-28
3e4eb54 ; * etc/PROBLEMS: Minor copyedits of the last change. (Bug#5...
35bc211 Document a macOS error message when opening Emacs
4df9998 Fix header-line and tab-line when mode-line-compact is set
81915a9 Add manual section about how to avoid regexp problems
a16e66c Clarify build environment
6ab6b2f Clarify build directory structure
9d61620 * src/pdumper.c (dump_do_dump_relocation): Add sanity check.
Diffstat (limited to 'src/xdisp.c')
| -rw-r--r-- | src/xdisp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/xdisp.c b/src/xdisp.c index aa01db210b7..39ede3c0952 100644 --- a/src/xdisp.c +++ b/src/xdisp.c @@ -25626,7 +25626,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); |