procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge changes from emacs-23

Browse source
This commit is contained in:
Chong Yidong 2011-10-01 14:46:45 -04:00
commit b6bd159922
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/ChangeLog
View file

@ -1,3 +1,9 @@
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>
* buffer.h (struct buffer): Use time_t, not int, for a time stamp.

7
src/keymap.c
View file

@ -2274,10 +2274,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 (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 */
{