From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 9 Apr 2012 22:55:58 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.2.90~471^2~366
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/271e61eb60721546bf373531852a88f14b840d12

Merge from trunk.
---

271e61eb60721546bf373531852a88f14b840d12
diff --cc src/ChangeLog
index 7027e9e5a9,18a3d4545e..5abf92bc4e
--- a/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):