Merged from miles@gnu.org--gnu-2005 (patch 152-156, 642-654)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-642
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-643
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-644
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-645
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-646
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-647
   lisp/gnus/ChangeLog: Remove duplicate entry

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-648
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-649
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-650
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-651
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-652
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-653
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-654
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-152
   Update from CVS: lisp/mml.el (mml-preview): Doc fix.

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-153
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-154
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-155
   Update from CVS

 * miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-156
   Update from CVS

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-440

1 files changed, 7 insertions, 4 deletions

diff --git a/src/doc.c b/src/doc.c
index a31c53d5b21..0566c5f9d06 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -735,15 +735,18 @@ the same file name is found in the `doc-directory'.  */)
 DEFUN ("substitute-command-keys", Fsubstitute_command_keys,
        Ssubstitute_command_keys, 1, 1, 0,
        doc: /* Substitute key descriptions for command names in STRING.
-Return a new string which is STRING with substrings of the form \\=\\[COMMAND]
-replaced by either:  a keystroke sequence that will invoke COMMAND,
-or "M-x COMMAND" if COMMAND is not on any keys.
+Substrings of the form \\=\\[COMMAND] replaced by either: a keystroke
+sequence that will invoke COMMAND, or "M-x COMMAND" if COMMAND is not
+on any keys.
 Substrings of the form \\=\\{MAPVAR} are replaced by summaries
 \(made by describe-bindings) of the value of MAPVAR, taken as a keymap.
 Substrings of the form \\=\\<MAPVAR> specify to use the value of MAPVAR
 as the keymap for future \\=\\[COMMAND] substrings.
 \\=\\= quotes the following character and is discarded;
-thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ into the output.  */)
+thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ into the output.
+
+Returns original STRING if no substitutions were made.  Othwerwise,
+a new string, without any text properties, is returned.  */)
      (string)
      Lisp_Object string;
 {