* src/keymap.c (Fsingle_key_description): Use make_specified_string

instead of build_string to build string from push_key_description.
(Bug#5193)

diff --git a/src/ChangeLog b/src/ChangeLog
index fa31b3d6f0e1bd578ed92da97c52d61601b5a44d..458e8c89821772ebb5f29b4925cec5ae6fb8b7a3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2011-09-19  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * keymap.c (Fsingle_key_description): Use make_specified_string
+       instead of build_string to build string from push_key_description.
+       (Bug#5193)
+
 2011-09-10  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * xdisp.c (expose_window): Save original value of phys_cursor_on_p

diff --git a/src/keymap.c b/src/keymap.c
index dec53cbd8e1f72361a4ccc2230fd1083dd33f974..218a2f1828f7b76f12ca92d7314ed349ce16b3d4 100644 (file)
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2529,10 +2529,11 @@ around function keys and event symbols.  */)
 
   if (INTEGERP (key))          /* Normal character */
     {
-      char tem[KEY_DESCRIPTION_SIZE];
+      char tem[KEY_DESCRIPTION_SIZE], *p;
 
-      *push_key_description (XUINT (key), tem, 1) = 0;
-      return build_string (tem);
+      p = push_key_description (XUINT (key), tem, 1);
+      *p = 0;
+      return make_specified_string (tem, -1, p - tem, 1);
     }
   else if (SYMBOLP (key))      /* Function key or event-symbol */
     {