emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

master f0e6b47: Revert "Fix problem with outputting error messages while


From: Eli Zaretskii
Subject: master f0e6b47: Revert "Fix problem with outputting error messages while dumping Emacs"
Date: Mon, 4 Oct 2021 11:11:00 -0400 (EDT)

branch: master
commit f0e6b47ef0a5ee15568e0b3992352d00d1055f46
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>

    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 7f0bc3f..d4301fd 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);
     }
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]