[Emacs-diffs] /srv/bzr/emacs/trunk r105975: Merge changes from emacs-23

[Chong Yidong]

------------------------------------------------------------
revno: 105975 [merge]
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2011-10-01 14:47:22 -0400
message:
  Merge changes from emacs-23
modified:
  src/ChangeLog
  src/keymap.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-09-30 20:22:01 +0000
+++ b/src/ChangeLog     2011-10-01 18:46:45 +0000
@@ -1,3 +1,9 @@
+2011-10-01  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-30  Paul Eggert  <address@hidden>
 
        * buffer.h (struct buffer): Use time_t, not int, for a time stamp.

=== modified file 'src/keymap.c'
--- a/src/keymap.c      2011-08-29 15:43:34 +0000
+++ b/src/keymap.c      2011-10-01 18:46:45 +0000
@@ -2274,10 +2274,11 @@
 
   if (INTEGERP (key))          /* Normal character */
     {
-      char tem[KEY_DESCRIPTION_SIZE];
+      char tem[KEY_DESCRIPTION_SIZE], *p;
 
-      *push_key_description (XINT (key), tem, 1) = 0;
-      return build_string (tem);
+      p = push_key_description (XINT (key), tem, 1);
+      *p = 0;
+      return make_specified_string (tem, -1, p - tem, 1);
     }
   else if (SYMBOLP (key))      /* Function key or event-symbol */
     {