diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/pdumper.c | 3 | ||||
| -rw-r--r-- | src/xdisp.c | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/pdumper.c b/src/pdumper.c index 6cf7b847cb7..9eff5c48d09 100644 --- a/src/pdumper.c +++ b/src/pdumper.c @@ -5296,6 +5296,9 @@ dump_do_dump_relocation (const uintptr_t dump_base, error ("Trying to load incoherent dumped eln file %s", SSDATA (comp_u->file)); + if (!CONSP (comp_u->file)) + error ("Incoherent compilation unit for dump was dumped"); + /* emacs_execdir is always unibyte, but the file names in comp_u->file could be multibyte, so we need to encode them. */ 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); |