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.

diff --git a/src/print.c b/src/print.c
index 7f0bc3f364b331c96b75d6d3df4b80a4a125a97e..d4301fd7b6423539ea2ae768a82a03487d6e97e6 100644 (file)
--- 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);
     }