From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 17 Apr 2012 22:57:44 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.2.90~471^2~350
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6083b85e047ca60a3132b62bbb4def3bc0b6e4d9;p=emacs.git

Merge from trunk.
---

6083b85e047ca60a3132b62bbb4def3bc0b6e4d9
diff --cc src/ChangeLog
index 78fa3b501a3,2e3142b7015..ae245a254a0
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,16 -1,7 +1,20 @@@
 +2012-04-17  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-17  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+ 	* dired.c (Fsystem_groups): Remove unused local.
+ 
  2012-04-17  Glenn Morris  <rgm@gnu.org>
  
  	* dired.c (Fsystem_users): Doc fix.