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

* src/keymap.c (Fsingle_key_description): Handle char ranges.

Browse source
This commit is contained in:
Stefan Monnier 2012-02-13 10:55:27 -05:00
parent 3d2af1938b
commit af70074f2f
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/ChangeLog
View file

@ -1,3 +1,7 @@
2012-02-13 Stefan Monnier <monnier@iro.umontreal.ca>
* keymap.c (Fsingle_key_description): Handle char ranges.
2012-02-12 Chong Yidong <cyd@gnu.org>
* xdisp.c (handle_stop): Avoid assigning -1 to it->face_id here,

10
src/keymap.c
View file

@ -2270,9 +2270,15 @@ around function keys and event symbols. */)
if (CONSP (key) && lucid_event_type_list_p (key))
key = Fevent_convert_list (key);
if (CONSP (key) && INTEGERP (XCAR (key)) && INTEGERP (XCDR (key)))
/* An interval from a map-char-table. */
return concat3 (Fsingle_key_description (XCAR (key), no_angles),
build_string (".."),
Fsingle_key_description (XCDR (key), no_angles));
key = EVENT_HEAD (key);
if (INTEGERP (key)) /* Normal character */
if (INTEGERP (key)) /* Normal character. */
{
char tem[KEY_DESCRIPTION_SIZE], *p;
@ -2280,7 +2286,7 @@ around function keys and event symbols. */)
*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. */
{
if (NILP (no_angles))
{