Merge: Minor fixes for signed vs unsigned integers.

diff --cc src/ChangeLog
index 0302f06f9c0e10c8eebd9f00268805f0e9b421de,6d1b740de9cd31c77a12c985a022f492d993c1ac..6e12a97d6411a0c57ff241bb424d7554a7108254
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,14 -1,19 +1,30 @@@
 -2011-06-01  Paul Eggert  <eggert@cs.ucla.edu>
++2011-06-02  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+       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.
+ 
 +2011-06-01  Dan Nicolaescu  <dann@ics.uci.edu>
 +
 +      Make it possible to build with GCC-4.6+ -O2 -flto.
 +
 +      * emacs.c (__malloc_initialize_hook): Mark as EXTERNALLY_VISIBLE.
 +
 +2011-06-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * minibuf.c (get_minibuffer, read_minibuf_unwind):
 +      Call minibuffer-inactive-mode.
 +
  2011-05-31  Juanma Barranquero  <lekktu@gmail.com>
  
        * makefile.w32-in ($(BLD)/data.$(O), $(BLD)/editfns.$(O)):