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

Avoid exiting when outputting error messages during loadup

Browse source 
* src/print.c (print_error_message): Don't call
'substitute-command-keys' when it isn't fboundp.
This commit is contained in:
Gregory Heytings 2021-10-04 14:13:46 +00:00 committed by Eli Zaretskii
parent b7ae0232be
commit 95a0227ff7
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/print.c
View file

@ -941,7 +941,11 @@ 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));
errmsg = Fget (errname, Qerror_message);
/* During loadup 'substitute-command-keys' might not be available. */
if (!NILP (Ffboundp (Qsubstitute_command_keys)))
errmsg = call1 (Qsubstitute_command_keys, errmsg);
file_error = Fmemq (Qfile_error, error_conditions);
}