Mercurial > emacs
comparison src/keymap.c @ 90573:858cb33ae39d
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 357-381)
- Merge from gnus--rel--5.10
- Update from CVS
- Merge from erc--emacs--21
* gnus--rel--5.10 (patch 116-122)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-98
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 03 Aug 2006 11:45:23 +0000 |
parents | 8a8e69664178 91ea8d22ef60 |
children | a1a25ac6c88a |
comparison
equal
deleted
inserted
replaced
90572:ab9b8d043c39 | 90573:858cb33ae39d |
---|---|
1170 if (SYMBOLP (def) && !EQ (Vdefine_key_rebound_commands, Qt)) | 1170 if (SYMBOLP (def) && !EQ (Vdefine_key_rebound_commands, Qt)) |
1171 Vdefine_key_rebound_commands = Fcons (def, Vdefine_key_rebound_commands); | 1171 Vdefine_key_rebound_commands = Fcons (def, Vdefine_key_rebound_commands); |
1172 | 1172 |
1173 meta_bit = VECTORP (key) ? meta_modifier : 0x80; | 1173 meta_bit = VECTORP (key) ? meta_modifier : 0x80; |
1174 | 1174 |
1175 if (VECTORP (def) && ASIZE (def) > 0 && CONSP (AREF (def, make_number (0)))) | |
1176 { /* DEF is apparently an XEmacs-style keyboard macro. */ | |
1177 Lisp_Object tmp = Fmake_vector (make_number (ASIZE (def)), Qnil); | |
1178 int i = ASIZE (def); | |
1179 while (--i >= 0) | |
1180 { | |
1181 Lisp_Object c = AREF (def, i); | |
1182 if (CONSP (c) && lucid_event_type_list_p (c)) | |
1183 c = Fevent_convert_list (c); | |
1184 ASET (tmp, i, c); | |
1185 } | |
1186 def = tmp; | |
1187 } | |
1188 | |
1175 idx = 0; | 1189 idx = 0; |
1176 while (1) | 1190 while (1) |
1177 { | 1191 { |
1178 c = Faref (key, make_number (idx)); | 1192 c = Faref (key, make_number (idx)); |
1179 | 1193 |