Merge from trunk.

diff --cc src/ChangeLog
index 7027e9e5a95c2614d54713e1f62b98fb662551f2,18a3d4545e36082efe4aba783f14f4d575fb855d..5abf92bc4e1649577f1ffc9ca8c6fc291a784a72
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,16 -1,11 +1,24 @@@
 +2012-04-09  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-09  Glenn Morris  <rgm@gnu.org>
+ 
+       * doc.c (Fsnarf_documentation): Check variables, functions are bound,
+       not just in the obarray, before snarfing them.  (Bug#11036)
+ 
+       * Makefile.in ($(leimdir)/leim-list.el):
+       Pass EMACS rather than BUILT_EMACS.
+ 
  2012-04-09  Teodor Zlatanov  <tzz@lifelogs.com>
  
        * process.c (make_process):

diff --cc src/Makefile.in
Simple merge