From: Paul Eggert Date: Mon, 25 Jul 2011 16:26:30 +0000 (-0700) Subject: Merge from trunk. X-Git-Tag: emacs-pretest-24.0.90~104^2~163 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ea8db5520cb3d1aa7c682cbcd22f80e7a9188169;p=emacs.git Merge from trunk. --- ea8db5520cb3d1aa7c682cbcd22f80e7a9188169 diff --cc ChangeLog index 5c85cf769cb,f9cadda71aa..5b9dc4d88b6 --- a/ChangeLog +++ b/ChangeLog @@@ -1,35 -1,3 +1,35 @@@ - 2011-07-24 Paul Eggert ++2011-07-25 Paul Eggert + + Merge from gnulib, using build-aux to remove clutter. + * 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. + * .bzrignore: The autogenerated files compile, config.guess, + config.sub, depcomp, install-sh, and missing are now in build-aux. + * 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-07-13 Jan Djärv * configure.in (GSETTINGS): Check for gio-2.0 >= 2.26. diff --cc admin/ChangeLog index 8b0ed10cb3b,dbbe38ce617..c934a3c1b57 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@@ -1,12 -1,3 +1,12 @@@ - 2011-07-24 Paul Eggert ++2011-07-25 Paul Eggert + + Merge from gnulib. + * 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-07-07 Juanma Barranquero * unidata/makefile.w32-in (charprop-SH, charprop-CMD): diff --cc leim/ChangeLog index 634ae719db7,5309671651b..ce25372c69b --- a/leim/ChangeLog +++ b/leim/ChangeLog @@@ -1,7 -1,3 +1,7 @@@ - 2011-07-24 Paul Eggert ++2011-07-25 Paul Eggert + + * Makefile.in (install): install-sh is now in build-aux. + 2011-07-23 Yair F * quail/hebrew.el ("hebrew"): Additional key mappings. diff --cc lib-src/ChangeLog index fe624bb80ac,2a4c1024293..aff4dc7630c --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@@ -1,8 -1,3 +1,8 @@@ - 2011-07-24 Paul Eggert ++2011-07-25 Paul Eggert + + * Makefile.in ($(DESTDIR)${archlibdir}): install-sh moved + to build-aux. + 2011-07-09 Andreas Schwab * update-game-score.c (usage): Update usage line. diff --cc msdos/ChangeLog index f01a60333ad,e1ce2a312e0..1b737575d94 --- a/msdos/ChangeLog +++ b/msdos/ChangeLog @@@ -1,8 -1,3 +1,8 @@@ - 2011-07-24 Paul Eggert ++2011-07-25 Paul Eggert + + * sedlibmk.inp (CONFIG_CLEAN_VPATH_FILES): Adjust to snippet moves + from top level to build-aux/snippet. + 2011-06-07 Eli Zaretskii * sedlibmk.inp (PTRDIFF_T_SUFFIX): Edit to nothing. diff --cc src/ChangeLog index 883c0d84bf6,b3d2f64bcc7..dc81626038d --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,7 -1,9 +1,13 @@@ - 2011-07-24 Paul Eggert ++2011-07-25 Paul Eggert + + * Makefile.in (gl-stamp): move-if-change is now in build-aux. + + 2011-07-25 Eli Zaretskii + + * xdisp.c (compute_display_string_pos): Fix logic of caching + previous display string position. Initialize cached_prev_pos to + -1. Fixes slow-down at the beginning of a buffer. + 2011-07-24 Eli Zaretskii * xfaces.c (check_lface_attrs) [HAVE_WINDOW_SYSTEM]: Allow `nil'