Mercurial > hg > xemacs-beta
changeset 2830:d7505a1267a4
[xemacs-hg @ 2005-06-26 19:05:05 by aidan]
Couple of build fixes--that'll teach me to spend the weekend doing something other than hacking XEmacs.
| author | aidan |
|---|---|
| date | Sun, 26 Jun 2005 19:05:07 +0000 |
| parents | 714b354cef67 |
| children | fadb4a4ee04a |
| files | src/ChangeLog src/event-stream.c src/mule-ccl.c |
| diffstat | 3 files changed, 17 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Jun 26 18:42:23 2005 +0000 +++ b/src/ChangeLog Sun Jun 26 19:05:07 2005 +0000 @@ -1,3 +1,10 @@ +2005-06-26 Aidan Kehoe <kehoea@parhasard.net> + + * event-stream.c (command_builder_find_leaf): + * mule-ccl.c (POSSIBLE_LEADING_BYTE_P): + * mule-ccl.c (ccl_driver): + Couple of build fixes. + 2005-06-26 Aidan Kehoe <kehoea@parhasard.net> * mule-ccl.c (POSSIBLE_LEADING_BYTE_P): Add.
--- a/src/event-stream.c Sun Jun 26 18:42:23 2005 +0000 +++ b/src/event-stream.c Sun Jun 26 19:05:07 2005 +0000 @@ -3591,7 +3591,8 @@ newb = XCOMMAND_BUILDER(newbuilder); - XSET_EVENT_KEY_KEYSYM(event_chain_tail (newbuilder->current_events), + XSET_EVENT_KEY_KEYSYM(event_chain_tail + (XCOMMAND_BUILDER(newbuilder)->current_events), make_char(this_alternative)); result = command_builder_find_leaf_no_jit_binding @@ -3602,12 +3603,15 @@ copy_command_builder (newb, builder); *did_munge = 1; } - else if (event_upshifted_p (newbuilder->most_current_event) && + else if (event_upshifted_p + (XCOMMAND_BUILDER(newbuilder)->most_current_event) && !NILP (Vretry_undefined_key_binding_unshifted) && isascii(this_alternative)) { - downshift_event (event_chain_tail (newbuilder->current_events)); - XSET_EVENT_KEY_KEYSYM(event_chain_tail (newb->current_events), + downshift_event (event_chain_tail + (XCOMMAND_BUILDER(newbuilder)->current_events)); + XSET_EVENT_KEY_KEYSYM(event_chain_tail + (newb->current_events), make_char(tolower(this_alternative))); result = command_builder_find_leaf_no_jit_binding (newb, allow_misc_user_events_p, did_munge);
--- a/src/mule-ccl.c Sun Jun 26 18:42:23 2005 +0000 +++ b/src/mule-ccl.c Sun Jun 26 19:05:07 2005 +0000 @@ -826,7 +826,7 @@ } \ } while (0) -#define POSSIBLE_LEADING_BYTE_P(lb) \ +#define POSSIBLE_LEADING_BYTE_P(leading_byte) \ ((leading_byte > MIN_LEADING_BYTE) && \ (leading_byte - MIN_LEADING_BYTE) < NUM_LEADING_BYTES) @@ -1367,7 +1367,7 @@ else if (LEADING_BYTE_CONTROL_1 == i) i = ((reg[rrr] & 0xFF) - 0xA0); else if (POSSIBLE_LEADING_BYTE_P(i) && - !NILP(charset_by_leading_byte(i)) + !NILP(charset_by_leading_byte(i))) { if (XCHARSET_DIMENSION (charset_by_leading_byte (i)) == 1) i = (((i - FIELD2_TO_OFFICIAL_LEADING_BYTE) << 7)