Merge from trunk.

diff --cc src/ChangeLog
index db1f1c82f35327d2c20a4388b86b596ba317d92d,c5eff48b48d914f52d8874f4246bfeb8db6acf1a..712e4269840c73eb6e38203b195c1d1bc5601369
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,32 -1,13 +1,42 @@@
- 2011-06-11  Paul Eggert  <eggert@cs.ucla.edu>
++2011-06-12  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * buffer.c (Qclone_number): Remove for now, as it's unused.
 +      (record_buffer, Funrecord_buffer): Rename local to avoid shadowing.
 +      (record_buffer): Remove unused local.
 +      * frame.c (other_visible_frames, frame_buffer_list): Now static.
 +      (set_frame_buffer_list): Remove; unused.
 +      * frame.h (other_visible_frames): Remove decl.
 +      * keyboard.h (menu_items_inuse): Declare only if USE_GTK || USE_MOTIF.
 +      * lisp.h (frame_buffer_list, set_frame_buffer_list): Remove decls.
 +      (add_gpm_wait_descriptor, delete_gpm_wait_descriptor): Declare only
 +      if HAVE_GPM.
 +      * menu.c (menu_items_inuse): Now static unless USE_GTK || USE_MOTIF.
 +      * process.c (add_gpm_wait_descriptor, delete_gpm_wait_descriptor):
 +      Define only if HAVE_GPM.
 +      * widget.c (EmacsFrameResize, emacsFrameClassRec): Now static.
 +      (update_hints_inhibit): Remove; never set.  All uses removed.
 +      * widgetprv.h (emacsFrameClassRec): Remove decl.
 +      * window.c (delete_deletable_window): Now returns void, since it
 +      wasn't returning anything.
 +      (compare_window_configurations): Remove unused locals.
 +      * xfns.c (x_set_scroll_bar_default_width): Remove unused locals.
 +      * xmenu.c (x_menu_set_in_use): Define only if USE_GTK || USE_MOTIF.
 +      (dialog_selection_callback) [!USE_GTK]: Prefer intptr_t for integers
 +      the same widths as pointers.  This follows up on the 2011-05-06 patch.
 +      * xterm.c (x_alloc_lighter_color_for_widget): Define only if USE_LUCID.
 +      * xterm.h: Likewise.
 +      (x_menu_set_in_use): Declare only if USE_GTK || USE_MOTIF.
 +
+ 2011-06-12  Juanma Barranquero  <lekktu@gmail.com>
+ 
+       * makefile.w32-in: Update dependencies.
+       (LISP_H): Add lib/intprops.h.
+ 
+ 2011-06-11  Chong Yidong  <cyd@stupidchicken.com>
+ 
+       * image.c (gif_load): Add animation frame delay to the metadata.
+       (syms_of_image): Use DEFSYM.  New symbol `delay'.
+ 
  2011-06-11  Martin Rudalics  <rudalics@gmx.at>
  
        * window.c (delete_deletable_window): Re-add.