Mercurial > emacs
comparison src/keymap.c @ 90228:fa0da9b57058
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-82
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 542-553)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 116-121)
- Merge from emacs--cvs-trunk--0
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 19 Sep 2005 10:20:33 +0000 |
parents | 2d92f5c9d6ae d9638b932900 |
children | 7beb78bc1f8e |
comparison
equal
deleted
inserted
replaced
90227:10fe5fadaf89 | 90228:fa0da9b57058 |
---|---|
723 /* We have to stop integers early since map_keymap gives them special | 723 /* We have to stop integers early since map_keymap gives them special |
724 significance. */ | 724 significance. */ |
725 Fsignal (Qinvalid_function, Fcons (function, Qnil)); | 725 Fsignal (Qinvalid_function, Fcons (function, Qnil)); |
726 if (! NILP (sort_first)) | 726 if (! NILP (sort_first)) |
727 return call3 (intern ("map-keymap-internal"), function, keymap, Qt); | 727 return call3 (intern ("map-keymap-internal"), function, keymap, Qt); |
728 | 728 |
729 map_keymap (keymap, map_keymap_call, function, NULL, 1); | 729 map_keymap (keymap, map_keymap_call, function, NULL, 1); |
730 return Qnil; | 730 return Qnil; |
731 } | 731 } |
732 | 732 |
733 /* Given OBJECT which was found in a slot in a keymap, | 733 /* Given OBJECT which was found in a slot in a keymap, |
2861 Findent_to (make_number (16), make_number (1)); | 2861 Findent_to (make_number (16), make_number (1)); |
2862 bufend = push_key_description (c, buf, 1); | 2862 bufend = push_key_description (c, buf, 1); |
2863 insert (buf, bufend - buf); | 2863 insert (buf, bufend - buf); |
2864 | 2864 |
2865 insert ("\n", 1); | 2865 insert ("\n", 1); |
2866 | |
2867 /* Insert calls signal_after_change which may GC. */ | |
2868 translate = SDATA (Vkeyboard_translate_table); | |
2866 } | 2869 } |
2867 | 2870 |
2868 insert ("\n", 1); | 2871 insert ("\n", 1); |
2869 } | 2872 } |
2870 | 2873 |