* keyboard.c (follow_key, read_key_sequence): Use XUINT on key value, or checks

for CHAR_META will fail.
* keymap.c (get_keyelt): Likewise.

diff --git a/src/ChangeLog b/src/ChangeLog
index 73f6dc10f23612c2e3047003cd490a479d2a9f58..b95056b91b9e730f0ee9fa1aa4e76923972ee20f 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2000-06-19  Ken Raeburn  <raeburn@gnu.org>
+
+       * 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  <handa@etl.go.jp>
 
        * ccl.h (struct ccl_program): New member eol_type.

diff --git a/src/keyboard.c b/src/keyboard.c
index 9a2f18f043ca29d8269e1f6a173f5a54a0009f86..dd115816781d4808ea796f2ed0ad221c982c0a8c 100644 (file)
--- 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 8ef1b8ab450857bc29251366ec20c2ac257730e6..371b6571c7628616d80c0def05c75fd667332b84 100644 (file)
--- 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);