From: Paul Eggert Date: Tue, 6 Sep 2011 16:34:41 +0000 (-0700) Subject: Merge from trunk. X-Git-Tag: emacs-pretest-24.0.90~104^2~152 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e39b275c8c4abe1e293d4336bb1cb13ad95e5491;p=emacs.git Merge from trunk. --- e39b275c8c4abe1e293d4336bb1cb13ad95e5491 diff --cc ChangeLog index ab2bf756a13,aae3e190049..f33d61ef9f1 --- a/ChangeLog +++ b/ChangeLog @@@ -1,37 -1,3 +1,51 @@@ - 2011-09-04 Paul Eggert ++2011-09-06 Paul Eggert + + Merge from gnulib, using build-aux to remove clutter (Bug#9169). ++ This is to fix the following problems: ++ . On FreeBSD 6.4, HP-UX 11.31, and Solaris 9, and when Emacs is ++ configured not to use gtk or any other thread-using library, ++ signals aren't blocked correctly. ++ . On IRIX 6.5 it fixes an unwanted clash between Emacs's ++ and IRIX's signal handling. ++ . On Cygwin 1.7.5 it works around an incompatibility with ++ the system pthread_sigmask. ++ . On MacOS X 10.5 (32-bit), files whose inode numbers ++ exceed 2**31 cannot be read or manipulated. ++ . pthread_sigmask: Actually use results of gl_THREADLIB. ++ . strtoimax, strtoumax: Avoid link error on OSF/1 with DTK cc. ++ . find 'ar' program that fits with --host argument. ++ . Allow the user to override the choice of AR, ARFLAGS, RANLIB. + * autogen/README: Update destination list. + * autogen/copy_autogen, autogen/update_autogen, .bzrignore: + The autogenerated files compile, config.guess, + config.sub, depcomp, install-sh, and missing are now in build-aux. + * m4/largefile.m4: New file, so that Emacs does not mess up when + accessing files with large inode numbers in MacOS X 10.5 and later. + * m4/nocrash.m4: New file, to avoid triggering background debugger + and/or create core dumps during 'configure'. + * build-aux/move-if-change: Renamed from move-if-change. + * build-aux/snippet/arg-nonnull.h: Renamed from arg-nonnull.h. + * build-aux/snippet/c++defs.h: Renamed from c++defs.h. + * build-aux/snippet/warn-on-use.h: Renamed from warn-on-use.h. + * build-aux/snippet/_Noreturn.h: New file, for draft C1X _Noreturn. + * Makefile.in (epaths-force, sync-from-gnulib): + move-if-change is now in build-aux. + (GNULIB_TOOL_FLAGS): Avoid threadlib; this is now a prerequisite + of gnulib's pthread_sigmask module, but Emacs doesn't need it. + (mkdir): install-sh is now in build-aux. + * config.bat: c++defs.h is now in build-aux/snippets. + * configure.in: Specify AC_CONFIG_AUX_DIR with build-aux (the + usual parameter). + * lib/gnulib.mk, m4/gl-comp.m4: Regenerate. + * lib/makefile.w32-in (ARG_NONNULL_H): arg-nonnull.h moved + to build-aux/snippet. + * lib/pthread_sigmask.c, lib/stdlib.in.h, m4/extensions.m4: + * m4/getopt.m4, m4/gnulib-common.m4, m4/pthread_sigmask.m4: + Merge from gnuilib. This fixes porting bugs on Cygwin, Irix, and + Solaris, enables MacOS extensions, and enables nocrash during + 'configure'. + * make-dist: Adjust to new build-aux and build-aux/snippit dirs. + 2011-09-04 Paul Eggert * configure.in (snprintf): New check. diff --cc admin/ChangeLog index 40300fc8dcf,17cbcbb3bdf..9856f38fabb --- a/admin/ChangeLog +++ b/admin/ChangeLog @@@ -1,12 -1,3 +1,12 @@@ - 2011-09-03 Paul Eggert ++2011-09-06 Paul Eggert + + Merge from gnulib (Bug#9169). + * notes/copyright: The files compile, config.guess, config.sub, + depcomp, install-sh, missing, and move-if-change are now in the + new build-aux subdirectory. The files arg-nonnull.h, c++defs.h, + and warn-on-use.h are now in build-aux/snippets. New file + build-aux/snippets/_Noreturn.h. + 2011-08-23 Eli Zaretskii * unidata/unidata-gen.el (unidata-prop-alist): Update the default diff --cc leim/ChangeLog index c28e9472625,426c679fe1f..23050bf791a --- a/leim/ChangeLog +++ b/leim/ChangeLog @@@ -1,7 -1,3 +1,7 @@@ - 2011-09-03 Paul Eggert ++2011-09-06 Paul Eggert + + * Makefile.in (install): install-sh is now in build-aux (Bug#9169). + 2011-08-29 Stefan Monnier * quail/latin-ltx.el: Complete the super and subscript letters. diff --cc lib-src/ChangeLog index 42073641cb9,9041eae8bbe..65ca56b17a8 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@@ -1,8 -1,3 +1,8 @@@ - 2011-09-04 Paul Eggert ++2011-09-06 Paul Eggert + + * Makefile.in ($(DESTDIR)${archlibdir}): install-sh moved + to build-aux (Bug#9169). + 2011-09-04 Paul Eggert Integer and memory overflow issues (Bug#9397). diff --cc msdos/ChangeLog index 9b8a96c117c,e1ce2a312e0..46a5b69cc16 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@@ -1,8 -1,3 +1,8 @@@ - 2011-07-25 Paul Eggert ++2011-09-06 Paul Eggert + + * sedlibmk.inp (CONFIG_CLEAN_VPATH_FILES): Adjust to snippet moves + from top level to build-aux/snippet (Bug#9169). + 2011-06-07 Eli Zaretskii * sedlibmk.inp (PTRDIFF_T_SUFFIX): Edit to nothing. diff --cc src/ChangeLog index e730c79f65b,e1bdfedbd31..6131249beb9 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,7 -1,26 +1,30 @@@ - 2011-09-04 Paul Eggert ++2011-09-06 Paul Eggert + + * Makefile.in (gl-stamp): move-if-change now in build-aux (Bug#9169). + + 2011-09-06 Paul Eggert + + * fileio.c: Fix bugs with large file offsets (Bug#9428). + The previous code assumed that file offsets (off_t values) fit in + EMACS_INT variables, which is not true on typical 32-bit hosts. + The code messed up by falsely reporting buffer overflow in cases + such as (insert-file-contents "big" nil 1 2) into an empty buffer + when "big" contains more than 2**29 bytes, even though this + inserts just one byte and does not overflow the buffer. + (Finsert_file_contents): Store file offsets as off_t + values, not as EMACS_INT values. Check for overflow when + converting between EMACS_INT and off_t. When checking for + buffer overflow or for overlap, take the offsets into account. + Don't use EMACS_INT for small values where int suffices. + When checking for overlap, fix a typo: ZV was used where + ZV_BYTE was intended. + (Fwrite_region): Don't assume off_t fits into 'long'. + * buffer.h (struct buffer.modtime_size): Now off_t, not EMACS_INT. + + 2011-09-05 Michael Albinus + + * dbusbind.c (xd_signature_cat): Rename from signature_cat. + 2011-09-04 Paul Eggert sprintf-related integer and memory overflow issues (Bug#9412).