Merge from mainline.

diff --cc ChangeLog
index 54b6958607e8cbde29a2787e89dce7fed8282f60,00cfbdfb2ca331fcf574069d598baef6537fbf1d..789d54cfa6081086cccc0f2d589ea8b6a38374a6
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,111 -1,12 +1,120 @@@
- 2011-01-11  Paul Eggert  <eggert@cs.ucla.edu>
++2011-01-13  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      * Makefile.in (GNULIB_MODULES): Change ftoastr to dtoastr.
 +      This avoids building ftoastr and ldtoastr, which aren't needed.  See
 +      <http://lists.gnu.org/archive/html/bug-gnulib/2011-01/msg00199.html>.
 +
 +      * .bzrignore: Add .h files that are host-dependent.
 +      Add lib/.deps/, lib/arg-nonnull.h, lib/c++defs.h, lib/getopt.h,
 +      lib/time.h, lib/unistd.h, lib/warn-on-use.h.  These are
 +      host-dependent and are built as part of an ordinary 'make', and
 +      should not be checked in.
 +
 +      * lib/Makefile.in: Regenerate.
 +      * lib/COPYING: New file, a copy of COPYING.
 +
 +      * configure: Regenerate.
 +      * configure.in (AC_USE_SYSTEM_EXTENSIONS): Remove: gnulib does this.
 +
 +      Regenerate.
 +      * lib/getopt.c, lib/getopt.in.h, lib/getopt1.c, lib/getopt_int.h:
 +      * lib/gettext.h, lib/unistd.in.h, m4/unistd_h.m4:
 +      New files, copied from gnulib by gnulib-tool.
 +      * aclocal.m4, configure, lib/Makefile.in, m4/getopt.m4:
 +      * m4/gnulib-cache.m4, m4/gnulib-comp.m4, src/config.in:
 +      Regenerate.
 +
 +      Use gnulib's getopt-gnu module.
 +      * Makefile.in (GNULIB_MODULES): Add getopt-gnu.
 +      (AUTOCONF_INPUTS): Remove getopt.m4; aclocal.m4 is a good-enough
 +      representative of the dependencies.
 +      * configure.in: Do not configure getopt, as gnulib does that now.
 +      * make-dist: Do not worry about lib-src/getopt.h, as gnulib handles
 +      getopt now, in lib.
 +
 +      Regenerate.
 +      * arg-nonnull.h, c++defs.h, lib/mktime-internal.h, lib/mktime.c:
 +      * lib/stddef.in.h, lib/time.h, lib/time.in.h, lib/time_r.c:
 +      * m4/extensions.m4, m4/include_next.m4, m4/mktime.m4:
 +      * m4/multiarch.m4, m4/stddef_h.m4, m4/time_h.m4, m4/time_r.m4:
 +      * m4/extensions.m4, m4/include_next.m4, m4/mktime.m4, m4/multiarch.m4:
 +      * m4/stddef_h.m4, m4/time_h.m4, m4/time_r.m4, m4/warn-on-use.m4:
 +      * m4/wchar_t.m4, warn-on-use.h:
 +      New files, copied from gnulib by gnulib-tool.
 +      * aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk:
 +      * m4/gnulib-cache.m4, m4/gnulib-comp.m4, src/config.in:
 +      Regenerate.
 +
 +      Use gnulib's mktime module.
 +      * Makefile.in (GNULIB_MODULES): Add mktime.
 +      * configure.in: Remove code no longer needed, as gnulib now does it.
 +      (AC_CHECK_FUNCS): Remove mktime.
 +      (AC_FUNC_MKTIME, BROKEN_MKTIME): Remove.
 +      (__restrict): Remove, as this now gets in the way of the C99
 +      support for 'restrict' pulled in by the gnulib mktime module.
 +      Code should now use 'restrict' and not '__restrict".
 +      (mktime): Remove.
 +      * make-dist: Put gnulib-generated files arg-nonnull.h, c++defs.h,
 +      and warn-on-use.h into the distribution.
 +
 +      Regenerate.
 +      * lib/dtoastr.c, lib/ftoastr.c, lib/ftoastr.h, lib/intprops.h:
 +      * lib/ldtoastr.c, m4/c-strtod.m4:
 +      New files, copied from gnulib by gnulib-tool.
 +      * lib/dummy.c: Remove.
 +      * aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk:
 +      * m4/gnulib-cache.m4, m4/gnulib-comp.m4, src/config.in:
 +      Regenerate.
 +
 +      Use gnulib's ftoastr module.
 +      * Makefile.in (GNULIB_MODULES): Add ftoastr.  Remove dummy.
 +
 +2011-01-08  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      Regenerate.
 +      * aclocal.m4, compile, depcomp, lib/Makefile.in, lib/dummy.c:
 +      * lib/gnulib.mk, m4/00gnulib.m4, m4/gnulib-cache.m4:
 +      * m4/gnulib-common.m4, m4/gnulib-comp.m4, m4/gnulib-tool.m4, missing:
 +      New files, generated automatically, with 'make sync-from-gnulib'
 +      followed by 'make'.
 +      * configure, lisp/dired.el, src/config.in: Regenerate.
 +
 +      Automate syncing from gnulib.
 +      * INSTALL, README: Document new subdirectory 'lib'.
 +      * Makefile.in (SUBDIR): Add lib.
 +      (SUBDIR_MAKEFILES): Add lib/Makefile.
 +      (lib-src, src, TAGS, tags): Depend on lib.
 +      (gnulib_srcdir, GNULIB_MODULES, GNULIB_TOOL_FLAGS): New macros.
 +      ($(gnulib_srcdir)): New rule.
 +      (sync-from-gnulib): New rule, which is .PHONY.
 +      (lib): New rule, which is like lib-src.
 +      (Makefile): Depend on lib/Makefile.in.
 +      (AUTOCONF_INPUTS): Depend on aclocal.m4.
 +      (ACLOCAL_INPUTS, AUTOMAKE_INPUTS): New macros.
 +      ($(srcdir)/aclocal.m4, $(srcdir)/lib/Makefile.in): New rules.
 +      (am--refresh): New rule, to pacify Automake.
 +      (mostlyclean, clean, distclean, bootstrap-clean, maintainer-clean):
 +      Clean lib, too.
 +      (top_maintainer_clean): New macro, to remove gnulib-tool and Automake
 +      droppings.
 +      (maintainer-clean, extraclean): Use it.
 +      * configure.in: Initialize for automake and gnulib, by invoking
 +      AM_INIT_AUTOMAKE, AM_PROG_CC_C_O, gl_EARLY, and gl_INIT.  Output
 +      lib/Makefile, too.  Use automake to build gnulib, as gnulib works
 +      more conveniently with automake.
 +      * lib/Makefile.am: New file.
 +      * make-dist: Also put into the distribution aclocal.m4,
 +      compile, depcomp, missing, and the files under lib/.
 +
+ 2011-01-13  Christian Ohler  <ohler@gnu.org>
+ 
+       * Makefile.in (INFO_FILES): Add ERT.
+ 
+       * Makefile.in (check): Run tests in test/automated.
+ 
+       * Makefile.in:
+       * configure.in: Add test/automated/Makefile.
+ 
  2011-01-07  Paul Eggert  <eggert@cs.ucla.edu>
  
        * install-sh, mkinstalldirs, move-if-change: Update from master

diff --cc Makefile.in
index 72e642c79c02c3fb4fac4121ce683f118772b5bb,ab713645bf8b3c732e1e350dea7c85500e171d22..b9237edac885bc438ff6b92453323b8236d0a29f
--- 1/Makefile.in
--- 2/Makefile.in
+++ b/Makefile.in
@@@ -264,10 -264,10 +264,10 @@@ EMACSFULL = `echo emacs-${version}${EXE
  # Actually, we now include `lisp' as well, since the compiled files
  # are not included any more in case of bootstrap or in case Emacs was
  # checked out from a VCS.
 -SUBDIR = lib-src src lisp
 +SUBDIR = lib lib-src src lisp
  
  # The subdir makefiles created by config.status.
- SUBDIR_MAKEFILES = lib/Makefile lib-src/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispref/Makefile doc/lispintro/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile lisp/Makefile
 -SUBDIR_MAKEFILES = lib-src/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispref/Makefile doc/lispintro/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile lisp/Makefile test/automated/Makefile
++SUBDIR_MAKEFILES = lib/Makefile lib-src/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispref/Makefile doc/lispintro/Makefile src/Makefile oldXMenu/Makefile lwlib/Makefile leim/Makefile lisp/Makefile test/automated/Makefile
  
  # Subdirectories to install, and where they'll go.
  # lib-src's makefile knows how to install it, so we don't do that here.

diff --cc configure
index 49dc050e7bc2114eb13bb00e5110a62af87bba0a,3d940710362ca7e34c689ef460f819e089106416..9fa20d66244eeabcde2ac4a1f1f33ab8de469a9c
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -17389,7 -15041,7 +17389,7 @@@ test "${prefix}" != NONE &
  test "${exec_prefix}" != NONE &&
    exec_prefix=`echo "${exec_prefix}" | sed 's,\([^/]\)/*$,\1,'`
  
- ac_config_files="$ac_config_files Makefile lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile"
 -ac_config_files="$ac_config_files Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile test/automated/Makefile"
++ac_config_files="$ac_config_files Makefile lib/Makefile lib-src/Makefile oldXMenu/Makefile doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile doc/lispref/Makefile src/Makefile lwlib/Makefile lisp/Makefile leim/Makefile test/automated/Makefile"
  
  ac_config_commands="$ac_config_commands default"
  

diff --cc configure.in
index 20e90faabbf4bdd48b1052e9dc55bd90765528a4,7785909019be43f48503c9f4c071673155a015f5..9fd9719c14e3d0e024808916f83afe6ec2c32e07
--- 1/configure.in
--- 2/configure.in
+++ b/configure.in
@@@ -3715,10 -3747,10 +3715,10 @@@ dnl Secondly, the GNU Coding standards 
  dnl to run `make prefix=/some/where/else' and override the values set
  dnl by configure.  This also explains the `move-if-change' test and
  dnl the use of force in the `epaths-force' rule in Makefile.in.
 -AC_OUTPUT(Makefile lib-src/Makefile oldXMenu/Makefile \
 +AC_OUTPUT(Makefile lib/Makefile lib-src/Makefile oldXMenu/Makefile \
        doc/emacs/Makefile doc/misc/Makefile doc/lispintro/Makefile \
        doc/lispref/Makefile src/Makefile \
-       lwlib/Makefile lisp/Makefile leim/Makefile, [
+       lwlib/Makefile lisp/Makefile leim/Makefile test/automated/Makefile, [
  
  ### Make the necessary directories, if they don't exist.
  for dir in etc lisp ; do

diff --cc lisp/dired.el
index e34340c15df6dbb7e43e3cede28ceb8afb9dcc19,e34340c15df6dbb7e43e3cede28ceb8afb9dcc19..1f9c78a9db327b41bcef1e7123787ff2c90fa208
--- 1/lisp/dired.el
--- 2/lisp/dired.el
+++ b/lisp/dired.el
@@@ -4021,7 -4021,7 +4021,7 @@@ true then the type of the file linked t
  ;;;***
  \f
  ;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el"
--;;;;;;  "27c312d6d5d40d8cb4ef8d62e30d5f4a")
++;;;;;;  "6181a5bcc2b61255676a7a41549b9f40")
  ;;; Generated autoloads from dired-x.el
  
  (autoload 'dired-jump "dired-x" "\

diff --cc src/image.c
Simple merge