(push_key_description): Adjusted for the change of

CHAR_STRING.
(Ftext_char_description): Likewise.

diff --git a/src/keymap.c b/src/keymap.c
index 5070fc1d1c83928ecd4301c537a9237eb4fcb5fa..4b7c6c2a4a086239fd58fc59e21a42c55f501667 100644 (file)
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -1903,10 +1903,7 @@ push_key_description (c, p)
        }
       else
        {
-         unsigned char work[4], *str;
-         int i = CHAR_STRING (c, work, str);
-         bcopy (str, p, i);
-         p += i;
+         p += CHAR_STRING (c, p);
        }
     }
 
@@ -1997,21 +1994,23 @@ Control characters turn into \"^char\", etc.")
   (character)
      Lisp_Object character;
 {
-  char tem[6];
+  /* Currently MAX_MULTIBYTE_LENGTH is 4 (< 6).  */
+  unsigned char str[6];
+  int c;
 
   CHECK_NUMBER (character, 0);
 
-  if (!SINGLE_BYTE_CHAR_P (XFASTINT (character)))
+  c = XINT (character);
+  if (!SINGLE_BYTE_CHAR_P (c))
     {
-      unsigned char *str;
-      int len = non_ascii_char_to_string (XFASTINT (character), tem, &str);
+      int len = CHAR_STRING (c, str);
 
       return make_multibyte_string (str, 1, len);
     }
 
-  *push_text_char_description (XINT (character) & 0377, tem) = 0;
+  *push_text_char_description (c & 0377, str) = 0;
 
-  return build_string (tem);
+  return build_string (str);
 }
 
 /* Return non-zero if SEQ contains only ASCII characters, perhaps with