Merged in changes from CVS trunk.

Patches applied:

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

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-221
   Restore deleted tagline in etc/TUTORIAL.ru

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

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

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

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


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

1 files changed, 1 insertions, 1 deletions

diff --git a/src/doc.c b/src/doc.c
index d4d749ab585..a0b840637e0 100644
--- a/src/doc.c
+++ b/src/doc.c
@@ -808,7 +808,7 @@ thus, \\=\\=\\=\\= puts \\=\\= into the output, and \\=\\=\\=\\[ puts \\=\\[ int
             }
           else
             {                   /* function is on a key */
-              tem = Fkey_description (tem);
+              tem = Fkey_description (tem, Qnil);
               goto subst_string;
             }
         }