From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 16 Aug 2016 20:16:49 +0000 (-0700)
Subject: Omit substitute-command-keys code no longer needed
X-Git-Tag: emacs-26.0.90~1733
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4b1b8dd80a287ec5e726e0672d94d5399c09b94c;p=emacs.git

Omit substitute-command-keys code no longer needed

* src/doc.c (Fsubstitute_command_keys):
Remove duplicate initializations.
---

diff --git a/src/doc.c b/src/doc.c
index 37a731bfcec..4b91831c703 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -743,10 +743,12 @@ Otherwise, return a new string.  */)
   if (NILP (string))
     return Qnil;
 
+  /* If STRING contains non-ASCII unibyte data, process its
+     properly-encoded multibyte equivalent instead.  This simplifies
+     the implementation and is OK since substitute-command-keys is
+     intended for use only on text strings.  Keep STRING around, since
+     it will be returned if no changes occur.  */
   Lisp_Object str = Fstring_make_multibyte (string);
-  tem = Qnil;
-  keymap = Qnil;
-  name = Qnil;
 
   enum text_quoting_style quoting_style = text_quoting_style ();
 
@@ -905,6 +907,8 @@ Otherwise, return a new string.  */)
 	 }
 
 	subst_string:
+	  /* Convert non-ASCII unibyte data to properly-encoded multibyte,
+	     for the same reason STRING was converted to STR.  */
 	  tem = Fstring_make_multibyte (tem);
 	  start = SDATA (tem);
 	  length = SCHARS (tem);