Revert "Prefer ‘format’ to ‘substitute-command-keys’"

This reverts commit 6af5aad26411ffe21c3fe4bc5438347110910111.

2 files changed, 8 insertions, 9 deletions

diff --git a/src/doc.c b/src/doc.c
index 9c9bdf3997a..f871ac75b59 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -927,13 +927,14 @@ Otherwise, return a new string.  */)
           if (NILP (tem))
             {
               name = Fsymbol_name (name);
-              insert1 (CALLN (Fformat, build_string ("\nUses keymap "uLSQM)));
+              insert1 (Fsubstitute_command_keys
+                       (build_string ("\nUses keymap "uLSQM)));
               insert_from_string (name, 0, 0,
                                   SCHARS (name),
                                   SBYTES (name), 1);
-              insert1 (CALLN (Fformat,
-                              (build_string
-                               (uRSQM", which is not currently defined.\n"))));
+              insert1 (Fsubstitute_command_keys
+                       (build_string
+                        (uRSQM", which is not currently defined.\n")));
               if (start[-1] == '<') keymap = Qnil;
             }
           else if (start[-1] == '<')
diff --git a/src/syntax.c b/src/syntax.c
index 30560affdf0..d45936b2b28 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -1333,11 +1333,9 @@ DEFUN ("internal-describe-syntax-value", Finternal_describe_syntax_value,
     insert_string (" (nestable)");
 
   if (prefix)
-    {
-      AUTO_STRING (prefixdoc,
-                   ",\n\t  is a prefix character for `backward-prefix-chars'");
-      insert1 (Fsubstitute_command_keys (prefixdoc));
-    }
+    insert1 (Fsubstitute_command_keys
+             (build_string
+              (",\n\t  is a prefix character for `backward-prefix-chars'")));
 
   return syntax;
 }