Mercurial > hg > xemacs-beta
comparison src/keymap.c @ 263:727739f917cb r20-5b30
Import from CVS: tag r20-5b30
author | cvs |
---|---|
date | Mon, 13 Aug 2007 10:24:41 +0200 |
parents | 83b3d10dcba9 |
children | 8efd647ea9ca |
comparison
equal
deleted
inserted
replaced
262:9d8607af9e13 | 263:727739f917cb |
---|---|
1052 if (CHARP (idx)) | 1052 if (CHARP (idx)) |
1053 { | 1053 { |
1054 struct Lisp_Event event; | 1054 struct Lisp_Event event; |
1055 event.event_type = empty_event; | 1055 event.event_type = empty_event; |
1056 character_to_event (XCHAR (idx), &event, | 1056 character_to_event (XCHAR (idx), &event, |
1057 XCONSOLE (Vselected_console), 0); | 1057 XCONSOLE (Vselected_console), 0, 0); |
1058 indirection = event.event.key; | 1058 indirection = event.event.key; |
1059 } | 1059 } |
1060 else if (CONSP (idx)) | 1060 else if (CONSP (idx)) |
1061 { | 1061 { |
1062 if (!INTP (XCDR (idx))) | 1062 if (!INTP (XCDR (idx))) |
1390 if (CHAR_OR_CHAR_INTP (spec)) | 1390 if (CHAR_OR_CHAR_INTP (spec)) |
1391 { | 1391 { |
1392 struct Lisp_Event event; | 1392 struct Lisp_Event event; |
1393 event.event_type = empty_event; | 1393 event.event_type = empty_event; |
1394 character_to_event (XCHAR_OR_CHAR_INT (spec), &event, | 1394 character_to_event (XCHAR_OR_CHAR_INT (spec), &event, |
1395 XCONSOLE (Vselected_console), 0); | 1395 XCONSOLE (Vselected_console), 0, 0); |
1396 returned_value->keysym = event.event.key.keysym; | 1396 returned_value->keysym = event.event.key.keysym; |
1397 returned_value->modifiers = event.event.key.modifiers; | 1397 returned_value->modifiers = event.event.key.modifiers; |
1398 } | 1398 } |
1399 else if (EVENTP (spec)) | 1399 else if (EVENTP (spec)) |
1400 { | 1400 { |
3242 { | 3242 { |
3243 struct Lisp_Event event; | 3243 struct Lisp_Event event; |
3244 event.event_type = empty_event; | 3244 event.event_type = empty_event; |
3245 CHECK_CHAR_COERCE_INT (key); | 3245 CHECK_CHAR_COERCE_INT (key); |
3246 character_to_event (XCHAR (key), &event, | 3246 character_to_event (XCHAR (key), &event, |
3247 XCONSOLE (Vselected_console), 0); | 3247 XCONSOLE (Vselected_console), 0, 1); |
3248 format_event_object (buf, &event, 1); | 3248 format_event_object (buf, &event, 1); |
3249 } | 3249 } |
3250 else | 3250 else |
3251 format_event_object (buf, XEVENT (key), 1); | 3251 format_event_object (buf, XEVENT (key), 1); |
3252 return build_string (buf); | 3252 return build_string (buf); |