From 0d7dbb4801d914be00ac9b9685fdb5c7b3d619ab Mon Sep 17 00:00:00 2001
From: Gregory Heytings <gregory@heytings.org>
Date: Mon, 4 Oct 2021 14:13:46 +0000
Subject: [PATCH] Fix problem with outputting error messages while dumping
 Emacs better

* src/print.c (print_error_message): Don't call substitute-command-keys
when it isn't bound.
---
 src/print.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/print.c b/src/print.c
index ef01738436..221e7b8c2a 100644
--- a/src/print.c
+++ b/src/print.c
@@ -941,7 +941,7 @@ print_error_message (Lisp_Object data, Lisp_Object stream, const char *context,
   else
     {
       Lisp_Object error_conditions = Fget (errname, Qerror_conditions);
-      if (will_bootstrap_p () || will_dump_p ())
+      if (NILP (Fboundp (Qsubstitute_command_keys)))
 	errmsg = Fget (errname, Qerror_message);
       else
 	errmsg = call1 (Qsubstitute_command_keys, Fget (errname, Qerror_message));
-- 
2.33.0