From f0e6b47ef0a5ee15568e0b3992352d00d1055f46 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 4 Oct 2021 18:07:46 +0300 Subject: [PATCH] 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. --- src/print.c | 8 +------- 1 file changed, 1 insertion(+), 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); } -- 2.39.5