From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 15 Feb 2011 05:41:07 +0000 (-0800)
Subject: Merge from mainline.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~794^2~10
X-Git-Url: https://code.delx.au/gnu-emacs/commitdiff_plain/fae95934b8edae3f538063e756ac799ed94313b2

Merge from mainline.
---

fae95934b8edae3f538063e756ac799ed94313b2
diff --cc ChangeLog
index 8516533846,e5b3b2e8b0..52db9f45cd
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,24 -1,23 +1,44 @@@
+ 2011-02-15  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+ 	Merge from gnulib.
+ 
+ 	2011-02-13  Bruno Haible  <bruno@clisp.org>
+ 
+ 	Consistent macro naming for macros that use GCC __attribute__.
+ 	* lib/ignore-value.h (_GL_ATTRIBUTE_DEPRECATED): Renamed from
+ 	ATTRIBUTE_DEPRECATED.
+ 
+ 	2011-02-12  Bruno Haible  <bruno@clisp.org>
+ 
+ 	setlocale: Prefer gnulib's override over libintl's override.
+ 	* lib/gettext.h (setlocale): Redefine to rpl_setlocale if
+ 	GNULIB_defined_setlocale is set.
+ 
+ 2011-02-13  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* make-dist: Exclude generated file src/globals.h.
+ 
 +2011-02-10  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	Import getloadavg module from gnulib.
 +	* .bzrignore: Add lib/stdlib.h.
 +	* Makefile.in (GNULIB_MODULES): Add getloadavg.
 +	* admin/notes/copyright: Remove src/getloadavg.c as a special case.
 +	* configure.in (LIBS_SYSTEM): Omit -lkstat on sol2*; gnulib does this.
 +	(AC_CONFIG_LIBOBJ_DIR, AC_FUNC_GETLOADAVG, GETLOADAVG_FILES):
 +	Remove; gnulib does this now.
 +	* lib/getloadavg.c: Rename from src/getloadavg.c, and sync
 +	from gnulib.  This adds support for several other systems, such
 +	as Tru64 4.0D, QNX, AIX perfstat, etc.  It also fixes a potential
 +	buffer overrun on Linux hosts under very high load, and on hosts
 +	that maintain a channel to the load average file it makes sure
 +	the file descriptor is close-on-exec (on hosts that support this)
 +	and is not stdin, stdout, or stderr.
 +	* lib/stdlib.in.h, m4/getloadavg.m4, m4/stdlib_h.m4: New files,
 +	from gnulib.
 +	* aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk, m4/gl-comp.m4:
 +	* src/config.in: Regenerate.
 +
  2011-02-10  Paul Eggert  <eggert@cs.ucla.edu>
  
  	* arg-nonnull.h, c++defs.h, warn-on-use.h: Fix licenses.
diff --cc admin/ChangeLog
index ce7ff76aa2,5f4dd11ec0..335fe1df92
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@@ -1,9 -1,7 +1,13 @@@
- 2011-02-10  Paul Eggert  <eggert@cs.ucla.edu>
++2011-02-15  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +	Remove no-longer needed getloadavg symbols.
 +	* CPP-DEFINES (LOAD_AVE_CVT, LOAD_AVE_TYPE, FSCALE, KERNEL_FILE):
 +	(LDAV_SYMBOL): Remove.
 +
+ 2011-02-12  Glenn Morris  <rgm@gnu.org>
+ 
+ 	* bzrmerge.el (bzrmerge-resolve): Fix bzr revert call.
+ 
  2011-02-05  Glenn Morris  <rgm@gnu.org>
  
  	* bzrmerge.el (bzrmerge-warning-buffer): New constant.