diff options
| author | Andreas Schwab <schwab@linux-m68k.org> | 2011-09-19 23:15:47 +0200 |
|---|---|---|
| committer | Andreas Schwab <schwab@linux-m68k.org> | 2011-09-19 23:15:47 +0200 |
| commit | fa2ec41ffd2cace14f37f5d18d986b410cb038a1 (patch) | |
| tree | 4d8d53ab738a2caf696191176464297b41987808 | |
| parent | 3390454c621048dcd996f497aba5e807c49dcfaf (diff) | |
| download | emacs-fa2ec41ffd2cace14f37f5d18d986b410cb038a1.tar.gz | |
* src/keymap.c (Fsingle_key_description): Use make_specified_string
instead of build_string to build string from push_key_description.
(Bug#5193)
| -rw-r--r-- | src/ChangeLog | 6 | ||||
| -rw-r--r-- | src/keymap.c | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index fa31b3d6f0e..458e8c89821 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2011-09-19 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-10 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * xdisp.c (expose_window): Save original value of phys_cursor_on_p diff --git a/src/keymap.c b/src/keymap.c index dec53cbd8e1..218a2f1828f 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -2529,10 +2529,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 (XUINT (key), tem, 1) = 0; - return build_string (tem); + p = push_key_description (XUINT (key), tem, 1); + *p = 0; + return make_specified_string (tem, -1, p - tem, 1); } else if (SYMBOLP (key)) /* Function key or event-symbol */ { |