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

diff --git a/src/ChangeLog b/src/ChangeLog
index 1e28d2585234c0abf8feb51e36aa42cf4fc6d86a..d9c02e011ad8250c85da17e33905a2c3b833e674 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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,

diff --git a/src/keymap.c b/src/keymap.c
index 5b5faec3a65e3767ccd1a02bc712f1a8625276d7..0ae055213c3e0c66218f5751dda3de166d8bc88a 100644 (file)
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -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))
        {