Merge from trunk.

diff --cc ChangeLog
index 8d89e361c59644e89a6d7980b89854c9c7052edb,ed63719f6c393f29ff2007951197172977c47d4a..86a352c4cf0c956bb712ddc1453071053aea6c0d
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,25 -1,10 +1,27 @@@
- 2012-04-09  Paul Eggert  <eggert@cs.ucla.edu>
++2012-04-10  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      configure: new option --enable-gcc-warnings (Bug#11207)
 +      I have been using this change for many months in my private copy
 +      of Emacs, and have used it to find several bugs.  It's mature
 +      enough to publish now.
 +      * Makefile.in (GNULIB_MODULES): Add warnings, manywarnings.
 +      * configure.in: Support --enable-gcc-warnings, in the style of
 +      other GNU packages such as coreutils.
 +      (C_WARNINGS_SWITCH): Remove, replacing with...
 +      (WARN_CFLAGS, GNULIB_WARN_CFLAGS): New variable.
 +      (PKG_CHECK_MODULES, C_SWITCH_X_SITE): Use -isystem rather than -I,
 +      when including system files with GCC.
 +      * etc/NEWS: Mention --enable-gcc-warnings.
 +      * lib/Makefile.am (AM_CFLAGS): New macro.
 +      * m4/manywarnings.m4, m4/warnings.m4: New files, from gnulib.
 +
+ 2012-04-10  Glenn Morris  <rgm@gnu.org>
+ 
+       * configure.in: Conditionally generate admin/unidata/Makefile.
+ 
  2012-04-09  Teodor Zlatanov  <tzz@lifelogs.com>
  
-       * info/dir (File):
-       * Makefile.in: Add emacs-gnutls to the info directory and the
-       INFO_FILES target.
+       * info/dir, Makefile.in (INFO_FILES): Add emacs-gnutls manual.
  
  2012-04-09  Glenn Morris  <rgm@gnu.org>
  

diff --cc configure.in
Simple merge

diff --cc etc/NEWS
Simple merge

diff --cc src/ChangeLog
index 5abf92bc4e1649577f1ffc9ca8c6fc291a784a72,994b8d034ffc1e51c5e95e44060daabc8eba20cc..2b6a0b2246e3e9d1ec4cb8f3c86d3a3ffb7c7b9f
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,16 -1,14 +1,27 @@@
- 2012-04-09  Paul Eggert  <eggert@cs.ucla.edu>
++2012-04-10  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      configure: new option --enable-gcc-warnings (Bug#11207)
 +      * Makefile.in (C_WARNINGS_SWITCH): Remove.
 +      (WARN_CFLAGS, WERROR_CFLAGS): New macros.
 +      (ALL_CFLAGS): Use new macros rather than old.
 +      * process.c: Ignore -Wstrict-overflow to work around GCC bug 52904.
 +      * regex.c: Ignore -Wstrict-overflow.  If !emacs, also ignore
 +      -Wunused-but-set-variable, -Wunused-function, -Wunused-macros,
 +      -Wunused-result, -Wunused-variable.  This should go away once
 +      the Emacs and Gnulib regex code is merged.
 +      (xmalloc, xrealloc): Now static.
 +
+ 2012-04-10  "Jason S. Cornez"  <jcornez@ravenpack.com>  (tiny change)
+ 
+       * keyboard.c: Override inhibit-quit after the third C-g (bug#6585).
+       (force_quit_count): New var.
+       (handle_interrupt): Use it.
+ 
+ 2012-04-10  Juanma Barranquero  <lekktu@gmail.com>
+ 
+       * w32.c (w32_delayed_load): Record the full path of the library
+       being loaded (bug#10424).
+ 
  2012-04-09  Glenn Morris  <rgm@gnu.org>
  
        * doc.c (Fsnarf_documentation): Check variables, functions are bound,