aboutsummaryrefslogtreecommitdiffstats
path: root/src/keymap.c
diff options
context:
space:
mode:
authorPaul Eggert2012-02-24 22:41:40 -0800
committerPaul Eggert2012-02-24 22:41:40 -0800
commita89654f8f34114db543cb91363e8fded6d73e986 (patch)
tree5ac508597ef2aa460308b4b26c244779e48cdb40 /src/keymap.c
parent6e6c82a4e687708d5a7a3887f92db45bd74da276 (diff)
parent67b0de11479247cb8bd8491e10e0b464046f18be (diff)
downloademacs-a89654f8f34114db543cb91363e8fded6d73e986.tar.gz
emacs-a89654f8f34114db543cb91363e8fded6d73e986.zip
Merge from trunk.
Diffstat (limited to 'src/keymap.c')
-rw-r--r--src/keymap.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/src/keymap.c b/src/keymap.c
index cc4419a4d2f..328e6d8ed23 100644
--- a/src/keymap.c
+++ b/src/keymap.c
@@ -2288,9 +2288,15 @@ around function keys and event symbols. */)
2288 if (CONSP (key) && lucid_event_type_list_p (key)) 2288 if (CONSP (key) && lucid_event_type_list_p (key))
2289 key = Fevent_convert_list (key); 2289 key = Fevent_convert_list (key);
2290 2290
2291 if (CONSP (key) && INTEGERP (XCAR (key)) && INTEGERP (XCDR (key)))
2292 /* An interval from a map-char-table. */
2293 return concat3 (Fsingle_key_description (XCAR (key), no_angles),
2294 build_string (".."),
2295 Fsingle_key_description (XCDR (key), no_angles));
2296
2291 key = EVENT_HEAD (key); 2297 key = EVENT_HEAD (key);
2292 2298
2293 if (INTEGERP (key)) /* Normal character */ 2299 if (INTEGERP (key)) /* Normal character. */
2294 { 2300 {
2295 char tem[KEY_DESCRIPTION_SIZE], *p; 2301 char tem[KEY_DESCRIPTION_SIZE], *p;
2296 2302
@@ -2298,7 +2304,7 @@ around function keys and event symbols. */)
2298 *p = 0; 2304 *p = 0;
2299 return make_specified_string (tem, -1, p - tem, 1); 2305 return make_specified_string (tem, -1, p - tem, 1);
2300 } 2306 }
2301 else if (SYMBOLP (key)) /* Function key or event-symbol */ 2307 else if (SYMBOLP (key)) /* Function key or event-symbol. */
2302 { 2308 {
2303 if (NILP (no_angles)) 2309 if (NILP (no_angles))
2304 { 2310 {