aboutsummaryrefslogtreecommitdiffstats
path: root/src/charset.c
diff options
context:
space:
mode:
authorPaul Eggert2011-05-31 19:49:12 -0700
committerPaul Eggert2011-05-31 19:49:12 -0700
commitccd9a01aa7b67dd3d71b49e3c30df04dd39b4cae (patch)
tree00b23405fddaa49b50ce942bc8775e96689176b1 /src/charset.c
parentb9627cfb1d5b5b0914525a19cd9edb06f91a1665 (diff)
downloademacs-ccd9a01aa7b67dd3d71b49e3c30df04dd39b4cae.tar.gz
emacs-ccd9a01aa7b67dd3d71b49e3c30df04dd39b4cae.zip
Minor fixes for signed vs unsigned integers.
* character.h (MAYBE_UNIFY_CHAR): * charset.c (maybe_unify_char): * keyboard.c (read_char, reorder_modifiers): XINT -> XFASTINT, since the integer must be nonnegative. * ftfont.c (ftfont_spec_pattern): * keymap.c (access_keymap, silly_event_symbol_error): XUINT -> XFASTINT, since the integer must be nonnegative. (Fsingle_key_description, preferred_sequence_p): XUINT -> XINT, since it makes no difference and we prefer signed. * keyboard.c (record_char): Use XUINT when all the neighbors do. (access_keymap): NATNUMP -> INTEGERP, since the integer must be nonnegative.
Diffstat (limited to 'src/charset.c')
-rw-r--r--src/charset.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/charset.c b/src/charset.c
index b1b4993d277..5423cd3216f 100644
--- a/src/charset.c
+++ b/src/charset.c
@@ -1637,7 +1637,7 @@ maybe_unify_char (int c, Lisp_Object val)
1637 struct charset *charset; 1637 struct charset *charset;
1638 1638
1639 if (INTEGERP (val)) 1639 if (INTEGERP (val))
1640 return XINT (val); 1640 return XFASTINT (val);
1641 if (NILP (val)) 1641 if (NILP (val))
1642 return c; 1642 return c;
1643 1643
@@ -1647,7 +1647,7 @@ maybe_unify_char (int c, Lisp_Object val)
1647 { 1647 {
1648 val = CHAR_TABLE_REF (Vchar_unify_table, c); 1648 val = CHAR_TABLE_REF (Vchar_unify_table, c);
1649 if (! NILP (val)) 1649 if (! NILP (val))
1650 c = XINT (val); 1650 c = XFASTINT (val);
1651 } 1651 }
1652 else 1652 else
1653 { 1653 {