Mercurial > emacs
comparison src/keymap.c @ 90533:8a8e69664178
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 343-356)
- Update from CVS
- Update for ERC 5.1.3.
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 113-115)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-90
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 19 Jul 2006 00:42:56 +0000 |
| parents | 9b61abfe926b df96acbe2970 |
| children | 858cb33ae39d |
comparison
equal
deleted
inserted
replaced
| 90532:e22cf6d2400c | 90533:8a8e69664178 |
|---|---|
| 731 Lisp_Object function, keymap, sort_first; | 731 Lisp_Object function, keymap, sort_first; |
| 732 { | 732 { |
| 733 if (INTEGERP (function)) | 733 if (INTEGERP (function)) |
| 734 /* We have to stop integers early since map_keymap gives them special | 734 /* We have to stop integers early since map_keymap gives them special |
| 735 significance. */ | 735 significance. */ |
| 736 Fsignal (Qinvalid_function, Fcons (function, Qnil)); | 736 xsignal1 (Qinvalid_function, function); |
| 737 if (! NILP (sort_first)) | 737 if (! NILP (sort_first)) |
| 738 return call3 (intern ("map-keymap-internal"), function, keymap, Qt); | 738 return call3 (intern ("map-keymap-internal"), function, keymap, Qt); |
| 739 | 739 |
| 740 map_keymap (keymap, map_keymap_call, function, NULL, 1); | 740 map_keymap (keymap, map_keymap_call, function, NULL, 1); |
| 741 return Qnil; | 741 return Qnil; |
| 1159 struct gcpro gcpro1, gcpro2, gcpro3; | 1159 struct gcpro gcpro1, gcpro2, gcpro3; |
| 1160 | 1160 |
| 1161 GCPRO3 (keymap, key, def); | 1161 GCPRO3 (keymap, key, def); |
| 1162 keymap = get_keymap (keymap, 1, 1); | 1162 keymap = get_keymap (keymap, 1, 1); |
| 1163 | 1163 |
| 1164 if (!VECTORP (key) && !STRINGP (key)) | 1164 CHECK_VECTOR_OR_STRING (key); |
| 1165 key = wrong_type_argument (Qarrayp, key); | |
| 1166 | 1165 |
| 1167 length = XFASTINT (Flength (key)); | 1166 length = XFASTINT (Flength (key)); |
| 1168 if (length == 0) | 1167 if (length == 0) |
| 1169 RETURN_UNGCPRO (Qnil); | 1168 RETURN_UNGCPRO (Qnil); |
| 1170 | 1169 |
| 1280 struct gcpro gcpro1, gcpro2; | 1279 struct gcpro gcpro1, gcpro2; |
| 1281 | 1280 |
| 1282 GCPRO2 (keymap, key); | 1281 GCPRO2 (keymap, key); |
| 1283 keymap = get_keymap (keymap, 1, 1); | 1282 keymap = get_keymap (keymap, 1, 1); |
| 1284 | 1283 |
| 1285 if (!VECTORP (key) && !STRINGP (key)) | 1284 CHECK_VECTOR_OR_STRING (key); |
| 1286 key = wrong_type_argument (Qarrayp, key); | |
| 1287 | 1285 |
| 1288 length = XFASTINT (Flength (key)); | 1286 length = XFASTINT (Flength (key)); |
| 1289 if (length == 0) | 1287 if (length == 0) |
| 1290 RETURN_UNGCPRO (keymap); | 1288 RETURN_UNGCPRO (keymap); |
| 1291 | 1289 |
