[Emacs-diffs] /srv/bzr/emacs/emacs-23 r100627: * src/keymap.c (Fsingle_key_description): Use make_specified_string

[Andreas Schwab]

------------------------------------------------------------
revno: 100627
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Mon 2011-09-19 23:15:47 +0200
message:
  * src/keymap.c (Fsingle_key_description): Use make_specified_string
  instead of build_string to build string from push_key_description.
  (Bug#5193)
modified:
  src/ChangeLog
  src/keymap.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-09-10 06:54:04 +0000
+++ b/src/ChangeLog     2011-09-19 21:15:47 +0000
@@ -1,3 +1,9 @@
+2011-09-19  Andreas Schwab  <address@hidden>
+
+       * 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  <address@hidden>
 
        * xdisp.c (expose_window): Save original value of phys_cursor_on_p

=== modified file 'src/keymap.c'
--- a/src/keymap.c      2011-05-09 09:59:23 +0000
+++ b/src/keymap.c      2011-09-19 21:15:47 +0000
@@ -2529,10 +2529,11 @@
 
   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 */
     {