Merge from trunk.

diff --cc src/ChangeLog
index 4a9e651e4d1a1de6a35f64d8e5927e8858c3e710,618a1819c19760c9d058d79f906df6d2f63efa11..6d1b740de9cd31c77a12c985a022f492d993c1ac
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,19 -1,26 +1,42 @@@
 +2011-06-01  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-05-31  Juanma Barranquero  <lekktu@gmail.com>
+ 
+       * makefile.w32-in ($(BLD)/data.$(O), $(BLD)/editfns.$(O)):
+       Update dependencies.
+ 
+ 2011-05-31  Dan Nicolaescu  <dann@ics.uci.edu>
+ 
+       * data.c (init_data): Remove code for UTS, this system is not
+       supported anymore.
+ 
+ 2011-05-31  Dan Nicolaescu  <dann@ics.uci.edu>
+ 
+       Don't force ./temacs to start in terminal mode.
+ 
+       * frame.c (make_initial_frame): Initialize faces in all cases, not
+       only when CANNOT_DUMP is defined.
+       * dispnew.c (init_display): Remove CANNOT_DUMP condition.
+ 
+ 2011-05-31  Dan Nicolaescu  <dann@ics.uci.edu>
+ 
+       * dispnew.c (add_window_display_history): Use const for the string
+       pointer.  Remove declaration, not needed.
+ 
  2011-05-31  Paul Eggert  <eggert@cs.ucla.edu>
  
        Use 'inline', not 'INLINE'.