From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 10 Apr 2012 21:59:42 +0000 (-0700)
Subject: Merge from trunk.
X-Git-Tag: emacs-24.2.90~471^2~365
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1530927cb9a3dca7c0f41975f2e9e62ef8be92a2;p=emacs.git

Merge from trunk.
---

1530927cb9a3dca7c0f41975f2e9e62ef8be92a2
diff --cc ChangeLog
index 8d89e361c59,ed63719f6c3..86a352c4cf0
--- a/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 src/ChangeLog
index 5abf92bc4e1,994b8d034ff..2b6a0b2246e
--- a/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,