diff options
| author | Paul Eggert | 2011-10-01 22:44:43 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-10-01 22:44:43 -0700 |
| commit | df52aeb91d63c3f904c717fa8897e59fd9a5a557 (patch) | |
| tree | 0d3a471d6e44def1ba160d06b454a149a1a033b9 /src/keymap.c | |
| parent | 39b5db3b1bb51088830bdf2d5e50940d462573d2 (diff) | |
| parent | 32c1fffd728cfed8427d144bf7c622257aad859f (diff) | |
| download | emacs-df52aeb91d63c3f904c717fa8897e59fd9a5a557.tar.gz emacs-df52aeb91d63c3f904c717fa8897e59fd9a5a557.zip | |
Merge from trunk.
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 6287f6a4a44..54134c67043 100644 --- a/src/keymap.c +++ b/src/keymap.c | |||
| @@ -2292,10 +2292,11 @@ around function keys and event symbols. */) | |||
| 2292 | 2292 | ||
| 2293 | if (INTEGERP (key)) /* Normal character */ | 2293 | if (INTEGERP (key)) /* Normal character */ |
| 2294 | { | 2294 | { |
| 2295 | char tem[KEY_DESCRIPTION_SIZE]; | 2295 | char tem[KEY_DESCRIPTION_SIZE], *p; |
| 2296 | 2296 | ||
| 2297 | *push_key_description (XINT (key), tem, 1) = 0; | 2297 | p = push_key_description (XINT (key), tem, 1); |
| 2298 | return build_string (tem); | 2298 | *p = 0; |
| 2299 | return make_specified_string (tem, -1, p - tem, 1); | ||
| 2299 | } | 2300 | } |
| 2300 | else if (SYMBOLP (key)) /* Function key or event-symbol */ | 2301 | else if (SYMBOLP (key)) /* Function key or event-symbol */ |
| 2301 | { | 2302 | { |