From 140c4ac6f3aad88bc2222ff8fb25d3272ee01a87 Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Mon, 19 Jun 2000 07:16:27 +0000 Subject: [PATCH] * keyboard.c (follow_key, read_key_sequence): Use XUINT on key value, or checks for CHAR_META will fail. * keymap.c (get_keyelt): Likewise. --- src/ChangeLog | 7 +++++++ src/keyboard.c | 4 ++-- src/keymap.c | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 73f6dc10f23..b95056b91b9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2000-06-19 Ken Raeburn + + * keyboard.c (follow_key, read_key_sequence): Use XUINT on key + value, or checks for CHAR_META can fail when Lisp_Object is a + union type. + * keymap.c (get_keyelt): Likewise. + 2000-06-19 Kenichi Handa * ccl.h (struct ccl_program): New member eol_type. diff --git a/src/keyboard.c b/src/keyboard.c index 9a2f18f043c..dd115816781 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -8192,7 +8192,7 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last, key = keybuf[fkey_end++]; /* Look up meta-characters by prefixing them with meta_prefix_char. I hate this. */ - if (INTEGERP (key) && XINT (key) & meta_modifier) + if (INTEGERP (key) && XUINT (key) & meta_modifier) { fkey_next = get_keymap_1 @@ -8316,7 +8316,7 @@ read_key_sequence (keybuf, bufsize, prompt, dont_downcase_last, key = keybuf[keytran_end++]; /* Look up meta-characters by prefixing them with meta_prefix_char. I hate this. */ - if (INTEGERP (key) && XINT (key) & meta_modifier) + if (INTEGERP (key) && XUINT (key) & meta_modifier) { keytran_next = get_keymap_1 diff --git a/src/keymap.c b/src/keymap.c index 8ef1b8ab450..371b6571c76 100644 --- a/src/keymap.c +++ b/src/keymap.c @@ -625,7 +625,7 @@ get_keyelt (object, autoload) { Lisp_Object key; key = Fcdr (object); - if (INTEGERP (key) && (XINT (key) & meta_modifier)) + if (INTEGERP (key) && (XUINT (key) & meta_modifier)) { object = access_keymap (map, meta_prefix_char, 0, 0); map = get_keymap_1 (object, 0, autoload); -- 2.39.5