diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2021-10-04 18:07:46 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2021-10-04 18:07:46 +0300 |
| commit | f0e6b47ef0a5ee15568e0b3992352d00d1055f46 (patch) | |
| tree | 041b4420dcbf204b1b6d2089f203f18e2e4feb2e | |
| parent | 7b409dfe9671ec12377d1bd3c02e5306badd22b5 (diff) | |
| download | emacs-f0e6b47ef0a5ee15568e0b3992352d00d1055f46.tar.gz emacs-f0e6b47ef0a5ee15568e0b3992352d00d1055f46.tar.bz2 emacs-f0e6b47ef0a5ee15568e0b3992352d00d1055f46.zip | |
Revert "Fix problem with outputting error messages while dumping Emacs"
This reverts commit 1428962590e216163f079ff838f39667383aec56.
A better fix was committed to the emacs-28 branch and will be
merged to master.
| -rw-r--r-- | src/print.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/print.c b/src/print.c index 7f0bc3f364b..d4301fd7b64 100644 --- a/src/print.c +++ b/src/print.c @@ -941,13 +941,7 @@ print_error_message (Lisp_Object data, Lisp_Object stream, const char *context, else { Lisp_Object error_conditions = Fget (errname, Qerror_conditions); - /* 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)); + errmsg = call1 (Qsubstitute_command_keys, Fget (errname, Qerror_message)); file_error = Fmemq (Qfile_error, error_conditions); } |