diff options
| author | Chong Yidong | 2011-10-01 14:46:45 -0400 |
|---|---|---|
| committer | Chong Yidong | 2011-10-01 14:46:45 -0400 |
| commit | b6bd159922608fa474026837771d63bf7eadcf97 (patch) | |
| tree | c8049a810e9e1f511ff9e79b87ba1d27803fd980 /src/keymap.c | |
| parent | 04c52e2f5bffa157bcec3a9b1d0a57c4df36bfea (diff) | |
| parent | fa2ec41ffd2cace14f37f5d18d986b410cb038a1 (diff) | |
| download | emacs-b6bd159922608fa474026837771d63bf7eadcf97.tar.gz emacs-b6bd159922608fa474026837771d63bf7eadcf97.zip | |
Merge changes from emacs-23
Diffstat (limited to 'src/keymap.c')
| -rw-r--r-- | src/keymap.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/keymap.c b/src/keymap.c index 4485080db21..739dfd8f2de 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -2274,10 +2274,11 @@ around function keys and event symbols. */) | |||
| 2274 | 2274 | ||
| 2275 | if (INTEGERP (key)) /* Normal character */ | 2275 | if (INTEGERP (key)) /* Normal character */ |
| 2276 | { | 2276 | { |
| 2277 | char tem[KEY_DESCRIPTION_SIZE]; | 2277 | char tem[KEY_DESCRIPTION_SIZE], *p; |
| 2278 | 2278 | ||
| 2279 | *push_key_description (XINT (key), tem, 1) = 0; | 2279 | p = push_key_description (XINT (key), tem, 1); |
| 2280 | return build_string (tem); | 2280 | *p = 0; |
| 2281 | return make_specified_string (tem, -1, p - tem, 1); | ||
| 2281 | } | 2282 | } |
| 2282 | else if (SYMBOLP (key)) /* Function key or event-symbol */ | 2283 | else if (SYMBOLP (key)) /* Function key or event-symbol */ |
| 2283 | { | 2284 | { |