(echo_char): If C is an integer, always call

push_key_description.  Former code could signal an invalid
character error.

diff --git a/src/keyboard.c b/src/keyboard.c
index d8c96c82addde044b4850aa612124ef227142dd4..15bb56a22eebd83f08182a2121465fd32b8a55cb 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -735,8 +735,6 @@ void
 echo_char (c)
      Lisp_Object c;
 {
-  extern char *push_key_description ();
-
   if (current_kboard->immediate_echo)
     {
       char *ptr = current_kboard->echoptr;
@@ -755,14 +753,7 @@ echo_char (c)
              > ECHOBUFSIZE - KEY_DESCRIPTION_SIZE)
            return;
 
-         if (ASCII_BYTE_P (ch))
-           ptr = push_key_description (ch, ptr);
-         else
-           {
-             if (SINGLE_BYTE_CHAR_P (ch))
-               ch = unibyte_char_to_multibyte (ch);          
-             ptr += CHAR_STRING (ch, ptr);
-           }
+         ptr = push_key_description (ch, ptr, 1);
        }
       else if (SYMBOLP (c))
        {