Commit b6bd1599 authored by Chong Yidong's avatar Chong Yidong
Browse files

Merge changes from emacs-23

parents 04c52e2f fa2ec41f
2011-10-01 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-30 Paul Eggert <eggert@cs.ucla.edu> 2011-09-30 Paul Eggert <eggert@cs.ucla.edu>
* buffer.h (struct buffer): Use time_t, not int, for a time stamp. * buffer.h (struct buffer): Use time_t, not int, for a time stamp.
......
...@@ -2274,10 +2274,11 @@ around function keys and event symbols. */) ...@@ -2274,10 +2274,11 @@ around function keys and event symbols. */)
if (INTEGERP (key)) /* Normal character */ if (INTEGERP (key)) /* Normal character */
{ {
char tem[KEY_DESCRIPTION_SIZE]; char tem[KEY_DESCRIPTION_SIZE], *p;
*push_key_description (XINT (key), tem, 1) = 0; p = push_key_description (XINT (key), tem, 1);
return build_string (tem); *p = 0;
return make_specified_string (tem, -1, p - tem, 1);
} }
else if (SYMBOLP (key)) /* Function key or event-symbol */ else if (SYMBOLP (key)) /* Function key or event-symbol */
{ {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment