Merge from trunk.

diff --cc ChangeLog
index 17b6bae02ccaea92fa2841da3a1c0bf9818dd99b,19dcf6818e3b993d535b9e20566231b4f6c8bae6..01fee7035b920b2ff1ada650c5606ae8d796ae14
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,7 +1,15 @@@
- 2011-07-05  Paul Eggert  <eggert@cs.ucla.edu>
++2011-07-06  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Assume support for memcmp, memcpy, memmove, memset.
 +      This simplifies the code a bit.  All current platforms have these,
 +      as they are required for C89.  If this turns into a problem we
 +      can add the gnulib modules for these (a 1-line change to Makefile.in).
 +      * configure.in: Don't check for memcmp, memcpy, memmove, memset.
 +
+ 2011-07-05  Jan Djärv  <jan.h.d@swipnet.se>
+ 
+       * configure.in (HAVE_GCONF): Allow both HAVE_GCONF and HAVE_GSETTINGS.
+ 
  2011-07-01  Glenn Morris  <rgm@gnu.org>
  
        * configure.in (SETTINGS_CFLAGS, SETTINGS_LIBS) [HAVE_GCONF]: Fix typo.

diff --cc configure.in
Simple merge

diff --cc lib-src/ChangeLog
index c2b1b106c15acd8cd99207bf277b941c2fe40418,098ee06c7626d5ad00cdaf497ff8d0106cc9eaaf..393cac2c8a058da9cd645190923211c39b593b88
--- 1/lib-src/ChangeLog
--- 2/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@@ -1,8 -1,3 +1,8 @@@
- 2011-07-05  Paul Eggert  <eggert@cs.ucla.edu>
++2011-07-06  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Assume support for memcmp, memcpy, memmove, memset.
 +      * etags.c (absolute_filename): Assume memmove exists.
 +
  2011-07-02  Jason Rumney  <jasonr@gnu.org>
  
        * emacsclient.c (decode_options) [WINDOWSNT]: Avoid tty mode on

diff --cc src/ChangeLog
index 22d70bf54ebacc346846ce9e1833adba619a5e7b,11ba7e00705a34621bbdaacaa5421f030846b40f..b0fb0f213ab053d927db793417be009a71dc03af
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,17 -1,49 +1,63 @@@
- 2011-07-05  Paul Eggert  <eggert@cs.ucla.edu>
++2011-07-06  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Assume support for memcmp, memcpy, memmove, memset.
 +      * lisp.h, sysdep.c (memcmp, memcpy, memmove, memset):
 +      * regex.c (memcmp, memcpy):
 +      Remove; we assume C89 now.
 +
 +      * gmalloc.c (memcpy, memset, memmove): Remove; we assume C89 now.
 +      (__malloc_safe_bcopy): Remove; no longer needed.
 +
 +      * lisp.h (struct vectorlike_header, struct Lisp_Subr):  Signed sizes.
 +      Use EMACS_INT, not EMACS_UINT, for sizes.  The code works equally
 +      well either way, and we prefer signed to unsigned.
 +
+ 2011-07-06  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+       Remove unportable assumption about struct layout (Bug#8884).
+       * alloc.c (mark_buffer):
+       * buffer.c (reset_buffer_local_variables, Fbuffer_local_variables)
+       (clone_per_buffer_values): Don't assume that
+       sizeof (struct buffer) is a multiple of sizeof (Lisp_Object).
+       This isn't true in general, and it's particularly not true
+       if Emacs is configured with --with-wide-int.
+       * buffer.h (FIRST_FIELD_PER_BUFFER, LAST_FIELD_PER_BUFFER):
+       New macros, used in the buffer.c change.
+ 
+ 2011-07-05  Jan Djärv  <jan.h.d@swipnet.se>
+ 
+       * xsettings.c: Use both GConf and GSettings if both are available.
+       (store_config_changed_event): Add comment.
+       (dpyinfo_valid, store_font_name_changed, map_tool_bar_style)
+       (store_tool_bar_style_changed): New functions.
+       (store_monospaced_changed): Add comment. Call dpyinfo_valid.
+       (struct xsettings): Move font inside HAVE_XFT.
+       (GSETTINGS_TOOL_BAR_STYLE, GSETTINGS_FONT_NAME): New defines.
+       (GSETTINGS_MONO_FONT): Renamed from SYSTEM_MONO_FONT.
+       Move inside HAVE_XFT.
+       (something_changed_gsettingsCB): Renamed from something_changedCB.
+       Check for changes in GSETTINGS_TOOL_BAR_STYLE and GSETTINGS_FONT_NAME
+       also.
+       (GCONF_TOOL_BAR_STYLE, GCONF_FONT_NAME): New defines.
+       (GCONF_MONO_FONT): Renamed from SYSTEM_MONO_FONT. Move inside HAVE_XFT.
+       (something_changed_gconfCB): Renamed from something_changedCB.
+       Check for changes in GCONF_TOOL_BAR_STYLE and GCONF_FONT_NAME also.
+       (parse_settings): Move check for font inside HAVE_XFT.
+       (read_settings, apply_xft_settings): Add comment.
+       (read_and_apply_settings): Add comment.  Call map_tool_bar_style and
+       store_tool_bar_style_changed.  Move check for font inside HAVE_XFT and
+       call store_font_name_changed.
+       (xft_settings_event): Add comment.
+       (init_gsettings): Add comment.  Get values for GSETTINGS_TOOL_BAR_STYLE
+       and GSETTINGS_FONT_NAME.  Move check for fonts within HAVE_XFT.
+       (init_gconf): Add comment.  Get values for GCONF_TOOL_BAR_STYLE
+       and GCONF_FONT_NAME.  Move check for fonts within HAVE_XFT.
+       (xsettings_initialize): Call init_gsettings last.
+       (xsettings_get_system_font, xsettings_get_system_normal_font): Add
+       comment.
+ 
+ 2011-07-05  Paul Eggert  <eggert@cs.ucla.edu>
+ 
        Random fixes.  E.g., (random) never returned negative values.
        * fns.c (Frandom): Use GET_EMACS_TIME for random seed, and add the
        subseconds part to the entropy, as that's a bit more random.