procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix problem with outputting error messages while dumping Emacs

Browse source 
* src/print.c (print_error_message): Don't call
substitute-command-keys while bootstrapping.
This commit is contained in:
Gregory Heytings 2021-10-04 11:18:07 +02:00 • committed by Lars Ingebrigtsen
parent b421e086ca
commit 1428962590
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/print.c
View file

@ -941,7 +941,13 @@ print_error_message (Lisp_Object data, Lisp_Object stream, const char *context,
else
{
Lisp_Object error_conditions = Fget (errname, Qerror_conditions);
errmsg = call1 (Qsubstitute_command_keys, Fget (errname, Qerror_message));
/* Calling `substitute-command-keys' while bootstrapping will make
Emacs exit, so don't do that. */
if (will_bootstrap_p () || will_dump_p ())
errmsg = Fget (errname, Qerror_message);
else
errmsg = call1 (Qsubstitute_command_keys,
Fget (errname, Qerror_message));
file_error = Fmemq (Qfile_error, error_conditions);
}