Merge from trunk.

diff --cc ChangeLog
index 5c85cf7,f9cadda..5b9dc4d
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,35 -1,3 +1,35 @@@
- 2011-07-24  Paul Eggert  <eggert@cs.ucla.edu>
++2011-07-25  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      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  <jan.h.d@swipnet.se>
  
        * configure.in (GSETTINGS): Check for gio-2.0 >= 2.26.

diff --cc admin/ChangeLog
index 8b0ed10,dbbe38c..c934a3c
--- 1/admin/ChangeLog
--- 2/admin/ChangeLog
+++ b/admin/ChangeLog
@@@ -1,12 -1,3 +1,12 @@@
- 2011-07-24  Paul Eggert  <eggert@cs.ucla.edu>
++2011-07-25  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      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  <lekktu@gmail.com>
  
        * unidata/makefile.w32-in (charprop-SH, charprop-CMD):

diff --cc leim/ChangeLog
index 634ae71,5309671..ce25372
--- 1/leim/ChangeLog
--- 2/leim/ChangeLog
+++ b/leim/ChangeLog
@@@ -1,7 -1,3 +1,7 @@@
- 2011-07-24  Paul Eggert  <eggert@cs.ucla.edu>
++2011-07-25  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * Makefile.in (install): install-sh is now in build-aux.
 +
  2011-07-23  Yair F  <yair.f.lists@gmail.com>
  
        * quail/hebrew.el ("hebrew"): Additional key mappings.

diff --cc lib-src/ChangeLog
index fe624bb,2a4c102..aff4dc7
--- 1/lib-src/ChangeLog
--- 2/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@@ -1,8 -1,3 +1,8 @@@
- 2011-07-24  Paul Eggert  <eggert@cs.ucla.edu>
++2011-07-25  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * Makefile.in ($(DESTDIR)${archlibdir}): install-sh moved
 +      to build-aux.
 +
  2011-07-09  Andreas Schwab  <schwab@linux-m68k.org>
  
        * update-game-score.c (usage): Update usage line.

diff --cc msdos/ChangeLog
index f01a603,e1ce2a3..1b73757
--- 1/msdos/ChangeLog
--- 2/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@@ -1,8 -1,3 +1,8 @@@
- 2011-07-24  Paul Eggert  <eggert@cs.ucla.edu>
++2011-07-25  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * sedlibmk.inp (CONFIG_CLEAN_VPATH_FILES): Adjust to snippet moves
 +      from top level to build-aux/snippet.
 +
  2011-06-07  Eli Zaretskii  <eliz@gnu.org>
  
        * sedlibmk.inp (PTRDIFF_T_SUFFIX): Edit to nothing.

diff --cc src/ChangeLog
index 883c0d8,b3d2f64..dc81626
--- 1/src/ChangeLog
--- 2/src/ChangeLog
+++ b/src/ChangeLog
@@@ -1,7 -1,9 +1,13 @@@
- 2011-07-24  Paul Eggert  <eggert@cs.ucla.edu>
++2011-07-25  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * Makefile.in (gl-stamp): move-if-change is now in build-aux.
 +
+ 2011-07-25  Eli Zaretskii  <eliz@gnu.org>
+ 
+       * 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  <eliz@gnu.org>
  
        * xfaces.c (check_lface_attrs) [HAVE_WINDOW_SYSTEM]: Allow `nil'