Mercurial > emacs
comparison src/keymap.c @ 90054:f2ebccfa87d4
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-74
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-709
Update from CVS: src/indent.c (Fvertical_motion): Fix last change.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-710
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-715
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-716
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-74
Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 08 Dec 2004 05:02:30 +0000 |
| parents | b637c617432f 277e7a013eb6 |
| children | cb67264d6096 |
comparison
equal
deleted
inserted
replaced
| 90053:fff5f1a61d92 | 90054:f2ebccfa87d4 |
|---|---|
| 1271 | 1271 |
| 1272 if (CONSP (c) && lucid_event_type_list_p (c)) | 1272 if (CONSP (c) && lucid_event_type_list_p (c)) |
| 1273 c = Fevent_convert_list (c); | 1273 c = Fevent_convert_list (c); |
| 1274 | 1274 |
| 1275 /* Turn the 8th bit of string chars into a meta modifier. */ | 1275 /* Turn the 8th bit of string chars into a meta modifier. */ |
| 1276 if (XINT (c) & 0x80 && STRINGP (key)) | 1276 if (INTEGERP (c) && XINT (c) & 0x80 && STRINGP (key)) |
| 1277 XSETINT (c, (XINT (c) | meta_modifier) & ~0x80); | 1277 XSETINT (c, (XINT (c) | meta_modifier) & ~0x80); |
| 1278 | 1278 |
| 1279 /* Allow string since binding for `menu-bar-select-buffer' | 1279 /* Allow string since binding for `menu-bar-select-buffer' |
| 1280 includes the buffer name in the key sequence. */ | 1280 includes the buffer name in the key sequence. */ |
| 1281 if (!INTEGERP (c) && !SYMBOLP (c) && !CONSP (c) && !STRINGP (c)) | 1281 if (!INTEGERP (c) && !SYMBOLP (c) && !CONSP (c) && !STRINGP (c)) |
