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, 2 insertions, 2 deletions

diff --git a/src/callint.c b/src/callint.c
index 50090db8b28..a3e4984fd16 100644
--- a/src/callint.c
+++ b/src/callint.c
@@ -612,7 +612,7 @@ supply if the command inquires which events were used to invoke it.  */)
                                           Qnil, Qnil, Qnil, Qnil);
             unbind_to (speccount1, Qnil);
             teml = args[i];
-            visargs[i] = Fkey_description (teml);
+            visargs[i] = Fkey_description (teml, Qnil);
 
             /* If the key sequence ends with a down-event,
                discard the following up-event.  */
@@ -639,7 +639,7 @@ supply if the command inquires which events were used to invoke it.  */)
             args[i] = Fread_key_sequence (build_string (callint_message),
                                           Qnil, Qt, Qnil, Qnil);
             teml = args[i];
-            visargs[i] = Fkey_description (teml);
+            visargs[i] = Fkey_description (teml, Qnil);
             unbind_to (speccount1, Qnil);
 
             /* If the key sequence ends with a down-event,