From: Paul Eggert Date: Thu, 10 Feb 2011 07:04:56 +0000 (-0800) Subject: Merge from mainline. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~794^2~18 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=be6d99804b3efdecf3660c4b51da1945e955fb4d;p=emacs.git Merge from mainline. --- be6d99804b3efdecf3660c4b51da1945e955fb4d diff --cc ChangeLog index 649fe4b2ba6,2a0dd144670..85165338460 --- a/ChangeLog +++ b/ChangeLog @@@ -1,24 -1,28 +1,49 @@@ - 2011-02-08 Paul Eggert ++2011-02-10 Paul Eggert + + 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 + + * arg-nonnull.h, c++defs.h, warn-on-use.h: Fix licenses. + Sync from gnulib, which has been patched to fix the problem + with the license notices. Problem reported by Glenn Morris in + . + + 2011-02-09 Stefan Monnier + + * .bzrignore: Ignore globals.h and related stamp. + + 2011-02-09 Paul Eggert + + * lib/Makefile.in, lib/gnulib.mk: Regenerate. + This merges the following fix from gnulib: + + 2011-02-08 Bruno Haible + + Split large sed scripts, for HP-UX sed. + + 2011-02-08 Tom Tromey + + * configure: Rebuild. + * configure.in (NS_OBJC_OBJ): New subst. + 2011-02-06 Paul Eggert gnulib: allow multiple gnulib generated replacements to coexist diff --cc src/ChangeLog index 72d6c49592a,68a12d4f55a..ccb54ffffa7 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,13 -1,44 +1,54 @@@ - 2011-02-08 Paul Eggert ++2011-02-10 Paul Eggert + + Import getloadavg module from gnulib. + * deps.mk (getloadavg.o): Remove; gnulib now does this. + * lisp.h (getloadavg) [!defined HAVE_GETLOADAVG]: Remove; gnulib + now does this. + * src/s/freebsd.h (HAVE_GETLOADAVG): Remove; gnulib now does this. + * src/s/netbsd.h (HAVE_GETLOADAVG): Likewise. + * config.in: Regenerate. + + 2011-02-10 Glenn Morris + + * Makefile.in (really-lwlib): Depend on globals.h, for parallel builds. + + 2011-02-09 Eli Zaretskii + + * makefile.w32-in (GLOBAL_SOURCES, SOME_MACHINE_OBJECTS, obj): + New macros. + (globals.h, gl-stamp): New targets. + (clean): Clean gl-stamp and globals.h. + + 2011-02-09 Andreas Schwab + + * Makefile.in (gl-stamp): Create globals.h here. + (globals.h): Don't do it here. + (mostlyclean): Clean globals.h and gl-stamp. + + 2011-02-09 Paul Eggert + + * Makefile.in ($(otherobj)): Depend on globals.h. + Otherwise 'make -j10' failed on my host, because the build lacked + necessary dependencies, e.g., vm-limit.o depends on globals.h. + + 2011-02-08 Tom Tromey + + * Makefile.in (NS_OBJC_OBJ): New variable. + (base_obj): Rename from 'obj'. + (obj): New variable. + (globals.h, gl-stamp, $(obj)): New targets. + (GLOBAL_SOURCES): New variable. + * globals.h: Remove. + * nsselect.m (Vselection_alist): Define. Reverts part of + 2011-01-19T22:11:33Z!jan.h.d@swipnet.se. + * buffer.c: Don't use "no_cell" for name of kill-buffer-hook's + variable. + * xselect.c (Vselection_alist): Define. Reverts part of 2011-01-19T23:32:42Z!eggert@cs.ucla.edu. + + 2011-02-08 Kenichi Handa + + * font.c (Ffont_get): Do not cache :otf value. + 2011-02-07 Paul Eggert conform to C89 pointer rules