From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 6 Apr 2011 04:52:22 +0000 (-0700)
Subject: Merge from mainline.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~394^2~1
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b70d23ff742098877b929e8a4982d5e56f6513da;p=emacs.git

Merge from mainline.
---

b70d23ff742098877b929e8a4982d5e56f6513da
diff --cc ChangeLog
index 5caab5fe8e2,26fcb77121b..d01cf106eda
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,14 -1,13 +1,22 @@@
- 2011-04-05  Paul Eggert  <eggert@cs.ucla.edu>
++2011-04-06  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	* configure.in (ATTRIBUTE_FORMAT, ATTRIBUTE_FORMAT_PRINTF): New macros.
 +
- 2011-04-01  Paul Eggert  <eggert@cs.ucla.edu>
- 
 +	Replace 2 copies of readlink code with 1 gnulib version (Bug#8401).
 +	* Makefile.in (GNULIB_MODULES): Add careadlinkat.
 +	* lib/allocator.h, lib/careadlinkat.c, lib/careadlinkat.h:
 +	* m4/ssize_t.m4: New files, automatically generated from gnulib.
 +
+ 2011-04-06  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* autogen/update_autogen: Handle loaddefs-like files as well.
+ 	(usage): Add -l, -C.
+ 	(clean, ldefs_flag, ldefs_in, ldefs_out): New variables.
+ 	With -l, check status of lisp/ as well.
+ 	With -C, clean before building.
+ 	(autoreconf): Only pass -f in the `clean' case.
+ 	(commit): New function.
+ 
  2011-03-28  Glenn Morris  <rgm@gnu.org>
  
  	* autogen/update_autogen: Pass -f to autoreconf.