Merge from mainline.

author: Paul Eggert 2011-03-05 23:53:03 -0800
committer: Paul Eggert 2011-03-05 23:53:03 -0800
commit: 58635e4de85621d4f16befe15b1df44a637bd078 (patch)
tree: b5dc80332d5912ba795e59ee86cea1527324709e
parent: 5489860be109ec6fa2a7d143cdecb6887e37f5d5 (diff)
parent: 555e9b5c69d70acca13310fbe533594a8f1eab98 (diff)
download: emacs-58635e4de85621d4f16befe15b1df44a637bd078.tar.gz
emacs-58635e4de85621d4f16befe15b1df44a637bd078.zip
128 files changed, 2594 insertions, 1574 deletions
diff --git a/ChangeLog b/ChangeLog
index 3bb49ce27f5..949862248bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-06  Glenn Morris  <rgm@gnu.org>
+        * configure.in (FREETYPE_LIBS): Actually set it to something.
 2011-03-02  Paul Eggert  <eggert@cs.ucla.edu>
        Work around some portability problems with symlinks.
diff --git a/aclocal.m4 b/aclocal.m4
index 1536f3b48b5..9fdc8e76c49 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -13,8 +13,8 @@
 m4_ifndef([AC_AUTOCONF_VERSION],
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
-[m4_warning([this file was generated for autoconf 2.68.
+[m4_warning([this file was generated for autoconf 2.67.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
diff --git a/configure b/configure
index 68447e985f0..b8a83e66779 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for emacs 24.0.50.
+# Generated by GNU Autoconf 2.67 for emacs 24.0.50.
 #
 #
 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -89,7 +89,6 @@ fi
 IFS=" ""        $as_nl"
 # Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
 case $0 in #((
  *[\\/]* ) as_myself=$0 ;;
  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -215,18 +214,11 @@ IFS=$as_save_IFS
  # We cannot yet assume a decent shell, so we have to provide a
        # neutralization value for shells without unset; and this also
        # works around shells that cannot unset nonexistent variables.
-        # Preserve -v and -x to the replacement shell.
        BASH_ENV=/dev/null
        ENV=/dev/null
        (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
        export CONFIG_SHELL
-        case $- in # ((((
+        exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
-          *v*x* | *x*v* ) as_opts=-vx ;;
-          *v* ) as_opts=-v ;;
-          *x* ) as_opts=-x ;;
-          * ) as_opts= ;;
-        esac
-        exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
 fi
    if test x$as_have_required = xno; then :
@@ -954,12 +946,12 @@ LIBTIFF
 LIBPNG
 LIBJPEG
 LIBXPM
-FREETYPE_LIBS
-FREETYPE_CFLAGS
 M17N_FLT_LIBS
 M17N_FLT_CFLAGS
 LIBOTF_LIBS
 LIBOTF_CFLAGS
+FREETYPE_LIBS
+FREETYPE_CFLAGS
 XFT_LIBS
 XFT_CFLAGS
 FONTCONFIG_LIBS
@@ -1570,7 +1562,7 @@ Try \`$0 --help' for more information"
    $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
      $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
+    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
    ;;
  esac
@@ -1847,7 +1839,7 @@ Optional Packages:
                          don't use Motif or Xaw3d scroll bars
  --without-xaw3d         don't use Xaw3d
  --without-xim           don't use X11 XIM
-  --with-ns               use nextstep (Cocoa or GNUstep) windowing system
+  --with-ns               use NeXTstep (Cocoa or GNUstep) windowing system
  --without-gpm           don't use -lgpm for mouse support on a GNU/Linux
                          console
  --without-dbus          don't compile with D-Bus support
@@ -1944,7 +1936,7 @@ test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
 emacs configure 24.0.50
-generated by GNU Autoconf 2.68
+generated by GNU Autoconf 2.67
 Copyright (C) 2010 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
@@ -1990,7 +1982,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
        ac_retval=1
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  as_fn_set_status $ac_retval
 } # ac_fn_c_try_compile
@@ -2027,7 +2019,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
    ac_retval=1
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  as_fn_set_status $ac_retval
 } # ac_fn_c_try_cpp
@@ -2040,10 +2032,10 @@ fi
 ac_fn_c_check_header_mongrel ()
 {
  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval \${$3+:} false; then :
+  if eval "test \"\${$3+set}\"" = set; then :
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
  $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -2106,7 +2098,7 @@ $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
 esac
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
  $as_echo_n "(cached) " >&6
 else
  eval "$3=\$ac_header_compiler"
@@ -2115,7 +2107,7 @@ eval ac_res=\$$3
               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 } # ac_fn_c_check_header_mongrel
@@ -2156,7 +2148,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
       ac_retval=$ac_status
 fi
  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  as_fn_set_status $ac_retval
 } # ac_fn_c_try_run
@@ -2170,7 +2162,7 @@ ac_fn_c_check_header_compile ()
  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2188,7 +2180,7 @@ fi
 eval ac_res=\$$3
               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 } # ac_fn_c_check_header_compile
@@ -2233,7 +2225,7 @@ fi
  # interfere with the next link command; also delete a directory that is
  # left behind by Apple's compiler.  We do this before executing the actions.
  rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  as_fn_set_status $ac_retval
 } # ac_fn_c_try_link
@@ -2249,7 +2241,7 @@ ac_fn_c_check_decl ()
  as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'`
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5
 $as_echo_n "checking whether $as_decl_name is declared... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2280,7 +2272,7 @@ fi
 eval ac_res=\$$3
               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 } # ac_fn_c_check_decl
@@ -2292,7 +2284,7 @@ ac_fn_c_check_header_preproc ()
  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2309,7 +2301,7 @@ fi
 eval ac_res=\$$3
               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 } # ac_fn_c_check_header_preproc
@@ -2322,7 +2314,7 @@ ac_fn_c_check_member ()
  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5
 $as_echo_n "checking for $2.$3... " >&6; }
-if eval \${$4+:} false; then :
+if eval "test \"\${$4+set}\"" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2366,7 +2358,7 @@ fi
 eval ac_res=\$$4
               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 } # ac_fn_c_check_member
@@ -2378,7 +2370,7 @@ ac_fn_c_check_func ()
  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2433,7 +2425,7 @@ fi
 eval ac_res=\$$3
               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 } # ac_fn_c_check_func
@@ -2446,7 +2438,7 @@ ac_fn_c_check_type ()
  as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval \${$3+:} false; then :
+if eval "test \"\${$3+set}\"" = set; then :
  $as_echo_n "(cached) " >&6
 else
  eval "$3=no"
@@ -2487,7 +2479,7 @@ fi
 eval ac_res=\$$3
               { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
 } # ac_fn_c_check_type
@@ -2664,7 +2656,7 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 rm -f conftest.val
  fi
-  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
+  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
  as_fn_set_status $ac_retval
 } # ac_fn_c_compute_int
@@ -2673,7 +2665,7 @@ This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 It was created by emacs $as_me 24.0.50, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+generated by GNU Autoconf 2.67.  Invocation command line was
  $ $0 $@
@@ -2931,7 +2923,7 @@ $as_echo "$as_me: loading site script $ac_site_file" >&6;}
      || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
  fi
 done
@@ -3086,7 +3078,7 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if ${ac_cv_path_install+:} false; then :
+if test "${ac_cv_path_install+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3173,11 +3165,11 @@ am_lf='
 '
 case `pwd` in
  *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
 esac
 case $srcdir in
  *[\\\"\#\$\&\'\`$am_lf\ \     ]*)
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
 esac
 # Do `set' in a subshell so we don't clobber the current shell's
@@ -3263,7 +3255,7 @@ if test "$cross_compiling" != no; then
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_STRIP+:} false; then :
+if test "${ac_cv_prog_STRIP+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  if test -n "$STRIP"; then
@@ -3303,7 +3295,7 @@ if test -z "$ac_cv_prog_STRIP"; then
 set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  if test -n "$ac_ct_STRIP"; then
@@ -3356,7 +3348,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if ${ac_cv_path_mkdir+:} false; then :
+  if test "${ac_cv_path_mkdir+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3408,7 +3400,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_AWK+:} false; then :
+if test "${ac_cv_prog_AWK+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  if test -n "$AWK"; then
@@ -3448,7 +3440,7 @@ done
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat >conftest.make <<\_ACEOF
@@ -4006,7 +3998,7 @@ do
        stringfreelist) ac_gc_check_string_free_list=1 ;;
        xmallocoverrun) ac_xmalloc_overrun=1 ;;
        conslist)       ac_gc_check_cons_list=1 ;;
-        *)      as_fn_error $? "unknown check category $check" "$LINENO" 5 ;;
+        *)      as_fn_error $? "unknown check category $check" "$LINENO" 5  ;;
        esac
 done
 IFS="$ac_save_IFS"
@@ -4125,7 +4117,7 @@ $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 ||
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if ${ac_cv_build+:} false; then :
+if test "${ac_cv_build+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_build_alias=$build_alias
@@ -4141,7 +4133,7 @@ fi
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -4159,7 +4151,7 @@ case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if ${ac_cv_host+:} false; then :
+if test "${ac_cv_host+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  if test "x$host_alias" = x; then
@@ -4174,7 +4166,7 @@ fi
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -4456,7 +4448,7 @@ if test -n "$ac_tool_prefix"; then
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  if test -n "$CC"; then
@@ -4496,7 +4488,7 @@ if test -z "$ac_cv_prog_CC"; then
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  if test -n "$ac_ct_CC"; then
@@ -4549,7 +4541,7 @@ if test -z "$CC"; then
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  if test -n "$CC"; then
@@ -4589,7 +4581,7 @@ if test -z "$CC"; then
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  if test -n "$CC"; then
@@ -4648,7 +4640,7 @@ if test -z "$CC"; then
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_CC+:} false; then :
+if test "${ac_cv_prog_CC+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  if test -n "$CC"; then
@@ -4692,7 +4684,7 @@ do
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_CC+:} false; then :
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  if test -n "$ac_ct_CC"; then
@@ -4747,7 +4739,7 @@ fi
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4862,7 +4854,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 else
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -4905,7 +4897,7 @@ else
  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -4964,7 +4956,7 @@ $as_echo "$ac_try_echo"; } >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run C compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
    fi
  fi
 fi
@@ -4975,7 +4967,7 @@ rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if ${ac_cv_objext+:} false; then :
+if test "${ac_cv_objext+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5016,7 +5008,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -5026,7 +5018,7 @@ OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if ${ac_cv_c_compiler_gnu+:} false; then :
+if test "${ac_cv_c_compiler_gnu+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5063,7 +5055,7 @@ ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if ${ac_cv_prog_cc_g+:} false; then :
+if test "${ac_cv_prog_cc_g+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_save_c_werror_flag=$ac_c_werror_flag
@@ -5141,7 +5133,7 @@ else
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if ${ac_cv_prog_cc_c89+:} false; then :
+if test "${ac_cv_prog_cc_c89+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_cv_prog_cc_c89=no
@@ -5302,7 +5294,7 @@ depcc="$CC"   am_compiler_list=
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if ${am_cv_CC_dependencies_compiler_type+:} false; then :
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -5434,7 +5426,7 @@ $as_echo_n "checking whether cc understands -c and -o together... " >&6; }
 fi
 set dummy $CC; ac_cc=`$as_echo "$2" |
                      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
+if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5558,7 +5550,7 @@ if test -n "$ac_tool_prefix"; then
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  if test -n "$RANLIB"; then
@@ -5598,7 +5590,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
 set dummy ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  if test -n "$ac_ct_RANLIB"; then
@@ -5658,7 +5650,7 @@ if test -n "$CPP" && test -d "$CPP"; then
  CPP=
 fi
 if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
+  if test "${ac_cv_prog_CPP+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
      # Double quotes because CPP needs to be expanded
@@ -5774,7 +5766,7 @@ else
  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 ac_ext=c
@@ -5786,7 +5778,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if ${ac_cv_path_GREP+:} false; then :
+if test "${ac_cv_path_GREP+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  if test -z "$GREP"; then
@@ -5849,7 +5841,7 @@ $as_echo "$ac_cv_path_GREP" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if ${ac_cv_path_EGREP+:} false; then :
+if test "${ac_cv_path_EGREP+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -5916,7 +5908,7 @@ $as_echo "$ac_cv_path_EGREP" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
+if test "${ac_cv_header_stdc+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6047,7 +6039,7 @@ done
  ac_fn_c_check_header_mongrel "$LINENO" "minix/config.h" "ac_cv_header_minix_config_h" "$ac_includes_default"
-if test "x$ac_cv_header_minix_config_h" = xyes; then :
+if test "x$ac_cv_header_minix_config_h" = x""yes; then :
  MINIX=yes
 else
  MINIX=
@@ -6077,7 +6069,7 @@ $as_echo "#define _XOPEN_SOURCE 500" >>confdefs.h
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether it is safe to define __EXTENSIONS__" >&5
 $as_echo_n "checking whether it is safe to define __EXTENSIONS__... " >&6; }
-if ${ac_cv_safe_to_define___extensions__+:} false; then :
+if test "${ac_cv_safe_to_define___extensions__+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6166,7 +6158,7 @@ if test x"$GCC" != xyes && test x"$emacs_check_sunpro_c" = xyes && \
 test x"$CPP" = x; then
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using a Sun C compiler" >&5
 $as_echo_n "checking whether we are using a Sun C compiler... " >&6; }
-  if ${emacs_cv_sunpro_c+:} false; then :
+  if test "${emacs_cv_sunpro_c+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -6334,7 +6326,7 @@ if test -n "$CPP" && test -d "$CPP"; then
  CPP=
 fi
 if test -z "$CPP"; then
-  if ${ac_cv_prog_CPP+:} false; then :
+  if test "${ac_cv_prog_CPP+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
      # Double quotes because CPP needs to be expanded
@@ -6450,7 +6442,7 @@ else
  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5; }
+See \`config.log' for more details" "$LINENO" 5 ; }
 fi
 ac_ext=c
@@ -6466,7 +6458,7 @@ if test "x$RANLIB" = x; then
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_RANLIB+:} false; then :
+if test "${ac_cv_prog_RANLIB+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  if test -n "$RANLIB"; then
@@ -6506,7 +6498,7 @@ if test -z "$ac_cv_prog_RANLIB"; then
 set dummy ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  if test -n "$ac_ct_RANLIB"; then
@@ -6561,7 +6553,7 @@ fi
 ## is running in i386 mode, we can help them out.
 if test "$machine" = "amdx86-64"; then
  ac_fn_c_check_decl "$LINENO" "i386" "ac_cv_have_decl_i386" "$ac_includes_default"
-if test "x$ac_cv_have_decl_i386" = xyes; then :
+if test "x$ac_cv_have_decl_i386" = x""yes; then :
 fi
@@ -6576,7 +6568,7 @@ fi
 set dummy install-info; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INSTALL_INFO+:} false; then :
+if test "${ac_cv_path_INSTALL_INFO+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  case $INSTALL_INFO in
@@ -6616,7 +6608,7 @@ fi
 set dummy install-info; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INSTALL_INFO+:} false; then :
+if test "${ac_cv_path_INSTALL_INFO+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  case $INSTALL_INFO in
@@ -6656,7 +6648,7 @@ fi
 set dummy install-info; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_INSTALL_INFO+:} false; then :
+if test "${ac_cv_path_INSTALL_INFO+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  case $INSTALL_INFO in
@@ -6697,7 +6689,7 @@ fi
 set dummy gzip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GZIP_PROG+:} false; then :
+if test "${ac_cv_path_GZIP_PROG+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  case $GZIP_PROG in
@@ -6740,7 +6732,7 @@ fi
 set dummy makeinfo; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_MAKEINFO+:} false; then :
+if test "${ac_cv_path_MAKEINFO+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  case $MAKEINFO in
@@ -6946,7 +6938,7 @@ esac
 C_SWITCH_MACHINE=
 if test "$machine" = "alpha"; then
  ac_fn_c_check_decl "$LINENO" "__ELF__" "ac_cv_have_decl___ELF__" "$ac_includes_default"
-if test "x$ac_cv_have_decl___ELF__" = xyes; then :
+if test "x$ac_cv_have_decl___ELF__" = x""yes; then :
 fi
@@ -7014,7 +7006,7 @@ if test "$enable_largefile" != no; then
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5
 $as_echo_n "checking for special C compiler options needed for large files... " >&6; }
-if ${ac_cv_sys_largefile_CC+:} false; then :
+if test "${ac_cv_sys_largefile_CC+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_cv_sys_largefile_CC=no
@@ -7065,7 +7057,7 @@ $as_echo "$ac_cv_sys_largefile_CC" >&6; }
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5
 $as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; }
-if ${ac_cv_sys_file_offset_bits+:} false; then :
+if test "${ac_cv_sys_file_offset_bits+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  while :; do
@@ -7134,7 +7126,7 @@ rm -rf conftest*
  if test $ac_cv_sys_file_offset_bits = unknown; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5
 $as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; }
-if ${ac_cv_sys_large_files+:} false; then :
+if test "${ac_cv_sys_large_files+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  while :; do
@@ -7302,7 +7294,7 @@ done
  # Emulation library used on NetBSD.
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _oss_ioctl in -lossaudio" >&5
 $as_echo_n "checking for _oss_ioctl in -lossaudio... " >&6; }
-if ${ac_cv_lib_ossaudio__oss_ioctl+:} false; then :
+if test "${ac_cv_lib_ossaudio__oss_ioctl+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -7336,7 +7328,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ossaudio__oss_ioctl" >&5
 $as_echo "$ac_cv_lib_ossaudio__oss_ioctl" >&6; }
-if test "x$ac_cv_lib_ossaudio__oss_ioctl" = xyes; then :
+if test "x$ac_cv_lib_ossaudio__oss_ioctl" = x""yes; then :
  LIBSOUND=-lossaudio
 else
  LIBSOUND=
@@ -7353,7 +7345,7 @@ fi
 set dummy pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  case $PKG_CONFIG in
@@ -7557,7 +7549,7 @@ fi
 for ac_header in term.h
 do :
  ac_fn_c_check_header_preproc "$LINENO" "term.h" "ac_cv_header_term_h"
-if test "x$ac_cv_header_term_h" = xyes; then :
+if test "x$ac_cv_header_term_h" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_TERM_H 1
 _ACEOF
@@ -7568,7 +7560,7 @@ done
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if ${ac_cv_header_stdc+:} false; then :
+if test "${ac_cv_header_stdc+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7680,7 +7672,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether time.h and sys/time.h may both be included" >&5
 $as_echo_n "checking whether time.h and sys/time.h may both be included... " >&6; }
-if ${ac_cv_header_time+:} false; then :
+if test "${ac_cv_header_time+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7714,7 +7706,7 @@ $as_echo "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
 fi
 ac_fn_c_check_decl "$LINENO" "sys_siglist" "ac_cv_have_decl_sys_siglist" "$ac_includes_default"
-if test "x$ac_cv_have_decl_sys_siglist" = xyes; then :
+if test "x$ac_cv_have_decl_sys_siglist" = x""yes; then :
  ac_have_decl=1
 else
  ac_have_decl=0
@@ -7727,7 +7719,7 @@ _ACEOF
 if test $ac_cv_have_decl_sys_siglist != yes; then
  # For Tru64, at least:
  ac_fn_c_check_decl "$LINENO" "__sys_siglist" "ac_cv_have_decl___sys_siglist" "$ac_includes_default"
-if test "x$ac_cv_have_decl___sys_siglist" = xyes; then :
+if test "x$ac_cv_have_decl___sys_siglist" = x""yes; then :
  ac_have_decl=1
 else
  ac_have_decl=0
@@ -7745,7 +7737,7 @@ $as_echo "#define sys_siglist __sys_siglist" >>confdefs.h
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5
 $as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; }
-if ${ac_cv_header_sys_wait_h+:} false; then :
+if test "${ac_cv_header_sys_wait_h+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7787,7 +7779,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct utimbuf" >&5
 $as_echo_n "checking for struct utimbuf... " >&6; }
-if ${emacs_cv_struct_utimbuf+:} false; then :
+if test "${emacs_cv_struct_utimbuf+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7830,7 +7822,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
 $as_echo_n "checking return type of signal handlers... " >&6; }
-if ${ac_cv_type_signal+:} false; then :
+if test "${ac_cv_type_signal+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7864,7 +7856,7 @@ _ACEOF
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for speed_t" >&5
 $as_echo_n "checking for speed_t... " >&6; }
-if ${emacs_cv_speed_t+:} false; then :
+if test "${emacs_cv_speed_t+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7895,7 +7887,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timeval" >&5
 $as_echo_n "checking for struct timeval... " >&6; }
-if ${emacs_cv_struct_timeval+:} false; then :
+if test "${emacs_cv_struct_timeval+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7936,7 +7928,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct exception" >&5
 $as_echo_n "checking for struct exception... " >&6; }
-if ${emacs_cv_struct_exception+:} false; then :
+if test "${emacs_cv_struct_exception+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7969,7 +7961,7 @@ fi
 for ac_header in sys/socket.h
 do :
  ac_fn_c_check_header_mongrel "$LINENO" "sys/socket.h" "ac_cv_header_sys_socket_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_socket_h" = xyes; then :
+if test "x$ac_cv_header_sys_socket_h" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_SOCKET_H 1
 _ACEOF
@@ -7985,7 +7977,7 @@ do :
 #include <sys/socket.h>
 #endif
 "
-if test "x$ac_cv_header_net_if_h" = xyes; then :
+if test "x$ac_cv_header_net_if_h" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_NET_IF_H 1
 _ACEOF
@@ -7997,7 +7989,7 @@ done
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether struct tm is in sys/time.h or time.h" >&5
 $as_echo_n "checking whether struct tm is in sys/time.h or time.h... " >&6; }
-if ${ac_cv_struct_tm+:} false; then :
+if test "${ac_cv_struct_tm+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8034,7 +8026,7 @@ ac_fn_c_check_member "$LINENO" "struct tm" "tm_zone" "ac_cv_member_struct_tm_tm_
 #include <$ac_cv_struct_tm>
 "
-if test "x$ac_cv_member_struct_tm_tm_zone" = xyes; then :
+if test "x$ac_cv_member_struct_tm_tm_zone" = x""yes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_TM_TM_ZONE 1
@@ -8050,7 +8042,7 @@ $as_echo "#define HAVE_TM_ZONE 1" >>confdefs.h
 else
  ac_fn_c_check_decl "$LINENO" "tzname" "ac_cv_have_decl_tzname" "#include <time.h>
 "
-if test "x$ac_cv_have_decl_tzname" = xyes; then :
+if test "x$ac_cv_have_decl_tzname" = x""yes; then :
  ac_have_decl=1
 else
  ac_have_decl=0
@@ -8062,7 +8054,7 @@ _ACEOF
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tzname" >&5
 $as_echo_n "checking for tzname... " >&6; }
-if ${ac_cv_var_tzname+:} false; then :
+if test "${ac_cv_var_tzname+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8099,7 +8091,7 @@ fi
 ac_fn_c_check_member "$LINENO" "struct tm" "tm_gmtoff" "ac_cv_member_struct_tm_tm_gmtoff" "#include <time.h>
 "
-if test "x$ac_cv_member_struct_tm_tm_gmtoff" = xyes; then :
+if test "x$ac_cv_member_struct_tm_tm_gmtoff" = x""yes; then :
 $as_echo "#define HAVE_TM_GMTOFF 1" >>confdefs.h
@@ -8113,7 +8105,7 @@ ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_flags" "ac_cv_member_struct_i
 #include <net/if.h>
 #endif
 "
-if test "x$ac_cv_member_struct_ifreq_ifr_flags" = xyes; then :
+if test "x$ac_cv_member_struct_ifreq_ifr_flags" = x""yes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_IFREQ_IFR_FLAGS 1
@@ -8129,7 +8121,7 @@ ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_hwaddr" "ac_cv_member_struct_
 #include <net/if.h>
 #endif
 "
-if test "x$ac_cv_member_struct_ifreq_ifr_hwaddr" = xyes; then :
+if test "x$ac_cv_member_struct_ifreq_ifr_hwaddr" = x""yes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_IFREQ_IFR_HWADDR 1
@@ -8145,7 +8137,7 @@ ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_netmask" "ac_cv_member_struct
 #include <net/if.h>
 #endif
 "
-if test "x$ac_cv_member_struct_ifreq_ifr_netmask" = xyes; then :
+if test "x$ac_cv_member_struct_ifreq_ifr_netmask" = x""yes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_IFREQ_IFR_NETMASK 1
@@ -8161,7 +8153,7 @@ ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_broadaddr" "ac_cv_member_stru
 #include <net/if.h>
 #endif
 "
-if test "x$ac_cv_member_struct_ifreq_ifr_broadaddr" = xyes; then :
+if test "x$ac_cv_member_struct_ifreq_ifr_broadaddr" = x""yes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_IFREQ_IFR_BROADADDR 1
@@ -8177,7 +8169,7 @@ ac_fn_c_check_member "$LINENO" "struct ifreq" "ifr_addr" "ac_cv_member_struct_if
 #include <net/if.h>
 #endif
 "
-if test "x$ac_cv_member_struct_ifreq_ifr_addr" = xyes; then :
+if test "x$ac_cv_member_struct_ifreq_ifr_addr" = x""yes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_IFREQ_IFR_ADDR 1
@@ -8206,7 +8198,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working volatile" >&5
 $as_echo_n "checking for working volatile... " >&6; }
-if ${ac_cv_c_volatile+:} false; then :
+if test "${ac_cv_c_volatile+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8240,7 +8232,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
 $as_echo_n "checking for an ANSI C-conforming const... " >&6; }
-if ${ac_cv_c_const+:} false; then :
+if test "${ac_cv_c_const+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8320,7 +8312,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for void * support" >&5
 $as_echo_n "checking for void * support... " >&6; }
-if ${emacs_cv_void_star+:} false; then :
+if test "${emacs_cv_void_star+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8353,7 +8345,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if ${ac_cv_c_bigendian+:} false; then :
+if test "${ac_cv_c_bigendian+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_cv_c_bigendian=unknown
@@ -8572,13 +8564,13 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
     ;; #(
   *)
     as_fn_error $? "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5  ;;
 esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for  __attribute__ ((__aligned__ (expr)))" >&5
 $as_echo_n "checking for  __attribute__ ((__aligned__ (expr)))... " >&6; }
-if ${emacs_cv_attribute_aligned+:} false; then :
+if test "${emacs_cv_attribute_aligned+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -8611,7 +8603,7 @@ fi
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat >conftest.make <<\_ACEOF
@@ -8699,7 +8691,7 @@ deps_frag=$srcdir/src/$deps_frag
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long file names" >&5
 $as_echo_n "checking for long file names... " >&6; }
-if ${ac_cv_sys_long_file_names+:} false; then :
+if test "${ac_cv_sys_long_file_names+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_cv_sys_long_file_names=yes
@@ -8755,8 +8747,8 @@ if test "x$with_x" = xno; then
  have_x=disabled
 else
  case $x_includes,$x_libraries in #(
-    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #(
+    *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5 ;; #(
-    *,NONE | NONE,*) if ${ac_cv_have_x+:} false; then :
+    *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  # One or both of the vars are not set, and there is no cached value.
@@ -9039,7 +9031,7 @@ if test "${with_ns}" != no; then
     TEMACS_LDFLAGS2=
  fi
  ac_fn_c_check_header_mongrel "$LINENO" "AppKit/AppKit.h" "ac_cv_header_AppKit_AppKit_h" "$ac_includes_default"
-if test "x$ac_cv_header_AppKit_AppKit_h" = xyes; then :
+if test "x$ac_cv_header_AppKit_AppKit_h" = x""yes; then :
  HAVE_NS=yes
 else
  as_fn_error $? "\`--with-ns' was specified, but the include
@@ -9124,7 +9116,7 @@ if test "$window_system" = none && test "X$with_x" != "Xno"; then
 set dummy X; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_HAVE_XSERVER+:} false; then :
+if test "${ac_cv_prog_HAVE_XSERVER+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  if test -n "$HAVE_XSERVER"; then
@@ -9183,14 +9175,14 @@ esac
 GNU_MALLOC=yes
 doug_lea_malloc=yes
 ac_fn_c_check_func "$LINENO" "malloc_get_state" "ac_cv_func_malloc_get_state"
-if test "x$ac_cv_func_malloc_get_state" = xyes; then :
+if test "x$ac_cv_func_malloc_get_state" = x""yes; then :
 else
  doug_lea_malloc=no
 fi
 ac_fn_c_check_func "$LINENO" "malloc_set_state" "ac_cv_func_malloc_set_state"
-if test "x$ac_cv_func_malloc_set_state" = xyes; then :
+if test "x$ac_cv_func_malloc_set_state" = x""yes; then :
 else
  doug_lea_malloc=no
@@ -9198,7 +9190,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether __after_morecore_hook exists" >&5
 $as_echo_n "checking whether __after_morecore_hook exists... " >&6; }
-if ${emacs_cv_var___after_morecore_hook+:} false; then :
+if test "${emacs_cv_var___after_morecore_hook+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9303,7 +9295,7 @@ done
 for ac_func in getpagesize
 do :
  ac_fn_c_check_func "$LINENO" "getpagesize" "ac_cv_func_getpagesize"
-if test "x$ac_cv_func_getpagesize" = xyes; then :
+if test "x$ac_cv_func_getpagesize" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_GETPAGESIZE 1
 _ACEOF
@@ -9313,7 +9305,7 @@ done
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mmap" >&5
 $as_echo_n "checking for working mmap... " >&6; }
-if ${ac_cv_func_mmap_fixed_mapped+:} false; then :
+if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  if test "$cross_compiling" = yes; then :
@@ -9488,7 +9480,7 @@ LIBS="$LIBS_SYSTEM $LIBS"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5
 $as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; }
-if ${ac_cv_lib_dnet_dnet_ntoa+:} false; then :
+if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -9522,7 +9514,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 $as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; }
-if test "x$ac_cv_lib_dnet_dnet_ntoa" = xyes; then :
+if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBDNET 1
 _ACEOF
@@ -9534,7 +9526,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lXbsd" >&5
 $as_echo_n "checking for main in -lXbsd... " >&6; }
-if ${ac_cv_lib_Xbsd_main+:} false; then :
+if test "${ac_cv_lib_Xbsd_main+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -9562,14 +9554,14 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xbsd_main" >&5
 $as_echo "$ac_cv_lib_Xbsd_main" >&6; }
-if test "x$ac_cv_lib_Xbsd_main" = xyes; then :
+if test "x$ac_cv_lib_Xbsd_main" = x""yes; then :
  LD_SWITCH_X_SITE="$LD_SWITCH_X_SITE -lXbsd"
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cma_open in -lpthreads" >&5
 $as_echo_n "checking for cma_open in -lpthreads... " >&6; }
-if ${ac_cv_lib_pthreads_cma_open+:} false; then :
+if test "${ac_cv_lib_pthreads_cma_open+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -9603,7 +9595,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthreads_cma_open" >&5
 $as_echo "$ac_cv_lib_pthreads_cma_open" >&6; }
-if test "x$ac_cv_lib_pthreads_cma_open" = xyes; then :
+if test "x$ac_cv_lib_pthreads_cma_open" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBPTHREADS 1
 _ACEOF
@@ -9630,7 +9622,7 @@ case ${host_os} in
 aix*)
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -bbigtoc option" >&5
 $as_echo_n "checking for -bbigtoc option... " >&6; }
-if ${gdb_cv_bigtoc+:} false; then :
+if test "${gdb_cv_bigtoc+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
@@ -9804,7 +9796,7 @@ fi
 if test "${window_system}" = "x11"; then
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking X11 version 6" >&5
 $as_echo_n "checking X11 version 6... " >&6; }
-  if ${emacs_cv_x11_version_6+:} false; then :
+  if test "${emacs_cv_x11_version_6+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -9869,7 +9861,7 @@ if test "${HAVE_X11}" = "yes" || test "${NS_IMPL_GNUSTEP}" = "yes"; then
 set dummy pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  case $PKG_CONFIG in
@@ -9980,7 +9972,7 @@ if test "${HAVE_X11}" = "yes"; then
 set dummy pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  case $PKG_CONFIG in
@@ -10079,7 +10071,7 @@ $as_echo "#define HAVE_IMAGEMAGICK 1" >>confdefs.h
      for ac_func in MagickExportImagePixels
 do :
  ac_fn_c_check_func "$LINENO" "MagickExportImagePixels" "ac_cv_func_MagickExportImagePixels"
-if test "x$ac_cv_func_MagickExportImagePixels" = xyes; then :
+if test "x$ac_cv_func_MagickExportImagePixels" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_MAGICKEXPORTIMAGEPIXELS 1
 _ACEOF
@@ -10105,7 +10097,7 @@ if test "${with_gtk3}" = "yes"; then
 set dummy pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  case $PKG_CONFIG in
@@ -10211,7 +10203,7 @@ if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then
 set dummy pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  case $PKG_CONFIG in
@@ -10316,7 +10308,7 @@ if test x"$pkg_check_gtk" = xyes; then
  for ac_func in gtk_main
 do :
  ac_fn_c_check_func "$LINENO" "gtk_main" "ac_cv_func_gtk_main"
-if test "x$ac_cv_func_gtk_main" = xyes; then :
+if test "x$ac_cv_func_gtk_main" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_GTK_MAIN 1
 _ACEOF
@@ -10326,7 +10318,7 @@ done
  if test "${GTK_COMPILES}" != "yes"; then
    if test "$USE_X_TOOLKIT" != "maybe"; then
-      as_fn_error $? "Gtk+ wanted, but it does not compile, see config.log.  Maybe some x11-devel files missing?" "$LINENO" 5;
+      as_fn_error $? "Gtk+ wanted, but it does not compile, see config.log.  Maybe some x11-devel files missing?" "$LINENO" 5 ;
    fi
  else
    HAVE_GTK=yes
@@ -10364,7 +10356,7 @@ if test "${HAVE_GTK}" = "yes"; then
  ac_fn_c_check_decl "$LINENO" "GTK_TYPE_FILE_SELECTION" "ac_cv_have_decl_GTK_TYPE_FILE_SELECTION" "$ac_includes_default
 #include <gtk/gtk.h>
 "
-if test "x$ac_cv_have_decl_GTK_TYPE_FILE_SELECTION" = xyes; then :
+if test "x$ac_cv_have_decl_GTK_TYPE_FILE_SELECTION" = x""yes; then :
  HAVE_GTK_FILE_SELECTION=yes
 else
  HAVE_GTK_FILE_SELECTION=no
@@ -10374,7 +10366,7 @@ fi
    for ac_func in gtk_file_selection_new
 do :
  ac_fn_c_check_func "$LINENO" "gtk_file_selection_new" "ac_cv_func_gtk_file_selection_new"
-if test "x$ac_cv_func_gtk_file_selection_new" = xyes; then :
+if test "x$ac_cv_func_gtk_file_selection_new" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_GTK_FILE_SELECTION_NEW 1
 _ACEOF
@@ -10388,7 +10380,7 @@ done
    for ac_header in pthread.h
 do :
  ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
-if test "x$ac_cv_header_pthread_h" = xyes; then :
+if test "x$ac_cv_header_pthread_h" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_PTHREAD_H 1
 _ACEOF
@@ -10400,7 +10392,7 @@ done
    if test "$ac_cv_header_pthread_h"; then
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_self in -lpthread" >&5
 $as_echo_n "checking for pthread_self in -lpthread... " >&6; }
-if ${ac_cv_lib_pthread_pthread_self+:} false; then :
+if test "${ac_cv_lib_pthread_pthread_self+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -10434,7 +10426,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pthread_pthread_self" >&5
 $as_echo "$ac_cv_lib_pthread_pthread_self" >&6; }
-if test "x$ac_cv_lib_pthread_pthread_self" = xyes; then :
+if test "x$ac_cv_lib_pthread_pthread_self" = x""yes; then :
  HAVE_GTK_AND_PTHREAD=yes
 fi
@@ -10477,7 +10469,7 @@ if test "${with_dbus}" = "yes"; then
 set dummy pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  case $PKG_CONFIG in
@@ -10572,7 +10564,7 @@ $as_echo "#define HAVE_DBUS 1" >>confdefs.h
     for ac_func in dbus_watch_get_unix_fd
 do :
  ac_fn_c_check_func "$LINENO" "dbus_watch_get_unix_fd" "ac_cv_func_dbus_watch_get_unix_fd"
-if test "x$ac_cv_func_dbus_watch_get_unix_fd" = xyes; then :
+if test "x$ac_cv_func_dbus_watch_get_unix_fd" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_DBUS_WATCH_GET_UNIX_FD 1
 _ACEOF
@@ -10594,7 +10586,7 @@ if test "${HAVE_X11}" = "yes" && test "${with_gconf}" = "yes"; then
 set dummy pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  case $PKG_CONFIG in
@@ -10688,7 +10680,7 @@ $as_echo "#define HAVE_GCONF 1" >>confdefs.h
            for ac_func in g_type_init
 do :
  ac_fn_c_check_func "$LINENO" "g_type_init" "ac_cv_func_g_type_init"
-if test "x$ac_cv_func_g_type_init" = xyes; then :
+if test "x$ac_cv_func_g_type_init" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_G_TYPE_INIT 1
 _ACEOF
@@ -10704,7 +10696,7 @@ LIBSELINUX_LIBS=
 if test "${with_selinux}" = "yes"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lgetfilecon in -lselinux" >&5
 $as_echo_n "checking for lgetfilecon in -lselinux... " >&6; }
-if ${ac_cv_lib_selinux_lgetfilecon+:} false; then :
+if test "${ac_cv_lib_selinux_lgetfilecon+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -10738,7 +10730,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_selinux_lgetfilecon" >&5
 $as_echo "$ac_cv_lib_selinux_lgetfilecon" >&6; }
-if test "x$ac_cv_lib_selinux_lgetfilecon" = xyes; then :
+if test "x$ac_cv_lib_selinux_lgetfilecon" = x""yes; then :
  HAVE_LIBSELINUX=yes
 else
  HAVE_LIBSELINUX=no
@@ -10762,7 +10754,7 @@ if test "${with_gnutls}" = "yes" ; then
 set dummy pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  case $PKG_CONFIG in
@@ -10864,7 +10856,7 @@ if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then
  if test "$with_xaw3d" != no; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xaw3d" >&5
 $as_echo_n "checking for xaw3d... " >&6; }
-    if ${emacs_cv_xaw3d+:} false; then :
+    if test "${emacs_cv_xaw3d+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10883,7 +10875,7 @@ _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XawScrollbarSetThumb in -lXaw3d" >&5
 $as_echo_n "checking for XawScrollbarSetThumb in -lXaw3d... " >&6; }
-if ${ac_cv_lib_Xaw3d_XawScrollbarSetThumb+:} false; then :
+if test "${ac_cv_lib_Xaw3d_XawScrollbarSetThumb+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -10917,7 +10909,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xaw3d_XawScrollbarSetThumb" >&5
 $as_echo "$ac_cv_lib_Xaw3d_XawScrollbarSetThumb" >&6; }
-if test "x$ac_cv_lib_Xaw3d_XawScrollbarSetThumb" = xyes; then :
+if test "x$ac_cv_lib_Xaw3d_XawScrollbarSetThumb" = x""yes; then :
  emacs_cv_xaw3d=yes
 else
  emacs_cv_xaw3d=no
@@ -10947,7 +10939,7 @@ $as_echo "#define HAVE_XAW3D 1" >>confdefs.h
 $as_echo "no" >&6; }
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libXaw" >&5
 $as_echo_n "checking for libXaw... " >&6; }
-    if ${emacs_cv_xaw+:} false; then :
+    if test "${emacs_cv_xaw+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -10993,7 +10985,7 @@ LIBXTR6=
 if test "${USE_X_TOOLKIT}" != "none"; then
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking X11 toolkit version" >&5
 $as_echo_n "checking X11 toolkit version... " >&6; }
-  if ${emacs_cv_x11_toolkit_version_6+:} false; then :
+  if test "${emacs_cv_x11_toolkit_version_6+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11044,7 +11036,7 @@ $as_echo "before 6" >&6; }
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XmuConvertStandardSelection in -lXmu" >&5
 $as_echo_n "checking for XmuConvertStandardSelection in -lXmu... " >&6; }
-if ${ac_cv_lib_Xmu_XmuConvertStandardSelection+:} false; then :
+if test "${ac_cv_lib_Xmu_XmuConvertStandardSelection+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -11078,7 +11070,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xmu_XmuConvertStandardSelection" >&5
 $as_echo "$ac_cv_lib_Xmu_XmuConvertStandardSelection" >&6; }
-if test "x$ac_cv_lib_Xmu_XmuConvertStandardSelection" = xyes; then :
+if test "x$ac_cv_lib_Xmu_XmuConvertStandardSelection" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBXMU 1
 _ACEOF
@@ -11105,7 +11097,7 @@ if test "${HAVE_X11}" = "yes"; then
  if test "${USE_X_TOOLKIT}" != "none"; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShapeQueryExtension in -lXext" >&5
 $as_echo_n "checking for XShapeQueryExtension in -lXext... " >&6; }
-if ${ac_cv_lib_Xext_XShapeQueryExtension+:} false; then :
+if test "${ac_cv_lib_Xext_XShapeQueryExtension+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -11139,7 +11131,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XShapeQueryExtension" >&5
 $as_echo "$ac_cv_lib_Xext_XShapeQueryExtension" >&6; }
-if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = xyes; then :
+if test "x$ac_cv_lib_Xext_XShapeQueryExtension" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBXEXT 1
 _ACEOF
@@ -11155,7 +11147,7 @@ LIBXP=
 if test "${USE_X_TOOLKIT}" = "MOTIF"; then
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Motif version 2.1" >&5
 $as_echo_n "checking for Motif version 2.1... " >&6; }
-if ${emacs_cv_motif_version_2_1+:} false; then :
+if test "${emacs_cv_motif_version_2_1+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -11185,7 +11177,7 @@ $as_echo "$emacs_cv_motif_version_2_1" >&6; }
  if test $emacs_cv_motif_version_2_1 = yes; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpCreateContext in -lXp" >&5
 $as_echo_n "checking for XpCreateContext in -lXp... " >&6; }
-if ${ac_cv_lib_Xp_XpCreateContext+:} false; then :
+if test "${ac_cv_lib_Xp_XpCreateContext+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -11219,14 +11211,14 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xp_XpCreateContext" >&5
 $as_echo "$ac_cv_lib_Xp_XpCreateContext" >&6; }
-if test "x$ac_cv_lib_Xp_XpCreateContext" = xyes; then :
+if test "x$ac_cv_lib_Xp_XpCreateContext" = x""yes; then :
  LIBXP=-lXp
 fi
  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LessTif where some systems put it" >&5
 $as_echo_n "checking for LessTif where some systems put it... " >&6; }
-if ${emacs_cv_lesstif+:} false; then :
+if test "${emacs_cv_lesstif+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  # We put this in CFLAGS temporarily to precede other -I options
@@ -11385,7 +11377,7 @@ if test "${HAVE_X11}" = "yes"; then
 set dummy pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  case $PKG_CONFIG in
@@ -11487,7 +11479,7 @@ $as_echo "no" >&6; }
 set dummy pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  case $PKG_CONFIG in
@@ -11579,7 +11571,7 @@ $as_echo "no" >&6; }
      HAVE_XRENDER=no
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRenderQueryExtension in -lXrender" >&5
 $as_echo_n "checking for XRenderQueryExtension in -lXrender... " >&6; }
-if ${ac_cv_lib_Xrender_XRenderQueryExtension+:} false; then :
+if test "${ac_cv_lib_Xrender_XRenderQueryExtension+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -11613,7 +11605,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xrender_XRenderQueryExtension" >&5
 $as_echo "$ac_cv_lib_Xrender_XRenderQueryExtension" >&6; }
-if test "x$ac_cv_lib_Xrender_XRenderQueryExtension" = xyes; then :
+if test "x$ac_cv_lib_Xrender_XRenderQueryExtension" = x""yes; then :
  HAVE_XRENDER=yes
 fi
@@ -11626,10 +11618,10 @@ fi
        XFT_LIBS="-lXrender $XFT_LIBS"
        LIBS="$XFT_LIBS $LIBS"
        ac_fn_c_check_header_mongrel "$LINENO" "X11/Xft/Xft.h" "ac_cv_header_X11_Xft_Xft_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_Xft_Xft_h" = xyes; then :
+if test "x$ac_cv_header_X11_Xft_Xft_h" = x""yes; then :
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XftFontOpen in -lXft" >&5
 $as_echo_n "checking for XftFontOpen in -lXft... " >&6; }
-if ${ac_cv_lib_Xft_XftFontOpen+:} false; then :
+if test "${ac_cv_lib_Xft_XftFontOpen+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -11663,7 +11655,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xft_XftFontOpen" >&5
 $as_echo "$ac_cv_lib_Xft_XftFontOpen" >&6; }
-if test "x$ac_cv_lib_Xft_XftFontOpen" = xyes; then :
+if test "x$ac_cv_lib_Xft_XftFontOpen" = x""yes; then :
  HAVE_XFT=yes
 fi
@@ -11685,13 +11677,109 @@ $as_echo "#define HAVE_XFT 1" >>confdefs.h
      fi                          # "$HAVE_XFT" != no
    fi                            # "x${with_xft}" != "xno"
-        if test "$HAVE_XFT" != "yes"; then
-       HAVE_XFT=no
-    fi
    ## We used to allow building with FreeType and without Xft.
    ## However, the ftx font backend driver is not in good shape.
-    HAVE_FREETYPE=$HAVE_XFT
+    if test "$HAVE_XFT" != "yes"; then
+              HAVE_XFT=no
+       HAVE_FREETYPE=no
+    else
+  succeeded=no
+  # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $PKG_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+  ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+  if test "$PKG_CONFIG" = "no" ; then
+     HAVE_FREETYPE=no
+  else
+     PKG_CONFIG_MIN_VERSION=0.9.0
+     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype2" >&5
+$as_echo_n "checking for freetype2... " >&6; }
+        if $PKG_CONFIG --exists "freetype2" 2>&5; then
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+            succeeded=yes
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking FREETYPE_CFLAGS" >&5
+$as_echo_n "checking FREETYPE_CFLAGS... " >&6; }
+            FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2"|sed -e 's,///*,/,g'`
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_CFLAGS" >&5
+$as_echo "$FREETYPE_CFLAGS" >&6; }
+            { $as_echo "$as_me:${as_lineno-$LINENO}: checking FREETYPE_LIBS" >&5
+$as_echo_n "checking FREETYPE_LIBS... " >&6; }
+            FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2"|sed -e 's,///*,/,g'`
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_LIBS" >&5
+$as_echo "$FREETYPE_LIBS" >&6; }
+        else
+            { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+            FREETYPE_CFLAGS=""
+            FREETYPE_LIBS=""
+            ## If we have a custom action on failure, don't print errors, but
+            ## do set a variable so people can do so.
+            FREETYPE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "freetype2"`
+        fi
+     else
+        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+        echo "*** See http://www.freedesktop.org/software/pkgconfig"
+     fi
+  fi
+  if test $succeeded = yes; then
+     HAVE_FREETYPE=yes
+  else
+     HAVE_FREETYPE=no
+  fi
+       test "$HAVE_FREETYPE" = "no" && as_fn_error $? "libxft requires libfreetype" "$LINENO" 5
+    fi
    HAVE_LIBOTF=no
    if test "${HAVE_FREETYPE}" = "yes"; then
@@ -11706,7 +11794,7 @@ $as_echo "#define HAVE_FREETYPE 1" >>confdefs.h
 set dummy pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  case $PKG_CONFIG in
@@ -11799,7 +11887,7 @@ $as_echo "#define HAVE_LIBOTF 1" >>confdefs.h
          { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OTF_get_variation_glyphs in -lotf" >&5
 $as_echo_n "checking for OTF_get_variation_glyphs in -lotf... " >&6; }
-if ${ac_cv_lib_otf_OTF_get_variation_glyphs+:} false; then :
+if test "${ac_cv_lib_otf_OTF_get_variation_glyphs+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -11833,7 +11921,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_otf_OTF_get_variation_glyphs" >&5
 $as_echo "$ac_cv_lib_otf_OTF_get_variation_glyphs" >&6; }
-if test "x$ac_cv_lib_otf_OTF_get_variation_glyphs" = xyes; then :
+if test "x$ac_cv_lib_otf_OTF_get_variation_glyphs" = x""yes; then :
  HAVE_OTF_GET_VARIATION_GLYPHS=yes
 else
  HAVE_OTF_GET_VARIATION_GLYPHS=no
@@ -11858,7 +11946,7 @@ $as_echo "#define HAVE_OTF_GET_VARIATION_GLYPHS 1" >>confdefs.h
 set dummy pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  case $PKG_CONFIG in
@@ -11976,10 +12064,10 @@ LIBXPM=
 if test "${HAVE_X11}" = "yes"; then
  if test "${with_xpm}" != "no"; then
    ac_fn_c_check_header_mongrel "$LINENO" "X11/xpm.h" "ac_cv_header_X11_xpm_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_xpm_h" = xyes; then :
+if test "x$ac_cv_header_X11_xpm_h" = x""yes; then :
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XpmReadFileToPixmap in -lXpm" >&5
 $as_echo_n "checking for XpmReadFileToPixmap in -lXpm... " >&6; }
-if ${ac_cv_lib_Xpm_XpmReadFileToPixmap+:} false; then :
+if test "${ac_cv_lib_Xpm_XpmReadFileToPixmap+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -12013,7 +12101,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xpm_XpmReadFileToPixmap" >&5
 $as_echo "$ac_cv_lib_Xpm_XpmReadFileToPixmap" >&6; }
-if test "x$ac_cv_lib_Xpm_XpmReadFileToPixmap" = xyes; then :
+if test "x$ac_cv_lib_Xpm_XpmReadFileToPixmap" = x""yes; then :
  HAVE_XPM=yes
 fi
@@ -12065,10 +12153,10 @@ LIBJPEG=
 if test "${HAVE_X11}" = "yes"; then
  if test "${with_jpeg}" != "no"; then
            ac_fn_c_check_header_mongrel "$LINENO" "jerror.h" "ac_cv_header_jerror_h" "$ac_includes_default"
-if test "x$ac_cv_header_jerror_h" = xyes; then :
+if test "x$ac_cv_header_jerror_h" = x""yes; then :
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_destroy_compress in -ljpeg" >&5
 $as_echo_n "checking for jpeg_destroy_compress in -ljpeg... " >&6; }
-if ${ac_cv_lib_jpeg_jpeg_destroy_compress+:} false; then :
+if test "${ac_cv_lib_jpeg_jpeg_destroy_compress+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -12102,7 +12190,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_destroy_compress" >&5
 $as_echo "$ac_cv_lib_jpeg_jpeg_destroy_compress" >&6; }
-if test "x$ac_cv_lib_jpeg_jpeg_destroy_compress" = xyes; then :
+if test "x$ac_cv_lib_jpeg_jpeg_destroy_compress" = x""yes; then :
  HAVE_JPEG=yes
 fi
@@ -12161,7 +12249,7 @@ done
    if test "$ac_cv_header_png_h" = yes || test "$ac_cv_header_libpng_png_h" = yes ; then
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for png_get_channels in -lpng" >&5
 $as_echo_n "checking for png_get_channels in -lpng... " >&6; }
-if ${ac_cv_lib_png_png_get_channels+:} false; then :
+if test "${ac_cv_lib_png_png_get_channels+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -12195,7 +12283,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_png_png_get_channels" >&5
 $as_echo "$ac_cv_lib_png_png_get_channels" >&6; }
-if test "x$ac_cv_lib_png_png_get_channels" = xyes; then :
+if test "x$ac_cv_lib_png_png_get_channels" = x""yes; then :
  HAVE_PNG=yes
 fi
@@ -12217,13 +12305,13 @@ LIBTIFF=
 if test "${HAVE_X11}" = "yes"; then
  if test "${with_tiff}" != "no"; then
    ac_fn_c_check_header_mongrel "$LINENO" "tiffio.h" "ac_cv_header_tiffio_h" "$ac_includes_default"
-if test "x$ac_cv_header_tiffio_h" = xyes; then :
+if test "x$ac_cv_header_tiffio_h" = x""yes; then :
  tifflibs="-lz -lm"
      # At least one tiff package requires the jpeg library.
      if test "${HAVE_JPEG}" = yes; then tifflibs="-ljpeg $tifflibs"; fi
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for TIFFGetVersion in -ltiff" >&5
 $as_echo_n "checking for TIFFGetVersion in -ltiff... " >&6; }
-if ${ac_cv_lib_tiff_TIFFGetVersion+:} false; then :
+if test "${ac_cv_lib_tiff_TIFFGetVersion+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -12257,7 +12345,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tiff_TIFFGetVersion" >&5
 $as_echo "$ac_cv_lib_tiff_TIFFGetVersion" >&6; }
-if test "x$ac_cv_lib_tiff_TIFFGetVersion" = xyes; then :
+if test "x$ac_cv_lib_tiff_TIFFGetVersion" = x""yes; then :
  HAVE_TIFF=yes
 fi
@@ -12280,12 +12368,12 @@ HAVE_GIF=no
 LIBGIF=
 if test "${HAVE_X11}" = "yes" && test "${with_gif}" != "no"; then
  ac_fn_c_check_header_mongrel "$LINENO" "gif_lib.h" "ac_cv_header_gif_lib_h" "$ac_includes_default"
-if test "x$ac_cv_header_gif_lib_h" = xyes; then :
+if test "x$ac_cv_header_gif_lib_h" = x""yes; then :
  # EGifPutExtensionLast only exists from version libungif-4.1.0b1.
 # Earlier versions can crash Emacs.
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGifPutExtensionLast in -lgif" >&5
 $as_echo_n "checking for EGifPutExtensionLast in -lgif... " >&6; }
-if ${ac_cv_lib_gif_EGifPutExtensionLast+:} false; then :
+if test "${ac_cv_lib_gif_EGifPutExtensionLast+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -12319,7 +12407,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gif_EGifPutExtensionLast" >&5
 $as_echo "$ac_cv_lib_gif_EGifPutExtensionLast" >&6; }
-if test "x$ac_cv_lib_gif_EGifPutExtensionLast" = xyes; then :
+if test "x$ac_cv_lib_gif_EGifPutExtensionLast" = x""yes; then :
  HAVE_GIF=yes
 else
  HAVE_GIF=maybe
@@ -12335,7 +12423,7 @@ fi
 # If gif_lib.h but no libgif, try libungif.
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EGifPutExtensionLast in -lungif" >&5
 $as_echo_n "checking for EGifPutExtensionLast in -lungif... " >&6; }
-if ${ac_cv_lib_ungif_EGifPutExtensionLast+:} false; then :
+if test "${ac_cv_lib_ungif_EGifPutExtensionLast+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -12369,7 +12457,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ungif_EGifPutExtensionLast" >&5
 $as_echo "$ac_cv_lib_ungif_EGifPutExtensionLast" >&6; }
-if test "x$ac_cv_lib_ungif_EGifPutExtensionLast" = xyes; then :
+if test "x$ac_cv_lib_ungif_EGifPutExtensionLast" = x""yes; then :
  HAVE_GIF=yes
 else
  HAVE_GIF=no
@@ -12416,10 +12504,10 @@ LIBGPM=
 MOUSE_SUPPORT=
 if test "${with_gpm}" != "no"; then
  ac_fn_c_check_header_mongrel "$LINENO" "gpm.h" "ac_cv_header_gpm_h" "$ac_includes_default"
-if test "x$ac_cv_header_gpm_h" = xyes; then :
+if test "x$ac_cv_header_gpm_h" = x""yes; then :
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Gpm_Open in -lgpm" >&5
 $as_echo_n "checking for Gpm_Open in -lgpm... " >&6; }
-if ${ac_cv_lib_gpm_Gpm_Open+:} false; then :
+if test "${ac_cv_lib_gpm_Gpm_Open+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -12453,7 +12541,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gpm_Gpm_Open" >&5
 $as_echo "$ac_cv_lib_gpm_Gpm_Open" >&6; }
-if test "x$ac_cv_lib_gpm_Gpm_Open" = xyes; then :
+if test "x$ac_cv_lib_gpm_Gpm_Open" = x""yes; then :
  HAVE_GPM=yes
 fi
@@ -12473,7 +12561,7 @@ fi
 ac_fn_c_check_header_mongrel "$LINENO" "malloc/malloc.h" "ac_cv_header_malloc_malloc_h" "$ac_includes_default"
-if test "x$ac_cv_header_malloc_malloc_h" = xyes; then :
+if test "x$ac_cv_header_malloc_malloc_h" = x""yes; then :
 $as_echo "#define HAVE_MALLOC_MALLOC_H 1" >>confdefs.h
@@ -12518,10 +12606,10 @@ HAVE_X_SM=no
 LIBXSM=
 if test "${HAVE_X11}" = "yes"; then
  ac_fn_c_check_header_mongrel "$LINENO" "X11/SM/SMlib.h" "ac_cv_header_X11_SM_SMlib_h" "$ac_includes_default"
-if test "x$ac_cv_header_X11_SM_SMlib_h" = xyes; then :
+if test "x$ac_cv_header_X11_SM_SMlib_h" = x""yes; then :
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SmcOpenConnection in -lSM" >&5
 $as_echo_n "checking for SmcOpenConnection in -lSM... " >&6; }
-if ${ac_cv_lib_SM_SmcOpenConnection+:} false; then :
+if test "${ac_cv_lib_SM_SmcOpenConnection+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -12555,7 +12643,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_SM_SmcOpenConnection" >&5
 $as_echo "$ac_cv_lib_SM_SmcOpenConnection" >&6; }
-if test "x$ac_cv_lib_SM_SmcOpenConnection" = xyes; then :
+if test "x$ac_cv_lib_SM_SmcOpenConnection" = x""yes; then :
  HAVE_X_SM=yes
 fi
@@ -12586,7 +12674,7 @@ if test "${with_xml2}" != "no"; then
 set dummy pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PKG_CONFIG+:} false; then :
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  case $PKG_CONFIG in
@@ -12677,7 +12765,7 @@ $as_echo "no" >&6; }
    LIBS="$LIBXML2_LIBS $LIBS"
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for htmlReadMemory in -lxml2" >&5
 $as_echo_n "checking for htmlReadMemory in -lxml2... " >&6; }
-if ${ac_cv_lib_xml2_htmlReadMemory+:} false; then :
+if test "${ac_cv_lib_xml2_htmlReadMemory+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -12711,7 +12799,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xml2_htmlReadMemory" >&5
 $as_echo "$ac_cv_lib_xml2_htmlReadMemory" >&6; }
-if test "x$ac_cv_lib_xml2_htmlReadMemory" = xyes; then :
+if test "x$ac_cv_lib_xml2_htmlReadMemory" = x""yes; then :
  HAVE_LIBXML2=yes
 else
  HAVE_LIBXML2=no
@@ -12733,7 +12821,7 @@ fi
 # If netdb.h doesn't declare h_errno, we must declare it by hand.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether netdb declares h_errno" >&5
 $as_echo_n "checking whether netdb declares h_errno... " >&6; }
-if ${emacs_cv_netdb_declares_h_errno+:} false; then :
+if test "${emacs_cv_netdb_declares_h_errno+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12763,22 +12851,11 @@ $as_echo "#define HAVE_H_ERRNO 1" >>confdefs.h
 fi
-ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
-else
-cat >>confdefs.h <<_ACEOF
-#define size_t unsigned int
-_ACEOF
-fi
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working alloca.h" >&5
 $as_echo_n "checking for working alloca.h... " >&6; }
-if ${ac_cv_working_alloca_h+:} false; then :
+if test "${ac_cv_working_alloca_h+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12811,7 +12888,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for alloca" >&5
 $as_echo_n "checking for alloca... " >&6; }
-if ${ac_cv_func_alloca_works+:} false; then :
+if test "${ac_cv_func_alloca_works+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12830,7 +12907,7 @@ else
 #pragma alloca
 #   else
 #    ifndef alloca /* predefined by HP cc +Olibcalls */
-void *alloca (size_t);
+char *alloca ();
 #    endif
 #   endif
 #  endif
@@ -12874,7 +12951,7 @@ $as_echo "#define C_ALLOCA 1" >>confdefs.h
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether \`alloca.c' needs Cray hooks" >&5
 $as_echo_n "checking whether \`alloca.c' needs Cray hooks... " >&6; }
-if ${ac_cv_os_cray+:} false; then :
+if test "${ac_cv_os_cray+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12915,7 +12992,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking stack direction for C alloca" >&5
 $as_echo_n "checking stack direction for C alloca... " >&6; }
-if ${ac_cv_c_stack_direction+:} false; then :
+if test "${ac_cv_c_stack_direction+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  if test "$cross_compiling" = yes; then :
@@ -12972,7 +13049,7 @@ fi
 # On HPUX 9.01, -lm does not contain logb, so check for sqrt.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqrt in -lm" >&5
 $as_echo_n "checking for sqrt in -lm... " >&6; }
-if ${ac_cv_lib_m_sqrt+:} false; then :
+if test "${ac_cv_lib_m_sqrt+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -13006,7 +13083,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_sqrt" >&5
 $as_echo "$ac_cv_lib_m_sqrt" >&6; }
-if test "x$ac_cv_lib_m_sqrt" = xyes; then :
+if test "x$ac_cv_lib_m_sqrt" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBM 1
 _ACEOF
@@ -13020,7 +13097,7 @@ fi
 # have the same check as for liblockfile below.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for maillock in -lmail" >&5
 $as_echo_n "checking for maillock in -lmail... " >&6; }
-if ${ac_cv_lib_mail_maillock+:} false; then :
+if test "${ac_cv_lib_mail_maillock+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -13054,7 +13131,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mail_maillock" >&5
 $as_echo "$ac_cv_lib_mail_maillock" >&6; }
-if test "x$ac_cv_lib_mail_maillock" = xyes; then :
+if test "x$ac_cv_lib_mail_maillock" = x""yes; then :
  have_mail=yes
 else
  have_mail=no
@@ -13071,7 +13148,7 @@ else
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for maillock in -llockfile" >&5
 $as_echo_n "checking for maillock in -llockfile... " >&6; }
-if ${ac_cv_lib_lockfile_maillock+:} false; then :
+if test "${ac_cv_lib_lockfile_maillock+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -13105,7 +13182,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lockfile_maillock" >&5
 $as_echo "$ac_cv_lib_lockfile_maillock" >&6; }
-if test "x$ac_cv_lib_lockfile_maillock" = xyes; then :
+if test "x$ac_cv_lib_lockfile_maillock" = x""yes; then :
  have_lockfile=yes
 else
  have_lockfile=no
@@ -13125,7 +13202,7 @@ else
 set dummy liblockfile.so; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_prog_liblockfile+:} false; then :
+if test "${ac_cv_prog_liblockfile+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  if test -n "$liblockfile"; then
@@ -13169,7 +13246,7 @@ fi
 for ac_func in touchlock
 do :
  ac_fn_c_check_func "$LINENO" "touchlock" "ac_cv_func_touchlock"
-if test "x$ac_cv_func_touchlock" = xyes; then :
+if test "x$ac_cv_func_touchlock" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_TOUCHLOCK 1
 _ACEOF
@@ -13180,7 +13257,7 @@ done
 for ac_header in maillock.h
 do :
  ac_fn_c_check_header_mongrel "$LINENO" "maillock.h" "ac_cv_header_maillock_h" "$ac_includes_default"
-if test "x$ac_cv_header_maillock_h" = xyes; then :
+if test "x$ac_cv_header_maillock_h" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_MAILLOCK_H 1
 _ACEOF
@@ -13261,7 +13338,7 @@ done
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_unwind_init" >&5
 $as_echo_n "checking for __builtin_unwind_init... " >&6; }
-if ${emacs_cv_func___builtin_unwind_init+:} false; then :
+if test "${emacs_cv_func___builtin_unwind_init+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13294,7 +13371,7 @@ fi
 for ac_header in sys/un.h
 do :
  ac_fn_c_check_header_mongrel "$LINENO" "sys/un.h" "ac_cv_header_sys_un_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_un_h" = xyes; then :
+if test "x$ac_cv_header_sys_un_h" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_UN_H 1
 _ACEOF
@@ -13306,7 +13383,7 @@ done
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5
 $as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; }
-if ${ac_cv_sys_largefile_source+:} false; then :
+if test "${ac_cv_sys_largefile_source+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  while :; do
@@ -13375,7 +13452,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getpgrp requires zero arguments" >&5
 $as_echo_n "checking whether getpgrp requires zero arguments... " >&6; }
-if ${ac_cv_func_getpgrp_void+:} false; then :
+if test "${ac_cv_func_getpgrp_void+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  # Use it with a single arg.
@@ -13424,7 +13501,7 @@ fi
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
-if ${ac_cv_c_bigendian+:} false; then :
+if test "${ac_cv_c_bigendian+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_cv_c_bigendian=unknown
@@ -13643,13 +13720,13 @@ $as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h
     ;; #(
   *)
     as_fn_error $? "unknown endianness
- presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;;
+ presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5  ;;
 esac
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for inline" >&5
 $as_echo_n "checking for inline... " >&6; }
-if ${ac_cv_c_inline+:} false; then :
+if test "${ac_cv_c_inline+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_cv_c_inline=no
@@ -13692,7 +13769,7 @@ esac
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strtold conforms to C99" >&5
 $as_echo_n "checking whether strtold conforms to C99... " >&6; }
-if ${gl_cv_func_c99_strtold+:} false; then :
+if test "${gl_cv_func_c99_strtold+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13735,7 +13812,7 @@ $as_echo "#define HAVE_C99_STRTOLD 1" >>confdefs.h
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for st_dm_mode in struct stat" >&5
 $as_echo_n "checking for st_dm_mode in struct stat... " >&6; }
-if ${ac_cv_struct_st_dm_mode+:} false; then :
+if test "${ac_cv_struct_st_dm_mode+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -13769,7 +13846,7 @@ $as_echo "#define HAVE_ST_DM_MODE 1" >>confdefs.h
 ac_fn_c_check_decl "$LINENO" "strmode" "ac_cv_have_decl_strmode" "$ac_includes_default"
-if test "x$ac_cv_have_decl_strmode" = xyes; then :
+if test "x$ac_cv_have_decl_strmode" = x""yes; then :
  ac_have_decl=1
 else
  ac_have_decl=0
@@ -13958,7 +14035,7 @@ _ACEOF
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the preprocessor supports include_next" >&5
 $as_echo_n "checking whether the preprocessor supports include_next... " >&6; }
-if ${gl_cv_have_include_next+:} false; then :
+if test "${gl_cv_have_include_next+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  rm -rf conftestd1a conftestd1b conftestd2
@@ -14038,7 +14115,7 @@ $as_echo "$gl_cv_have_include_next" >&6; }
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system header files limit the line length" >&5
 $as_echo_n "checking whether system header files limit the line length... " >&6; }
-if ${gl_cv_pragma_columns+:} false; then :
+if test "${gl_cv_pragma_columns+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
       cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14088,7 +14165,7 @@ $as_echo "$gl_cv_pragma_columns" >&6; }
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <getopt.h>" >&5
 $as_echo_n "checking absolute name of <getopt.h>... " >&6; }
-if ${gl_cv_next_getopt_h+:} false; then :
+if test "${gl_cv_next_getopt_h+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
@@ -14147,7 +14224,7 @@ $as_echo "$gl_cv_next_getopt_h" >&6; }
    for ac_header in getopt.h
 do :
  ac_fn_c_check_header_mongrel "$LINENO" "getopt.h" "ac_cv_header_getopt_h" "$ac_includes_default"
-if test "x$ac_cv_header_getopt_h" = xyes; then :
+if test "x$ac_cv_header_getopt_h" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_GETOPT_H 1
 _ACEOF
@@ -14164,7 +14241,7 @@ done
    for ac_func in getopt_long_only
 do :
  ac_fn_c_check_func "$LINENO" "getopt_long_only" "ac_cv_func_getopt_long_only"
-if test "x$ac_cv_func_getopt_long_only" = xyes; then :
+if test "x$ac_cv_func_getopt_long_only" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_GETOPT_LONG_ONLY 1
 _ACEOF
@@ -14179,7 +14256,7 @@ done
                    if test -z "$gl_replace_getopt"; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether getopt is POSIX compatible" >&5
 $as_echo_n "checking whether getopt is POSIX compatible... " >&6; }
-if ${gl_cv_func_getopt_posix+:} false; then :
+if test "${gl_cv_func_getopt_posix+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
@@ -14337,7 +14414,7 @@ $as_echo "$gl_cv_func_getopt_posix" >&6; }
  if test -z "$gl_replace_getopt" && test $gl_getopt_required = GNU; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working GNU getopt function" >&5
 $as_echo_n "checking for working GNU getopt function... " >&6; }
-if ${gl_cv_func_getopt_gnu+:} false; then :
+if test "${gl_cv_func_getopt_gnu+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  # Even with POSIXLY_CORRECT, the GNU extension of leading '-' in the
@@ -14449,7 +14526,7 @@ $as_echo "$gl_cv_func_getopt_gnu" >&6; }
  fi
 ac_fn_c_check_decl "$LINENO" "getenv" "ac_cv_have_decl_getenv" "$ac_includes_default"
-if test "x$ac_cv_have_decl_getenv" = xyes; then :
+if test "x$ac_cv_have_decl_getenv" = x""yes; then :
  ac_have_decl=1
 else
  ac_have_decl=0
@@ -14557,7 +14634,7 @@ done
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lstat correctly handles trailing slash" >&5
 $as_echo_n "checking whether lstat correctly handles trailing slash... " >&6; }
-if ${ac_cv_func_lstat_dereferences_slashed_symlink+:} false; then :
+if test "${ac_cv_func_lstat_dereferences_slashed_symlink+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  rm -f conftest.sym conftest.file
@@ -14687,7 +14764,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stdbool.h that conforms to C99" >&5
 $as_echo_n "checking for stdbool.h that conforms to C99... " >&6; }
-if ${ac_cv_header_stdbool_h+:} false; then :
+if test "${ac_cv_header_stdbool_h+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14762,7 +14839,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5
 $as_echo "$ac_cv_header_stdbool_h" >&6; }
   ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default"
-if test "x$ac_cv_type__Bool" = xyes; then :
+if test "x$ac_cv_type__Bool" = x""yes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE__BOOL 1
@@ -14780,7 +14857,7 @@ fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for wchar_t" >&5
 $as_echo_n "checking for wchar_t... " >&6; }
-if ${gt_cv_c_wchar_t+:} false; then :
+if test "${gt_cv_c_wchar_t+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14813,7 +14890,7 @@ $as_echo "#define HAVE_WCHAR_T 1" >>confdefs.h
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unsigned long long int" >&5
 $as_echo_n "checking for unsigned long long int... " >&6; }
-if ${ac_cv_type_unsigned_long_long_int+:} false; then :
+if test "${ac_cv_type_unsigned_long_long_int+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_cv_type_unsigned_long_long_int=yes
@@ -14871,7 +14948,7 @@ $as_echo "#define HAVE_UNSIGNED_LONG_LONG_INT 1" >>confdefs.h
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for long long int" >&5
 $as_echo_n "checking for long long int... " >&6; }
-if ${ac_cv_type_long_long_int+:} false; then :
+if test "${ac_cv_type_long_long_int+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_cv_type_long_long_int=yes
@@ -14934,7 +15011,7 @@ $as_echo "#define HAVE_LONG_LONG_INT 1" >>confdefs.h
 ac_fn_c_check_member "$LINENO" "struct tm" "tm_gmtoff" "ac_cv_member_struct_tm_tm_gmtoff" "#include <time.h>
 "
-if test "x$ac_cv_member_struct_tm_tm_gmtoff" = xyes; then :
+if test "x$ac_cv_member_struct_tm_tm_gmtoff" = x""yes; then :
 $as_echo "#define HAVE_TM_GMTOFF 1" >>confdefs.h
@@ -14947,7 +15024,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat file-mode macros are broken" >&5
 $as_echo_n "checking whether stat file-mode macros are broken... " >&6; }
-if ${ac_cv_header_stat_broken+:} false; then :
+if test "${ac_cv_header_stat_broken+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -14991,7 +15068,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
 $as_echo_n "checking for C/C++ restrict keyword... " >&6; }
-if ${ac_cv_c_restrict+:} false; then :
+if test "${ac_cv_c_restrict+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_cv_c_restrict=no
@@ -15041,7 +15118,7 @@ _ACEOF
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <time.h>" >&5
 $as_echo_n "checking for struct timespec in <time.h>... " >&6; }
-if ${gl_cv_sys_struct_timespec_in_time_h+:} false; then :
+if test "${gl_cv_sys_struct_timespec_in_time_h+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15074,7 +15151,7 @@ $as_echo "$gl_cv_sys_struct_timespec_in_time_h" >&6; }
  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <sys/time.h>" >&5
 $as_echo_n "checking for struct timespec in <sys/time.h>... " >&6; }
-if ${gl_cv_sys_struct_timespec_in_sys_time_h+:} false; then :
+if test "${gl_cv_sys_struct_timespec_in_sys_time_h+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15103,7 +15180,7 @@ $as_echo "$gl_cv_sys_struct_timespec_in_sys_time_h" >&6; }
    else
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for struct timespec in <pthread.h>" >&5
 $as_echo_n "checking for struct timespec in <pthread.h>... " >&6; }
-if ${gl_cv_sys_struct_timespec_in_pthread_h+:} false; then :
+if test "${gl_cv_sys_struct_timespec_in_pthread_h+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15152,7 +15229,7 @@ $as_echo "$gl_cv_sys_struct_timespec_in_pthread_h" >&6; }
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <time.h>" >&5
 $as_echo_n "checking absolute name of <time.h>... " >&6; }
-if ${gl_cv_next_time_h+:} false; then :
+if test "${gl_cv_next_time_h+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
@@ -15195,7 +15272,7 @@ $as_echo "$gl_cv_next_time_h" >&6; }
 ac_fn_c_check_decl "$LINENO" "localtime_r" "ac_cv_have_decl_localtime_r" "$ac_includes_default"
-if test "x$ac_cv_have_decl_localtime_r" = xyes; then :
+if test "x$ac_cv_have_decl_localtime_r" = x""yes; then :
  ac_have_decl=1
 else
  ac_have_decl=0
@@ -15283,7 +15360,7 @@ gl_save_LIBS=$LIBS
 # getloadvg is present in libc on glibc >= 2.2, MacOS X, FreeBSD >= 2.0,
 # NetBSD >= 0.9, OpenBSD >= 2.0, Solaris >= 7.
 ac_fn_c_check_func "$LINENO" "getloadavg" "ac_cv_func_getloadavg"
-if test "x$ac_cv_func_getloadavg" = xyes; then :
+if test "x$ac_cv_func_getloadavg" = x""yes; then :
 else
  gl_have_func=no
@@ -15296,7 +15373,7 @@ else
   if test $gl_have_func = no; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for elf_begin in -lelf" >&5
 $as_echo_n "checking for elf_begin in -lelf... " >&6; }
-if ${ac_cv_lib_elf_elf_begin+:} false; then :
+if test "${ac_cv_lib_elf_elf_begin+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -15330,13 +15407,13 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_elf_elf_begin" >&5
 $as_echo "$ac_cv_lib_elf_elf_begin" >&6; }
-if test "x$ac_cv_lib_elf_elf_begin" = xyes; then :
+if test "x$ac_cv_lib_elf_elf_begin" = x""yes; then :
  LIBS="-lelf $LIBS"
 fi
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kvm_open in -lkvm" >&5
 $as_echo_n "checking for kvm_open in -lkvm... " >&6; }
-if ${ac_cv_lib_kvm_kvm_open+:} false; then :
+if test "${ac_cv_lib_kvm_kvm_open+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -15370,14 +15447,14 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kvm_kvm_open" >&5
 $as_echo "$ac_cv_lib_kvm_kvm_open" >&6; }
-if test "x$ac_cv_lib_kvm_kvm_open" = xyes; then :
+if test "x$ac_cv_lib_kvm_kvm_open" = x""yes; then :
  LIBS="-lkvm $LIBS"
 fi
     # Check for the 4.4BSD definition of getloadavg.
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getloadavg in -lutil" >&5
 $as_echo_n "checking for getloadavg in -lutil... " >&6; }
-if ${ac_cv_lib_util_getloadavg+:} false; then :
+if test "${ac_cv_lib_util_getloadavg+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -15411,7 +15488,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_getloadavg" >&5
 $as_echo "$ac_cv_lib_util_getloadavg" >&6; }
-if test "x$ac_cv_lib_util_getloadavg" = xyes; then :
+if test "x$ac_cv_lib_util_getloadavg" = x""yes; then :
  LIBS="-lutil $LIBS" gl_have_func=yes
 fi
@@ -15424,7 +15501,7 @@ fi
     LIBS="-L/usr/local/lib $LIBS"
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for getloadavg in -lgetloadavg" >&5
 $as_echo_n "checking for getloadavg in -lgetloadavg... " >&6; }
-if ${ac_cv_lib_getloadavg_getloadavg+:} false; then :
+if test "${ac_cv_lib_getloadavg_getloadavg+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -15458,7 +15535,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_getloadavg_getloadavg" >&5
 $as_echo "$ac_cv_lib_getloadavg_getloadavg" >&6; }
-if test "x$ac_cv_lib_getloadavg_getloadavg" = xyes; then :
+if test "x$ac_cv_lib_getloadavg_getloadavg" = x""yes; then :
  LIBS="-lgetloadavg $LIBS" gl_have_func=yes
 else
  LIBS=$gl_getloadavg_LIBS
@@ -15484,7 +15561,7 @@ fi
 # Solaris has libkstat which does not require root.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for kstat_open in -lkstat" >&5
 $as_echo_n "checking for kstat_open in -lkstat... " >&6; }
-if ${ac_cv_lib_kstat_kstat_open+:} false; then :
+if test "${ac_cv_lib_kstat_kstat_open+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -15518,7 +15595,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kstat_kstat_open" >&5
 $as_echo "$ac_cv_lib_kstat_kstat_open" >&6; }
-if test "x$ac_cv_lib_kstat_kstat_open" = xyes; then :
+if test "x$ac_cv_lib_kstat_kstat_open" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBKSTAT 1
 _ACEOF
@@ -15534,7 +15611,7 @@ if test $gl_have_func = no; then
  for ac_func in pstat_getdynamic
 do :
  ac_fn_c_check_func "$LINENO" "pstat_getdynamic" "ac_cv_func_pstat_getdynamic"
-if test "x$ac_cv_func_pstat_getdynamic" = xyes; then :
+if test "x$ac_cv_func_pstat_getdynamic" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_PSTAT_GETDYNAMIC 1
 _ACEOF
@@ -15548,7 +15625,7 @@ fi
 if test $gl_have_func = no; then
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for perfstat_cpu_total in -lperfstat" >&5
 $as_echo_n "checking for perfstat_cpu_total in -lperfstat... " >&6; }
-if ${ac_cv_lib_perfstat_perfstat_cpu_total+:} false; then :
+if test "${ac_cv_lib_perfstat_perfstat_cpu_total+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -15582,7 +15659,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_perfstat_perfstat_cpu_total" >&5
 $as_echo "$ac_cv_lib_perfstat_perfstat_cpu_total" >&6; }
-if test "x$ac_cv_lib_perfstat_perfstat_cpu_total" = xyes; then :
+if test "x$ac_cv_lib_perfstat_perfstat_cpu_total" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBPERFSTAT 1
 _ACEOF
@@ -15596,14 +15673,14 @@ fi
 if test $gl_have_func = no; then
  ac_fn_c_check_header_mongrel "$LINENO" "sys/dg_sys_info.h" "ac_cv_header_sys_dg_sys_info_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_dg_sys_info_h" = xyes; then :
+if test "x$ac_cv_header_sys_dg_sys_info_h" = x""yes; then :
  gl_have_func=yes
 $as_echo "#define DGUX 1" >>confdefs.h
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dg_sys_info in -ldgc" >&5
 $as_echo_n "checking for dg_sys_info in -ldgc... " >&6; }
-if ${ac_cv_lib_dgc_dg_sys_info+:} false; then :
+if test "${ac_cv_lib_dgc_dg_sys_info+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -15637,7 +15714,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dgc_dg_sys_info" >&5
 $as_echo "$ac_cv_lib_dgc_dg_sys_info" >&6; }
-if test "x$ac_cv_lib_dgc_dg_sys_info" = xyes; then :
+if test "x$ac_cv_lib_dgc_dg_sys_info" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBDGC 1
 _ACEOF
@@ -15664,7 +15741,7 @@ fi
 if test $gl_have_func = no; then
  ac_fn_c_check_header_mongrel "$LINENO" "inq_stats/cpustats.h" "ac_cv_header_inq_stats_cpustats_h" "$ac_includes_default"
-if test "x$ac_cv_header_inq_stats_cpustats_h" = xyes; then :
+if test "x$ac_cv_header_inq_stats_cpustats_h" = x""yes; then :
  gl_have_func=yes
 $as_echo "#define UMAX 1" >>confdefs.h
@@ -15679,7 +15756,7 @@ fi
 if test $gl_have_func = no; then
  ac_fn_c_check_header_mongrel "$LINENO" "sys/cpustats.h" "ac_cv_header_sys_cpustats_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_cpustats_h" = xyes; then :
+if test "x$ac_cv_header_sys_cpustats_h" = x""yes; then :
  gl_have_func=yes; $as_echo "#define UMAX 1" >>confdefs.h
 fi
@@ -15691,7 +15768,7 @@ if test $gl_have_func = no; then
  for ac_header in mach/mach.h
 do :
  ac_fn_c_check_header_mongrel "$LINENO" "mach/mach.h" "ac_cv_header_mach_mach_h" "$ac_includes_default"
-if test "x$ac_cv_header_mach_mach_h" = xyes; then :
+if test "x$ac_cv_header_mach_mach_h" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_MACH_MACH_H 1
 _ACEOF
@@ -15705,13 +15782,13 @@ fi
 for ac_header in nlist.h
 do :
  ac_fn_c_check_header_mongrel "$LINENO" "nlist.h" "ac_cv_header_nlist_h" "$ac_includes_default"
-if test "x$ac_cv_header_nlist_h" = xyes; then :
+if test "x$ac_cv_header_nlist_h" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_NLIST_H 1
 _ACEOF
 ac_fn_c_check_member "$LINENO" "struct nlist" "n_un.n_name" "ac_cv_member_struct_nlist_n_un_n_name" "#include <nlist.h>
 "
-if test "x$ac_cv_member_struct_nlist_n_un_n_name" = xyes; then :
+if test "x$ac_cv_member_struct_nlist_n_un_n_name" = x""yes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_STRUCT_NLIST_N_UN_N_NAME 1
@@ -15765,7 +15842,7 @@ LIBS=$gl_save_LIBS
 for ac_header in sys/loadavg.h
 do :
  ac_fn_c_check_header_mongrel "$LINENO" "sys/loadavg.h" "ac_cv_header_sys_loadavg_h" "$ac_includes_default"
-if test "x$ac_cv_header_sys_loadavg_h" = xyes; then :
+if test "x$ac_cv_header_sys_loadavg_h" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_SYS_LOADAVG_H 1
 _ACEOF
@@ -15784,7 +15861,7 @@ ac_fn_c_check_decl "$LINENO" "getloadavg" "ac_cv_have_decl_getloadavg" "#if HAVE
   #endif
   #include <stdlib.h>
 "
-if test "x$ac_cv_have_decl_getloadavg" = xyes; then :
+if test "x$ac_cv_have_decl_getloadavg" = x""yes; then :
 else
  HAVE_DECL_GETLOADAVG=0
@@ -15893,7 +15970,7 @@ if test $APPLE_UNIVERSAL_BUILD = 1; then
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working mktime" >&5
 $as_echo_n "checking for working mktime... " >&6; }
-if ${ac_cv_func_working_mktime+:} false; then :
+if test "${ac_cv_func_working_mktime+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  if test "$cross_compiling" = yes; then :
@@ -16158,7 +16235,7 @@ fi
  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readlink signature is correct" >&5
 $as_echo_n "checking whether readlink signature is correct... " >&6; }
-if ${gl_cv_decl_readlink_works+:} false; then :
+if test "${gl_cv_decl_readlink_works+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16185,7 +16262,7 @@ fi
 $as_echo "$gl_cv_decl_readlink_works" >&6; }
            { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether readlink handles trailing slash correctly" >&5
 $as_echo_n "checking whether readlink handles trailing slash correctly... " >&6; }
-if ${gl_cv_func_readlink_works+:} false; then :
+if test "${gl_cv_func_readlink_works+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  # We have readlink, so assume ln -s works.
@@ -16263,7 +16340,7 @@ $as_echo "#define READLINK_TRAILING_SLASH_BUG 1" >>confdefs.h
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on directories" >&5
 $as_echo_n "checking whether stat handles trailing slashes on directories... " >&6; }
-if ${gl_cv_func_stat_dir_slash+:} false; then :
+if test "${gl_cv_func_stat_dir_slash+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  if test "$cross_compiling" = yes; then :
@@ -16298,7 +16375,7 @@ fi
 $as_echo "$gl_cv_func_stat_dir_slash" >&6; }
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stat handles trailing slashes on files" >&5
 $as_echo_n "checking whether stat handles trailing slashes on files... " >&6; }
-if ${gl_cv_func_stat_file_slash+:} false; then :
+if test "${gl_cv_func_stat_file_slash+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  touch conftest.tmp
@@ -16406,7 +16483,7 @@ $as_echo "#define REPLACE_FUNC_STAT_FILE 1" >>confdefs.h
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NULL can be used in arbitrary expressions" >&5
 $as_echo_n "checking whether NULL can be used in arbitrary expressions... " >&6; }
-if ${gl_cv_decl_null_works+:} false; then :
+if test "${gl_cv_decl_null_works+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -16449,7 +16526,7 @@ $as_echo "$gl_cv_decl_null_works" >&6; }
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stddef.h>" >&5
 $as_echo_n "checking absolute name of <stddef.h>... " >&6; }
-if ${gl_cv_next_stddef_h+:} false; then :
+if test "${gl_cv_next_stddef_h+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
@@ -16545,7 +16622,7 @@ $as_echo "$gl_cv_next_stddef_h" >&6; }
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdint.h>" >&5
 $as_echo_n "checking absolute name of <stdint.h>... " >&6; }
-if ${gl_cv_next_stdint_h+:} false; then :
+if test "${gl_cv_next_stdint_h+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
@@ -16601,7 +16678,7 @@ $as_echo "$gl_cv_next_stdint_h" >&6; }
    if test $ac_cv_header_stdint_h = yes; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stdint.h conforms to C99" >&5
 $as_echo_n "checking whether stdint.h conforms to C99... " >&6; }
-if ${gl_cv_header_working_stdint_h+:} false; then :
+if test "${gl_cv_header_working_stdint_h+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  gl_cv_header_working_stdint_h=no
@@ -16904,7 +16981,7 @@ done
  for gltype in ptrdiff_t size_t ; do
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
 $as_echo_n "checking for bit size of $gltype... " >&6; }
-if eval \${gl_cv_bitsizeof_${gltype}+:} false; then :
+if eval "test \"\${gl_cv_bitsizeof_${gltype}+set}\"" = set; then :
  $as_echo_n "(cached) " >&6
 else
  if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result"        "
@@ -16949,7 +17026,7 @@ _ACEOF
  for gltype in sig_atomic_t wchar_t wint_t ; do
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for bit size of $gltype" >&5
 $as_echo_n "checking for bit size of $gltype... " >&6; }
-if eval \${gl_cv_bitsizeof_${gltype}+:} false; then :
+if eval "test \"\${gl_cv_bitsizeof_${gltype}+set}\"" = set; then :
  $as_echo_n "(cached) " >&6
 else
  if ac_fn_c_compute_int "$LINENO" "sizeof ($gltype) * CHAR_BIT" "result"        "
@@ -16993,7 +17070,7 @@ _ACEOF
  for gltype in sig_atomic_t wchar_t wint_t ; do
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $gltype is signed" >&5
 $as_echo_n "checking whether $gltype is signed... " >&6; }
-if eval \${gl_cv_type_${gltype}_signed+:} false; then :
+if eval "test \"\${gl_cv_type_${gltype}_signed+set}\"" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -17052,7 +17129,7 @@ _ACEOF
  for gltype in ptrdiff_t size_t ; do
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
 $as_echo_n "checking for $gltype integer literal suffix... " >&6; }
-if eval \${gl_cv_type_${gltype}_suffix+:} false; then :
+if eval "test \"\${gl_cv_type_${gltype}_suffix+set}\"" = set; then :
  $as_echo_n "(cached) " >&6
 else
  eval gl_cv_type_${gltype}_suffix=no
@@ -17124,7 +17201,7 @@ _ACEOF
  for gltype in sig_atomic_t wchar_t wint_t ; do
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $gltype integer literal suffix" >&5
 $as_echo_n "checking for $gltype integer literal suffix... " >&6; }
-if eval \${gl_cv_type_${gltype}_suffix+:} false; then :
+if eval "test \"\${gl_cv_type_${gltype}_suffix+set}\"" = set; then :
  $as_echo_n "(cached) " >&6
 else
  eval gl_cv_type_${gltype}_suffix=no
@@ -17211,7 +17288,7 @@ _ACEOF
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <stdlib.h>" >&5
 $as_echo_n "checking absolute name of <stdlib.h>... " >&6; }
-if ${gl_cv_next_stdlib_h+:} false; then :
+if test "${gl_cv_next_stdlib_h+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
@@ -17299,7 +17376,7 @@ $as_echo "#define my_strftime nstrftime" >>confdefs.h
  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether symlink handles trailing slash correctly" >&5
 $as_echo_n "checking whether symlink handles trailing slash correctly... " >&6; }
-if ${gl_cv_func_symlink_works+:} false; then :
+if test "${gl_cv_func_symlink_works+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  if test "$cross_compiling" = yes; then :
@@ -17382,7 +17459,7 @@ $as_echo "$gl_cv_func_symlink_works" >&6; }
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <sys/stat.h>" >&5
 $as_echo_n "checking absolute name of <sys/stat.h>... " >&6; }
-if ${gl_cv_next_sys_stat_h+:} false; then :
+if test "${gl_cv_next_sys_stat_h+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
@@ -17432,7 +17509,7 @@ $as_echo "$gl_cv_next_sys_stat_h" >&6; }
      ac_fn_c_check_type "$LINENO" "nlink_t" "ac_cv_type_nlink_t" "#include <sys/types.h>
     #include <sys/stat.h>
 "
-if test "x$ac_cv_type_nlink_t" = xyes; then :
+if test "x$ac_cv_type_nlink_t" = x""yes; then :
 else
@@ -17465,7 +17542,7 @@ fi
    HAVE_LOCALTIME_R=1
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether localtime_r is compatible with its POSIX signature" >&5
 $as_echo_n "checking whether localtime_r is compatible with its POSIX signature... " >&6; }
-if ${gl_cv_time_r_posix+:} false; then :
+if test "${gl_cv_time_r_posix+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -17547,7 +17624,7 @@ $as_echo "$gl_cv_time_r_posix" >&6; }
     else
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <unistd.h>" >&5
 $as_echo_n "checking absolute name of <unistd.h>... " >&6; }
-if ${gl_cv_next_unistd_h+:} false; then :
+if test "${gl_cv_next_unistd_h+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
@@ -17647,7 +17724,7 @@ $as_echo "$gl_cv_next_unistd_h" >&6; }
 for ac_func in grantpt
 do :
  ac_fn_c_check_func "$LINENO" "grantpt" "ac_cv_func_grantpt"
-if test "x$ac_cv_func_grantpt" = xyes; then :
+if test "x$ac_cv_func_grantpt" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_GRANTPT 1
 _ACEOF
@@ -17660,7 +17737,7 @@ done
 for ac_func in getpt
 do :
  ac_fn_c_check_func "$LINENO" "getpt" "ac_cv_func_getpt"
-if test "x$ac_cv_func_getpt" = xyes; then :
+if test "x$ac_cv_func_getpt" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_GETPT 1
 _ACEOF
@@ -17677,7 +17754,7 @@ done
 have_tputs_et_al=true
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing tputs" >&5
 $as_echo_n "checking for library containing tputs... " >&6; }
-if ${ac_cv_search_tputs+:} false; then :
+if test "${ac_cv_search_tputs+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_func_search_save_LIBS=$LIBS
@@ -17711,11 +17788,11 @@ for ac_lib in '' ncurses terminfo termcap; do
 fi
 rm -f core conftest.err conftest.$ac_objext \
    conftest$ac_exeext
-  if ${ac_cv_search_tputs+:} false; then :
+  if test "${ac_cv_search_tputs+set}" = set; then :
  break
 fi
 done
-if ${ac_cv_search_tputs+:} false; then :
+if test "${ac_cv_search_tputs+set}" = set; then :
 else
  ac_cv_search_tputs=no
@@ -17774,7 +17851,7 @@ case "$opsys" in
  freebsd)
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether FreeBSD is new enough to use terminfo" >&5
 $as_echo_n "checking whether FreeBSD is new enough to use terminfo... " >&6; }
-    if ${emacs_cv_freebsd_terminfo+:} false; then :
+    if test "${emacs_cv_freebsd_terminfo+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -17916,16 +17993,16 @@ LIBHESIOD=
 if test "$with_hesiod" != no ; then
  # Don't set $LIBS here -- see comments above.  FIXME which comments?
  ac_fn_c_check_func "$LINENO" "res_send" "ac_cv_func_res_send"
-if test "x$ac_cv_func_res_send" = xyes; then :
+if test "x$ac_cv_func_res_send" = x""yes; then :
 else
  ac_fn_c_check_func "$LINENO" "__res_send" "ac_cv_func___res_send"
-if test "x$ac_cv_func___res_send" = xyes; then :
+if test "x$ac_cv_func___res_send" = x""yes; then :
 else
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for res_send in -lresolv" >&5
 $as_echo_n "checking for res_send in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv_res_send+:} false; then :
+if test "${ac_cv_lib_resolv_res_send+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -17959,12 +18036,12 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv_res_send" >&5
 $as_echo "$ac_cv_lib_resolv_res_send" >&6; }
-if test "x$ac_cv_lib_resolv_res_send" = xyes; then :
+if test "x$ac_cv_lib_resolv_res_send" = x""yes; then :
  resolv=yes
 else
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __res_send in -lresolv" >&5
 $as_echo_n "checking for __res_send in -lresolv... " >&6; }
-if ${ac_cv_lib_resolv___res_send+:} false; then :
+if test "${ac_cv_lib_resolv___res_send+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -17998,7 +18075,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_resolv___res_send" >&5
 $as_echo "$ac_cv_lib_resolv___res_send" >&6; }
-if test "x$ac_cv_lib_resolv___res_send" = xyes; then :
+if test "x$ac_cv_lib_resolv___res_send" = x""yes; then :
  resolv=yes
 fi
@@ -18014,12 +18091,12 @@ fi
    RESOLVLIB=
  fi
  ac_fn_c_check_func "$LINENO" "hes_getmailhost" "ac_cv_func_hes_getmailhost"
-if test "x$ac_cv_func_hes_getmailhost" = xyes; then :
+if test "x$ac_cv_func_hes_getmailhost" = x""yes; then :
 else
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hes_getmailhost in -lhesiod" >&5
 $as_echo_n "checking for hes_getmailhost in -lhesiod... " >&6; }
-if ${ac_cv_lib_hesiod_hes_getmailhost+:} false; then :
+if test "${ac_cv_lib_hesiod_hes_getmailhost+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -18053,7 +18130,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hesiod_hes_getmailhost" >&5
 $as_echo "$ac_cv_lib_hesiod_hes_getmailhost" >&6; }
-if test "x$ac_cv_lib_hesiod_hes_getmailhost" = xyes; then :
+if test "x$ac_cv_lib_hesiod_hes_getmailhost" = x""yes; then :
  hesiod=yes
 else
  :
@@ -18092,7 +18169,7 @@ KRB4LIB=
 if test "${with_kerberos}" != no; then
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for com_err in -lcom_err" >&5
 $as_echo_n "checking for com_err in -lcom_err... " >&6; }
-if ${ac_cv_lib_com_err_com_err+:} false; then :
+if test "${ac_cv_lib_com_err_com_err+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -18126,7 +18203,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_com_err_com_err" >&5
 $as_echo "$ac_cv_lib_com_err_com_err" >&6; }
-if test "x$ac_cv_lib_com_err_com_err" = xyes; then :
+if test "x$ac_cv_lib_com_err_com_err" = x""yes; then :
  have_com_err=yes
 else
  have_com_err=no
@@ -18141,7 +18218,7 @@ $as_echo "#define HAVE_LIBCOM_ERR 1" >>confdefs.h
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mit_des_cbc_encrypt in -lcrypto" >&5
 $as_echo_n "checking for mit_des_cbc_encrypt in -lcrypto... " >&6; }
-if ${ac_cv_lib_crypto_mit_des_cbc_encrypt+:} false; then :
+if test "${ac_cv_lib_crypto_mit_des_cbc_encrypt+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -18175,7 +18252,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypto_mit_des_cbc_encrypt" >&5
 $as_echo "$ac_cv_lib_crypto_mit_des_cbc_encrypt" >&6; }
-if test "x$ac_cv_lib_crypto_mit_des_cbc_encrypt" = xyes; then :
+if test "x$ac_cv_lib_crypto_mit_des_cbc_encrypt" = x""yes; then :
  have_crypto=yes
 else
  have_crypto=no
@@ -18190,7 +18267,7 @@ $as_echo "#define HAVE_LIBCRYPTO 1" >>confdefs.h
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mit_des_cbc_encrypt in -lk5crypto" >&5
 $as_echo_n "checking for mit_des_cbc_encrypt in -lk5crypto... " >&6; }
-if ${ac_cv_lib_k5crypto_mit_des_cbc_encrypt+:} false; then :
+if test "${ac_cv_lib_k5crypto_mit_des_cbc_encrypt+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -18224,7 +18301,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&5
 $as_echo "$ac_cv_lib_k5crypto_mit_des_cbc_encrypt" >&6; }
-if test "x$ac_cv_lib_k5crypto_mit_des_cbc_encrypt" = xyes; then :
+if test "x$ac_cv_lib_k5crypto_mit_des_cbc_encrypt" = x""yes; then :
  have_k5crypto=yes
 else
  have_k5crypto=no
@@ -18239,7 +18316,7 @@ $as_echo "#define HAVE_LIBK5CRYPTO 1" >>confdefs.h
  fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_init_context in -lkrb5" >&5
 $as_echo_n "checking for krb5_init_context in -lkrb5... " >&6; }
-if ${ac_cv_lib_krb5_krb5_init_context+:} false; then :
+if test "${ac_cv_lib_krb5_krb5_init_context+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -18273,7 +18350,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_krb5_krb5_init_context" >&5
 $as_echo "$ac_cv_lib_krb5_krb5_init_context" >&6; }
-if test "x$ac_cv_lib_krb5_krb5_init_context" = xyes; then :
+if test "x$ac_cv_lib_krb5_krb5_init_context" = x""yes; then :
  have_krb5=yes
 else
  have_krb5=no
@@ -18289,7 +18366,7 @@ $as_echo "#define HAVE_LIBKRB5 1" >>confdefs.h
    if test "${with_kerberos5}" = no; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for des_cbc_encrypt in -ldes425" >&5
 $as_echo_n "checking for des_cbc_encrypt in -ldes425... " >&6; }
-if ${ac_cv_lib_des425_des_cbc_encrypt+:} false; then :
+if test "${ac_cv_lib_des425_des_cbc_encrypt+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -18323,7 +18400,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_des425_des_cbc_encrypt" >&5
 $as_echo "$ac_cv_lib_des425_des_cbc_encrypt" >&6; }
-if test "x$ac_cv_lib_des425_des_cbc_encrypt" = xyes; then :
+if test "x$ac_cv_lib_des425_des_cbc_encrypt" = x""yes; then :
  have_des425=yes
 else
  have_des425=no
@@ -18338,7 +18415,7 @@ $as_echo "#define HAVE_LIBDES425 1" >>confdefs.h
    else
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for des_cbc_encrypt in -ldes" >&5
 $as_echo_n "checking for des_cbc_encrypt in -ldes... " >&6; }
-if ${ac_cv_lib_des_des_cbc_encrypt+:} false; then :
+if test "${ac_cv_lib_des_des_cbc_encrypt+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -18372,7 +18449,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_des_des_cbc_encrypt" >&5
 $as_echo "$ac_cv_lib_des_des_cbc_encrypt" >&6; }
-if test "x$ac_cv_lib_des_des_cbc_encrypt" = xyes; then :
+if test "x$ac_cv_lib_des_des_cbc_encrypt" = x""yes; then :
  have_des=yes
 else
  have_des=no
@@ -18388,7 +18465,7 @@ $as_echo "#define HAVE_LIBDES 1" >>confdefs.h
    fi
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb_get_cred in -lkrb4" >&5
 $as_echo_n "checking for krb_get_cred in -lkrb4... " >&6; }
-if ${ac_cv_lib_krb4_krb_get_cred+:} false; then :
+if test "${ac_cv_lib_krb4_krb_get_cred+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -18422,7 +18499,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_krb4_krb_get_cred" >&5
 $as_echo "$ac_cv_lib_krb4_krb_get_cred" >&6; }
-if test "x$ac_cv_lib_krb4_krb_get_cred" = xyes; then :
+if test "x$ac_cv_lib_krb4_krb_get_cred" = x""yes; then :
  have_krb4=yes
 else
  have_krb4=no
@@ -18437,7 +18514,7 @@ $as_echo "#define HAVE_LIBKRB4 1" >>confdefs.h
    else
      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb_get_cred in -lkrb" >&5
 $as_echo_n "checking for krb_get_cred in -lkrb... " >&6; }
-if ${ac_cv_lib_krb_krb_get_cred+:} false; then :
+if test "${ac_cv_lib_krb_krb_get_cred+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -18471,7 +18548,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_krb_krb_get_cred" >&5
 $as_echo "$ac_cv_lib_krb_krb_get_cred" >&6; }
-if test "x$ac_cv_lib_krb_krb_get_cred" = xyes; then :
+if test "x$ac_cv_lib_krb_krb_get_cred" = x""yes; then :
  have_krb=yes
 else
  have_krb=no
@@ -18491,13 +18568,13 @@ $as_echo "#define HAVE_LIBKRB 1" >>confdefs.h
    for ac_header in krb5.h
 do :
  ac_fn_c_check_header_mongrel "$LINENO" "krb5.h" "ac_cv_header_krb5_h" "$ac_includes_default"
-if test "x$ac_cv_header_krb5_h" = xyes; then :
+if test "x$ac_cv_header_krb5_h" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_KRB5_H 1
 _ACEOF
 ac_fn_c_check_member "$LINENO" "krb5_error" "text" "ac_cv_member_krb5_error_text" "#include <krb5.h>
 "
-if test "x$ac_cv_member_krb5_error_text" = xyes; then :
+if test "x$ac_cv_member_krb5_error_text" = x""yes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_KRB5_ERROR_TEXT 1
@@ -18507,7 +18584,7 @@ _ACEOF
 fi
 ac_fn_c_check_member "$LINENO" "krb5_error" "e_text" "ac_cv_member_krb5_error_e_text" "#include <krb5.h>
 "
-if test "x$ac_cv_member_krb5_error_e_text" = xyes; then :
+if test "x$ac_cv_member_krb5_error_e_text" = x""yes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_KRB5_ERROR_E_TEXT 1
@@ -18524,7 +18601,7 @@ done
    for ac_header in des.h
 do :
  ac_fn_c_check_header_mongrel "$LINENO" "des.h" "ac_cv_header_des_h" "$ac_includes_default"
-if test "x$ac_cv_header_des_h" = xyes; then :
+if test "x$ac_cv_header_des_h" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_DES_H 1
 _ACEOF
@@ -18533,7 +18610,7 @@ else
  for ac_header in kerberosIV/des.h
 do :
  ac_fn_c_check_header_mongrel "$LINENO" "kerberosIV/des.h" "ac_cv_header_kerberosIV_des_h" "$ac_includes_default"
-if test "x$ac_cv_header_kerberosIV_des_h" = xyes; then :
+if test "x$ac_cv_header_kerberosIV_des_h" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_KERBEROSIV_DES_H 1
 _ACEOF
@@ -18542,7 +18619,7 @@ else
  for ac_header in kerberos/des.h
 do :
  ac_fn_c_check_header_mongrel "$LINENO" "kerberos/des.h" "ac_cv_header_kerberos_des_h" "$ac_includes_default"
-if test "x$ac_cv_header_kerberos_des_h" = xyes; then :
+if test "x$ac_cv_header_kerberos_des_h" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_KERBEROS_DES_H 1
 _ACEOF
@@ -18562,7 +18639,7 @@ done
    for ac_header in krb.h
 do :
  ac_fn_c_check_header_mongrel "$LINENO" "krb.h" "ac_cv_header_krb_h" "$ac_includes_default"
-if test "x$ac_cv_header_krb_h" = xyes; then :
+if test "x$ac_cv_header_krb_h" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_KRB_H 1
 _ACEOF
@@ -18571,7 +18648,7 @@ else
  for ac_header in kerberosIV/krb.h
 do :
  ac_fn_c_check_header_mongrel "$LINENO" "kerberosIV/krb.h" "ac_cv_header_kerberosIV_krb_h" "$ac_includes_default"
-if test "x$ac_cv_header_kerberosIV_krb_h" = xyes; then :
+if test "x$ac_cv_header_kerberosIV_krb_h" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_KERBEROSIV_KRB_H 1
 _ACEOF
@@ -18580,7 +18657,7 @@ else
  for ac_header in kerberos/krb.h
 do :
  ac_fn_c_check_header_mongrel "$LINENO" "kerberos/krb.h" "ac_cv_header_kerberos_krb_h" "$ac_includes_default"
-if test "x$ac_cv_header_kerberos_krb_h" = xyes; then :
+if test "x$ac_cv_header_kerberos_krb_h" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_KERBEROS_KRB_H 1
 _ACEOF
@@ -18601,7 +18678,7 @@ done
  for ac_header in com_err.h
 do :
  ac_fn_c_check_header_mongrel "$LINENO" "com_err.h" "ac_cv_header_com_err_h" "$ac_includes_default"
-if test "x$ac_cv_header_com_err_h" = xyes; then :
+if test "x$ac_cv_header_com_err_h" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_COM_ERR_H 1
 _ACEOF
@@ -18622,7 +18699,7 @@ fi
 # to return localized messages.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dgettext in -lintl" >&5
 $as_echo_n "checking for dgettext in -lintl... " >&6; }
-if ${ac_cv_lib_intl_dgettext+:} false; then :
+if test "${ac_cv_lib_intl_dgettext+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  ac_check_lib_save_LIBS=$LIBS
@@ -18656,7 +18733,7 @@ LIBS=$ac_check_lib_save_LIBS
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_intl_dgettext" >&5
 $as_echo "$ac_cv_lib_intl_dgettext" >&6; }
-if test "x$ac_cv_lib_intl_dgettext" = xyes; then :
+if test "x$ac_cv_lib_intl_dgettext" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBINTL 1
 _ACEOF
@@ -18668,7 +18745,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether localtime caches TZ" >&5
 $as_echo_n "checking whether localtime caches TZ... " >&6; }
-if ${emacs_cv_localtime_cache+:} false; then :
+if test "${emacs_cv_localtime_cache+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  if test x$ac_cv_func_tzset = xyes; then
@@ -18727,7 +18804,7 @@ if test "x$HAVE_TIMEVAL" = xyes; then
  for ac_func in gettimeofday
 do :
  ac_fn_c_check_func "$LINENO" "gettimeofday" "ac_cv_func_gettimeofday"
-if test "x$ac_cv_func_gettimeofday" = xyes; then :
+if test "x$ac_cv_func_gettimeofday" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_GETTIMEOFDAY 1
 _ACEOF
@@ -18738,7 +18815,7 @@ done
  if test $ac_cv_func_gettimeofday = yes; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether gettimeofday can accept two arguments" >&5
 $as_echo_n "checking whether gettimeofday can accept two arguments... " >&6; }
-if ${emacs_cv_gettimeofday_two_arguments+:} false; then :
+if test "${emacs_cv_gettimeofday_two_arguments+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -18782,7 +18859,7 @@ fi
 ok_so_far=yes
 ac_fn_c_check_func "$LINENO" "socket" "ac_cv_func_socket"
-if test "x$ac_cv_func_socket" = xyes; then :
+if test "x$ac_cv_func_socket" = x""yes; then :
 else
  ok_so_far=no
@@ -18790,7 +18867,7 @@ fi
 if test $ok_so_far = yes; then
  ac_fn_c_check_header_mongrel "$LINENO" "netinet/in.h" "ac_cv_header_netinet_in_h" "$ac_includes_default"
-if test "x$ac_cv_header_netinet_in_h" = xyes; then :
+if test "x$ac_cv_header_netinet_in_h" = x""yes; then :
 else
  ok_so_far=no
@@ -18800,7 +18877,7 @@ fi
 fi
 if test $ok_so_far = yes; then
  ac_fn_c_check_header_mongrel "$LINENO" "arpa/inet.h" "ac_cv_header_arpa_inet_h" "$ac_includes_default"
-if test "x$ac_cv_header_arpa_inet_h" = xyes; then :
+if test "x$ac_cv_header_arpa_inet_h" = x""yes; then :
 else
  ok_so_far=no
@@ -18834,7 +18911,7 @@ $as_echo "no" >&6; }
 fi
 ac_fn_c_check_type "$LINENO" "pid_t" "ac_cv_type_pid_t" "$ac_includes_default"
-if test "x$ac_cv_type_pid_t" = xyes; then :
+if test "x$ac_cv_type_pid_t" = x""yes; then :
 else
@@ -18847,7 +18924,7 @@ fi
 for ac_header in vfork.h
 do :
  ac_fn_c_check_header_mongrel "$LINENO" "vfork.h" "ac_cv_header_vfork_h" "$ac_includes_default"
-if test "x$ac_cv_header_vfork_h" = xyes; then :
+if test "x$ac_cv_header_vfork_h" = x""yes; then :
  cat >>confdefs.h <<_ACEOF
 #define HAVE_VFORK_H 1
 _ACEOF
@@ -18871,7 +18948,7 @@ done
 if test "x$ac_cv_func_fork" = xyes; then
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working fork" >&5
 $as_echo_n "checking for working fork... " >&6; }
-if ${ac_cv_func_fork_works+:} false; then :
+if test "${ac_cv_func_fork_works+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  if test "$cross_compiling" = yes; then :
@@ -18924,7 +19001,7 @@ ac_cv_func_vfork_works=$ac_cv_func_vfork
 if test "x$ac_cv_func_vfork" = xyes; then
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working vfork" >&5
 $as_echo_n "checking for working vfork... " >&6; }
-if ${ac_cv_func_vfork_works+:} false; then :
+if test "${ac_cv_func_vfork_works+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  if test "$cross_compiling" = yes; then :
@@ -19060,7 +19137,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nl_langinfo and CODESET" >&5
 $as_echo_n "checking for nl_langinfo and CODESET... " >&6; }
-if ${emacs_cv_langinfo_codeset+:} false; then :
+if test "${emacs_cv_langinfo_codeset+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -19092,7 +19169,7 @@ $as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
 fi
 ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
-if test "x$ac_cv_type_size_t" = xyes; then :
+if test "x$ac_cv_type_size_t" = x""yes; then :
 cat >>confdefs.h <<_ACEOF
 #define HAVE_SIZE_T 1
@@ -19104,7 +19181,7 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mbstate_t" >&5
 $as_echo_n "checking for mbstate_t... " >&6; }
-if ${ac_cv_type_mbstate_t+:} false; then :
+if test "${ac_cv_type_mbstate_t+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -19140,7 +19217,7 @@ $as_echo "#define mbstate_t int" >>confdefs.h
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for C restricted array declarations" >&5
 $as_echo_n "checking for C restricted array declarations... " >&6; }
-if ${emacs_cv_c_restrict_arr+:} false; then :
+if test "${emacs_cv_c_restrict_arr+set}" = set; then :
  $as_echo_n "(cached) " >&6
 else
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -19737,21 +19814,10 @@ $as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
     :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
  if test -w "$cache_file"; then
-    if test "x$cache_file" != "x/dev/null"; then
+    test "x$cache_file" != "x/dev/null" &&
      { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-      if test ! -f "$cache_file" || test -h "$cache_file"; then
+    cat confcache >$cache_file
-        cat confcache >"$cache_file"
-      else
-        case $cache_file in #(
-        */* | ?:*)
-          mv -f confcache "$cache_file"$$ &&
-          mv -f "$cache_file"$$ "$cache_file" ;; #(
-        *)
-          mv -f confcache "$cache_file" ;;
-        esac
-      fi
-    fi
  else
    { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -19837,7 +19903,7 @@ fi
-: "${CONFIG_STATUS=./config.status}"
+: ${CONFIG_STATUS=./config.status}
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -19938,7 +20004,6 @@ fi
 IFS=" ""        $as_nl"
 # Find who we are.  Look in the path if we contain no directory separator.
-as_myself=
 case $0 in #((
  *[\\/]* ) as_myself=$0 ;;
  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -20246,7 +20311,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # values after options handling.
 ac_log="
 This file was extended by emacs $as_me 24.0.50, which was
-generated by GNU Autoconf 2.68.  Invocation command line was
+generated by GNU Autoconf 2.67.  Invocation command line was
  CONFIG_FILES    = $CONFIG_FILES
  CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -20312,7 +20377,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
 emacs config.status 24.0.50
-configured by $0, generated by GNU Autoconf 2.68,
+configured by $0, generated by GNU Autoconf 2.67,
  with options \\"\$ac_cs_config\\"
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -20460,7 +20525,7 @@ do
    "epaths") CONFIG_COMMANDS="$CONFIG_COMMANDS epaths" ;;
    "gdbinit") CONFIG_COMMANDS="$CONFIG_COMMANDS gdbinit" ;;
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
  esac
 done
@@ -20483,10 +20548,9 @@ fi
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp= ac_tmp=
+  tmp=
  trap 'exit_status=$?
-  : "${ac_tmp:=$tmp}"
+  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
-  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
  trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -20494,13 +20558,12 @@ $debug ||
 {
  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -d "$tmp"
+  test -n "$tmp" && test -d "$tmp"
 }  ||
 {
  tmp=./conf$$-$RANDOM
  (umask 077 && mkdir "$tmp")
 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
-ac_tmp=$tmp
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -20539,13 +20602,13 @@ else
  ac_cs_awk_cr=$ac_cr
 fi
-echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+echo 'BEGIN {' >"$tmp/subs1.awk" &&
 _ACEOF
 # Create commands to substitute file output variables.
 {
  echo "cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1" &&
-  echo 'cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&' &&
+  echo 'cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&' &&
  echo "$ac_subst_files" | sed 's/.*/F["&"]="$&"/' &&
  echo "_ACAWK" &&
  echo "_ACEOF"
@@ -20578,7 +20641,7 @@ done
 rm -f conf$$subs.sh
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -20626,7 +20689,7 @@ t delim
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$tmp/subs1.awk" <<_ACAWK &&
  for (key in S) S_is_set[key] = 1
  FS = ""
  \$ac_cs_awk_pipe_init
@@ -20664,7 +20727,7 @@ if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
  cat
-fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
@@ -20698,7 +20761,7 @@ fi # test -n "$CONFIG_FILES"
 # No need to generate them if there are no CONFIG_HEADERS.
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
-cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
+cat >"$tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
@@ -20710,8 +20773,8 @@ _ACEOF
 # handling of long lines.
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
-  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_tt"; then
+  if test -z "$ac_t"; then
    break
  elif $ac_last_try; then
    as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
@@ -20812,7 +20875,7 @@ do
  esac
  case $ac_mode$ac_tag in
  :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
  :[FH]-) ac_tag=-:-;;
  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
  esac
@@ -20831,7 +20894,7 @@ do
    for ac_f
    do
      case $ac_f in
-      -) ac_f="$ac_tmp/stdin";;
+      -) ac_f="$tmp/stdin";;
      *) # Look for the file first in the build tree, then in the source tree
         # (if the path is not absolute).  The absolute path cannot be DOS-style,
         # because $ac_f cannot contain `:'.
@@ -20840,7 +20903,7 @@ do
           [\\/$]*) false;;
           *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
           esac ||
-           as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+           as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
      esac
      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
      as_fn_append ac_file_inputs " '$ac_f'"
@@ -20866,8 +20929,8 @@ $as_echo "$as_me: creating $ac_file" >&6;}
    esac
    case $ac_tag in
-    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
    esac
    ;;
  esac
@@ -21005,25 +21068,24 @@ $ac_datarootdir_hack
 "
 eval sed \"\$ac_sed_extra\" "$ac_file_inputs" |
 if $ac_cs_awk_getline; then
-  $AWK -f "$ac_tmp/subs.awk"
+  $AWK -f "$tmp/subs.awk"
 else
-  $AWK -f "$ac_tmp/subs.awk" | $SHELL
+  $AWK -f "$tmp/subs.awk" | $SHELL
-fi \
+fi >$tmp/out \
-  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[  ]*datarootdir[  ]*:*=/p' \
+  { ac_out=`sed -n '/^[  ]*datarootdir[  ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
-      "$ac_tmp/out"`; test -z "$ac_out"; } &&
  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
-  rm -f "$ac_tmp/stdin"
+  rm -f "$tmp/stdin"
  case $ac_file in
-  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
  esac \
  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 ;;
@@ -21034,20 +21096,20 @@ which seems to be undefined.  Please make sure it is defined" >&2;}
  if test x"$ac_file" != x-; then
    {
      $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$ac_tmp/config.h" \
+    } >"$tmp/config.h" \
      || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
+    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
      { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
    else
      rm -f "$ac_file"
-      mv "$ac_tmp/config.h" "$ac_file" \
+      mv "$tmp/config.h" "$ac_file" \
        || as_fn_error $? "could not create $ac_file" "$LINENO" 5
    fi
  else
    $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
+      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
      || as_fn_error $? "could not create -" "$LINENO" 5
  fi
 # Compute "$ac_file"'s index in $config_headers.
diff --git a/configure.in b/configure.in
index 710f0945066..69d1a1e5bd3 100644
--- a/configure.in
+++ b/configure.in
@@ -162,7 +162,7 @@ OPTION_DEFAULT_ON([m17n-flt],[don't use m17n-flt for text shaping])
 OPTION_DEFAULT_ON([toolkit-scroll-bars],[don't use Motif or Xaw3d scroll bars])
 OPTION_DEFAULT_ON([xaw3d],[don't use Xaw3d])
 OPTION_DEFAULT_ON([xim],[don't use X11 XIM])
-OPTION_DEFAULT_OFF([ns],[use nextstep (Cocoa or GNUstep) windowing system])
+OPTION_DEFAULT_OFF([ns],[use NeXTstep (Cocoa or GNUstep) windowing system])
 OPTION_DEFAULT_ON([gpm],[don't use -lgpm for mouse support on a GNU/Linux console])
 OPTION_DEFAULT_ON([dbus],[don't compile with D-Bus support])
@@ -2244,15 +2244,23 @@ if test "${HAVE_X11}" = "yes"; then
      fi                          # "$HAVE_XFT" != no
    fi                            # "x${with_xft}" != "xno"
-    dnl For the "Does Emacs use" message at the end.
+    ## We used to allow building with FreeType and without Xft.
+    ## However, the ftx font backend driver is not in good shape.
    if test "$HAVE_XFT" != "yes"; then
+       dnl For the "Does Emacs use" message at the end.
       HAVE_XFT=no
+       HAVE_FREETYPE=no
+    else
+       dnl Strict linkers fail with
+       dnl ftfont.o: undefined reference to symbol 'FT_New_Face'
+       dnl if -lfreetype is not specified.
+       dnl The following is needed to set FREETYPE_LIBS.
+       PKG_CHECK_MODULES(FREETYPE, freetype2, HAVE_FREETYPE=yes,
+                         HAVE_FREETYPE=no) 
+       test "$HAVE_FREETYPE" = "no" && AC_MSG_ERROR(libxft requires libfreetype)
    fi
-    ## We used to allow building with FreeType and without Xft.
-    ## However, the ftx font backend driver is not in good shape.
-    HAVE_FREETYPE=$HAVE_XFT
    HAVE_LIBOTF=no
    if test "${HAVE_FREETYPE}" = "yes"; then
      AC_DEFINE(HAVE_FREETYPE, 1,
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 8438fa4952c..dc43450110f 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,12 @@
+2011-03-03  Drake Wilson  <drake@begriffli.ch>  (tiny change)
+        * misc.texi (emacsclient Options): Add q/quiet.
+2011-03-02  Glenn Morris  <rgm@gnu.org>
+        * mule.texi (Communication Coding) <x-select-request-type>:
+        Remove duplicate (essentially) paragraph.  (Bug#8148)
 2011-03-01  Christoph Scholtes  <cschol2112@googlemail.com>
        * maintaining.texi (Format of ChangeLog): Add reference to
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index d7143d1498a..1299895a06e 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -1672,6 +1672,11 @@ all server buffers are finished.  You can take as long as you like to
 edit the server buffers within Emacs, and they are @emph{not} killed
 when you type @kbd{C-x #} in them.
+@item -q
+@itemx --quiet
+Do not let @command{emacsclient} display messages about waiting for
+Emacs or connecting to remote server sockets.
 @item -s @var{server-name}
 @itemx --socket-name=@var{server-name}
 Connect to the Emacs server named @var{server-name}.  The server name
diff --git a/doc/emacs/mule.texi b/doc/emacs/mule.texi
index f0facec86c1..22c155d26de 100644
--- a/doc/emacs/mule.texi
+++ b/doc/emacs/mule.texi
@@ -1153,15 +1153,6 @@ specified by one of the environment variables @env{LC_ALL},
 specified above, whose value is nonempty is the one that determines
 the text representation.)
-@vindex x-select-request-type
-  The variable @code{x-select-request-type} specifies a selection data
-type of selection to request from the X server.  The default value is
-@code{nil}, which means Emacs tries @code{COMPOUND_TEXT} and
-@code{UTF8_STRING}, and uses whichever result seems more appropriate.
-You can explicitly specify the data type by setting the variable to
-one of the symbols @code{COMPOUND_TEXT}, @code{UTF8_STRING},
-@code{STRING} and @code{TEXT}.
 @node File Name Coding
 @section Coding Systems for File Names
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 1a980f14f3d..7bb1919b837 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,16 @@
+2011-03-06  Chong Yidong  <cyd@stupidchicken.com>
+        * Makefile.in (srcs): Add package.texi.
+2011-03-05  Chong Yidong  <cyd@stupidchicken.com>
+        * processes.texi (Synchronous Processes): Minor clarification
+        (Bug#8149).
+2011-03-03  Glenn Morris  <rgm@gnu.org>
+        * files.texi (Truenames): Minor clarification.  (Bug#2341)
 2011-03-01  Glenn Morris  <rgm@gnu.org>
        * variables.texi (Directory Local Variables):
diff --git a/doc/lispref/Makefile.in b/doc/lispref/Makefile.in
index a9664a4e197..d5427f6e477 100644
--- a/doc/lispref/Makefile.in
+++ b/doc/lispref/Makefile.in
@@ -80,6 +80,7 @@ srcs = \
  $(srcdir)/numbers.texi \
  $(srcdir)/objects.texi \
  $(srcdir)/os.texi \
+  $(srcdir)/package.texi \
  $(srcdir)/positions.texi \
  $(srcdir)/processes.texi \
  $(srcdir)/searching.texi \
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 3697f18badd..e3bdebd28a1 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -1041,7 +1041,8 @@ because they eliminate symbolic links as a cause of name variation.
 @defun file-truename filename
 The function @code{file-truename} returns the truename of the file
-@var{filename}.  The argument must be an absolute file name.
+@var{filename}.  If the argument is not an absolute file name,
+this function first expands it against @code{default-directory}.
 This function does not expand environment variables.  Only
 @code{substitute-in-file-name} does that.  @xref{Definition of
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi
index 8a8de0e7fa8..dc9fed58076 100644
--- a/doc/lispref/processes.texi
+++ b/doc/lispref/processes.texi
@@ -266,10 +266,9 @@ subprocess by @code{call-process-region} is encoded using a coding
 system, much like text written into a file.  @xref{Coding Systems}.
 @defun call-process program &optional infile destination display &rest args
-This function calls @var{program} in a separate process and waits for
+This function calls @var{program} and waits for it to finish.
-it to finish.
-The standard input for the process comes from file @var{infile} if
+The standard input for the new process comes from file @var{infile} if
 @var{infile} is not @code{nil}, and from the null device otherwise.
 The argument @var{destination} says where to put the process output.
 Here are the possibilities:
@@ -488,10 +487,10 @@ inputinput@point{}
 @end defun
 @defun call-process-shell-command command &optional infile destination display &rest args
-This function executes the shell command @var{command} synchronously
+This function executes the shell command @var{command} synchronously.
-in a separate process.  The final arguments @var{args} are additional
+The final arguments @var{args} are additional arguments to add at the
-arguments to add at the end of @var{command}.  The other arguments
+end of @var{command}.  The other arguments are handled as in
-are handled as in @code{call-process}.
+@code{call-process}.
 @end defun
 @defun process-file-shell-command command &optional infile destination display &rest args
@@ -506,12 +505,12 @@ then returns the command's output as a string.
 @end defun
 @defun process-lines program &rest args
-This function runs @var{program} in a separate process, waits for it
+This function runs @var{program}, waits for it to finish, and returns
-to finish, and returns its output as a list of strings.  Each string
+its output as a list of strings.  Each string in the list holds a
-in the list holds a single line of text output by the program; the
+single line of text output by the program; the end-of-line characters
-end-of-line characters are stripped from each line.  The arguments
+are stripped from each line.  The arguments beyond @var{program},
-beyond @var{program}, @var{args}, are strings that specify
+@var{args}, are strings that specify command-line arguments with which
-command-line arguments with which to run the program.
+to run the program.
 If @var{program} exits with a non-zero exit status, this function
 signals an error.
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index b50dafb62ee..2c5f998737a 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,25 @@
+2011-03-06  Jay Belanger  <jay.p.belanger@gmail.com>
+        * calc.texi (Logarithmic Units): Rename calc-logunits-dblevel
+        and calc-logunits-nplevel to calc-dblevel and calc-nplevel,
+        respectively.
+        (Musical Notes): New section.
+        (Customizing Calc): Mention the customizable variable
+        calc-note-threshold.
+2011-03-03  Glenn Morris  <rgm@gnu.org>
+        * url.texi (Dealing with HTTP documents): Remove reference to
+        function url-decode-text-part; never seems to have existed.  (Bug#6038)
+        (Configuration): Update url-configuration-directory description.
+2011-03-02  Glenn Morris  <rgm@gnu.org>
+        * dired-x.texi (Multiple Dired Directories): Remove mentions
+        of dired-default-directory-alist and dired-default-directory.
+        Move dired-smart-shell-command here...
+        (Miscellaneous Commands): ... from here.
 2011-03-02  Paul Eggert  <eggert@cs.ucla.edu>
        * texinfo.tex: Update to version 2011-02-24.09.
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi
index b9d4f8c4a23..88103fc0034 100644
--- a/doc/misc/calc.texi
+++ b/doc/misc/calc.texi
@@ -27676,6 +27676,7 @@ begin with the @kbd{u} prefix key.
 * Predefined Units::
 * User-Defined Units::
 * Logarithmic Units::
+* Musical Notes::
 @end menu
 @node Basic Operations on Units, The Units Table, Units, Units
@@ -28121,7 +28122,7 @@ was already a set of user-defined units in your Calc init file, it
 is replaced by the new set.  (@xref{General Mode Commands}, for a way to
 tell Calc to use a different file for the Calc init file.)
-@node Logarithmic Units,  , User-Defined Units, Units
+@node Logarithmic Units, Musical Notes, User-Defined Units, Units
 @section Logarithmic Units
 The units @code{dB} (decibels) and @code{Np} (nepers) are logarithmic
@@ -28251,18 +28252,18 @@ The @kbd{H l q} [@code{fieldquant}] command behaves like @kbd{l q} but
 computes field quantities instead of power quantities.
 @kindex l d
-@pindex calc-logunits-dblevel
+@pindex calc-dblevel
 @tindex dbpowerlevel
 @tindex dbfieldlevel
 @kindex l n
-@pindex calc-logunits-nplevel
+@pindex calc-nplevel
 @tindex nppowerlevel
 @tindex npfieldlevel
-The @kbd{l d} (@code{calc-logunits-dblevel}) [@code{dbpowerlevel}]
+The @kbd{l d} (@code{calc-dblevel}) [@code{dbpowerlevel}]
 command will compute the decibel level of a power quantity using the
 default reference level; @kbd{H l d} [@code{dbfieldlevel}] will
 compute the decibel level of a field quantity.  The commands @kbd{l n} 
-(@code{calc-logunits-nplevel}) [@code{nppowerlevel}] and @kbd{H l n} 
+(@code{calc-nplevel}) [@code{nppowerlevel}] and @kbd{H l n} 
 [@code{npfieldlevel}] will similarly compute neper levels.  With the
 capital @kbd{O} prefix these commands will read a reference level
 from the stack; in an algebraic formula the reference level can be
@@ -28363,6 +28364,76 @@ a logarithmic unit by a number; the @kbd{l /}
 logarithmic unit by a number. Note that the reference quantities don't
 play a role in this arithmetic. 
+@node Musical Notes, , Logarithmic Units, Units
+@section Musical Notes
+Calc can convert between musical notes and their associated
+frequencies.  Notes can be given using either scientific pitch
+notation or midi numbers.  Since these note systems are basically
+logarithmic scales, Calc uses the @kbd{l} prefix for functions
+operating on notes.
+Scientific pitch notation refers to a note by giving a letter
+A through G, possibly followed by a flat or sharp) with a subscript
+indicating an octave number.  Each octave starts with C and ends with
+B and 
+@c increasing each note by a semitone will result
+@c in the sequence @expr{C}, @expr{C} sharp, @expr{D}, @expr{E} flat, @expr{E},
+@c @expr{F}, @expr{F} sharp, @expr{G}, @expr{A} flat, @expr{A}, @expr{B}
+@c flat and @expr{B}.  
+the octave numbered 0 was chosen to correspond to the lowest
+audible frequency.  Using this system, middle C (about 261.625 Hz)
+corresponds to the note @expr{C} in octave 4 and is denoted
+@expr{C_4}.  Any frequency can be described by giving a note plus an
+offset in cents (where a cent is a ratio of frequencies so that a
+semitone consists of 100 cents). 
+The midi note number system assigns numbers to notes so that
+@expr{C_(-1)} corresponds to the midi note number 0 and @expr{G_9}
+corresponds to the midi note number 127.   A midi controller can have
+up to 128 keys and each midi note number from  0 to 127 corresponds to
+a possible key. 
+@kindex l s
+@pindex calc-spn
+@tindex spn
+The @kbd{l s} (@code{calc-spn}) [@code{spn}] command converts either
+a frequency or a midi number to scientific pitch notation.  For
+example, @code{500 Hz} gets converted to 
+@code{B_4 + 21.3094853649 cents} and @code{84} to @code{C_6}. 
+@kindex l m
+@pindex calc-midi
+@tindex midi
+The @kbd{l m} (@code{calc-midi}) [@code{midi}] command converts either
+a frequency or a note given in scientific pitch notation to the
+corresponding midi number. For example, @code{C_6} gets converted to 84
+and @code{440 Hz} to 69.
+@kindex l f
+@pindex calc-freq
+@tindex freq
+The @kbd{l f} (@code{calc-freq}) [@code{freq}] command converts either
+either a midi number or a note given in scientific pitch notation to
+the corresponding frequency. For example, @code{Asharp_2 + 30 cents}
+gets converted to @code{118.578040134 Hz} and @code{55} to
+@code{195.99771799 Hz}.
+Since the frequencies of notes are not usually given exactly (and are
+typically irrational), the customizable variable
+@code{calc-note-threshold} determines how close (in cents) a frequency
+needs to be to a note to be recognized as that note
+(@pxref{Customizing Calc}).  This variable has a default value of
+@code{1}.  For example, middle @var{C} is approximately
+@expr{261.625565302 Hz}; this frequency is often shortened to
+@expr{261.625 Hz}.  Without @code{calc-note-threshold} (or a value of
+@expr{0}), Calc would convert @code{261.625 Hz} to scientific pitch
+notation @code{B_3 + 99.9962592773 cents}; with the default value of
+@code{1}, Calc converts @code{261.625 Hz} to @code{C_4}.
 @node Store and Recall, Graphics, Units, Top
 @chapter Storing and Recalling
@@ -35481,6 +35552,15 @@ and the default value of @code{calc-logunits-field-reference} is
 @code{"20 uPa"}.  
 @end defvar
+@defvar calc-note-threshold
+See @ref{Musical Notes}.@*
+The variable @code{calc-note-threshold} is a number (written as a
+string) which determines how close (in cents) a frequency needs to be
+to a note to be recognized as that note.
+The default value of @code{calc-note-threshold} is 1.
+@end defvar
 @defvar calc-highlight-selections-with-faces
 @defvarx calc-selected-face
 @defvarx calc-nonselected-face
@@ -36129,26 +36209,29 @@ keystrokes are not listed in this summary.
 @r{    v x@:    I k T   @:             @:        @:ltpt@:(x,v)}
 @c
-@r{    a b@:      l +   @:             @:     2  @:lupoweradd@:(a,b)}
+@r{    a b@:      l +   @:             @:        @:lupoweradd@:(a,b)}
-@r{    a b@:    H l +   @:             @:     2  @:lufieldadd@:(a,b)}
+@r{    a b@:    H l +   @:             @:        @:lufieldadd@:(a,b)}
-@r{    a b@:      l -   @:             @:     2  @:lupowersub@:(a,b)}
+@r{    a b@:      l -   @:             @:        @:lupowersub@:(a,b)}
-@r{    a b@:    H l -   @:             @:     2  @:lufieldsub@:(a,b)}
+@r{    a b@:    H l -   @:             @:        @:lufieldsub@:(a,b)}
-@r{    a b@:      l *   @:             @:     2  @:lupowermul@:(a,b)}
+@r{    a b@:      l *   @:             @:        @:lupowermul@:(a,b)}
-@r{    a b@:    H l *   @:             @:     2  @:lufieldmul@:(a,b)}
+@r{    a b@:    H l *   @:             @:        @:lufieldmul@:(a,b)}
-@r{    a b@:      l /   @:             @:     2  @:lupowerdiv@:(a,b)}
+@r{    a b@:      l /   @:             @:        @:lupowerdiv@:(a,b)}
-@r{    a b@:    H l /   @:             @:     2  @:lufielddiv@:(a,b)}
+@r{    a b@:    H l /   @:             @:        @:lufielddiv@:(a,b)}
-@r{      a@:      l d   @:             @:     1  @:dbpowerlevel@:(a)}
+@r{      a@:      l d   @:             @:        @:dbpowerlevel@:(a)}
-@r{    a b@:    O l d   @:             @:     2  @:dbpowerlevel@:(a,b)}
+@r{    a b@:    O l d   @:             @:        @:dbpowerlevel@:(a,b)}
-@r{      a@:    H l d   @:             @:     1  @:dbfieldlevel@:(a)}
+@r{      a@:    H l d   @:             @:        @:dbfieldlevel@:(a)}
-@r{    a b@:  O H l d   @:             @:     2  @:dbfieldlevel@:(a,b)}
+@r{    a b@:  O H l d   @:             @:        @:dbfieldlevel@:(a,b)}
-@r{      a@:      l n   @:             @:     1  @:nppowerlevel@:(a)}
+@r{      a@:      l n   @:             @:        @:nppowerlevel@:(a)}
-@r{    a b@:    O l n   @:             @:     2  @:nppowerlevel@:(a,b)}
+@r{    a b@:    O l n   @:             @:        @:nppowerlevel@:(a,b)}
-@r{      a@:    H l n   @:             @:     1  @:npfieldlevel@:(a)}
+@r{      a@:    H l n   @:             @:        @:npfieldlevel@:(a)}
-@r{    a b@:  O H l n   @:             @:     2  @:npfieldlevel@:(a,b)}
+@r{    a b@:  O H l n   @:             @:        @:npfieldlevel@:(a,b)}
-@r{      a@:      l q   @:             @:     1  @:powerquant@:(a)}
+@r{      a@:      l q   @:             @:        @:powerquant@:(a)}
-@r{    a b@:    O l q   @:             @:     2  @:powerquant@:(a,b)}
+@r{    a b@:    O l q   @:             @:        @:powerquant@:(a,b)}
-@r{      a@:    H l q   @:             @:     1  @:fieldquant@:(a)}
+@r{      a@:    H l q   @:             @:        @:fieldquant@:(a)}
-@r{    a b@:  O H l q   @:             @:     2  @:fieldquant@:(a,b)}
+@r{    a b@:  O H l q   @:             @:        @:fieldquant@:(a,b)}
+@r{      a@:      l s   @:             @:        @:spn@:(a)}
+@r{      a@:      l m   @:             @:        @:midi@:(a)}
+@r{      a@:      l f   @:             @:        @:freq@:(a)}
 @c
 @r{       @:      m a   @:             @: 12,13  @:calc-algebraic-mode@:}
diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi
index dba99d9c6c7..eb797789922 100644
--- a/doc/misc/dired-x.texi
+++ b/doc/misc/dired-x.texi
@@ -867,24 +867,12 @@ some commands it is appropriate that they use the current Dired
 directory instead of @code{default-directory}, e.g., @code{find-file} and
 @code{compile}.
-A general mechanism is provided for special handling of the working
+@findex dired-smart-shell-command
-directory in special major modes:
+@findex shell-command
+@kindex M-!
-@table @code
+The command @code{dired-smart-shell-command}, bound to @kbd{M-!} in
-@item dired-default-directory-alist
+Dired buffers, is like @code{shell-command}, but it runs with
-@vindex dired-default-directory-alist
+@code{default-directory} bound to the current Dired directory.
-Default: @code{((dired-mode . (dired-current-directory)))}
-Alist of major modes and their notion of @code{default-directory}, as a
-Lisp expression to evaluate.  A resulting value of @code{nil} is ignored
-in favor of @code{default-directory}.
-@item dired-default-directory
-@findex dired-default-directory
-Use this function like you would use the variable
-@code{default-directory}, except that @code{dired-default-directory}
-also consults the variable @code{dired-default-directory-alist}.
-@end table
 @node Find File At Point, Miscellaneous Commands, Multiple Dired Directories, Top
 @section Find File At Point
@@ -993,12 +981,6 @@ inserted subdirectories.
 @end table
 @table @code
-@item dired-smart-shell-command
-@findex dired-smart-shell-command
-@findex shell-command
-@kindex M-!
-Like function @code{shell-command}, but in the current Dired directory.
-Bound to @kbd{M-!} in Dired buffers.
 @item dired-jump
 @findex dired-jump
diff --git a/doc/misc/faq.texi b/doc/misc/faq.texi
index a9a5e4dc6eb..7528abca58d 100644
--- a/doc/misc/faq.texi
+++ b/doc/misc/faq.texi
@@ -1042,11 +1042,11 @@ Emacs now supports using both X displays and ttys in the same session
 @item
 Emacs can be started as a daemon in the background.
-@cindex NeXTSTEP port
+@cindex NeXTstep port
 @cindex GNUstep port
 @cindex Mac OS X Cocoa
 @item
-There is a new NeXTSTEP port of Emacs.  This supports GNUstep and Mac OS
+There is a new NeXTstep port of Emacs.  This supports GNUstep and Mac OS
 X (via the Cocoa libraries).  The Carbon port of Emacs, which supported
 Mac OS X in Emacs 22, has been removed.
diff --git a/doc/misc/url.texi b/doc/misc/url.texi
index 2bde54a8dea..42594457ab1 100644
--- a/doc/misc/url.texi
+++ b/doc/misc/url.texi
@@ -116,7 +116,10 @@ The meaning of the @var{path} component depends on the service.
 @cindex @file{~/.url}
 @cindex configuration files
 The directory in which URL configuration files, the cache etc.,
-reside.  Default @file{~/.url}.
+reside.  The old default was @file{~/.url}, and this directory
+is still used if it exists.  The new default is a @file{url/}
+directory in @code{user-emacs-directory}, which is normally
+@file{~/.emacs.d}.
 @end defvar
 @node Parsed URLs
@@ -383,20 +386,7 @@ Currently this is just the raw header contents.
 HTTP URLs are retrieved into a buffer containing the HTTP headers
 followed by the body.  Since the headers are quasi-MIME, they may be
 processed using the MIME library.  @xref{Top,, Emacs MIME,
-emacs-mime, The Emacs MIME Manual}.  The URL package provides a
+emacs-mime, The Emacs MIME Manual}.
-function to do this in general:
-@defun url-decode-text-part handle &optional coding
-This function decodes charset-encoded text in the current buffer.  In
-Emacs, the buffer is expected to be unibyte initially and is set to
-multibyte after decoding.
-HANDLE is the MIME handle of the original part.  CODING is an explicit
-coding to use, overriding what the MIME headers specify.
-The coding system used for the decoding is returned.
-Note that this function doesn't deal with @samp{http-equiv} charset
-specifications in HTML @samp{<meta>} elements.
-@end defun
 @node file/ftp
 @section file and ftp
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 74787c3de3b..13f99b466a3 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-06  Juanma Barranquero  <lekktu@gmail.com>
+        * srecode/el.srt: Fix typo.
 2011-02-21  Chong Yidong  <cyd@stupidchicken.com>
        * themes/tango-dark-theme.el: Tweak background on low-color
@@ -117,7 +121,7 @@
        * NEWS: Mention new Tramp method "ksu".
-2010-12-13  W. Martin Borgert <debacle@debian.org>  (tiny change)
+2010-12-13  W. Martin Borgert  <debacle@debian.org>  (tiny change)
        * schema/schemas.xml: Add DocBook (Bug#7491).
diff --git a/etc/NEWS b/etc/NEWS
index 7be8d4fb34b..df9884e94b1 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -71,6 +71,9 @@ from load-path.  -Q now implies this.
 client frame in parent X window ID, via XEmbed.  This works like the
 --parent-id argument to Emacs.
+++
+*** New emacsclient argument -q/--quiet suppresses some status messages.
 *** If emacsclient shuts down as a result of Emacs signalling an
 error, its exit status is 1.
@@ -176,6 +179,8 @@ higher-resolution time stamps.
 and SIGHUP, and upon SIGINT in batch mode.
 ** kill-emacs-hook is now also run in batch mode.
+If you have code that adds something to kill-emacs-hook, you should
+consider if it is still appropriate to add it in the noninteractive case.
 ** New scrolling commands `scroll-up-command' and `scroll-down-command'
 (bound to C-v/[next] and M-v/[prior]) does not signal errors at top/bottom
@@ -651,6 +656,8 @@ Notifications API.  It requires D-Bus for communication.
 ** soap-client.el supports access to SOAP web services from Emacs.
 soap-inspect.el is an interactive inspector for SOAP WSDL structures.
+** xmodmap-generic-mode for xmodmap files.
 * Incompatible Lisp Changes in Emacs 24.1
diff --git a/etc/NEWS.23 b/etc/NEWS.23
index 181548e98d6..3e7a364ffd0 100644
--- a/etc/NEWS.23
+++ b/etc/NEWS.23
@@ -129,7 +129,7 @@ starting from the first line of text below the header line.
 * Changes in Emacs 23.3 on non-free operating systems
-** The nextstep port can have different modifiers for the left and right
+** The NeXTstep port can have different modifiers for the left and right
 alt/option key by customizing the value for ns-right-alternate-modifier.
@@ -697,7 +697,7 @@ a GIF library.
 *** Emacs now supports multi-page TIFF images.
-** New NeXTSTEP-based port.
+** New NeXTstep-based port.
 This provides support for GNUstep (via the GNUstep libraries) and Mac
 OS X (via the Cocoa libraries).
@@ -707,7 +707,7 @@ other emacsen (e.g. X11 build) use --disable-ns-self-contained.  See
 nextstep/README and nextstep/INSTALL in the Emacs source directory.
 ** Mac OS X is no longer supported via Carbon.
-Use the NeXTSTEP port, described above.
+Use the NeXTstep port, described above.
 ** The new configuration option "--with-dbus" enables D-Bus language
 bindings for Emacs.
diff --git a/etc/srecode/el.srt b/etc/srecode/el.srt
index b63d560582c..6117e72be2a 100644
--- a/etc/srecode/el.srt
+++ b/etc/srecode/el.srt
@@ -261,7 +261,7 @@ template defgroup :indent :blank
 ----
 (defgroup $?MODESYM$-mode nil
  "$MODESYM$ group."
-  :group 'langauges)
+  :group 'languages)
 ----
 bind "g"
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index f54ad384b13..4b50b2dddeb 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,10 @@
+2011-03-03  Drake Wilson  <drake@begriffli.ch>  (tiny change)
+        * emacsclient.c (longopts): Add quiet.
+        (decode_options): Handle q/quiet.
+        (print_help_and_exit): Add q/quiet.
+        (main): Suppress some messages if quiet option is used.
 2011-02-26  Eli Zaretskii  <eliz@gnu.org>
        * Makefile.in (fakemail${EXEEXT}): Depend on lib/ignore-value.h.
diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index 836891ae6aa..abc9aee37c1 100644
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -129,6 +129,9 @@ char **main_argv;
 /* Nonzero means don't wait for a response from Emacs.  --no-wait.  */
 int nowait = 0;
+/* Nonzero means don't print messages for successful operations.  --quiet. */
+int quiet = 0;
 /* Nonzero means args are expressions to be evaluated.  --eval.  */
 int eval = 0;
@@ -164,6 +167,7 @@ static void fail (void) NO_RETURN;
 struct option longopts[] =
 {
  { "no-wait",  no_argument,       NULL, 'n' },
+  { "quiet",    no_argument,       NULL, 'q' },
  { "eval",     no_argument,       NULL, 'e' },
  { "help",     no_argument,       NULL, 'H' },
  { "version",  no_argument,       NULL, 'V' },
@@ -523,9 +527,9 @@ decode_options (int argc, char **argv)
    {
      int opt = getopt_long_only (argc, argv,
 #ifndef NO_SOCKETS_IN_FILE_SYSTEM
-                             "VHnea:s:f:d:tc",
+                             "VHneqa:s:f:d:tc",
 #else
-                             "VHnea:f:d:tc",
+                             "VHneqa:f:d:tc",
 #endif
                             longopts, 0);
@@ -569,6 +573,10 @@ decode_options (int argc, char **argv)
          eval = 1;
          break;
+        case 'q':
+          quiet = 1;
+          break;
        case 'V':
          message (FALSE, "emacsclient %s\n", VERSION);
          exit (EXIT_SUCCESS);
@@ -660,6 +668,7 @@ The following OPTIONS are accepted:\n\
                        use the current Emacs frame\n\
 -e, --eval              Evaluate the FILE arguments as ELisp expressions\n\
 -n, --no-wait           Don't wait for the server to return\n\
+-q, --quiet             Don't display messages on success\n\
 -d DISPLAY, --display=DISPLAY\n\
                        Visit the file in the given display\n\
 --parent-id=ID          Open in parent window ID, via XEmbed\n"
@@ -986,7 +995,7 @@ set_tcp_socket (void)
  if (! get_server_config (&server, auth_string))
    return INVALID_SOCKET;
-  if (server.sin_addr.s_addr != inet_addr ("127.0.0.1"))
+  if (server.sin_addr.s_addr != inet_addr ("127.0.0.1") && !quiet)
    message (FALSE, "%s: connected to remote socket at %s\n",
             progname, inet_ntoa (server.sin_addr));
@@ -1712,7 +1721,7 @@ main (int argc, char **argv)
  send_to_emacs (emacs_socket, "\n");
  /* Wait for an answer. */
-  if (!eval && !tty && !nowait)
+  if (!eval && !tty && !nowait && !quiet)
    {
      printf ("Waiting for Emacs...");
      needlf = 2;
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1f1dbf69fe5..e34fde79543 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,319 @@
+2011-03-06  Jay Belanger  <jay.p.belanger@gmail.com>
+        * calc/calc-ext.el (calc-init-extensions):
+        Rename calc-logunits-dblevel and calc-logunits-nplevel to
+        calc-dblevel and calc-nplevel, respectively.
+        Add keybindings for calc-spn, calc-midi and calc-freq.  Add
+        autoloads for calcFunc-spn, calcFunc-midi, calcFunc-freq,
+        calc-spn, calc-midi and calc-freq.
+        * calc/calc-units.el (calc-dblevel): Rename from
+        calc-logunits-dblevel.
+        (calc-nplevel): Rename from calc-logunits-nplevel.
+        (math-midi-round, math-freqp, math-midip, math-spnp)
+        (math-spn-to-midi, math-midi-to-spn, math-freq-to-spn)
+        (math-midi-to-freq, math-spn-to-freq, calcFunc-spn, calcFunc-midi)
+        (calcFunc-freq, calc-freq, calc-midi, calc-spn): New functions.
+        (math-notes): New variable.
+        * calc/calc.el (calc-note-threshold): New variable.
+2011-03-06  Chong Yidong  <cyd@stupidchicken.com>
+        * emacs-lisp/package.el (package-archives): Accept either ordinary
+        directory names, in addition to HTTP URLs.
+        (package--with-work-buffer): New macro.   Handle normal directories.
+        (package-handle-response): Don't display the failing buffer.
+        (package-download-single, package-download-tar)
+        (package--download-one-archive): Use package--with-work-buffer.
+        (package-archive-base): Rename from package-archive-url.
+2011-03-06  Glenn Morris  <rgm@gnu.org>
+        * generic-x.el (generic-unix-modes): Add xmodmap-generic-mode.
+        (xmodmap-generic-mode): Respect generic-extras-enable-list.
+2011-03-06  Daniel Clemente  <dcl441-bugs@yahoo.com>  (tiny change)
+        * generic-x.el (xmodmap-generic-mode): New.  (Bug#2065)
+2011-03-06  Juanma Barranquero  <lekktu@gmail.com>
+        * allout.el (allout-init, allout-prefixed-keybindings)
+        (allout-unprefixed-keybindings):
+        * progmodes/prolog.el (prolog-find-term):
+        Fix typos in docstrings.
+2011-03-06  Nikolaj Schumacher  <me@nschum.de>  (tiny change)
+        * emacs-lisp/elp.el (elp-results): Fix off-by-one in header.  (Bug#2746)
+2011-03-06  Kevin Ryde  <user42@zip.com.au>
+        * textmodes/sgml-mode.el (sgml-fill-nobreak): Give it a doc.  (Bug#5326)
+2011-03-06  Michael Shields  <shields@msrl.com>  (tiny change)
+        * window.el (one-window-p, walk-windows, display-buffer):
+        Doc fixes.  (Bug#5567)
+2011-03-06  Jay Belanger  <jay.p.belanger@gmail.com>
+        * cus-edit.el (custom-prompt-variable): Use the `custom-get' property
+        of the variable if it exists.
+2011-03-06  Juanma Barranquero  <lekktu@gmail.com>
+        * bookmark.el:
+        * desktop.el:
+        * emacs-lock.el:
+        * ps-print.el:
+        * saveplace.el:
+        * net/tramp-cache.el:
+        * obsolete/fast-lock.el:
+        * textmodes/reftex.el:
+        Don't set `kill-emacs-hook' on noninteractive sessions (bug#8137).
+2011-03-05  Antoine Levitt  <antoine.levitt@gmail.com>
+        * files.el (delete-directory, copy-directory, list-directory):
+        Use read-directory-name.
+        * find-file.el (ff-find-the-other-file):
+        * net/ange-ftp.el (ange-ftp-make-directory):
+        * printing.el (pr-interactive-dir):
+        * progmodes/ada-prj.el (ada-prj-load-directory):
+        * progmodes/ebnf2ps.el (ebnf-print-directory)
+        (ebnf-spool-directory, ebnf-eps-directory)
+        (ebnf-syntax-directory):
+        * shell.el (shell):
+        * speedbar.el (speedbar-create-directory):
+        * vc/emerge.el (emerge-merge-directories):
+        * vc/vc-dir.el (vc-dir):
+        * vc/vc.el (vc-create-tag, vc-retrieve-tag): Likewise.
+2011-03-05  Chong Yidong  <cyd@stupidchicken.com>
+        * help-mode.el (help-buffer): If we are to return the current
+        buffer, signal an error if it's not in Help mode (Bug#8147).
+2011-03-05  Reuben Thomas  <rrt@sc3d.org>
+        * files.el (file-name-version-regexp): Handle backup files of the
+        form `foo.js.~HEAD~1~' (Bug#8159).
+2011-03-05  Glenn Morris  <rgm@gnu.org>
+        * eshell/esh-var.el: Don't require esh-test when compiling.
+        * eshell/em-banner.el, eshell/esh-cmd.el, eshell/esh-mode.el:
+        * eshell/esh-var.el, eshell/eshell.el: Move tests to esh-test.
+        * eshell/esh-test.el: Move to ../../test/eshell.el.
+2011-03-05  David Engster  <deng@randomsample.de>
+        * files.el (save-some-buffers): Report the names of buffers saved
+        automatically due to buffer-save-without-query (Bug#8134).
+2011-03-05  Deniz Dogan  <deniz.a.m.dogan@gmail.com>
+        * net/rcirc.el: Add QuakeNet authentication support.
+        (rcirc-authinfo, rcirc-check-auth-status)
+        (rcirc-authenticate): Support QuakeNet.
+2011-03-05  Deniz Dogan  <deniz.a.m.dogan@gmail.com>
+        * net/rcirc.el: Add functionality to authenticate before
+        autojoining channels.
+        (rcirc-authenticate-before-join): New option.
+        (rcirc-authenticated-hook): New variable.
+        (rcirc-connect): Make local variable rcirc-user-authenticated.
+        (rcirc-handler-001): Respect rcirc-authenticate-before-join.
+        (rcirc-check-auth-status, rcirc-join-channels-post-auth):
+        New functions.
+        (rcirc-handler-PRIVMSG, rcirc-handler-NOTICE):
+        Call rcirc-check-auth-status.
+2011-03-05  Alex Harsanyi  <AlexHarsanyi@gmail.com>
+        * net/soap-client.el (soap-namespace-put-link): Check if the target
+        name is fully qualified -- use only the name part.
+        (soap-parse-complex-type, soap-parse-sequence): Recognize xsd:all
+        types, treated the same as xsd:sequence.  (Bug#8166)
+2011-03-05  Eli Zaretskii  <eliz@gnu.org>
+        * files.el (find-file-noselect): Don't ask about re-visiting
+        non-literally if the file is already visited in image-mode.
+        (Bug#8177)
+2011-03-05  Glenn Morris  <rgm@gnu.org>
+        * eshell/esh-mode.el (eshell-kill-buffer-function): New function.
+        (eshell-mode): Use eshell-kill-buffer-function.
+        Run the -initialize functions independently of the -load-hooks.
+        * eshell/esh-proc.el (eshell-kill-process-function): New function.
+        (eshell-gather-process-output, eshell-sentinel)
+        (eshell-interrupt-process, eshell-kill-process, eshell-quit-process):
+        Use eshell-kill-process-function.
+        * eshell/em-alias.el (eshell-alias-load-hook):
+        * eshell/em-banner.el (eshell-banner-load-hook):
+        * eshell/em-cmpl.el (eshell-cmpl-load-hook):
+        * eshell/em-dirs.el (eshell-dirs-load-hook):
+        * eshell/em-glob.el (eshell-glob-load-hook):
+        * eshell/em-hist.el (eshell-hist-load-hook):
+        * eshell/em-pred.el (eshell-pred-load-hook):
+        * eshell/em-prompt.el (eshell-prompt-load-hook):
+        * eshell/em-rebind.el (eshell-rebind-load-hook):
+        * eshell/em-script.el (eshell-script-load-hook):
+        * eshell/em-smart.el (eshell-smart-load-hook):
+        * eshell/em-term.el (eshell-term-load-hook):
+        * eshell/em-unix.el (eshell-unix-load-hook):
+        * eshell/esh-arg.el (eshell-arg-load-hook):
+        * eshell/esh-cmd.el (eshell-cmd-load-hook):
+        * eshell/esh-ext.el (eshell-ext-load-hook):
+        * eshell/esh-io.el (eshell-io-load-hook):
+        * eshell/esh-mode.el (eshell-exit-hook):
+        * eshell/esh-proc.el (eshell-proc-load-hook, eshell-kill-hook):
+        * eshell/esh-var.el (eshell-var-load-hook):
+        Set default hook values to nil.  (Bug#5375)
+        * eshell/esh-module.el (eshell-module-unload-hook)
+        (eshell-modules-list): Remove leading * from defcustom docs.
+        * eshell/esh-util.el (eshell-for): Make it obsolete.
+        * eshell/em-alias.el (eshell/alias, eshell-alias-completions):
+        * eshell/em-dirs.el (eshell-save-some-last-dir):
+        * eshell/em-hist.el (eshell-save-some-history)
+        (eshell-hist-parse-modifier):
+        * eshell/em-ls.el (eshell-ls-dir, eshell-ls-files)
+        (eshell-ls-entries):
+        * eshell/em-unix.el (eshell/cat, eshell/du, eshell/su):
+        * eshell/esh-cmd.el (eshell-invoke-directly, eshell-do-eval)
+        (eshell/which):
+        * eshell/esh-ext.el (eshell-find-interpreter):
+        * eshell/esh-mode.el (eshell-mode):
+        * eshell/esh-module.el (eshell-unload-extension-modules):
+        * eshell/esh-proc.el (eshell-process-interact):
+        * eshell/esh-test.el (eshell-test):
+        * eshell/esh-util.el (eshell-flatten-list, eshell-winnow-list):
+        * eshell/esh-var.el (eshell/env, eshell-environment-variables)
+        (eshell-variables-list):
+        * eshell/eshell.el (eshell-unload-all-modules):
+        Replace eshell-for with dolist.
+2011-03-04  Glenn Morris  <rgm@gnu.org>
+        * vc/vc-bzr.el (vc-bzr-after-dir-status): Handle bzr 2.3.0.  (Bug#8170)
+2011-03-04  Tom Tromey  <tromey@redhat.com>
+        * progmodes/gud.el (gdb-script-mode): Derive from prog-mode.
+2011-03-04  Glenn Morris  <rgm@gnu.org>
+        * outline.el (outline-regexp): No longer allow nil.
+        (outline-heading-end-regexp): Add safety predicate.  (Bug#7619)
+        * net/browse-url.el (browse-url):
+        Handle deleted default-directory.  (Bug#6077)
+        * recentf.el (recentf-include-p): In case of a buggy predicate,
+        err on the side of including, not excluding.  (Bug#5843)
+2011-03-04  Jay Belanger  <jay.p.belanger@gmail.com>
+        * calc/calc-units.el (math-to-standard-rec): Don't treat subscripted
+        variables as units.
+2011-03-04  Bob Rogers  <rogers@rgrjr.dyndns.org>
+        * emacs-lisp/ewoc.el (ewoc-goto-next): Give a more explicit error
+        if there is no node.  (Bug#3261)
+2011-03-04  Leo  <sdl.web@gmail.com>
+        * vc/diff-mode.el (diff-mode): Fix whitespace-style.  (Bug#8139)
+        * time.el (display-time-world-list): Fix typo.  (Bug#7571)
+2011-03-04  Zachary Kanfer  <zkanfer@gmail.com>  (tiny change)
+        * cus-edit.el (custom-buffer-create-internal):
+        Split search string before passing it to `customize-apropos' (bug#8136).
+2011-03-04  Drew Adams  <drew.adams@oracle.com>
+        * image-dired.el (image-dired-cmd-read-exif-data-options):
+        Fix typo in docstring (bug#8156).
+2011-03-03  Deniz Dogan  <deniz.a.m.dogan@gmail.com>
+        * net/rcirc.el (rcirc-cmd-join): Accept comma-separated input.
+2011-03-03  Christian Ohler  <ohler@gnu.org>
+        * emacs-lisp/ert.el (ert--explain-equal): New function.
+        (ert--explain-equal-rec): Renamed from `ert--explain-not-equal'.
+        All callers changed.
+        (ert--explain-equal-including-properties): Renamed from
+        `ert--explain-not-equal-including-properties'.  All callers
+        changed.
+2011-03-03  Christian Ohler  <ohler@gnu.org>
+        * emacs-lisp/ert.el (ert--stats-set-test-and-result)
+        (ert-char-for-test-result, ert-string-for-test-result)
+        (ert-run-tests-batch, ert--print-test-for-ewoc):
+        Handle `ert-test-quit'.
+2011-03-03  David Abrahams  <dave@boostpro.com>  (tiny change)
+        * vc/ediff-init.el (ediff-use-faces, ediff-highlight-all-diffs):
+        Move ediff-defvar-local calls after defcustoms.  (Bug#1821)
+2011-03-03  Glenn Morris  <rgm@gnu.org>
+        * files.el (file-truename): Doc fix.  (Bug#2341)
+2011-03-03  Bob Rogers  <rogers-emacs@rgrjr.dyndns.org>
+        * vc/vc-dir.el (vc-dir-mode-map): Bind vc-dir-find-file to e (Bug#7349).
+2011-03-03  Vagn Johansen  <gonz808@hotmail.com>  (tiny change)
+        * vc/vc-svn.el (vc-svn-after-dir-status): Some MS Windows svn client
+        programs output backslashes.  (Bug#7663)
+2011-03-03  Glenn Morris  <rgm@gnu.org>
+        * mail/sendmail.el (mail-mode-map): Remove mail-sent-via.
+        (mail-mode): Remove mail-sent-via from the doc.
+        (mail-sent-via): Make it obsolete.  (Bug#1776)
+        * progmodes/grep.el (grep-highlight-matches): Doc fix.
+        (grep-process-setup): No highlighting without font-lock.  (Bug#8084)
+        * vc/vc-bzr.el (vc-bzr-state-heuristic): Handle dirstate entries
+        with no parents.  (Bug#8025)
+2011-03-02  Teodor Zlatanov  <tzz@lifelogs.com>
+        * password-cache.el (password-in-cache-p): Add autoload.
 2011-03-02  Glenn Morris  <rgm@gnu.org>
+        * man.el (Man-support-local-filenames): Also handle Red Hat's man.
+        * dired-x.el (Man-support-local-filenames): Autoload it.
+        (dired-guess-shell-alist-default): Also handle Red Hat's man.
+        * dired-x.el (dired-default-directory-alist, dired-default-directory):
+        Mark as obsolete.
+        (dired-smart-shell-command): Just call dired-current-directory.
+        * dired-x.el (dired-jump-other-window): Add autoload.
+        (dired-default-directory-alist, dired-default-directory): Doc fixes.
+        (dired-default-directory-alist): Mark as risky.
        * dired-x.el (dired-omit-here-always): Make it obsolete.
 2011-03-02  Chong Yidong  <cyd@stupidchicken.com>
@@ -28,8 +342,9 @@
 2011-03-01  Glenn Morris  <rgm@gnu.org>
-        * calendar/cal-hebrew.el (calendar-hebrew-birthday, diary-hebrew-date):
+        * calendar/cal-hebrew.el (calendar-hebrew-birthday)
-        Rename and rework functions added in previous change.
+        (diary-hebrew-birthday): Rename and rework functions added
+        in previous change.
 2011-03-01  Ed Reingold  <reingold@emr.cs.iit.edu>
@@ -66,7 +381,7 @@
        * net/tramp-cmds.el (tramp-append-tramp-buffers): Dump load-path
        shadows.
-2011-02-28  Antoine Levitt  <antoine.levitt@gmail.com>  (tiny change)
+2011-02-28  Antoine Levitt  <antoine.levitt@gmail.com>
        * dired-x.el (dired-guess-shell-alist-default): Add rar and 7z.
@@ -187,7 +502,7 @@
        * help-fns.el (describe-function-1): Don't signal an error just because
        the DOC file disappeared.
-2011-02-22  Seppo Sade <sepposade1@gmail.com>  (tiny change)
+2011-02-22  Seppo Sade  <sepposade1@gmail.com>  (tiny change)
        * eshell/esh-ext.el (eshell-external-command): Do not restrict
        remote check to "ftp".  (Bug#8089)
@@ -250,8 +565,8 @@
        * autorevert.el (auto-revert-mode, auto-revert-tail-mode)
        (global-auto-revert-ignore-buffer): Remove leading "*" from docs.
-2011-02-19  Dmitry Bolshakov <dmitry.bolshakov@bridge-quest.com>
+2011-02-19  Dmitry Bolshakov  <dmitry.bolshakov@bridge-quest.com>
-            Dima Kogan <dkogan@cds.caltech.edu>  (tiny change)
+            Dima Kogan  <dkogan@cds.caltech.edu>  (tiny change)
        * progmodes/hideshow.el (hs-find-block-beginning)
        (hs-hide-level-recursive): Ignore comments when parsing braces
@@ -406,13 +721,13 @@
 2011-02-17  Ken Manheimer  <ken.manheimer@gmail.com>
-        * lisp/allout-widgets.el: (allout-widgets-icons-light-subdir)
+        * lisp/allout-widgets.el (allout-widgets-icons-light-subdir)
        (allout-widgets-icons-dark-subdir): Track relocations of icons
        * lisp/allout.el: Remove commentary about remove encryption
        passphrase mnemonic support and verification.
-        (allout-encrypt-string): (allout-encrypt-string): Recognize epg
+        (allout-encrypt-string): Recognize epg failure to decrypt gpg2
-        failure to decrypt gpg2 armored text using gpg1, and indicate that
+        armored text using gpg1, and indicate that the gpg version *might*
-        the gpg version *might* be the problem in the error message.
+        be the problem in the error message.
 2011-02-17  Deniz Dogan  <deniz.a.m.dogan@gmail.com>
@@ -701,7 +1016,7 @@
 2011-02-11  Deniz Dogan  <deniz.a.m.dogan@gmail.com>
-        * net/rcirc.el (defun-rcirc-join): Accept multiple channels.
+        * net/rcirc.el (rcirc-cmd-join): Accept multiple channels.
 2011-02-11  Glenn Morris  <rgm@gnu.org>
@@ -744,7 +1059,7 @@
        * play/pong.el (pong-mode-map):
        * play/handwrite.el (menu-bar-handwrite-map):
        * play/gametree.el (gametree-mode-map):
-        * net/rcirc.el (rcirc-mode-map, rcirc-browse-url-map
+        * net/rcirc.el (rcirc-mode-map, rcirc-browse-url-map)
        (rcirc-multiline-minor-mode-map, rcirc-track-minor-mode-map):
        * net/newst-plainview.el (newsticker-menu, newsticker-mode-map)
        (newsticker--url-keymap):
@@ -782,7 +1097,7 @@
        auto-activation is controlled solely by customization
        `allout-auto-activation'.
-        (allout-auto-activation-helper) (allout-setup): New autoloads
+        (allout-auto-activation-helper, allout-setup): New autoloads
        implement new custom set procedure for allout-auto-activation.
        Also, explicitly invoke
        (allout-setup) after allout-auto-activation is custom-defined, to
@@ -794,7 +1109,7 @@
        allout-auto-activation, and mark obsolete.
        (allout-mode): Respect string values for allout-auto-activation.
        Run allout-after-copy-or-kill-hook without any args.
-        (allout-mode) (allout-layout) (allout-default-layout)
+        (allout-mode, allout-layout, allout-default-layout)
        (outlineify-sticky): Adjust docstring for new scheme.
        (allout-after-copy-or-kill-hook): No arguments - hook implementers
        should concentrate on the kill ring.
@@ -835,7 +1150,7 @@
        extension-specific processing of killed text.
        (allout-mode): Include new allout-after-copy-or-kill-hook among
        mentioned hooks.
-        (allout-kill-line) (allout-kill-topic): Ensure that processing
+        (allout-kill-line, allout-kill-topic): Ensure that processing
        after kill happens even if barf-if-buffer-read-only is raised.
        Include new allout-after-copy-or-kill-hook among that subsequent
        processing.
@@ -857,23 +1172,23 @@
        * calc/calc.el (calc-logunits-field-reference): Rename from
        `calc-default-field-reference-level'.
        (calc-logunits-power-reference): Rename from
-        `calc-default-power-reference-level'
+        `calc-default-power-reference-level'.
        * calc/calc-units.el (math-logunits-quant): Rename from
        `math-logunits-level'
        (math-logunits-plus): Rename from math-logcombine.
        (calcFunc-luplus, calcFunc-luminus calc-luplus, calc-luminus): Remove.
        (calcFunc-lufieldadd, calcFunc-lupoweradd, calcFunc-lufieldsub)
-        (calcFunc-lufieldsub,calc-logunits-add calc-logunits-sub):
+        (calcFunc-lufieldsub, calc-logunits-add, calc-logunits-sub):
        New functions.
        (calcFunc-fieldquant): Rename from `calcFunc-fieldlevel'.
        (calcFunc-powerquant): Rename from `calcFunc-powerlevel'.
        (calc-logunits-quantity): Rename from `calc-level'.
        (calcFunc-dbfieldlevel, calcFunc-dbpowerlevel, calcFunc-npfieldlevel)
-        (calcFunc-nppowerlevel,calc-logunits-dblevel, calc-logunits-nplevel)
+        (calcFunc-nppowerlevel, calc-logunits-dblevel, calc-logunits-nplevel)
        (math-logunits-mul, calcFunc-lufieldmul, calcFunc-lupowermul)
        (calc-logunits-mul, math-logunits-divide, calcFunc-lufielddiv)
-        (calcFunc-lupowerdiv,calc-logunits-divide,math-logunits-level):
+        (calcFunc-lupowerdiv, calc-logunits-divide, math-logunits-level):
        New functions.
        * calc/calc-help.el (calc-u-prefix-help): Remove "L" reference.
@@ -1596,7 +1911,7 @@
        (allout-institute-keymap): Take over the "setup" part of the former
        allout-setup-mode-map.  Reassign allout-mode-map-value value and
        update the defalias.
-        (allout-command-prefix) (allout-prefixed-keybindings)
+        (allout-command-prefix, allout-prefixed-keybindings)
        (allout-unprefixed-keybindings):
        Use allout-compose-and-institute-keymap to process the bindings.
        (allout-unprefixed-keybindings): Remove extraneous '?' question marks.
@@ -2591,7 +2906,7 @@
        * loadup.el (symbol-file-load-history-loaded): Remove; unused.
 2010-12-15  Jari Aalto  <jari.aalto@cante.net>
-            Scott Evans <gse@antisleep.com>
+            Scott Evans  <gse@antisleep.com>
        * rect.el (rectange--default-line-number-format)
        (rectangle-number-line-callback): New functions.
@@ -2751,7 +3066,7 @@
        * dired.el (dired-pop-to-buffer): Bind pop-up-frames to nil
        (Bug#7533).
-2010-12-13  W. Martin Borgert <debacle@debian.org>  (tiny change)
+2010-12-13  W. Martin Borgert  <debacle@debian.org>  (tiny change)
        * files.el (auto-mode-alist): Handle .dbk (DocBook) with xml-mode.
        (Bug#7491).
@@ -3679,7 +3994,7 @@
          describe-prefix-bindings
        - adapt to new version of called-interactively-p, while
          maintaining backwards compatibility with old version
-        - fix hotspot navigation so i works properly with meta-modified keys
+        - fix hotspot navigation so i works properly with meta-modified keys.
        * allout.el (allout-keybindings, allout-bind-keys)
        (allout-keybindings-binding, allout-prefixed-keybindings)
@@ -3806,7 +4121,7 @@
 2010-11-12  Glenn Morris  <rgm@gnu.org>
        * emacs-lisp/bytecomp.el (byte-compile-log-buffer): New constant.
-        Use it to replace all instances of "*Compile-Log*"
+        Use it to replace all instances of "*Compile-Log*".
 2010-11-12  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -5737,7 +6052,7 @@
 2010-10-03  Glenn Morris  <rgm@gnu.org>
-        * obsolete/x-menu.el: Remove file, obsolete since 21.1
+        * obsolete/x-menu.el: Remove file, obsolete since 21.1.
        * textmodes/rst.el (rst-font-lock-keywords-function):
        Drop Emacs 20 code.
@@ -6451,7 +6766,7 @@
 2010-09-14  Sascha Wilde  <wilde@sha-bang.de>
-        * vc/vc-hg.el (vc-hg-state,vc-hg-working-revision):
+        * vc/vc-hg.el (vc-hg-state, vc-hg-working-revision):
        Replace setting HGRCPATH to "" by some less invasive --config options.
 2010-09-14  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -7567,7 +7882,7 @@
        * net/dbus.el: Accept UNIX domain sockets as bus address.
        (top): Don't initialize `dbus-registered-objects-table' anymore,
-        this is done in dbusbind,c.
+        this is done in dbusbind.c.
        (dbus-check-event): Adapt test for bus.
        (dbus-return-values-table, dbus-unregister-service)
        (dbus-event-bus-name, dbus-introspect, dbus-register-property):
@@ -7904,7 +8219,7 @@
        * progmodes/octave-mod.el (octave-mode): Set comment-add.
        (octave-mode-map): Use comment-dwim (bug#6829).
-2010-08-12  Antoine Levitt  <antoine.levitt@gmail.com>  (tiny change)
+2010-08-12  Antoine Levitt  <antoine.levitt@gmail.com>
        * cus-edit.el (custom-save-variables, custom-save-faces): Fix up
        indentation of inserted comment.
@@ -8083,7 +8398,7 @@
 2010-08-08  Jay Belanger  <jay.p.belanger@gmail.com>
-        * calc/calc.el (calc-trail-mode,calc-refresh): Use `face' property
+        * calc/calc.el (calc-trail-mode, calc-refresh): Use `face' property
        to italicize headers.
        (calc-highlight-selections-with-faces): New variable.
        (calc-selected-face, calc-nonselected-face): New faces.
@@ -8128,7 +8443,7 @@
        * progmodes/cc-cmds.el (c-mask-paragraph, c-fill-paragraph):
        Fix for the case that a C style comment has its delimiters alone on
-        their respective lines.
+        their respective lines.  (Bug#193)
 2010-08-06  Michael Albinus  <michael.albinus@gmx.de>
@@ -10903,7 +11218,7 @@
        * textmodes/ispell.el (ispell-init-process): Fix personal dictionary
        condition in default directory check.
-        (ispell-init-process,ispell-kill-ispell,kill-buffer-hook):
+        (ispell-init-process, ispell-kill-ispell, kill-buffer-hook):
        Kill ispell process when killing its associated buffer.
 2010-04-27  Jan Djärv  <jan.h.d@swipnet.se>
@@ -15633,7 +15948,7 @@
        * vc-rcs.el (vc-rcs-print-log):
        * vc-git.el (vc-git-print-log):
        * vc-cvs.el (vc-cvs-print-log): Add new optional argument LIMIT,
-        ignore it.  Make the BUFFER argument non-optional
+        ignore it.  Make the BUFFER argument non-optional.
        * bindings.el (mode-line-buffer-identification): Do not purecopy.
@@ -20387,12 +20702,12 @@
 2009-08-19  Magnus Henoch  <magnus.henoch@gmail.com>
        * log-edit.el (log-edit-strip-single-file-name): New var.
-        (log-edit-insert-changelog): Use it.  Bug#3571
+        (log-edit-insert-changelog): Use it.  Bug#3571.
 2009-08-19  Stefan Monnier  <monnier@iro.umontreal.ca>
        * subr.el (read-passwd): Use read-key so keypad keys work as well.
-        Bug#3287
+        Bug#3287.
        * help.el (help-print-return-message): Rename from
        print-help-return-message.
@@ -22156,7 +22471,7 @@
        or shell command text during AUTO expansion.  Suggested by Tad Truex.
        (verilog-read-sub-decls-expr, verilog-read-sub-decls-line)
        (verilog-read-sub-decls-sig, verilog-symbol-detick-text):
-        Fix dotted nets {a.b,c.d} and excaped identifiers being mis-included
+        Fix dotted nets {a.b,c.d} and escaped identifiers being mis-included
        in AUTOINOUT.  Reported by Matthew Lovell.
        (verilog-read-always-signals-recurse): Fix AUTORESET "if (a<=b)"
        causing use of <= assignments.  Reported by Alex Reed.
diff --git a/lisp/allout.el b/lisp/allout.el
index ca72806b7d9..c75b7a22f9a 100644
--- a/lisp/allout.el
+++ b/lisp/allout.el
@@ -234,7 +234,7 @@ Use vector format for the keys:
  - put literal keys after a '?' question mark, eg: '?a', '?.'
  - enclose control, shift, or meta-modified keys as sequences within
    parentheses, with the literal key, as above, preceded by the name(s)
-    of the modifers, eg: [(control ?a)]
+    of the modifiers, eg: [(control ?a)]
 See the existing keys for examples.
 Functions can be bound to multiple keys, but binding keys to
@@ -261,7 +261,7 @@ Use vector format for the keys:
  - put literal keys after a '?' question mark, eg: '?a', '?.'
  - enclose control, shift, or meta-modified keys as sequences within
    parentheses, with the literal key, as above, preceded by the name(s)
-    of the modifers, eg: [(control ?a)]
+    of the modifiers, eg: [(control ?a)]
 See the existing keys for examples."
  :type 'allout-keybindings-binding
  :group 'allout-keybindings
@@ -1642,7 +1642,7 @@ So `allout-post-command-business' should not reactivate it...")
 (defun allout-init (mode)
  "DEPRECATED - configure allout activation by customizing
 `allout-auto-activation'.  This function remains around, limited
-from what it did before, for backwards compatability.
+from what it did before, for backwards compatibility.
 MODE is the activation mode - see `allout-auto-activation' for
 valid values."
diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index cd946e46be9..d3db54c81d4 100644
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -2181,7 +2181,8 @@ This also runs `bookmark-exit-hook'."
       (bookmark-time-to-save-p t)
       (bookmark-save)))
-(add-hook 'kill-emacs-hook 'bookmark-exit-hook-internal)
+(unless noninteractive
+  (add-hook 'kill-emacs-hook 'bookmark-exit-hook-internal))
 (defun bookmark-unload-function ()
  "Unload the Bookmark library."
diff --git a/lisp/calc/calc-ext.el b/lisp/calc/calc-ext.el
index ec4e902f33d..11a26d6d125 100644
--- a/lisp/calc/calc-ext.el
+++ b/lisp/calc/calc-ext.el
@@ -423,12 +423,16 @@
  (define-key calc-mode-map "l" nil)
  (define-key calc-mode-map "lq" 'calc-logunits-quantity)
-  (define-key calc-mode-map "ld" 'calc-logunits-dblevel)
+  (define-key calc-mode-map "ld" 'calc-dblevel)
-  (define-key calc-mode-map "ln" 'calc-logunits-nplevel)
+  (define-key calc-mode-map "ln" 'calc-nplevel)
  (define-key calc-mode-map "l+" 'calc-logunits-add)
  (define-key calc-mode-map "l-" 'calc-logunits-sub)
  (define-key calc-mode-map "l*" 'calc-logunits-mul)
  (define-key calc-mode-map "l/" 'calc-logunits-divide)
+  (define-key calc-mode-map "ls" 'calc-spn)
+  (define-key calc-mode-map "lm" 'calc-midi)
+  (define-key calc-mode-map "lf" 'calc-freq)
+  
  (define-key calc-mode-map "l?" 'calc-l-prefix-help)
  (define-key calc-mode-map "m" nil)
@@ -944,7 +948,7 @@ calcFunc-lupoweradd calcFunc-lufieldsub calcFunc-lupowersub
 calcFunc-lufieldmul calcFunc-lupowermul calcFunc-lufielddiv
 calcFunc-lupowerdiv calcFunc-fieldquant calcFunc-powerquant
 calcFunc-dbfieldlevel calcFunc-dbpowerlevel calcFunc-npfieldlevel
-calcFunc-nppowerlevel
+calcFunc-nppowerlevel calcFunc-spn calcFunc-midi calcFunc-freq
 math-build-units-table math-build-units-table-buffer
 math-check-unit-name math-convert-temperature math-convert-units
 math-extract-units math-remove-units math-simplify-units
@@ -1176,9 +1180,10 @@ calc-convert-temperature calc-convert-units calc-define-unit
 calc-enter-units-table calc-explain-units calc-extract-units
 calc-get-unit-definition calc-permanent-units calc-quick-units
 calc-remove-units calc-simplify-units calc-undefine-unit
-calc-view-units-table calc-logunits-quantity calc-logunits-dblevel
+calc-view-units-table calc-logunits-quantity calc-dblevel
-calc-logunits-nplevel calc-logunits-add calc-logunits-sub
+calc-nplevel calc-logunits-add calc-logunits-sub
-calc-logunits-mul calc-logunits-divide)
+calc-logunits-mul calc-logunits-divide calc-spn calc-midi
+calc-freq)
 ("calc-vec" calc-arrange-vector calc-build-vector calc-cnorm
 calc-conj-transpose calc-cons calc-cross calc-kron calc-diag
diff --git a/lisp/calc/calc-units.el b/lisp/calc/calc-units.el
index e6a6fb01132..7f0adc9fe7e 100644
--- a/lisp/calc/calc-units.el
+++ b/lisp/calc/calc-units.el
@@ -960,7 +960,10 @@ If EXPR is nil, return nil."
          (if (eq base 'pi)
              (math-pi)
            expr)))
-    (if (Math-primp expr)
+    (if (or
+         (Math-primp expr)
+         (and (eq (car-safe expr) 'calcFunc-subscr)
+              (eq (car-safe (nth 1 expr)) 'var)))
        expr
      (cons (car expr)
            (mapcar 'math-to-standard-rec (cdr expr))))))
@@ -1834,7 +1837,7 @@ In symbolic mode, return the list (^ a b)."
    (setq ref (math-read-expr calc-logunits-power-reference)))
  (math-logunits-level val ref nil t))
-(defun calc-logunits-dblevel (arg)
+(defun calc-dblevel (arg)
  (interactive "P")
  (calc-slow-wrapper
   (if (calc-is-hyperbolic)
@@ -1845,7 +1848,7 @@ In symbolic mode, return the list (^ a b)."
         (calc-binary-op "ludb" 'calcFunc-dbpowerlevel arg)
       (calc-unary-op "ludb" 'calcFunc-dbpowerlevel arg)))))
-(defun calc-logunits-nplevel (arg)
+(defun calc-nplevel (arg)
  (interactive "P")
  (calc-slow-wrapper
   (if (calc-is-hyperbolic)
@@ -1856,6 +1859,222 @@ In symbolic mode, return the list (^ a b)."
         (calc-binary-op "lunp" 'calcFunc-nppowerlevel arg)
       (calc-unary-op "lunp" 'calcFunc-nppowerlevel arg)))))
+;;; Musical notes
+(defvar calc-note-threshold)
+(defun math-midi-round (num)
+  "Round NUM to an integer N if NUM is within calc-note-threshold cents of N."
+  (let* ((n (math-round num))
+         (diff (math-abs
+                (math-sub num n))))
+    (if (< (math-compare diff 
+                         (math-div (math-read-expr calc-note-threshold) 100)) 0)
+        n
+      num)))
+(defconst math-notes
+  '(((var C var-C) . 0)
+    ((var Csharp var-Csharp) . 1)
+;    ((var C♯ var-C♯) . 1)
+    ((var Dflat var-Dflat) . 1)
+;    ((var D♭ var-D♭) . 1)
+    ((var D var-D) . 2)
+    ((var Dsharp var-Dsharp) . 3)
+;    ((var D♯ var-D♯) . 3)
+    ((var E var-E) . 4)
+    ((var F var-F) . 5)
+    ((var Fsharp var-Fsharp) . 6)
+;    ((var F♯ var-F♯) . 6)
+    ((var Gflat var-Gflat) . 6)
+;    ((var G♭ var-G♭) . 6)
+    ((var G var-G) . 7)
+    ((var Gsharp var-Gsharp) . 8)
+;    ((var G♯ var-G♯) . 8)
+    ((var A var-A) . 9)
+    ((var Asharp var-Asharp) . 10)
+;    ((var A♯ var-A♯) . 10)
+    ((var Bflat var-Bflat) . 10)
+;    ((var B♭ var-B♭) . 10)
+    ((var B var-B) . 11))
+  "An alist of notes with their number of semitones above C.")
+(defun math-freqp (freq)
+  "Non-nil if FREQ is a positive number times the unit Hz.
+If non-nil, return the coefficient of Hz."
+  (let ((freqcoef (math-simplify-units
+                   (math-div freq '(var Hz var-Hz)))))
+    (if (Math-posp freqcoef) freqcoef)))
+(defun math-midip (num)
+  "Non-nil if NUM is a possible MIDI note number.
+If non-nil, return NUM."
+  (if (Math-numberp num) num))
+(defun math-spnp (spn)
+  "Non-nil if NUM is a scientific pitch note (note + cents).
+If non-nil, return a list consisting of the note and the cents coefficient."
+  (let (note cents rnote rcents)
+    (if (eq (car-safe spn) '+)
+        (setq note (nth 1 spn)
+              cents (nth 2 spn))
+      (setq note spn
+            cents nil))
+    (cond
+     ((and  ;; NOTE is a note, CENTS is nil or cents.
+       (eq (car-safe note) 'calcFunc-subscr)
+       (assoc (nth 1 note) math-notes)
+       (integerp (nth 2 note))
+       (setq rnote note)
+       (or 
+        (not cents)
+        (Math-numberp (setq rcents
+                            (math-simplify 
+                             (math-div cents '(var cents var-cents)))))))
+      (list rnote rcents))
+     ((and  ;; CENTS is a note, NOTE is cents.
+       (eq (car-safe cents) 'calcFunc-subscr)
+       (assoc (nth 1 cents) math-notes)
+       (integerp (nth 2 cents))
+       (setq rnote cents)
+       (or 
+        (not note)
+        (Math-numberp (setq rcents
+                            (math-simplify 
+                             (math-div note '(var cents var-cents)))))))
+      (list rnote rcents)))))
+(defun math-freq-to-midi (freq)
+  "Return the midi note number corresponding to FREQ Hz."
+  (let ((midi (math-add
+               69
+               (math-mul
+                12
+                (calcFunc-log
+                 (math-div freq 440)
+                 2)))))
+    (math-midi-round midi)))
+(defun math-spn-to-midi (spn)
+  "Return the MIDI number corresponding to SPN."
+  (let* ((note (cdr (assoc (nth 1 (car spn)) math-notes)))
+         (octave (math-add (nth 2 (car spn)) 1))
+         (cents (nth 1 spn))
+         (midi  (math-add
+                 (math-mul 12 octave)
+                 note)))
+    (if cents
+        (math-add midi (math-div cents 100))
+      midi)))
+(defun math-midi-to-spn (midi)
+  "Return the scientific pitch notation corresponding to midi number MIDI."
+  (let (midin cents)
+    (if (math-integerp midi)
+        (setq midin midi 
+              cents nil)
+      (setq midin (math-floor midi)
+            cents (math-mul 100 (math-sub midi midin))))
+    (let* ((nr ;; This should be (math-idivmod midin 12), but with
+               ;; better behavior for negative midin.
+            (if (Math-negp midin)
+                (let ((dm (math-idivmod (math-neg midin) 12)))
+                  (if (= (cdr dm) 0)
+                      (cons (math-neg (car dm)) 0)
+                    (cons
+                     (math-sub (math-neg (car dm)) 1)
+                     (math-sub 12 (cdr dm)))))
+              (math-idivmod midin 12)))
+           (n (math-sub (car nr) 1))
+           (note (car (rassoc (cdr nr) math-notes))))
+      (if cents
+          (list '+ (list 'calcFunc-subscr note n) 
+                   (list '* cents '(var cents var-cents)))
+        (list 'calcFunc-subscr note n)))))
+(defun math-freq-to-spn (freq)
+  "Return the scientific pitch notation corresponding to FREQ Hz."
+  (math-with-extra-prec 3
+    (math-midi-to-spn (math-freq-to-midi freq))))
+(defun math-midi-to-freq (midi)
+  "Return the frequency of the note with midi number MIDI."
+  (list '*
+        (math-mul
+         440
+         (math-pow
+          2
+          (math-div 
+           (math-sub
+            midi
+            69)
+           12)))
+        '(var Hz var-Hz)))
+(defun math-spn-to-freq (spn)
+  "Return the frequency of the note with scientific pitch notation SPN."
+  (math-midi-to-freq (math-spn-to-midi spn)))
+(defun calcFunc-spn (expr)
+  "Return EXPR written as scientific pitch notation + cents."
+  ;; Get the coeffecient of Hz
+  (let (note)
+    (cond
+     ((setq note (math-freqp expr))
+      (math-freq-to-spn note))
+     ((setq note (math-midip expr))
+      (math-midi-to-spn note))
+     ((math-spnp expr)
+      expr)
+     (t
+      (math-reject-arg expr "*Improper expression")))))
+(defun calcFunc-midi (expr)
+  "Return EXPR written as a MIDI number."
+  (let (note)
+    (cond
+     ((setq note (math-freqp expr))
+      (math-freq-to-midi note))
+     ((setq note (math-spnp expr))
+      (math-spn-to-midi note))
+     ((math-midip expr)
+      expr)
+     (t
+      (math-reject-arg expr "*Improper expression")))))
+(defun calcFunc-freq (expr)
+  "Return the frequency corresponding to EXPR."
+  (let (note)
+    (cond
+     ((setq note (math-midip expr))
+      (math-midi-to-freq note))
+     ((setq note (math-spnp expr))
+      (math-spn-to-freq note))
+     ((math-freqp expr)
+      expr)
+     (t
+      (math-reject-arg expr "*Improper expression")))))
+(defun calc-freq (arg)
+  "Return the frequency corresponding to the expression on the stack."
+  (interactive "P")
+  (calc-slow-wrapper
+   (calc-unary-op "freq" 'calcFunc-freq arg)))
+(defun calc-midi (arg)
+  "Return the MIDI number corresponding to the expression on the stack."
+  (interactive "P")
+  (calc-slow-wrapper
+   (calc-unary-op "midi" 'calcFunc-midi arg)))
+(defun calc-spn (arg)
+  "Return the scientific pitch notation corresponding to the expression on the stack."
+  (interactive "P")
+  (calc-slow-wrapper
+   (calc-unary-op "spn" 'calcFunc-spn arg)))
 (provide 'calc-units)
 ;; Local variables:
diff --git a/lisp/calc/calc.el b/lisp/calc/calc.el
index 72ddddeb32d..f4d8983eb88 100644
--- a/lisp/calc/calc.el
+++ b/lisp/calc/calc.el
@@ -446,6 +446,11 @@ by displaying the sub-formula in `calc-selected-face'."
  :group 'calc
  :type '(string))
+(defcustom calc-note-threshold "1" 
+  "The number of cents that a frequency should be near a note
+to be identified as that note."
+  :type 'string
+  :group 'calc)
 (defface calc-nonselected-face
  '((t :inherit shadow       
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index d43d2607c9a..88821652784 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -920,6 +920,8 @@ it were the arg to `interactive' (which see) to interactively read the value.
 If the variable has a `custom-type' property, it must be a widget and the
 `:prompt-value' property of that widget will be used for reading the value.
+If the variable also has a `custom-get' property, that is used for finding 
+the current value of the variable, otherwise `symbol-value' is used.
 If optional COMMENT argument is non-nil, also prompt for a comment and return
 it as the third element in the list."
@@ -941,7 +943,9 @@ it as the third element in the list."
                   (widget-prompt-value type
                                        prompt
                                        (if (boundp var)
-                                            (symbol-value var))
+                                            (funcall 
+                                             (or (get var 'custom-get) 'symbol-value) 
+                                             var))
                                        (not (boundp var))))
                  (t
                   (eval-minibuffer prompt))))))
@@ -1599,7 +1603,7 @@ Otherwise use brackets."
               'editable-field
               :size 40 :help-echo echo
               :action `(lambda (widget &optional event)
-                          (customize-apropos (widget-value widget))))))
+                          (customize-apropos (split-string (widget-value widget)))))))
        (widget-insert " ")
        (widget-create-child-and-convert
         search-widget 'push-button
diff --git a/lisp/desktop.el b/lisp/desktop.el
index 4ca4cec38ff..fd5baaf020f 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -611,7 +611,8 @@ Furthermore, it clears the variables listed in `desktop-globals-to-clear'."
  (delete-other-windows))
 ;; ----------------------------------------------------------------------------
-(add-hook 'kill-emacs-hook 'desktop-kill)
+(unless noninteractive
+  (add-hook 'kill-emacs-hook 'desktop-kill))
 (defun desktop-kill ()
  "If `desktop-save-mode' is non-nil, do what `desktop-save' says to do.
diff --git a/lisp/dired-x.el b/lisp/dired-x.el
index 81f77b48289..a5063bb77dd 100644
--- a/lisp/dired-x.el
+++ b/lisp/dired-x.el
@@ -436,6 +436,7 @@ move to its line in dired."
                (dired-omit-mode)
                (dired-goto-file file)))))))
+;;;###autoload
 (defun dired-jump-other-window (&optional file-name)
  "Like \\[dired-jump] (`dired-jump') but in other window."
  (interactive
@@ -704,15 +705,26 @@ Also useful for `auto-mode-alist' like this:
                      (dired-current-directory)
                    default-directory)))
  "Alist of major modes and their opinion on `default-directory'.
-This is given as a Lisp expression to evaluate.  A resulting value of
+Each element has the form (MAJOR . EXPRESSION).
-nil is ignored in favor of `default-directory'.")
+The function `dired-default-directory' evaluates EXPRESSION to
+determine a default directory.")
+(put 'dired-default-directory-alist 'risky-local-variable t) ; gets eval'd
+(make-obsolete-variable 'dired-default-directory-alist
+                        "this feature is due to be removed." "24.1")
 (defun dired-default-directory ()
-  "Usage like variable `default-directory'.
+  "Return the `dired-default-directory-alist' entry for the current major-mode.
-Knows about the special cases in variable `dired-default-directory-alist'."
+If none, return `default-directory'."
  (or (eval (cdr (assq major-mode dired-default-directory-alist)))
      default-directory))
+;; It looks like this was intended to be something of a "general" feature,
+;; but it only ever seems to have been used in dired-smart-shell-command,
+;; and does not seem worth keeping around (?).
+(make-obsolete 'dired-default-directory
+               "this feature is due to be removed." "24.1")
 (defun dired-smart-shell-command (command &optional output-buffer error-buffer)
  "Like function `shell-command', but in the current Virtual Dired directory."
  (interactive
@@ -723,7 +735,9 @@ Knows about the special cases in variable `dired-default-directory-alist'."
                         ((eq major-mode 'dired-mode) (dired-get-filename t t))))
    current-prefix-arg
    shell-command-default-error-buffer))
-  (let ((default-directory (dired-default-directory)))
+  (let ((default-directory (or (and (eq major-mode 'dired-mode)
+                                    (dired-current-directory))
+                               default-directory)))
    (shell-command command output-buffer error-buffer)))
@@ -846,7 +860,7 @@ replace it with a dir-locals-file `./%s'"
 ;; NOTE: Use `gunzip -c' instead of `zcat' on `.gz' files.  Some do not
 ;; install GNU zip's version of zcat.
-(declare-function Man-support-local-filenames "man" ())
+(autoload 'Man-support-local-filenames "man")
 (defvar dired-guess-shell-alist-default
  (list
@@ -939,20 +953,27 @@ replace it with a dir-locals-file `./%s'"
                  " " dired-guess-shell-znew-switches))
   ;; The following four extensions are useful with dired-man ("N" key)
-   (list "\\.\\(?:[0-9]\\|man\\)\\'" '(progn (require 'man)
+   ;; FIXME "man ./" does not work with dired-do-shell-command,
-                                           (if (Man-support-local-filenames)
+   ;; because there seems to be no way for us to modify the filename,
-                                               "man -l"
+   ;; only the command.  Hmph.  `dired-man' works though.
-                                             "cat * | tbl | nroff -man -h")))
+   (list "\\.\\(?:[0-9]\\|man\\)\\'" '(let ((loc (Man-support-local-filenames)))
-   (list "\\.\\(?:[0-9]\\|man\\)\\.g?z\\'" '(progn (require 'man)
+                                        (cond ((eq loc 'man-db) "man -l")
-                                                 (if (Man-support-local-filenames)
+                                              ((eq loc 'man) "man ./")
-                                                     "man -l"
+                                              (t
-                                                   "gunzip -qc * | tbl | nroff -man -h"))
+                                               "cat * | tbl | nroff -man -h"))))
+   (list "\\.\\(?:[0-9]\\|man\\)\\.g?z\\'"
+         '(let ((loc (Man-support-local-filenames)))
+            (cond ((eq loc 'man-db)
+                   "man -l")
+                  ((eq loc 'man)
+                   "man ./")
+                  (t "gunzip -qc * | tbl | nroff -man -h")))
         ;; Optional decompression.
         '(concat "gunzip" (if dired-guess-shell-gzip-quiet " -q")))
-   (list "\\.[0-9]\\.Z\\'" '(progn (require 'man)
+   (list "\\.[0-9]\\.Z\\'" '(let ((loc (Man-support-local-filenames)))
-                                 (if (Man-support-local-filenames)
+                              (cond ((eq loc 'man-db) "man -l")
-                                     "man -l"
+                                    ((eq loc 'man) "man ./")
-                                   "zcat * | tbl | nroff -man -h"))
+                                    (t "zcat * | tbl | nroff -man -h")))
         ;; Optional conversion to gzip format.
         '(concat "znew" (if dired-guess-shell-gzip-quiet " -q")
                  " " dired-guess-shell-znew-switches))
diff --git a/lisp/dired.el b/lisp/dired.el
index c113f0cb2f4..c4374503a6f 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -611,9 +611,12 @@ Don't use that together with FILTER."
            (if current-prefix-arg
                (read-string "Dired listing switches: "
                             dired-listing-switches))
-            ;; If a dialog is about to be used, call read-directory-name so
+            ;; If a dialog is used, call `read-directory-name' so the
-            ;; the dialog code knows we want directories.  Some dialogs can
+            ;; dialog code knows we want directories.  Some dialogs
-            ;; only select directories or files when popped up, not both.
+            ;; can only select directories or files when popped up,
+            ;; not both.  If no dialog is used, call `read-file-name'
+            ;; because the user may want completion of file names for
+            ;; use in a wildcard pattern.
            (if (next-read-file-uses-dialog-p)
                (read-directory-name (format "Dired %s(directory): " str)
                                     nil default-directory nil)
@@ -4082,8 +4085,8 @@ true then the type of the file linked to by FILE is printed instead.
 ;;;***
-;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el"
+;;;### (autoloads (dired-do-relsymlink dired-jump-other-window dired-jump)
-;;;;;;  "3b8851132739ab3f9054bf639873c53e")
+;;;;;;  "dired-x" "dired-x.el" "87fd4ae2fdade7e0f11c4a0b1cfdeda2")
 ;;; Generated autoloads from dired-x.el
 (autoload 'dired-jump "dired-x" "\
@@ -4098,6 +4101,11 @@ move to its line in dired.
 \(fn &optional OTHER-WINDOW FILE-NAME)" t nil)
+(autoload 'dired-jump-other-window "dired-x" "\
+Like \\[dired-jump] (`dired-jump') but in other window.
+\(fn &optional FILE-NAME)" t nil)
 (autoload 'dired-do-relsymlink "dired-x" "\
 Relative symlink all marked (or next ARG) files into a directory.
 Otherwise make a relative symbolic link to the current file.
diff --git a/lisp/emacs-lisp/elp.el b/lisp/emacs-lisp/elp.el
index 910eff3c78f..73af3a5708f 100644
--- a/lisp/emacs-lisp/elp.el
+++ b/lisp/emacs-lisp/elp.el
@@ -630,7 +630,7 @@ displayed."
                                   'display (list 'space :align-to column)
                                   'face 'fixed-pitch)
                       title)
-                    (setq column (+ column 1
+                    (setq column (+ column 2
                                    (if (= column 0)
                                        elp-field-len
                                      (length title))))))
diff --git a/lisp/emacs-lisp/ert.el b/lisp/emacs-lisp/ert.el
index b3c95fcc78f..5bd8fd01b1e 100644
--- a/lisp/emacs-lisp/ert.el
+++ b/lisp/emacs-lisp/ert.el
@@ -219,7 +219,7 @@ Emacs bug 6581 at URL `http://debbugs.gnu.org/cgi/bugreport.cgi?bug=6581'."
  ;; This implementation is inefficient.  Rather than making it
  ;; efficient, let's hope bug 6581 gets fixed so that we can delete
  ;; it altogether.
-  (not (ert--explain-not-equal-including-properties a b)))
+  (not (ert--explain-equal-including-properties a b)))
 ;;; Defining and locating tests.
@@ -571,16 +571,15 @@ failed."
   (when (and (not firstp) (eq fast slow)) (return nil))))
 (defun ert--explain-format-atom (x)
-  "Format the atom X for `ert--explain-not-equal'."
+  "Format the atom X for `ert--explain-equal'."
  (typecase x
    (fixnum (list x (format "#x%x" x) (format "?%c" x)))
    (t x)))
-(defun ert--explain-not-equal (a b)
+(defun ert--explain-equal-rec (a b)
-  "Explainer function for `equal'.
+  "Returns a programmer-readable explanation of why A and B are not `equal'.
-Returns a programmer-readable explanation of why A and B are not
+Returns nil if they are."
-`equal', or nil if they are."
  (if (not (equal (type-of a) (type-of b)))
      `(different-types ,a ,b)
    (etypecase a
@@ -598,13 +597,13 @@ Returns a programmer-readable explanation of why A and B are not
                 (loop for i from 0
                       for ai in a
                       for bi in b
-                       for xi = (ert--explain-not-equal ai bi)
+                       for xi = (ert--explain-equal-rec ai bi)
                       do (when xi (return `(list-elt ,i ,xi)))
                       finally (assert (equal a b) t)))
-             (let ((car-x (ert--explain-not-equal (car a) (car b))))
+             (let ((car-x (ert--explain-equal-rec (car a) (car b))))
               (if car-x
                   `(car ,car-x)
-                 (let ((cdr-x (ert--explain-not-equal (cdr a) (cdr b))))
+                 (let ((cdr-x (ert--explain-equal-rec (cdr a) (cdr b))))
                   (if cdr-x
                       `(cdr ,cdr-x)
                     (assert (equal a b) t)
@@ -618,7 +617,7 @@ Returns a programmer-readable explanation of why A and B are not
               (loop for i from 0
                     for ai across a
                     for bi across b
-                     for xi = (ert--explain-not-equal ai bi)
+                     for xi = (ert--explain-equal-rec ai bi)
                     do (when xi (return `(array-elt ,i ,xi)))
                     finally (assert (equal a b) t))))
      (atom (if (not (equal a b))
@@ -627,7 +626,15 @@ Returns a programmer-readable explanation of why A and B are not
                  `(different-atoms ,(ert--explain-format-atom a)
                                    ,(ert--explain-format-atom b)))
              nil)))))
-(put 'equal 'ert-explainer 'ert--explain-not-equal)
+(defun ert--explain-equal (a b)
+  "Explainer function for `equal'."
+  ;; Do a quick comparison in C to avoid running our expensive
+  ;; comparison when possible.
+  (if (equal a b)
+      nil
+    (ert--explain-equal-rec a b)))
+(put 'equal 'ert-explainer 'ert--explain-equal)
 (defun ert--significant-plist-keys (plist)
  "Return the keys of PLIST that have non-null values, in order."
@@ -658,8 +665,8 @@ key/value pairs in each list does not matter."
                   (value-b (plist-get b key)))
               (assert (not (equal value-a value-b)) t)
               `(different-properties-for-key
-                 ,key ,(ert--explain-not-equal-including-properties value-a
+                 ,key ,(ert--explain-equal-including-properties value-a
-                                                                    value-b)))))
+                                                                value-b)))))
      (cond (keys-in-a-not-in-b
             (explain-with-key (first keys-in-a-not-in-b)))
            (keys-in-b-not-in-a
@@ -681,13 +688,16 @@ If SUFFIXP is non-nil, returns a suffix of S, otherwise a prefix."
          (t
           (substring s 0 len)))))
-(defun ert--explain-not-equal-including-properties (a b)
+;; TODO(ohler): Once bug 6581 is fixed, rename this to
+;; `ert--explain-equal-including-properties-rec' and add a fast-path
+;; wrapper like `ert--explain-equal'.
+(defun ert--explain-equal-including-properties (a b)
  "Explainer function for `ert-equal-including-properties'.
 Returns a programmer-readable explanation of why A and B are not
 `ert-equal-including-properties', or nil if they are."
  (if (not (equal a b))
-      (ert--explain-not-equal a b)
+      (ert--explain-equal a b)
    (assert (stringp a) t)
    (assert (stringp b) t)
    (assert (eql (length a) (length b)) t)
@@ -713,7 +723,7 @@ Returns a programmer-readable explanation of why A and B are not
          )))
 (put 'ert-equal-including-properties
     'ert-explainer
-     'ert--explain-not-equal-including-properties)
+     'ert--explain-equal-including-properties)
 ;;; Implementation of `ert-info'.
@@ -1244,12 +1254,14 @@ Also changes the counters in STATS to match."
                   (ert-test-passed (incf (ert--stats-passed-expected stats) d))
                   (ert-test-failed (incf (ert--stats-failed-expected stats) d))
                   (null)
-                   (ert-test-aborted-with-non-local-exit))
+                   (ert-test-aborted-with-non-local-exit)
+                   (ert-test-quit))
               (etypecase (aref results pos)
                 (ert-test-passed (incf (ert--stats-passed-unexpected stats) d))
                 (ert-test-failed (incf (ert--stats-failed-unexpected stats) d))
                 (null)
-                 (ert-test-aborted-with-non-local-exit)))))
+                 (ert-test-aborted-with-non-local-exit)
+                 (ert-test-quit)))))
      ;; Adjust counters to remove the result that is currently in stats.
      (update -1)
      ;; Put new test and result into stats.
@@ -1342,7 +1354,8 @@ EXPECTEDP specifies whether the result was expected."
             (ert-test-passed ".P")
             (ert-test-failed "fF")
             (null "--")
-             (ert-test-aborted-with-non-local-exit "aA"))))
+             (ert-test-aborted-with-non-local-exit "aA")
+             (ert-test-quit "qQ"))))
    (elt s (if expectedp 0 1))))
 (defun ert-string-for-test-result (result expectedp)
@@ -1353,7 +1366,8 @@ EXPECTEDP specifies whether the result was expected."
             (ert-test-passed '("passed" "PASSED"))
             (ert-test-failed '("failed" "FAILED"))
             (null '("unknown" "UNKNOWN"))
-             (ert-test-aborted-with-non-local-exit '("aborted" "ABORTED")))))
+             (ert-test-aborted-with-non-local-exit '("aborted" "ABORTED"))
+             (ert-test-quit '("quit" "QUIT")))))
    (elt s (if expectedp 0 1))))
 (defun ert--pp-with-indentation-and-newline (object)
@@ -1478,7 +1492,9 @@ Returns the stats object."
                 (message "%s" (buffer-string))))
              (ert-test-aborted-with-non-local-exit
               (message "Test %S aborted with non-local exit"
-                        (ert-test-name test)))))
+                        (ert-test-name test)))
+              (ert-test-quit
+               (message "Quit during %S" (ert-test-name test)))))
          (let* ((max (prin1-to-string (length (ert--stats-tests stats))))
                 (format-string (concat "%9s  %"
                                        (prin1-to-string (length max))
@@ -1853,7 +1869,9 @@ non-nil, returns the face for expected results.."
                     (ert-test-result-with-condition-condition result))
                    (ert--make-xrefs-region begin (point)))))
               (ert-test-aborted-with-non-local-exit
-                (insert "    aborted\n")))
+                (insert "    aborted\n"))
+               (ert-test-quit
+                (insert "    quit\n")))
             (insert "\n")))))
  nil)
diff --git a/lisp/emacs-lisp/ewoc.el b/lisp/emacs-lisp/ewoc.el
index bf9998695ee..a71f3c7244c 100644
--- a/lisp/emacs-lisp/ewoc.el
+++ b/lisp/emacs-lisp/ewoc.el
@@ -495,6 +495,8 @@ Return the node (or nil if we just passed the last node)."
    ;; Never step below the first element.
    ;; (unless (ewoc--filter-hf-nodes ewoc node)
    ;;   (setq node (ewoc--node-nth dll -2)))
+    (unless node
+      (error "No next"))
    (ewoc-goto-node ewoc node)))
 (defun ewoc-goto-node (ewoc node)
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index ab5ba1bea56..2552ad4eb68 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -220,10 +220,15 @@ If VERSION is nil, the package is not loaded (it is \"disabled\")."
 (defcustom package-archives '(("gnu" . "http://elpa.gnu.org/packages/"))
  "An alist of archives from which to fetch.
 The default value points to the GNU Emacs package repository.
-Each element has the form (ID . URL), where ID is an identifier
-string for an archive and URL is a http: URL (a string)."
+Each element has the form (ID . LOCATION).
+ ID is an archive name, as a string.
+ LOCATION specifies the base location for the archive.
+  If it starts with \"http:\", it is treated as a HTTP URL;
+  otherwise it should be an absolute directory name.
+  (Other types of URL are currently not supported.)"
  :type '(alist :key-type (string :tag "Archive name")
-                :value-type (string :tag "Archive URL"))
+                :value-type (string :tag "URL or directory name"))
  :risky t
  :group 'package
  :version "24.1")
@@ -617,8 +622,36 @@ Otherwise it uses an external `tar' program.
      (let ((load-path (cons pkg-dir load-path)))
        (byte-recompile-directory pkg-dir 0 t)))))
+(defmacro package--with-work-buffer (location file &rest body)
+  "Run BODY in a buffer containing the contents of FILE at LOCATION.
+LOCATION is the base location of a package archive, and should be
+one of the URLs (or file names) specified in `package-archives'.
+FILE is the name of a file relative to that base location.
+This macro retrieves FILE from LOCATION into a temporary buffer,
+and evaluates BODY while that buffer is current.  This work
+buffer is killed afterwards.  Return the last value in BODY."
+  `(let* ((http (string-match "\\`http:" ,location))
+          (buffer
+           (if http
+               (url-retrieve-synchronously (concat ,location ,file))
+             (generate-new-buffer "*package work buffer*"))))
+     (prog1
+         (with-current-buffer buffer
+           (if http
+               (progn (package-handle-response)
+                      (re-search-forward "^$" nil 'move)
+                      (forward-char)
+                      (delete-region (point-min) (point)))
+             (unless (file-name-absolute-p ,location)
+               (error "Archive location %s is not an absolute file name"
+                      ,location))
+             (insert-file-contents (expand-file-name ,file ,location)))
+           ,@body)
+       (kill-buffer buffer))))
 (defun package-handle-response ()
-  "Handle the response from the server.
+  "Handle the response from a `url-retrieve-synchronously' call.
 Parse the HTTP response and throw if an error occurred.
 The url package seems to require extra processing for this.
 This should be called in a `save-excursion', in the download buffer.
@@ -627,7 +660,6 @@ It will move point to somewhere in the headers."
  (require 'url-http)
  (let ((response (url-http-parse-response)))
    (when (or (< response 200) (>= response 300))
-      (display-buffer (current-buffer))
      (error "Error during download request:%s"
             (buffer-substring-no-properties (point) (progn
                                                       (end-of-line)
@@ -635,28 +667,17 @@ It will move point to somewhere in the headers."
 (defun package-download-single (name version desc requires)
  "Download and install a single-file package."
-  (let ((buffer (url-retrieve-synchronously
+  (let ((location (package-archive-base name))
-                 (concat (package-archive-url name)
+        (file (concat (symbol-name name) "-" version ".el")))
-                         (symbol-name name) "-" version ".el"))))
+    (package--with-work-buffer location file
-    (with-current-buffer buffer
+      (package-unpack-single (symbol-name name) version desc requires))))
-      (package-handle-response)
-      (re-search-forward "^$" nil 'move)
-      (forward-char)
-      (delete-region (point-min) (point))
-      (package-unpack-single (symbol-name name) version desc requires)
-      (kill-buffer buffer))))
 (defun package-download-tar (name version)
  "Download and install a tar package."
-  (let ((tar-buffer (url-retrieve-synchronously
+  (let ((location (package-archive-base name))
-                     (concat (package-archive-url name)
+        (file (concat (symbol-name name) "-" version ".tar")))
-                             (symbol-name name) "-" version ".tar"))))
+    (package--with-work-buffer location file
-    (with-current-buffer tar-buffer
+      (package-unpack name version))))
-      (package-handle-response)
-      (re-search-forward "^$" nil 'move)
-      (forward-char)
-      (package-unpack name version)
-      (kill-buffer tar-buffer))))
 (defun package-installed-p (package &optional min-version)
  "Return true if PACKAGE, of VERSION or newer, is installed.
@@ -987,31 +1008,26 @@ The file can either be a tar file or an Emacs Lisp file."
      (error "Package `%s-%s' is a system package, not deleting"
             name version))))
-(defun package-archive-url (name)
+(defun package-archive-base (name)
  "Return the archive containing the package NAME."
  (let ((desc (cdr (assq (intern-soft name) package-archive-contents))))
    (cdr (assoc (aref desc (- (length desc) 1)) package-archives))))
 (defun package--download-one-archive (archive file)
-  "Download an archive file FILE from ARCHIVE, and cache it locally."
+  "Retrieve an archive file FILE from ARCHIVE, and cache it.
-  (let* ((archive-name (car archive))
+ARCHIVE should be a cons cell of the form (NAME . LOCATION),
-         (archive-url  (cdr archive))
+similar to an entry in `package-alist'.  Save the cached copy to
-         (dir (expand-file-name "archives" package-user-dir))
+\"archives/NAME/archive-contents\" in `package-user-dir'."
-         (dir (expand-file-name archive-name dir))
+  (let* ((dir (expand-file-name "archives" package-user-dir))
-         (buffer (url-retrieve-synchronously (concat archive-url file))))
+         (dir (expand-file-name (car archive) dir)))
-    (with-current-buffer buffer
+    (package--with-work-buffer (cdr archive) file
-      (package-handle-response)
-      (re-search-forward "^$" nil 'move)
-      (forward-char)
-      (delete-region (point-min) (point))
      ;; Read the retrieved buffer to make sure it is valid (e.g. it
      ;; may fetch a URL redirect page).
      (when (listp (read buffer))
        (make-directory dir t)
        (setq buffer-file-name (expand-file-name file dir))
        (let ((version-control 'never))
-          (save-buffer))))
+          (save-buffer))))))
-    (kill-buffer buffer)))
 (defun package-refresh-contents ()
  "Download the ELPA archive description if needed.
@@ -1176,27 +1192,21 @@ If optional arg NO-ACTIVATE is non-nil, don't activate packages."
            (while (re-search-forward "^\\(;+ ?\\)" nil t)
              (replace-match ""))))
      (let ((readme (expand-file-name (concat package-name "-readme.txt")
-                                      package-user-dir)))
+                                      package-user-dir))
+            readme-string)
        ;; For elpa packages, try downloading the commentary.  If that
        ;; fails, try an existing readme file in `package-user-dir'.
-        (cond ((let ((buffer (ignore-errors
+        (cond ((condition-case nil
-                               (url-retrieve-synchronously
+                   (package--with-work-buffer (package-archive-base package)
-                                (concat (package-archive-url package)
+                                              (concat package-name "-readme.txt")
-                                        package-name "-readme.txt"))))
+                     (setq buffer-file-name
-                     response)
+                           (expand-file-name readme package-user-dir))
-                 (when buffer
+                     (let ((version-control 'never))
-                   (with-current-buffer buffer
+                       (save-buffer))
-                     (setq response (url-http-parse-response))
+                     (setq readme-string (buffer-string))
-                     (if (or (< response 200) (>= response 300))
+                     t)
-                         (setq response nil)
+                 (error nil))
-                       (setq buffer-file-name
+               (insert readme-string))
-                             (expand-file-name readme package-user-dir))
-                       (delete-region (point-min) (1+ url-http-end-of-headers))
-                       (save-buffer)))
-                   (when response
-                     (insert-buffer-substring buffer)
-                     (kill-buffer buffer)
-                     t))))
              ((file-readable-p readme)
               (insert-file-contents readme)
               (goto-char (point-max))))))))
diff --git a/lisp/emacs-lock.el b/lisp/emacs-lock.el
index 22795a47d98..6033648298d 100644
--- a/lisp/emacs-lock.el
+++ b/lisp/emacs-lock.el
@@ -88,7 +88,8 @@ If the buffer is locked, signal error and display its name."
  (if emacs-lock-buffer-locked
      (setq emacs-lock-from-exiting t)))
-(add-hook 'kill-emacs-hook 'check-emacs-lock)
+(unless noninteractive
+  (add-hook 'kill-emacs-hook 'check-emacs-lock))
 (add-hook 'kill-buffer-hook 'emacs-lock-check-buffer-lock)
 (add-hook 'shell-mode-hook 'emacs-lock-was-buffer-locked)
 (add-hook 'shell-mode-hook 'emacs-lock-shell-sentinel)
diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el
index d9b79ccd317..5daef7f9666 100644
--- a/lisp/emulation/viper-cmd.el
+++ b/lisp/emulation/viper-cmd.el
@@ -776,7 +776,7 @@ Vi's prefix argument will be used.  Otherwise, the prefix argument passed to
                  (viper-copy-event (viper-seq-last-elt key))))
          (if (commandp com)
-              ;; pretend that current state is the state we excaped to
+              ;; pretend that current state is the state we escaped to
              (let ((viper-current-state state))
                (setq prefix-arg (or prefix-arg arg))
                (command-execute com)))
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index 2996fee9bcb..e05828dfeea 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2011-03-04  Julien Danjou  <julien@danjou.info>
+        * erc-track.el (erc-track-visibility): Fix :type.  (Bug#6369)
 2011-02-10  Stefan Monnier  <monnier@iro.umontreal.ca>
        * erc-list.el (erc-list-menu-mode-map): Move initialization
diff --git a/lisp/erc/erc-track.el b/lisp/erc/erc-track.el
index a89244f695d..28c1ced91c6 100644
--- a/lisp/erc/erc-track.el
+++ b/lisp/erc/erc-track.el
@@ -84,8 +84,8 @@ Activity means that there was no user input in the last 10 seconds."
  :type  '(choice (const :tag "All frames" t)
                  (const :tag "All visible frames" visible)
                  (const :tag "Only the selected frame" nil)
-                  (const :tag "Only the selected frame if it was active"
+                  (const :tag "Only the selected frame if it is visible"
-                         active)))
+                         selected-visible)))
 (defcustom erc-track-exclude nil
  "A list targets (channel names or query targets) which should not be tracked."
diff --git a/lisp/eshell/em-alias.el b/lisp/eshell/em-alias.el
index aa138cb4dcb..4e1dbd41045 100644
--- a/lisp/eshell/em-alias.el
+++ b/lisp/eshell/em-alias.el
@@ -117,8 +117,9 @@ gained by using this module."
  ;; :link '(custom-manual "(eshell)Auto-correction of bad commands")
  :group 'eshell-alias)
-(defcustom eshell-alias-load-hook '(eshell-alias-initialize)
+(defcustom eshell-alias-load-hook nil
  "A hook that gets run when `eshell-alias' is loaded."
+  :version "24.1"                       ; removed eshell-alias-initialize
  :type 'hook
  :group 'eshell-alias)
@@ -156,7 +157,7 @@ command, which will automatically write them to the file named by
 (defun eshell/alias (&optional alias &rest definition)
  "Define an ALIAS in the user's alias list using DEFINITION."
  (if (not alias)
-      (eshell-for alias eshell-command-aliases-list
+      (dolist (alias eshell-command-aliases-list)
        (eshell-print (apply 'format "alias %s %s\n" alias)))
    (if (not definition)
        (setq eshell-command-aliases-list
@@ -238,7 +239,7 @@ command, which will automatically write them to the file named by
  "Find all possible completions for NAME.
 These are all the command aliases which begin with NAME."
  (let (completions)
-    (eshell-for alias eshell-command-aliases-list
+    (dolist (alias eshell-command-aliases-list)
      (if (string-match (concat "^" name) (car alias))
          (setq completions (cons (car alias) completions))))
    completions))
diff --git a/lisp/eshell/em-banner.el b/lisp/eshell/em-banner.el
index b2ebde98cee..ce987f132e3 100644
--- a/lisp/eshell/em-banner.el
+++ b/lisp/eshell/em-banner.el
@@ -64,8 +64,9 @@ This can be any sexp, and should end with at least two newlines."
 (put 'eshell-banner-message 'risky-local-variable t)
-(defcustom eshell-banner-load-hook '(eshell-banner-initialize)
+(defcustom eshell-banner-load-hook nil
  "A list of functions to run when `eshell-banner' is loaded."
+  :version "24.1"                       ; removed eshell-banner-initialize
  :type 'hook
  :group 'eshell-banner)
@@ -81,14 +82,6 @@ This can be any sexp, and should end with at least two newlines."
      (assert msg)
      (eshell-interactive-print msg))))
-(eshell-deftest banner banner-displayed
-  "Startup banner is displayed at point-min"
-  (assert eshell-banner-message)
-  (let ((msg (eval eshell-banner-message)))
-    (assert msg)
-    (goto-char (point-min))
-    (looking-at msg)))
 (provide 'em-banner)
 ;; Local Variables:
diff --git a/lisp/eshell/em-cmpl.el b/lisp/eshell/em-cmpl.el
index f3f104c1ede..c551684210c 100644
--- a/lisp/eshell/em-cmpl.el
+++ b/lisp/eshell/em-cmpl.el
@@ -84,8 +84,9 @@ variable names, arguments, etc."
 ;;; User Variables:
-(defcustom eshell-cmpl-load-hook '(eshell-cmpl-initialize)
+(defcustom eshell-cmpl-load-hook nil
  "A list of functions to run when `eshell-cmpl' is loaded."
+  :version "24.1"                       ; removed eshell-cmpl-initialize
  :type 'hook
  :group 'eshell-cmpl)
diff --git a/lisp/eshell/em-dirs.el b/lisp/eshell/em-dirs.el
index 64555ab15ef..1aa2c34c395 100644
--- a/lisp/eshell/em-dirs.el
+++ b/lisp/eshell/em-dirs.el
@@ -58,8 +58,9 @@ they lack somewhat in feel from the typical shell equivalents."
 ;;; User Variables:
-(defcustom eshell-dirs-load-hook '(eshell-dirs-initialize)
+(defcustom eshell-dirs-load-hook nil
  "A hook that gets run when `eshell-dirs' is loaded."
+  :version "24.1"                       ; removed eshell-dirs-initialize
  :type 'hook
  :group 'eshell-dirs)
@@ -233,7 +234,7 @@ Thus, this does not include the current directory.")
 (defun eshell-save-some-last-dir ()
  "Save the list-dir-ring for any open Eshell buffers."
-  (eshell-for buf (buffer-list)
+  (dolist (buf (buffer-list))
    (if (buffer-live-p buf)
        (with-current-buffer buf
          (if (and eshell-mode
diff --git a/lisp/eshell/em-glob.el b/lisp/eshell/em-glob.el
index 2a565c5c827..732c6c05bfe 100644
--- a/lisp/eshell/em-glob.el
+++ b/lisp/eshell/em-glob.el
@@ -61,8 +61,9 @@ by zsh for filename generation."
 ;;; User Variables:
-(defcustom eshell-glob-load-hook '(eshell-glob-initialize)
+(defcustom eshell-glob-load-hook nil
  "A list of functions to run when `eshell-glob' is loaded."
+  :version "24.1"                       ; removed eshell-glob-initialize
  :type 'hook
  :group 'eshell-glob)
diff --git a/lisp/eshell/em-hist.el b/lisp/eshell/em-hist.el
index 5ec529f4b8f..993e9d63a94 100644
--- a/lisp/eshell/em-hist.el
+++ b/lisp/eshell/em-hist.el
@@ -70,8 +70,9 @@
 ;;; User Variables:
-(defcustom eshell-hist-load-hook '(eshell-hist-initialize)
+(defcustom eshell-hist-load-hook nil
  "A list of functions to call when loading `eshell-hist'."
+  :version "24.1"                       ; removed eshell-hist-initialize
  :type 'hook
  :group 'eshell-hist)
@@ -292,7 +293,7 @@ element, regardless of any text on the command line.  In that case,
 (defun eshell-save-some-history ()
  "Save the history for any open Eshell buffers."
-  (eshell-for buf (buffer-list)
+  (dolist (buf (buffer-list))
    (if (buffer-live-p buf)
        (with-current-buffer buf
          (if (and eshell-mode
@@ -730,7 +731,7 @@ matched."
          (narrow-to-region here (point))
          (goto-char (point-min))
          (let ((modifiers (cdr (eshell-parse-modifiers))))
-            (eshell-for mod modifiers
+            (dolist (mod modifiers)
              (setq hist (funcall mod hist)))
            hist))
      (delete-region here (point)))))
diff --git a/lisp/eshell/em-ls.el b/lisp/eshell/em-ls.el
index 7714629f2fa..4ef259dee4b 100644
--- a/lisp/eshell/em-ls.el
+++ b/lisp/eshell/em-ls.el
@@ -561,7 +561,7 @@ relative to that directory."
          (when (or (eq listing-style 'long-listing) show-size)
            (let ((total 0.0))
              (setq size-width 0)
-              (eshell-for e entries
+              (dolist (e entries)
                (if (nth 7 (cdr e))
                    (setq total (+ total (nth 7 (cdr e)))
                          size-width
@@ -651,7 +651,7 @@ Each member of FILES is either a string or a cons cell of the form
               (not (eq eshell-in-pipeline-p 'last))
               (not (eq listing-style 'by-lines)))
          (memq listing-style '(long-listing single-column)))
-      (eshell-for file files
+      (dolist (file files)
        (if file
            (eshell-ls-file file size-width copy-fileinfo)))
    (let ((f files)
@@ -676,7 +676,7 @@ Each member of FILES is either a string or a cons cell of the form
              (setcdr f (cddr f))))))
      (if (not show-size)
          (setq display-files (mapcar 'eshell-ls-annotate files))
-        (eshell-for file files
+        (dolist (file files)
          (let* ((str (eshell-ls-printable-size (nth 7 (cdr file)) t))
                 (len (length str)))
            (if (< len size-width)
@@ -696,7 +696,7 @@ Each member of FILES is either a string or a cons cell of the form
             (columns (length col-widths))
             (col-index 1)
             need-return)
-        (eshell-for file display-files
+        (dolist (file display-files)
          (let ((name
                 (if (car file)
                     (if show-size
@@ -731,7 +731,7 @@ ROOT-DIR, if non-nil, specifies the root directory of the listing, to
 which non-absolute directory names will be made relative if ever they
 need to be printed."
  (let (dirs files show-names need-return (size-width 0))
-    (eshell-for entry entries
+    (dolist (entry entries)
      (if (and (not dir-literal)
               (or (eshell-ls-filetype-p (cdr entry) ?d)
                   (and (eshell-ls-filetype-p (cdr entry) ?l)
@@ -757,7 +757,7 @@ need to be printed."
      (setq need-return t))
    (setq show-names (or show-recursive
                         (> (+ (length files) (length dirs)) 1)))
-    (eshell-for dir (eshell-ls-sort-entries dirs)
+    (dolist (dir (eshell-ls-sort-entries dirs))
      (if (and need-return (not dir-literal))
          (funcall insert-func "\n"))
      (eshell-ls-dir dir show-names
diff --git a/lisp/eshell/em-pred.el b/lisp/eshell/em-pred.el
index 33085c067fd..f3027ea9b5e 100644
--- a/lisp/eshell/em-pred.el
+++ b/lisp/eshell/em-pred.el
@@ -59,8 +59,9 @@ ordinary strings."
 ;;; User Variables:
-(defcustom eshell-pred-load-hook '(eshell-pred-initialize)
+(defcustom eshell-pred-load-hook nil
  "A list of functions to run when `eshell-pred' is loaded."
+  :version "24.1"                       ; removed eshell-pred-initialize
  :type 'hook
  :group 'eshell-pred)
diff --git a/lisp/eshell/em-prompt.el b/lisp/eshell/em-prompt.el
index 448d2cdf303..3e87acc6d1e 100644
--- a/lisp/eshell/em-prompt.el
+++ b/lisp/eshell/em-prompt.el
@@ -37,8 +37,9 @@ as is common with most shells."
 ;;; User Variables:
-(defcustom eshell-prompt-load-hook '(eshell-prompt-initialize)
+(defcustom eshell-prompt-load-hook nil
  "A list of functions to call when loading `eshell-prompt'."
+  :version "24.1"                       ; removed eshell-prompt-initialize
  :type 'hook
  :group 'eshell-prompt)
diff --git a/lisp/eshell/em-rebind.el b/lisp/eshell/em-rebind.el
index 6def23e1b71..2c346dfcd3d 100644
--- a/lisp/eshell/em-rebind.el
+++ b/lisp/eshell/em-rebind.el
@@ -41,8 +41,9 @@ the behavior of normal shells while the user editing new input text."
 ;;; User Variables:
-(defcustom eshell-rebind-load-hook '(eshell-rebind-initialize)
+(defcustom eshell-rebind-load-hook nil
  "A list of functions to call when loading `eshell-rebind'."
+  :version "24.1"                       ; removed eshell-rebind-initialize
  :type 'hook
  :group 'eshell-rebind)
diff --git a/lisp/eshell/em-script.el b/lisp/eshell/em-script.el
index ed4ad1c0712..d76e19cdd07 100644
--- a/lisp/eshell/em-script.el
+++ b/lisp/eshell/em-script.el
@@ -34,8 +34,9 @@ commands, as a script file."
 ;;; User Variables:
-(defcustom eshell-script-load-hook '(eshell-script-initialize)
+(defcustom eshell-script-load-hook nil
  "A list of functions to call when loading `eshell-script'."
+  :version "24.1"                       ; removed eshell-script-initialize
  :type 'hook
  :group 'eshell-script)
diff --git a/lisp/eshell/em-smart.el b/lisp/eshell/em-smart.el
index 2c54930e439..f08fec8f8fa 100644
--- a/lisp/eshell/em-smart.el
+++ b/lisp/eshell/em-smart.el
@@ -84,8 +84,9 @@ it to get a real sense of how it works."
 ;;; User Variables:
-(defcustom eshell-smart-load-hook '(eshell-smart-initialize)
+(defcustom eshell-smart-load-hook nil
  "A list of functions to call when loading `eshell-smart'."
+  :version "24.1"                       ; removed eshell-smart-initialize
  :type 'hook
  :group 'eshell-smart)
diff --git a/lisp/eshell/em-term.el b/lisp/eshell/em-term.el
index be394ba5b22..7d5fbbeabeb 100644
--- a/lisp/eshell/em-term.el
+++ b/lisp/eshell/em-term.el
@@ -46,8 +46,9 @@ which commands are considered visual in nature."
 ;;; User Variables:
-(defcustom eshell-term-load-hook '(eshell-term-initialize)
+(defcustom eshell-term-load-hook nil
  "A list of functions to call when loading `eshell-term'."
+  :version "24.1"                       ; removed eshell-term-initialize
  :type 'hook
  :group 'eshell-term)
diff --git a/lisp/eshell/em-unix.el b/lisp/eshell/em-unix.el
index dc5650d240e..707f2ebc2ce 100644
--- a/lisp/eshell/em-unix.el
+++ b/lisp/eshell/em-unix.el
@@ -53,8 +53,9 @@ by name)."
  :tag "UNIX commands in Lisp"
  :group 'eshell-module)
-(defcustom eshell-unix-load-hook '(eshell-unix-initialize)
+(defcustom eshell-unix-load-hook nil
  "A list of functions to run when `eshell-unix' is loaded."
+  :version "24.1"                       ; removed eshell-unix-initialize
  :type 'hook
  :group 'eshell-unix)
@@ -587,7 +588,7 @@ symlink, then revert to the system's definition of cat."
  (setq args (eshell-stringify-list (eshell-flatten-list args)))
  (if (or eshell-in-pipeline-p
          (catch 'special
-            (eshell-for arg args
+            (dolist (arg args)
              (unless (or (and (stringp arg)
                               (> (length arg) 0)
                               (eq (aref arg 0) ?-))
@@ -610,12 +611,12 @@ symlink, then revert to the system's definition of cat."
       :show-usage
       :usage "[OPTION] FILE...
 Concatenate FILE(s), or standard input, to standard output.")
-     (eshell-for file args
+     (dolist (file args)
       (if (string= file "-")
           (throw 'eshell-external
                  (eshell-external-command "cat" args))))
     (let ((curbuf (current-buffer)))
-       (eshell-for file args
+       (dolist (file args)
         (with-temp-buffer
           (insert-file-contents file)
           (goto-char (point-min))
@@ -851,7 +852,7 @@ external command."
  (let ((ext-du (eshell-search-path "du")))
    (if (and ext-du
             (not (catch 'have-ange-path
-                    (eshell-for arg args
+                    (dolist (arg args)
                      (if (string-equal
                           (file-remote-p (expand-file-name arg) 'method) "ftp")
                          (throw 'have-ange-path t))))))
@@ -1055,7 +1056,7 @@ Become another USER during a login session.")
                            "localhost"))
                  (dir (or (file-remote-p default-directory 'localname)
                           (expand-file-name default-directory))))
-              (eshell-for arg args
+              (dolist (arg args)
                (if (string-equal arg "-") (setq login t) (setq user arg)))
              ;; `eshell-eval-using-options' does not handle "-".
              (if (member "-" orig-args) (setq login t))
diff --git a/lisp/eshell/esh-arg.el b/lisp/eshell/esh-arg.el
index f42440ae4ec..1fb8b7f4c32 100644
--- a/lisp/eshell/esh-arg.el
+++ b/lisp/eshell/esh-arg.el
@@ -117,8 +117,9 @@ treated as a literal character."
 ;;; User Variables:
-(defcustom eshell-arg-load-hook '(eshell-arg-initialize)
+(defcustom eshell-arg-load-hook nil
  "A hook that gets run when `eshell-arg' is loaded."
+  :version "24.1"                      ; removed eshell-arg-initialize
  :type 'hook
  :group 'eshell-arg)
diff --git a/lisp/eshell/esh-cmd.el b/lisp/eshell/esh-cmd.el
index 0567beb9a53..bdcdc453272 100644
--- a/lisp/eshell/esh-cmd.el
+++ b/lisp/eshell/esh-cmd.el
@@ -229,8 +229,9 @@ return non-nil if the command is complex."
 ;;; User Variables:
-(defcustom eshell-cmd-load-hook '(eshell-cmd-initialize)
+(defcustom eshell-cmd-load-hook nil
  "A hook that gets run when `eshell-cmd' is loaded."
+  :version "24.1"                      ; removed eshell-cmd-initialize
  :type 'hook
  :group 'eshell-cmd)
@@ -319,18 +320,6 @@ otherwise t.")
    (add-hook 'pcomplete-try-first-hook
              'eshell-complete-lisp-symbols nil t)))
-(eshell-deftest var last-result-var
-  "\"last result\" variable"
-  (eshell-command-result-p "+ 1 2; + $$ 2" "3\n5\n"))
-(eshell-deftest var last-result-var2
-  "\"last result\" variable"
-  (eshell-command-result-p "+ 1 2; + $$ $$" "3\n6\n"))
-(eshell-deftest var last-arg-var
-  "\"last arg\" variable"
-  (eshell-command-result-p "+ 1 2; + $_ 4" "3\n6\n"))
 (defun eshell-complete-lisp-symbols ()
  "If there is a user reference, complete it."
  (let ((arg (pcomplete-actual-arg)))
@@ -440,32 +429,12 @@ hooks should be run before and after the command."
           (eq (caar terms) 'eshell-command-to-value))
      (car (cdar terms))))
-(eshell-deftest cmd lisp-command
-  "Evaluate Lisp command"
-  (eshell-command-result-p "(+ 1 2)" "3"))
-(eshell-deftest cmd lisp-command-args
-  "Evaluate Lisp command (ignore args)"
-  (eshell-command-result-p "(+ 1 2) 3" "3"))
 (defun eshell-rewrite-initial-subcommand (terms)
  "Rewrite a subcommand in initial position, such as '{+ 1 2}'."
  (if (and (listp (car terms))
           (eq (caar terms) 'eshell-as-subcommand))
      (car terms)))
-(eshell-deftest cmd subcommand
-  "Run subcommand"
-  (eshell-command-result-p "{+ 1 2}" "3\n"))
-(eshell-deftest cmd subcommand-args
-  "Run subcommand (ignore args)"
-  (eshell-command-result-p "{+ 1 2} 3" "3\n"))
-(eshell-deftest cmd subcommand-lisp
-  "Run subcommand + Lisp form"
-  (eshell-command-result-p "{(+ 1 2)}" "3\n"))
 (defun eshell-rewrite-named-command (terms)
  "If no other rewriting rule transforms TERMS, assume a named command."
  (let ((sym (if eshell-in-pipeline-p
@@ -477,10 +446,6 @@ hooks should be run before and after the command."
        (list sym cmd (append (list 'list) (cdr terms)))
      (list sym cmd))))
-(eshell-deftest cmd named-command
-  "Execute named command"
-  (eshell-command-result-p "+ 1 2" "3\n"))
 (defvar eshell-command-body)
 (defvar eshell-test-body)
@@ -987,7 +952,7 @@ at the moment are:
         (not (member name eshell-complex-commands))
         (catch 'simple
           (progn
-            (eshell-for pred eshell-complex-commands
+            (dolist (pred eshell-complex-commands)
              (if (and (functionp pred)
                       (funcall pred name))
                  (throw 'simple nil)))
@@ -1165,7 +1130,7 @@ be finished later after the completion of an asynchronous subprocess."
        (if (and (eq (car form) 'let)
                 (not (eq (car (cadr args)) 'eshell-do-eval)))
            (eshell-manipulate "evaluating let args"
-              (eshell-for letarg (car args)
+              (dolist (letarg (car args))
                (if (and (listp letarg)
                         (not (eq (cadr letarg) 'quote)))
                    (setcdr letarg
@@ -1241,7 +1206,7 @@ be finished later after the completion of an asynchronous subprocess."
 (defun eshell/which (command &rest names)
  "Identify the COMMAND, and where it is located."
-  (eshell-for name (cons command names)
+  (dolist (name (cons command names))
    (let (program alias direct)
      (if (eq (aref name 0) eshell-explicit-command-char)
          (setq name (substring name 1)
diff --git a/lisp/eshell/esh-ext.el b/lisp/eshell/esh-ext.el
index 7128d7e4749..3acbeac0b89 100644
--- a/lisp/eshell/esh-ext.el
+++ b/lisp/eshell/esh-ext.el
@@ -46,8 +46,9 @@ loaded into memory, thus beginning a new process."
 ;;; User Variables:
-(defcustom eshell-ext-load-hook '(eshell-ext-initialize)
+(defcustom eshell-ext-load-hook nil
  "A hook that gets run when `eshell-ext' is loaded."
+  :version "24.1"                       ; removed eshell-ext-initialize
  :type 'hook
  :group 'eshell-ext)
@@ -263,7 +264,7 @@ line of the form #!<interp>."
  (let ((finterp
         (catch 'found
           (ignore
-            (eshell-for possible eshell-interpreter-alist
+            (dolist (possible eshell-interpreter-alist)
              (cond
               ((functionp (car possible))
                (and (funcall (car possible) file)
diff --git a/lisp/eshell/esh-io.el b/lisp/eshell/esh-io.el
index ef8966f1d7d..71fae34b360 100644
--- a/lisp/eshell/esh-io.el
+++ b/lisp/eshell/esh-io.el
@@ -71,8 +71,9 @@ though they were files."
 ;;; User Variables:
-(defcustom eshell-io-load-hook '(eshell-io-initialize)
+(defcustom eshell-io-load-hook nil
  "A hook that gets run when `eshell-io' is loaded."
+  :version "24.1"                       ; removed eshell-io-initialize
  :type 'hook
  :group 'eshell-io)
diff --git a/lisp/eshell/esh-mode.el b/lisp/eshell/esh-mode.el
index 3735ee35fd5..10623dba8e3 100644
--- a/lisp/eshell/esh-mode.el
+++ b/lisp/eshell/esh-mode.el
@@ -89,9 +89,10 @@ That is to say, the first time during an Emacs session."
  :type 'hook
  :group 'eshell-mode)
-(defcustom eshell-exit-hook '(eshell-query-kill-processes)
+(defcustom eshell-exit-hook nil
  "A hook that is run whenever `eshell' is exited.
 This hook is only run if exiting actually kills the buffer."
+  :version "24.1"                       ; removed eshell-query-kill-processes
  :type 'hook
  :group 'eshell-mode)
@@ -287,6 +288,17 @@ This is used by `eshell-watch-for-password-prompt'."
 ;;; User Functions:
+(defun eshell-kill-buffer-function ()
+  "Function added to `kill-buffer-hook' in Eshell buffers.
+This runs the function `eshell-kill-processes-on-exit',
+and the hook `eshell-exit-hook'."
+  ;; It's fine to run this unconditionally since it can be customized
+  ;; via the `eshell-kill-processes-on-exit' variable.
+  (and (fboundp 'eshell-query-kill-processes)
+       (not (memq 'eshell-query-kill-processes eshell-exit-hook))
+       (eshell-query-kill-processes))
+  (run-hooks 'eshell-exit-hook))
 ;;;###autoload
 (defun eshell-mode ()
  "Emacs shell interactive mode.
@@ -389,7 +401,7 @@ This is used by `eshell-watch-for-password-prompt'."
  ;; load extension modules into memory.  This will cause any global
  ;; variables they define to be visible, since some of the core
  ;; modules sometimes take advantage of their functionality if used.
-  (eshell-for module eshell-modules-list
+  (dolist (module eshell-modules-list)
    (let ((module-fullname (symbol-name module))
          module-shortname)
      (if (string-match "^eshell-\\(.*\\)" module-fullname)
@@ -403,17 +415,15 @@ This is used by `eshell-watch-for-password-prompt'."
  (unless (file-exists-p eshell-directory-name)
    (eshell-make-private-directory eshell-directory-name t))
-  ;; load core Eshell modules for this session
+  ;; Load core Eshell modules, then extension modules, for this session.
-  (eshell-for module (eshell-subgroups 'eshell)
+  (dolist (module (append (eshell-subgroups 'eshell) eshell-modules-list))
-    (run-hooks (intern-soft (concat (symbol-name module)
+    (let ((load-hook (intern-soft (format "%s-load-hook" module)))
-                                    "-load-hook"))))
+          (initfunc (intern-soft (format "%s-initialize" module))))
+      (when (and load-hook (boundp load-hook))
-  ;; load extension modules for this session
+        (if (memq initfunc (symbol-value load-hook)) (setq initfunc nil))
-  (eshell-for module eshell-modules-list
+        (run-hooks load-hook))
-    (let ((load-hook (intern-soft (concat (symbol-name module)
+      ;; So we don't need the -initialize functions on the hooks (b#5375).
-                                          "-load-hook"))))
+      (and initfunc (fboundp initfunc) (funcall initfunc))))
-      (if (and load-hook (boundp load-hook))
-          (run-hooks load-hook))))
  (if eshell-send-direct-to-subprocesses
      (add-hook 'pre-command-hook 'eshell-intercept-commands t t))
@@ -428,10 +438,7 @@ This is used by `eshell-watch-for-password-prompt'."
    (add-hook 'eshell-pre-command-hook 'eshell-command-started nil t)
    (add-hook 'eshell-post-command-hook 'eshell-command-finished nil t))
-  (add-hook 'kill-buffer-hook
+  (add-hook 'kill-buffer-hook 'eshell-kill-buffer-function t t)
-            (function
-             (lambda ()
-               (run-hooks 'eshell-exit-hook))) t t)
  (if eshell-first-time-p
      (run-hooks 'eshell-first-time-mode-hook))
@@ -440,19 +447,6 @@ This is used by `eshell-watch-for-password-prompt'."
 (put 'eshell-mode 'mode-class 'special)
-(eshell-deftest mode major-mode
-  "Major mode is correct"
-  (eq major-mode 'eshell-mode))
-(eshell-deftest mode eshell-mode-variable
-  "`eshell-mode' is true"
-  (eq eshell-mode t))
-(eshell-deftest var window-height
-  "LINES equals window height"
-  (let ((eshell-stringify-t t))
-    (eshell-command-result-p "= $LINES (window-height)" "t\n")))
 (defun eshell-command-started ()
  "Indicate in the modeline that a command has started."
  (setq eshell-command-running-string "**")
@@ -463,13 +457,6 @@ This is used by `eshell-watch-for-password-prompt'."
  (setq eshell-command-running-string "--")
  (force-mode-line-update))
-(eshell-deftest mode command-running-p
-  "Modeline shows no command running"
-  (or (featurep 'xemacs)
-      (not eshell-status-in-modeline)
-      (and (memq 'eshell-command-running-string mode-line-format)
-           (equal eshell-command-running-string "--"))))
 ;;; Internal Functions:
 (defun eshell-toggle-direct-send ()
@@ -539,20 +526,6 @@ This is used by `eshell-watch-for-password-prompt'."
             (= (1+ pos) limit))
        (forward-char 1))))
-(eshell-deftest arg forward-arg
-  "Move across command arguments"
-  (eshell-insert-command "echo $(+ 1 (- 4 3)) \"alpha beta\" file" 'ignore)
-  (let ((here (point)) begin valid)
-    (eshell-bol)
-    (setq begin (point))
-    (eshell-forward-argument 4)
-    (setq valid (= here (point)))
-    (eshell-backward-argument 4)
-    (prog1
-        (and valid (= begin (point)))
-      (eshell-bol)
-      (delete-region (point) (point-max)))))
 (defun eshell-forward-argument (&optional arg)
  "Move forward ARG arguments."
  (interactive "p")
@@ -652,17 +625,6 @@ waiting for input."
  (interactive "P")
  (eshell-send-input use-region t))
-(eshell-deftest mode queue-input
-  "Queue command input"
-  (eshell-insert-command "sleep 2")
-  (eshell-insert-command "echo alpha" 'eshell-queue-input)
-  (let ((count 10))
-    (while (and eshell-current-command
-                (> count 0))
-      (sit-for 1 0)
-      (setq count (1- count))))
-  (eshell-match-result "alpha\n"))
 (defun eshell-send-input (&optional use-region queue-p no-newline)
  "Send the input received to Eshell for parsing and processing.
 After `eshell-last-output-end', sends all text from that marker to
@@ -741,20 +703,6 @@ newline."
               (run-hooks 'eshell-post-command-hook)
               (insert-and-inherit input)))))))))
-; (eshell-deftest proc send-to-subprocess
-;   "Send input to a subprocess"
-;   ;; jww (1999-12-06): what about when bc is unavailable?
-;   (if (not (eshell-search-path "bc"))
-;       t
-;     (eshell-insert-command "bc")
-;     (eshell-insert-command "1 + 2")
-;     (sit-for 1 0)
-;     (forward-line -1)
-;     (prog1
-;       (looking-at "3\n")
-;       (eshell-insert-command "quit")
-;       (sit-for 1 0))))
 (defsubst eshell-kill-new ()
  "Add the last input text to the kill ring."
  (kill-ring-save eshell-last-input-start eshell-last-input-end))
@@ -900,14 +848,6 @@ Does not delete the prompt."
    (insert "*** output flushed ***\n")
    (delete-region (point) (eshell-end-of-output))))
-(eshell-deftest io flush-output
-  "Flush previous output"
-  (eshell-insert-command "echo alpha")
-  (eshell-kill-output)
-  (and (eshell-match-result (regexp-quote "*** output flushed ***\n"))
-       (forward-line)
-       (= (point) eshell-last-output-start)))
 (defun eshell-show-output (&optional arg)
  "Display start of this batch of interpreter output at top of window.
 Sets mark to the value of point when this command is run.
@@ -968,12 +908,6 @@ When run interactively, widen the buffer first."
    (goto-char eshell-last-output-end)
    (insert-and-inherit input)))
-(eshell-deftest mode run-old-command
-  "Re-run an old command"
-  (eshell-insert-command "echo alpha")
-  (goto-char eshell-last-input-start)
-  (string= (eshell-get-old-input) "echo alpha"))
 (defun eshell/exit ()
  "Leave or kill the Eshell buffer, depending on `eshell-kill-on-exit'."
  (throw 'eshell-terminal t))
diff --git a/lisp/eshell/esh-module.el b/lisp/eshell/esh-module.el
index 5a62c71355c..1581d05889e 100644
--- a/lisp/eshell/esh-module.el
+++ b/lisp/eshell/esh-module.el
@@ -43,7 +43,7 @@ customizing the variable `eshell-modules-list'."
 (defcustom eshell-module-unload-hook
  '(eshell-unload-extension-modules)
-  "*A hook run when `eshell-module' is unloaded."
+  "A hook run when `eshell-module' is unloaded."
  :type 'hook
  :group 'eshell-module)
@@ -61,7 +61,7 @@ customizing the variable `eshell-modules-list'."
    eshell-script
    eshell-term
    eshell-unix)
-  "*A list of optional add-on modules to be loaded by Eshell.
+  "A list of optional add-on modules to be loaded by Eshell.
 Changes will only take effect in future Eshell buffers."
  :type (append
         (list 'set ':tag "Supported modules")
@@ -92,7 +92,7 @@ customization group.  Example: `eshell-cmpl' for that module."
 (defun eshell-unload-extension-modules ()
  "Unload any memory resident extension modules."
-  (eshell-for module (eshell-subgroups 'eshell-module)
+  (dolist (module (eshell-subgroups 'eshell-module))
    (if (featurep module)
        (ignore-errors
          (message "Unloading %s..." (symbol-name module))
diff --git a/lisp/eshell/esh-proc.el b/lisp/eshell/esh-proc.el
index f697a400556..eeaccc4b890 100644
--- a/lisp/eshell/esh-proc.el
+++ b/lisp/eshell/esh-proc.el
@@ -38,8 +38,9 @@ finish."
 ;;; User Variables:
-(defcustom eshell-proc-load-hook '(eshell-proc-initialize)
+(defcustom eshell-proc-load-hook nil
  "A hook that gets run when `eshell-proc' is loaded."
+  :version "24.1"                       ; removed eshell-proc-initialize
  :type 'hook
  :group 'eshell-proc)
@@ -94,13 +95,14 @@ is created."
  :type 'hook
  :group 'eshell-proc)
-(defcustom eshell-kill-hook '(eshell-reset-after-proc)
+(defcustom eshell-kill-hook nil
  "Called when a process run by `eshell-gather-process-output' has ended.
 It is passed two arguments: the process that was just ended, and the
 termination status (as a string).  Note that the first argument may be
 nil, in which case the user attempted to send a signal, but there was
 no relevant process.  This can be used for displaying help
 information, for example."
+  :version "24.1"                       ; removed eshell-reset-after-proc
  :type 'hook
  :group 'eshell-proc)
@@ -113,6 +115,14 @@ information, for example."
 ;;; Functions:
+(defun eshell-kill-process-function (proc status)
+  "Function run when killing a process.
+Runs `eshell-reset-after-proc' and `eshell-kill-hook', passing arguments
+PROC and STATUS to both."
+  (or (memq 'eshell-reset-after-proc eshell-kill-hook)
+      (eshell-reset-after-proc proc status))
+  (run-hook-with-args 'eshell-kill-hook proc status))
 (defun eshell-proc-initialize ()
  "Initialize the process handling code."
  (make-local-variable 'eshell-process-list)
@@ -346,7 +356,7 @@ See `eshell-needs-pipe'."
        (eshell-update-markers eshell-last-output-end)
        ;; Simulate the effect of eshell-sentinel.
        (eshell-close-handles (if (numberp exit-status) exit-status -1))
-        (run-hook-with-args 'eshell-kill-hook command exit-status)
+        (eshell-kill-process-function command exit-status)
        (or eshell-in-pipeline-p
            (setq eshell-last-sync-output-start nil))
        (if (not (numberp exit-status))
@@ -391,14 +401,14 @@ PROC is the process that's exiting.  STRING is the exit message."
                      (eshell-close-handles (process-exit-status proc) 'nil
                                            (cadr entry))))
                (eshell-remove-process-entry entry))))
-        (run-hook-with-args 'eshell-kill-hook proc string)))))
+        (eshell-kill-process-function proc string)))))
 (defun eshell-process-interact (func &optional all query)
  "Interact with a process, using PROMPT if more than one, via FUNC.
 If ALL is non-nil, background processes will be interacted with as well.
 If QUERY is non-nil, query the user with QUERY before calling FUNC."
  (let (defunct result)
-    (eshell-for entry eshell-process-list
+    (dolist (entry eshell-process-list)
      (if (and (memq (process-status (car entry))
                    '(run stop open closed))
               (or all
@@ -412,7 +422,7 @@ If QUERY is non-nil, query the user with QUERY before calling FUNC."
    ;; clean up the process list; this can get dirty if an error
    ;; occurred that brought the user into the debugger, and then they
    ;; quit, so that the sentinel was never called.
-    (eshell-for d defunct
+    (dolist (d defunct)
      (eshell-remove-process-entry d))
    result))
@@ -485,31 +495,29 @@ See the variable `eshell-kill-processes-on-exit'."
            (kill-buffer buf)))
      (message nil))))
-(custom-add-option 'eshell-exit-hook 'eshell-query-kill-processes)
 (defun eshell-interrupt-process ()
  "Interrupt a process."
  (interactive)
  (unless (eshell-process-interact 'interrupt-process)
-    (run-hook-with-args 'eshell-kill-hook nil "interrupt")))
+    (eshell-kill-process-function nil "interrupt")))
 (defun eshell-kill-process ()
  "Kill a process."
  (interactive)
  (unless (eshell-process-interact 'kill-process)
-    (run-hook-with-args 'eshell-kill-hook nil "killed")))
+    (eshell-kill-process-function nil "killed")))
 (defun eshell-quit-process ()
  "Send quit signal to process."
  (interactive)
  (unless (eshell-process-interact 'quit-process)
-    (run-hook-with-args 'eshell-kill-hook nil "quit")))
+    (eshell-kill-process-function nil "quit")))
 ;(defun eshell-stop-process ()
 ;  "Send STOP signal to process."
 ;  (interactive)
 ;  (unless (eshell-process-interact 'stop-process)
-;    (run-hook-with-args 'eshell-kill-hook nil "stopped")))
+;    (eshell-kill-process-function nil "stopped")))
 ;(defun eshell-continue-process ()
 ;  "Send CONTINUE signal to process."
@@ -518,7 +526,7 @@ See the variable `eshell-kill-processes-on-exit'."
 ;    ;; jww (1999-09-17): this signal is not dealt with yet.  For
 ;    ;; example, `eshell-reset' will be called, and so will
 ;    ;; `eshell-resume-eval'.
-;    (run-hook-with-args 'eshell-kill-hook nil "continue")))
+;    (eshell-kill-process-function nil "continue")))
 (defun eshell-send-eof-to-process ()
  "Send EOF to process."
diff --git a/lisp/eshell/esh-util.el b/lisp/eshell/esh-util.el
index 2de147acb00..dbe4f824deb 100644
--- a/lisp/eshell/esh-util.el
+++ b/lisp/eshell/esh-util.el
@@ -147,18 +147,6 @@ function `string-to-number'."
 (put 'eshell-condition-case 'lisp-indent-function 2)
-(defmacro eshell-deftest (module name label &rest forms)
-  (if (and (fboundp 'cl-compiling-file) (cl-compiling-file))
-      nil
-    (let ((fsym (intern (concat "eshell-test--" (symbol-name name)))))
-      `(eval-when-compile
-         (ignore
-          (defun ,fsym () ,label
-            (eshell-run-test (quote ,module) (quote ,fsym) ,label
-                             (quote (progn ,@forms)))))))))
-(put 'eshell-deftest 'lisp-indent-function 2)
 (defun eshell-find-delimiter
  (open close &optional bound reverse-p backslash-p)
  "From point, find the CLOSE delimiter corresponding to OPEN.
@@ -285,7 +273,6 @@ Prepend remote identification of `default-directory', if any."
      (setq text (replace-match " " t t text)))
    text))
-;; FIXME this is just dolist.
 (defmacro eshell-for (for-var for-list &rest forms)
  "Iterate through a list"
  `(let ((list-iter ,for-list))
@@ -296,10 +283,12 @@ Prepend remote identification of `default-directory', if any."
 (put 'eshell-for 'lisp-indent-function 2)
+(make-obsolete 'eshell-for 'dolist "24.1")
 (defun eshell-flatten-list (args)
  "Flatten any lists within ARGS, so that there are no sublists."
  (let ((new-list (list t)))
-    (eshell-for a args
+    (dolist (a args)
      (if (and (listp a)
               (listp (cdr a)))
          (nconc new-list (eshell-flatten-list a))
@@ -405,7 +394,7 @@ list."
    (unless (listp entries)
      (setq entries (list entries)
            listified t))
-    (eshell-for entry entries
+    (dolist (entry entries)
      (unless (and exclude (string-match exclude entry))
        (setq p predicates valid (null p))
        (while p
diff --git a/lisp/eshell/esh-var.el b/lisp/eshell/esh-var.el
index 4c42b305ec2..69004a841f1 100644
--- a/lisp/eshell/esh-var.el
+++ b/lisp/eshell/esh-var.el
@@ -109,7 +109,6 @@
 (eval-when-compile
  (require 'pcomplete)
-  (require 'esh-test)
  (require 'esh-util)
  (require 'esh-opt)
  (require 'esh-mode))
@@ -126,8 +125,9 @@ variable value, a subcommand, or even the result of a Lisp form."
 ;;; User Variables:
-(defcustom eshell-var-load-hook '(eshell-var-initialize)
+(defcustom eshell-var-load-hook nil
  "A list of functions to call when loading `eshell-var'."
+  :version "24.1"                       ; removed eshell-var-initialize
  :type 'hook
  :group 'eshell-var)
@@ -351,8 +351,7 @@ This function is explicit for adding to `eshell-parse-argument-hook'."
   '((?h "help" nil nil "show this usage screen")
     :external "env"
     :usage "<no arguments>")
-   (eshell-for setting (sort (eshell-environment-variables)
+   (dolist (setting (sort (eshell-environment-variables) 'string-lessp))
-                             'string-lessp)
     (eshell-buffered-print setting "\n"))
   (eshell-flush)))
@@ -374,7 +373,7 @@ This function is explicit for adding to `eshell-parse-argument-hook'."
 This involves setting any variable aliases which affect the
 environment, as specified in `eshell-variable-aliases-list'."
  (let ((process-environment (eshell-copy-environment)))
-    (eshell-for var-alias eshell-variable-aliases-list
+    (dolist (var-alias eshell-variable-aliases-list)
      (if (nth 2 var-alias)
          (setenv (car var-alias)
                  (eshell-stringify
@@ -477,30 +476,6 @@ Possible options are:
     (t
      (error "Invalid variable reference")))))
-(eshell-deftest var interp-cmd
-  "Interpolate command result"
-  (eshell-command-result-p "+ ${+ 1 2} 3" "6\n"))
-(eshell-deftest var interp-lisp
-  "Interpolate Lisp form evalution"
-  (eshell-command-result-p "+ $(+ 1 2) 3" "6\n"))
-(eshell-deftest var interp-concat
-  "Interpolate and concat command"
-  (eshell-command-result-p "+ ${+ 1 2}3 3" "36\n"))
-(eshell-deftest var interp-concat-lisp
-  "Interpolate and concat Lisp form"
-  (eshell-command-result-p "+ $(+ 1 2)3 3" "36\n"))
-(eshell-deftest var interp-concat2
-  "Interpolate and concat two commands"
-  (eshell-command-result-p "+ ${+ 1 2}${+ 1 2} 3" "36\n"))
-(eshell-deftest var interp-concat-lisp2
-  "Interpolate and concat two Lisp forms"
-  (eshell-command-result-p "+ $(+ 1 2)$(+ 1 2) 3" "36\n"))
 (defun eshell-parse-indices ()
  "Parse and return a list of list of indices."
  (let (indices)
@@ -623,7 +598,7 @@ For example, to retrieve the second element of a user's record in
  "Generate list of applicable variables."
  (let ((argname pcomplete-stub)
        completions)
-    (eshell-for alias eshell-variable-aliases-list
+    (dolist (alias eshell-variable-aliases-list)
      (if (string-match (concat "^" argname) (car alias))
          (setq completions (cons (car alias) completions))))
    (sort
diff --git a/lisp/eshell/eshell.el b/lisp/eshell/eshell.el
index 7690a102a9b..1a9d7c97b83 100644
--- a/lisp/eshell/eshell.el
+++ b/lisp/eshell/eshell.el
@@ -280,26 +280,12 @@ shells such as bash, zsh, rc, 4dos."
  :type 'string
  :group 'eshell)
-(eshell-deftest mode same-window-buffer-names
-  "`eshell-buffer-name' is a member of `same-window-buffer-names'"
-  (member eshell-buffer-name same-window-buffer-names))
 (defcustom eshell-directory-name
  (locate-user-emacs-file "eshell/" ".eshell/")
  "The directory where Eshell control files should be kept."
  :type 'directory
  :group 'eshell)
-(eshell-deftest mode eshell-directory-exists
-  "`eshell-directory-name' exists and is writable"
-  (file-writable-p eshell-directory-name))
-(eshell-deftest mode eshell-directory-modes
-  "`eshell-directory-name' has correct access protections"
-  (or (eshell-under-windows-p)
-      (= (file-modes eshell-directory-name)
-         eshell-private-directory-modes)))
 ;;;_* Running Eshell
 ;;
 ;; There are only three commands used to invoke Eshell.  The first two
@@ -450,10 +436,6 @@ corresponding to a successful execution."
              (set status-var eshell-last-command-status))
          (cadr result))))))
-(eshell-deftest mode simple-command-result
-  "`eshell-command-result' works with a simple command."
-  (= (eshell-command-result "+ 1 2") 3))
 ;;;_* Reporting bugs
 ;;
 ;; If you do encounter a bug, on any system, please report
@@ -474,7 +456,7 @@ Emacs."
  ;; if the user set `eshell-prefer-to-shell' to t, but never loaded
  ;; Eshell, then `eshell-subgroups' will be unbound
  (when (fboundp 'eshell-subgroups)
-    (eshell-for module (eshell-subgroups 'eshell)
+    (dolist (module (eshell-subgroups 'eshell))
      ;; this really only unloads as many modules as possible,
      ;; since other `require' references (such as by customizing
      ;; `eshell-prefer-to-shell' to a non-nil value) might make it
diff --git a/lisp/files.el b/lisp/files.el
index 8849e264151..ffc0b33119f 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -983,7 +983,8 @@ accessible."
      nil)))
 (defun file-truename (filename &optional counter prev-dirs)
-  "Return the truename of FILENAME, which should be absolute.
+  "Return the truename of FILENAME.
+If FILENAME is not absolute, first expands it against `default-directory'.
 The truename of a file name is found by chasing symbolic links
 both at the level of the file and at the level of the directories
 containing it, until no links are left at any level.
@@ -1893,8 +1894,8 @@ the various files."
                           (not nonexistent)
                           ;; It is confusing to ask whether to visit
                           ;; non-literally if they have the file in
-                           ;; hexl-mode.
+                           ;; hexl-mode or image-mode.
-                           (not (eq major-mode 'hexl-mode)))
+                           (not (memq major-mode '(hexl-mode image-mode))))
                  (if (buffer-modified-p)
                      (if (y-or-n-p
                           (format
@@ -3868,7 +3869,9 @@ BACKUPNAME is the backup file name, which is the old file renamed."
       (set-file-selinux-context to-name context)))
 (defvar file-name-version-regexp
-  "\\(?:~\\|\\.~[-[:alnum:]:#@^._]+~\\)"
+  "\\(?:~\\|\\.~[-[:alnum:]:#@^._]+\\(?:~[[:digit:]]+\\)?~\\)"
+  ;; The last ~[[:digit]]+ matches relative versions in git,
+  ;; e.g. `foo.js.~HEAD~1~'.
  "Regular expression matching the backup/version part of a file name.
 Used by `file-name-sans-versions'.")
@@ -4608,14 +4611,14 @@ See `save-some-buffers-action-alist' if you want to
 change the additional actions you can take on files."
  (interactive "P")
  (save-window-excursion
-    (let* (queried some-automatic
+    (let* (queried autosaved-buffers
           files-done abbrevs-done)
      (dolist (buffer (buffer-list))
        ;; First save any buffers that we're supposed to save unconditionally.
        ;; That way the following code won't ask about them.
        (with-current-buffer buffer
          (when (and buffer-save-without-query (buffer-modified-p))
-            (setq some-automatic t)
+            (push (buffer-name) autosaved-buffers)
            (save-buffer))))
      ;; Ask about those buffers that merit it,
      ;; and record the number thus saved.
@@ -4661,9 +4664,15 @@ change the additional actions you can take on files."
             (setq abbrevs-changed nil)
             (setq abbrevs-done t)))
      (or queried (> files-done 0) abbrevs-done
-          (message (if some-automatic
+          (cond
-                       "(Some special files were saved without asking)"
+           ((null autosaved-buffers)
-                     "(No files need saving)"))))))
+            (message "(No files need saving)"))
+           ((= (length autosaved-buffers) 1)
+            (message "(Saved %s)" (car autosaved-buffers)))
+           (t
+            (message "(Saved %d files: %s)"
+                     (length autosaved-buffers)
+                     (mapconcat 'identity autosaved-buffers ", "))))))))
 (defun not-modified (&optional arg)
  "Mark current buffer as unmodified, not needing to be saved.
@@ -4822,7 +4831,7 @@ given.  With a prefix argument, TRASH is nil."
   (let* ((trashing (and delete-by-moving-to-trash
                         (null current-prefix-arg)))
          (dir (expand-file-name
-                (read-file-name
+                (read-directory-name
                 (if trashing
                     "Move directory to trash: "
                   "Delete directory: ")
@@ -4890,7 +4899,7 @@ directly into NEWNAME instead."
   (let ((dir (read-directory-name
               "Copy directory: " default-directory default-directory t nil)))
     (list dir
-           (read-file-name
+           (read-directory-name
            (format "Copy directory %s to: " dir)
            default-directory default-directory nil nil)
           current-prefix-arg t nil)))
@@ -5589,7 +5598,7 @@ Prefix arg (second arg if noninteractive) means supply -l switch to `ls'.
 Actions controlled by variables `list-directory-brief-switches'
 and `list-directory-verbose-switches'."
  (interactive (let ((pfx current-prefix-arg))
-                 (list (read-file-name (if pfx "List directory (verbose): "
+                 (list (read-directory-name (if pfx "List directory (verbose): "
                                         "List directory (brief): ")
                                       nil default-directory nil)
                       pfx)))
diff --git a/lisp/find-file.el b/lisp/find-file.el
index 7ace6ce01dc..e4285523184 100644
--- a/lisp/find-file.el
+++ b/lisp/find-file.el
@@ -183,7 +183,7 @@ To override this, give an argument to `ff-find-other-file'."
 ;;;###autoload
 (defvar ff-special-constructs
  `(
-    ;; C/C++ include, for NeXTSTEP too
+    ;; C/C++ include, for NeXTstep too
    (,(purecopy "^\#\\s *\\(include\\|import\\)\\s +[<\"]\\(.*\\)[>\"]") .
     (lambda ()
       (buffer-substring (match-beginning 2) (match-end 2))))
@@ -494,7 +494,7 @@ If optional IN-OTHER-WINDOW is non-nil, find the file in another window."
            (setq name
                  (expand-file-name
-                   (read-file-name
+                   (read-directory-name
                    (format "Find or create %s in: " default-name)
                    default-directory default-name nil)))
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index e23af4dff78..bce03331a29 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -229,7 +229,8 @@ This hook will be installed if the variable
    prototype-generic-mode
    resolve-conf-generic-mode
    samba-generic-mode
-    x-resource-generic-mode)
+    x-resource-generic-mode
+    xmodmap-generic-mode)
  "List of generic modes that are defined by default on Unix.")
 (defconst generic-other-modes
@@ -370,6 +371,15 @@ your changes into effect."
  nil
  "Generic mode for X Resource configuration files."))
+(if (memq 'xmodmap-generic-mode generic-extras-enable-list)
+(define-generic-mode xmodmap-generic-mode
+  '(?!)
+  '("add" "clear" "keycode" "keysym" "remove" "pointer")
+  nil
+  '("[xX]modmap\\(rc\\)?\\'")
+  nil
+  "Simple mode for xmodmap files."))
 ;;; Hosts
 (when (memq 'hosts-generic-mode generic-extras-enable-list)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 4562d544a58..c14c79a92cb 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,53 @@
+2011-03-05  Antoine Levitt  <antoine.levitt@gmail.com>
+        * gnus.el (gnus-interactive): Use read-directory-name.
+        * gnus-uu.el (gnus-uu-decode-uu-and-save)
+        (gnus-uu-decode-unshar-and-save, gnus-uu-decode-save)
+        (gnus-uu-decode-binhex, gnus-uu-decode-yenc)
+        (gnus-uu-decode-save-view, gnus-uu-decode-postscript-and-save):
+        Likewise.
+        * gnus-group.el (gnus-group-make-directory-group): Likewise.
+2011-03-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+        * gnus-sum.el (gnus-update-read-articles): Fix typo.
+        * gnus.el (gnus-valid-select-methods): Mark nnimap as a backend that
+        really have server-side marks.
+        * gnus-sum.el (gnus-propagate-marks): Change default back to nil again,
+        since most backends do not usefully have server-side marks.
+        (gnus-update-read-articles): Propagate marks to all backends that
+        really have server-side marks.
+2011-03-05  Antoine Levitt  <antoine.levitt@gmail.com>
+        * message.el (message-cite-reply-position, message-cite-style): New
+        variables.
+        (message-yank-original): Use the new citation styles.
+2011-03-04  Daiki Ueno  <ueno@unixuser.org>
+        * message.el (message-options): Revert the change that's a workaround
+        for XEmacs buffer-local issue; don't mark it buffer-local when running
+        under XEmacs.
+2011-03-03  Tassilo Horn  <tassilo@member.fsf.org>
+        * nnimap.el (nnimap-parse-flags): Add a workaround for FETCH lines with
+        numbers too big to be `read'.
+2011-03-02  Teodor Zlatanov  <tzz@lifelogs.com>
+        * message.el (message-options): Make buffer-local two ways to attempt
+        to fix a XEmacs bug.
+2011-03-02  Julien Danjou  <julien@danjou.info>
+        * gnus-art.el (gnus-with-article-buffer): Fix buffer live check.
 2011-03-01  Julien Danjou  <julien@danjou.info>
        * gnus-art.el (list-identifier): Add list-identifier as a parameter
@@ -787,7 +837,7 @@
        * shr.el: Revert change that made headings use different-sized faces.
        The Emacs display engine isn't advanced enough that, for instance,
-        tables can comfortably use differntly-sized faces.
+        tables can comfortably use differently-sized faces.
 2011-01-25  Lars Ingebrigtsen  <larsi@gnus.org>
@@ -1839,7 +1889,7 @@
 2010-11-24  Lars Magne Ingebrigtsen  <larsi@gnus.org>
-        * shr.el (shr-color-check): Protect against non-existant colour names.
+        * shr.el (shr-color-check): Protect against non-existent colour names.
 2010-11-24  Julien Danjou  <julien@danjou.info>
@@ -3153,7 +3203,7 @@
        This makes nnimap work properly on Courier again.
        * gnus.el (gnus-carpal): The carpal mode has been removed, but define
-        the variable for backwards compatability.
+        the variable for backwards compatibility.
        * mm-decode.el (mm-save-part): If given a non-directory result, expand
        the file name before using to avoid setting mm-default-directory to
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 7469c4445c6..c64138b43d7 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -1743,7 +1743,7 @@ Initialized from `text-mode-syntax-table.")
 (put 'gnus-with-article-headers 'edebug-form-spec '(body))
 (defmacro gnus-with-article-buffer (&rest forms)
-  `(when (buffer-live-p gnus-article-buffer)
+  `(when (buffer-live-p (get-buffer gnus-article-buffer))
     (with-current-buffer gnus-article-buffer
       (let ((inhibit-read-only t))
         ,@forms))))
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 832cd758b61..9ed3cf02a49 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -3102,7 +3102,7 @@ The user will be prompted for a directory.  The contents of this
 directory will be used as a newsgroup.  The directory should contain
 mail messages or news articles in files that have numeric names."
  (interactive
-   (list (read-file-name "Create group from directory: ")))
+   (list (read-directory-name "Create group from directory: ")))
  (unless (file-exists-p dir)
    (error "No such directory"))
  (unless (file-directory-p dir)
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index abe6367f0d0..a8786e39c7b 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -1234,7 +1234,7 @@ For example: ((1 . cn-gb-2312) (2 . big5))."
  :type 'boolean
  :group 'gnus-summary-marks)
-(defcustom gnus-propagate-marks t
+(defcustom gnus-propagate-marks nil
  "If non-nil, Gnus will store and retrieve marks from the backends.
 This means that marks will be stored both in .newsrc.eld and in
 the backend, and will slow operation down somewhat."
@@ -12435,7 +12435,10 @@ UNREAD is a sorted list."
        (save-excursion
          (let (setmarkundo)
            ;; Propagate the read marks to the backend.
-            (when (and gnus-propagate-marks
+            (when (and (or gnus-propagate-marks
+                           (gnus-method-option-p
+                            (gnus-find-method-for-group group)
+                            'server-marks))
                       (gnus-check-backend-function 'request-set-mark group))
              (let ((del (gnus-remove-from-range (gnus-info-read info) read))
                    (add (gnus-remove-from-range read (gnus-info-read info))))
diff --git a/lisp/gnus/gnus-uu.el b/lisp/gnus/gnus-uu.el
index d6aad539029..05ba3595479 100644
--- a/lisp/gnus/gnus-uu.el
+++ b/lisp/gnus/gnus-uu.el
@@ -366,7 +366,7 @@ didn't work, and overwrite existing files.  Otherwise, ask each time."
  (interactive
   (list current-prefix-arg
         (file-name-as-directory
-          (read-file-name "Uudecode and save in dir: "
+          (read-directory-name "Uudecode and save in dir: "
                          gnus-uu-default-dir
                          gnus-uu-default-dir t))))
  (gnus-uu-decode-with-method 'gnus-uu-uustrip-article n dir nil nil t))
@@ -381,7 +381,7 @@ didn't work, and overwrite existing files.  Otherwise, ask each time."
  (interactive
   (list current-prefix-arg
         (file-name-as-directory
-          (read-file-name "Unshar and save in dir: "
+          (read-directory-name "Unshar and save in dir: "
                          gnus-uu-default-dir
                          gnus-uu-default-dir t))))
  (gnus-uu-decode-with-method 'gnus-uu-unshar-article n dir nil 'scan t))
@@ -390,12 +390,11 @@ didn't work, and overwrite existing files.  Otherwise, ask each time."
  "Saves the current article."
  (interactive
   (list current-prefix-arg
-         (read-file-name
+         (if gnus-uu-save-separate-articles
-          (if gnus-uu-save-separate-articles
+             (read-directory-name
-              "Save articles in dir: "
+              "Save articles in dir: " gnus-uu-default-dir gnus-uu-default-dir)
-            "Save articles in file: ")
+           (read-file-name
-          gnus-uu-default-dir
+            "Save article in file: " gnus-uu-default-dir gnus-uu-default-dir))))
-          gnus-uu-default-dir)))
  (setq gnus-uu-saved-article-name file)
  (gnus-uu-decode-with-method 'gnus-uu-save-article n nil t))
@@ -404,7 +403,7 @@ didn't work, and overwrite existing files.  Otherwise, ask each time."
  (interactive
   (list current-prefix-arg
         (file-name-as-directory
-          (read-file-name "Unbinhex and save in dir: "
+          (read-directory-name "Unbinhex and save in dir: "
                          gnus-uu-default-dir
                          gnus-uu-default-dir))))
  (setq gnus-uu-binhex-article-name
@@ -416,7 +415,7 @@ didn't work, and overwrite existing files.  Otherwise, ask each time."
  (interactive
   (list current-prefix-arg
         (file-name-as-directory
-          (read-file-name "yEnc decode and save in dir: "
+          (read-directory-name "yEnc decode and save in dir: "
                          gnus-uu-default-dir
                          gnus-uu-default-dir))))
  (setq gnus-uu-yenc-article-name nil)
@@ -458,10 +457,11 @@ didn't work, and overwrite existing files.  Otherwise, ask each time."
  "Saves and views the current article."
  (interactive
   (list current-prefix-arg
-         (read-file-name  (if gnus-uu-save-separate-articles
+         (if gnus-uu-save-separate-articles
-                              "Save articles is dir: "
+             (read-directory-name "Save articles in dir: "
-                            "Save articles in file: ")
+                                  gnus-uu-default-dir gnus-uu-default-dir)
-                          gnus-uu-default-dir gnus-uu-default-dir)))
+           (read-file-name "Save articles in file: "
+                           gnus-uu-default-dir gnus-uu-default-dir))))
  (let ((gnus-view-pseudos (or gnus-view-pseudos 'automatic)))
    (gnus-uu-decode-save n file)))
@@ -742,7 +742,7 @@ When called interactively, prompt for REGEXP."
  (interactive
   (list current-prefix-arg
         (file-name-as-directory
-          (read-file-name "Save in dir: "
+          (read-directory-name "Save in dir: "
                          gnus-uu-default-dir
                          gnus-uu-default-dir t))))
  (gnus-uu-decode-with-method 'gnus-uu-decode-postscript-article
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index a5c727925f6..57d085a0380 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -1607,7 +1607,8 @@ slower."
    ("nnweb" none)
    ("nnrss" none)
    ("nnagent" post-mail)
-    ("nnimap" post-mail address prompt-address physical-address respool)
+    ("nnimap" post-mail address prompt-address physical-address respool
+     server-marks)
    ("nnmaildir" mail respool address)
    ("nnnil" none))
  "*An alist of valid select methods.
@@ -2545,7 +2546,7 @@ a string, be sure to use a valid format, see RFC 2616."
 (defvar gnus-extended-servers nil)
 ;; The carpal mode has been removed, but define the variable for
-;; backwards compatability.
+;; backwards compatibility.
 (defvar gnus-carpal nil)
 (make-obsolete-variable 'gnus-carpal nil "Emacs 24.1")
@@ -3267,7 +3268,7 @@ g -- Group name."
        ((= c ?d)
         (point))
        ((= c ?D)
-         (read-file-name prompt nil default-directory 'lambda))
+         (read-directory-name prompt nil default-directory 'lambda))
        ((= c ?f)
         (read-file-name prompt nil nil 'lambda))
        ((= c ?F)
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index 58daf1baf94..08c59b00bfc 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -129,17 +129,6 @@
  :group 'message-buffers
  :type '(choice function (const nil)))
-(defcustom message-cite-style nil
-  "The overall style to be used when yanking cited text.
-Values are either `traditional' (cited text first),
-`top-post' (cited text at the bottom), or nil (don't override the
-individual message variables)."
-  :version "24.1"
-  :group 'message-various
-  :type '(choice (const :tag "None" :value nil)
-                 (const :tag "Traditional" :value traditional)
-                 (const :tag "Top-post" :value top-post)))
 (defcustom message-fcc-handler-function 'message-output
  "*A function called to save outgoing articles.
 This function will be called with the name of the file to store the
@@ -1088,6 +1077,71 @@ needed."
  :link '(custom-manual "(message)Insertion Variables")
  :group 'message-insertion)
+(defcustom message-cite-reply-position 'traditional
+  "*Where the reply should be positioned.
+If `traditional', reply inline.
+If `above', reply above quoted text.
+If `below', reply below quoted text.
+Note: Many newsgroups frown upon nontraditional reply styles. You
+probably want to set this variable only for specific groups,
+e.g. using `gnus-posting-styles':
+  (eval (set (make-local-variable 'message-cite-reply-above) 'above))"
+  :type '(choice (const :tag "Reply inline" 'traditional)
+                 (const :tag "Reply above" 'above)
+                 (const :tag "Reply below" 'below))
+  :group 'message-insertion)
+(defcustom message-cite-style nil
+  "*The overall style to be used when yanking cited text.
+Value is either `nil' (no variable overrides) or a let-style list
+of pairs (VARIABLE VALUE) that will be bound in
+`message-yank-original' to do the quoting.
+Presets to impersonate popular mail agents are found in the
+message-cite-style-* variables.  This variable is intended for
+use in `gnus-posting-styles', such as:
+  ((posting-from-work-p) (eval (set (make-local-variable 'message-cite-style) message-cite-style-outlook)))"
+  :version "24.1"
+  :group 'message-insertion
+  :type '(choice (const :tag "Do not override variables" :value nil)
+                 (const :tag "MS Outlook" :value message-cite-style-outlook)
+                 (const :tag "Mozilla Thunderbird" :value message-cite-style-thunderbird)
+                 (const :tag "Gmail" :value message-cite-style-gmail)
+                 (variable :tag "User-specified")))
+(defconst message-cite-style-outlook
+  '((message-cite-function  'message-cite-original)
+    (message-citation-line-function  'message-insert-formatted-citation-line)
+    (message-cite-reply-position 'above)
+    (message-yank-prefix  "")
+    (message-yank-cited-prefix  "")
+    (message-yank-empty-prefix  "")
+    (message-citation-line-format  "\n\n-----------------------\nOn %a, %b %d %Y, %N wrote:\n"))
+  "Message citation style used by MS Outlook. Use with message-cite-style.")
+(defconst message-cite-style-thunderbird
+  '((message-cite-function  'message-cite-original)
+    (message-citation-line-function  'message-insert-formatted-citation-line)
+    (message-cite-reply-position 'above)
+    (message-yank-prefix  "> ")
+    (message-yank-cited-prefix  ">")
+    (message-yank-empty-prefix  ">")
+    (message-citation-line-format "On %D %R %p, %N wrote:"))
+  "Message citation style used by Mozilla Thunderbird. Use with message-cite-style.")
+(defconst message-cite-style-gmail
+  '((message-cite-function  'message-cite-original)
+    (message-citation-line-function  'message-insert-formatted-citation-line)
+    (message-cite-reply-position 'above)
+    (message-yank-prefix  "    ")
+    (message-yank-cited-prefix  "    ")
+    (message-yank-empty-prefix  "    ")
+    (message-citation-line-format "On %e %B %Y %R, %f wrote:\n"))
+  "Message citation style used by Gmail. Use with message-cite-style.")
 (defcustom message-distribution-function nil
  "*Function called to return a Distribution header."
  :group 'message-news
@@ -1814,7 +1868,12 @@ You must have the \"hashcash\" binary installed, see `hashcash-path'."
 (defvar message-options nil
  "Some saved answers when sending message.")
-(make-variable-buffer-local 'message-options)
+;; FIXME: On XEmacs this causes problems since let-binding like:
+;; (let ((message-options message-options)) ...)
+;; as in `message-send' and `mml-preview' loses to buffer-local
+;; variable initialization.
+(unless (featurep 'xemacs)
+  (make-variable-buffer-local 'message-options))
 (defvar message-send-mail-real-function nil
  "Internal send mail function.")
@@ -3645,17 +3704,6 @@ To use this automatically, you may add this function to
      (while (re-search-forward citexp nil t)
        (replace-match (if remove "" "\n"))))))
-(defvar message-cite-reply-above nil
-  "If non-nil, start own text above the quote.
-Note: Top posting is bad netiquette.  Don't use it unless you
-really must.  You probably want to set variable only for specific
-groups, e.g. using `gnus-posting-styles':
-  (eval (set (make-local-variable 'message-cite-reply-above) t))
-This variable has no effect in news postings.")
 (defun message-yank-original (&optional arg)
  "Insert the message being replied to, if any.
 Puts point before the text and mark after.
@@ -3669,49 +3717,49 @@ prefix, and don't delete any headers."
  (interactive "P")
  (let ((modified (buffer-modified-p))
        body-text)
-    (when (and message-reply-buffer
+    ;; eval the let forms contained in message-cite-style
-               message-cite-function)
+    (eval
-      (when message-cite-reply-above
+     `(let ,message-cite-style
-        (if (and (not (message-news-p))
+        (when (and message-reply-buffer
-                 (or (eq message-cite-reply-above 'is-evil)
+                   message-cite-function)
-                     (y-or-n-p "\
+          (when (equal message-cite-reply-position 'above)
-Top posting is bad netiquette.  Please don't top post unless you really must.
-Really top post? ")))
            (save-excursion
              (setq body-text
                    (buffer-substring (message-goto-body)
                                      (point-max)))
-              (delete-region (message-goto-body) (point-max)))
+              (delete-region (message-goto-body) (point-max))))
-          (set (make-local-variable 'message-cite-reply-above) nil)))
+          (if (bufferp message-reply-buffer)
-      (if (bufferp message-reply-buffer)
+              (delete-windows-on message-reply-buffer t))
-          (delete-windows-on message-reply-buffer t))
+          (push-mark (save-excursion
-      (push-mark (save-excursion
+                       (cond
-                   (cond
+                        ((bufferp message-reply-buffer)
-                    ((bufferp message-reply-buffer)
+                         (insert-buffer-substring message-reply-buffer))
-                     (insert-buffer-substring message-reply-buffer))
+                        ((and (consp message-reply-buffer)
-                    ((and (consp message-reply-buffer)
+                              (functionp (car message-reply-buffer)))
-                          (functionp (car message-reply-buffer)))
+                         (apply (car message-reply-buffer)
-                     (apply (car message-reply-buffer)
+                                (cdr message-reply-buffer))))
-                            (cdr message-reply-buffer))))
+                       (unless (bolp)
-                   (unless (bolp)
+                         (insert ?\n))
-                     (insert ?\n))
+                       (point)))
-                   (point)))
+          (unless arg
-      (unless arg
+            (funcall message-cite-function)
-        (funcall message-cite-function)
+            (unless (eq (char-before (mark t)) ?\n)
-        (unless (eq (char-before (mark t)) ?\n)
+              (let ((pt (point)))
-          (let ((pt (point)))
+                (goto-char (mark t))
-            (goto-char (mark t))
+                (insert-before-markers ?\n)
-            (insert-before-markers ?\n)
+                (goto-char pt))))
-            (goto-char pt))))
+          (case message-cite-reply-position
-      (when message-cite-reply-above
+            ('above
-        (message-goto-body)
+             (message-goto-body)
-        (insert body-text)
+             (insert body-text)
-        (insert (if (bolp) "\n" "\n\n"))
+             (insert (if (bolp) "\n" "\n\n"))
-        (message-goto-body))
+             (message-goto-body))
-      ;; Add a `message-setup-very-last-hook' here?
+            ('below
-      ;; Add `gnus-article-highlight-citation' here?
+             (message-goto-signature)))
-      (unless modified
+          ;; Add a `message-setup-very-last-hook' here?
-        (setq message-checksum (message-checksum))))))
+          ;; Add `gnus-article-highlight-citation' here?
+          (unless modified
+            (setq message-checksum (message-checksum))))))))
 (defun message-yank-buffer (buffer)
  "Insert BUFFER into the current buffer and quote it."
diff --git a/lisp/gnus/nnimap.el b/lisp/gnus/nnimap.el
index c579261e356..aa4ecbc3b0f 100644
--- a/lisp/gnus/nnimap.el
+++ b/lisp/gnus/nnimap.el
@@ -1496,10 +1496,22 @@ textual parts.")
            (setq start (point))
            (goto-char end))
          (while (re-search-forward "^\\* [0-9]+ FETCH " start t)
-            (setq elems (read (current-buffer)))
+            (let ((p (point)))
-            (push (cons (cadr (memq 'UID elems))
+              ;; FIXME: For FETCH lines like "* 2971 FETCH (FLAGS (%Recent) UID
-                        (cadr (memq 'FLAGS elems)))
+              ;; 12509 MODSEQ (13419098521433281274))" we get an
-                  articles))
+              ;; overflow-error.  The handler simply deletes that large number
+              ;; and reads again.  But maybe there's a better fix...
+              (setq elems (condition-case nil (read (current-buffer))
+                            (overflow-error
+                             ;; After an overflow-error, point is just after
+                             ;; the too large number.  So delete it and try
+                             ;; again.
+                             (delete-region (point) (progn (backward-word) (point)))
+                             (goto-char p)
+                             (read (current-buffer)))))
+              (push (cons (cadr (memq 'UID elems))
+                          (cadr (memq 'FLAGS elems)))
+                    articles)))
          (push (nconc (list group uidnext totalp permanent-flags uidvalidity
                             vanished highestmodseq)
                       articles)
diff --git a/lisp/help-mode.el b/lisp/help-mode.el
index 724b0186679..51d18235e1b 100644
--- a/lisp/help-mode.el
+++ b/lisp/help-mode.el
@@ -409,13 +409,16 @@ restore it properly when going back."
 (defun help-buffer ()
  "Return the name of a buffer for inserting help.
 If `help-xref-following' is non-nil, this is the name of the
-current buffer.
+current buffer.  Signal an error if this buffer is not derived
-Otherwise, it is *Help*; if no buffer with that name currently
+from `help-mode'.
-exists, it is created."
+Otherwise, return \"*Help*\", creating a buffer with that name if
+it does not already exist."
  (buffer-name                          ;for with-output-to-temp-buffer
-   (if help-xref-following
+   (if (not help-xref-following)
-       (current-buffer)
+       (get-buffer-create "*Help*")
-     (get-buffer-create "*Help*"))))
+     (unless (derived-mode-p 'help-mode)
+       (error "Current buffer is not in Help mode"))
+     (current-buffer))))
 (defvar help-xref-override-view-map
  (let ((map (make-sparse-keymap)))
diff --git a/lisp/image-dired.el b/lisp/image-dired.el
index 8fa6963b3d7..efe8262645d 100644
--- a/lisp/image-dired.el
+++ b/lisp/image-dired.el
@@ -384,7 +384,7 @@ Used together with `image-dired-cmd-read-exif-data-program-options'."
  "%p -s -s -s -%t \"%f\""
  "Format of command used to read EXIF data.
 Available options are %p which is replaced by
-`image-dired-cmd-write-exif-data-options', %f which is replaced
+`image-dired-cmd-write-exif-data-program', %f which is replaced
 by the image file name and %t which is replaced by the tag name."
  :type 'string
  :group 'image-dired)
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 77ae87b5449..0548f24b1dd 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -309,7 +309,6 @@ The default value matches citations like `foo-bar>' plus whitespace."
    (define-key map [remap split-line] 'mail-split-line)
    (define-key map "\C-c\C-q" 'mail-fill-yanked-message)
    (define-key map "\C-c\C-w" 'mail-signature)
-    (define-key map "\C-c\C-v" 'mail-sent-via)
    (define-key map "\C-c\C-c" 'mail-send-and-exit)
    (define-key map "\C-c\C-s" 'mail-send)
    (define-key map "\C-c\C-i" 'mail-attach-file)
@@ -349,9 +348,6 @@ The default value matches citations like `foo-bar>' plus whitespace."
    (define-key map [menu-bar headers expand-aliases]
      '("Expand Aliases" . expand-mail-aliases))
-    (define-key map [menu-bar headers sent-via]
-      '("Sent-Via" . mail-sent-via))
    (define-key map [menu-bar headers mail-reply-to]
      '("Mail-Reply-To" . mail-mail-reply-to))
@@ -665,7 +661,6 @@ Here are commands that move to a header field (and create it if there isn't):
 \\[mail-signature]  mail-signature (insert `mail-signature-file' file).
 \\[mail-yank-original]  mail-yank-original (insert current message, in Rmail).
 \\[mail-fill-yanked-message]  mail-fill-yanked-message (fill what was yanked).
-\\[mail-sent-via]  mail-sent-via (add a sent-via field for each To or CC).
 Turning on Mail mode runs the normal hooks `text-mode-hook' and
 `mail-mode-hook' (in that order)."
  (make-local-variable 'mail-reply-action)
@@ -1346,6 +1341,9 @@ just append to the file, in Babyl format if necessary."
                                   (point)))))
          ;; Insert a copy, with altered header field name.
          (insert-before-markers "Sent-via:" to-line))))))
+(make-obsolete 'mail-sent-via "nobody can remember what it is for." "24.1")
 (defun mail-to ()
  "Move point to end of To field, creating it if necessary."
diff --git a/lisp/man.el b/lisp/man.el
index 0b3ac537c5b..c8c2f8653e2 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -623,36 +623,32 @@ and the `Man-section-translations-alist' variables)."
      (concat Man-specified-section-option section " " name))))
 (defun Man-support-local-filenames ()
-  "Check the availability of `-l' option of the man command.
+  "Return non-nil if the man command supports local filenames.
-This option allows `man' to interpret command line arguments
+Different man programs support this feature in different ways.
-as local filenames.
+The default Debian man program (\"man-db\") has a `--local-file'
-Return the value of the variable `Man-support-local-filenames'
+\(or `-l') option for this purpose.  The default Red Hat man
-if it was set to nil or t before the call of this function.
+program has no such option, but interprets any name containing
-If t, the man command supports `-l' option.  If nil, it doesn't.
+a \"/\" as a local filename.  The function returns either `man-db'
-Otherwise, if the value of `Man-support-local-filenames'
+`man', or nil."
-is neither t nor nil, then determine a new value, set it
+  (if (eq Man-support-local-filenames 'auto-detect)
-to the variable `Man-support-local-filenames' and return
+      (setq Man-support-local-filenames
-a new value."
+            (with-temp-buffer
-  (if (or (not Man-support-local-filenames)
+              (let ((default-directory
-          (eq Man-support-local-filenames t))
+                      ;; Ensure that `default-directory' exists and is readable.
-      Man-support-local-filenames
+                      (if (and (file-directory-p default-directory)
-    (setq Man-support-local-filenames
+                               (file-readable-p default-directory))
-          (with-temp-buffer
+                        default-directory
-            (and (equal (condition-case nil
+                        (expand-file-name "~/"))))
-                            (let ((default-directory
+                (ignore-errors
-                                    ;; Assure that `default-directory' exists
+                  (call-process manual-program nil t nil "--help")))
-                                    ;; and is readable.
+              (cond ((search-backward "--local-file" nil 'move)
-                                    (if (and (file-directory-p default-directory)
+                     'man-db)
-                                             (file-readable-p default-directory))
+                    ;; This feature seems to be present in at least ver 1.4f,
-                                        default-directory
+                    ;; which is about 20 years old.
-                                      (expand-file-name "~/"))))
+                    ;; I don't know if this version has an official name?
-                              (call-process manual-program nil t nil "--help"))
+                    ((looking-at "^man, versione? [1-9]")
-                          (error nil))
+                     'man))))
-                        0)
+    Man-support-local-filenames))
-                 (progn
-                   (goto-char (point-min))
-                   (search-forward "--local-file" nil t))
-                 t)))))
 ;; ======================================================================
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index f3d1682127e..4b904ed2b7a 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-05  Antoine Levitt  <antoine.levitt@gmail.com>
+        * mh-funcs.el (mh-store-msg, mh-store-buffer):
+        * mh-mime.el (mh-mime-save-parts): Use read-directory-name.
 2011-01-13  Chong Yidong  <cyd@stupidchicken.com>
        * mh-comp.el (mh-user-agent-compose): New arg RETURN-ACTION.
diff --git a/lisp/mh-e/mh-funcs.el b/lisp/mh-e/mh-funcs.el
index ad508416501..c3f301e649d 100644
--- a/lisp/mh-e/mh-funcs.el
+++ b/lisp/mh-e/mh-funcs.el
@@ -286,7 +286,7 @@ to \"Directory\", and then enter the name of the directory for
 storing the content of these messages."
  (interactive (list (let ((udir (or mh-store-default-directory
                                     default-directory)))
-                       (read-file-name "Store message in directory: "
+                       (read-directory-name "Store message in directory: "
                                       udir udir nil))))
  (let ((msg-file-to-store (mh-msg-filename (mh-get-msg-num t))))
    (with-current-buffer (get-buffer-create mh-temp-buffer)
@@ -300,7 +300,7 @@ storing the content of these messages."
 See `mh-store-msg' for a description of DIRECTORY."
  (interactive (list (let ((udir (or mh-store-default-directory
                                     default-directory)))
-                       (read-file-name "Store buffer in directory: "
+                       (read-directory-name "Store buffer in directory: "
                                       udir udir nil))))
  (let ((store-directory (expand-file-name directory))
        (sh-start (save-excursion
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index de0f49e41db..ba994e73a91 100644
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -390,11 +390,11 @@ do the work."
                    (equal nil mh-mime-save-parts-default-directory)
                    (equal t mh-mime-save-parts-default-directory))
                (not mh-mime-save-parts-directory))
-           (read-file-name "Store in directory: " nil nil t nil))
+           (read-directory-name "Store in directory: " nil nil t))
          ((and (or prompt
                    (equal t mh-mime-save-parts-default-directory))
                mh-mime-save-parts-directory)
-           (read-file-name (format
+           (read-directory-name (format
                            "Store in directory (default %s): "
                            mh-mime-save-parts-directory)
                           "" mh-mime-save-parts-directory t ""))
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index f0d36451b5c..8c9ead479e8 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -4071,7 +4071,7 @@ directory, so that Emacs will know its current contents."
        (ange-ftp-get-files dir t))))
 (defun ange-ftp-make-directory (dir &optional parents)
-  (interactive (list (expand-file-name (read-file-name "Make directory: "))))
+  (interactive (list (expand-file-name (read-directory-name "Make directory: "))))
  (if parents
      (let ((parent (file-name-directory (directory-file-name dir))))
        (or (file-exists-p parent)
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 660eb3b968e..24dbfc0c30a 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -798,7 +798,12 @@ first, if that exists."
  (let ((process-environment (copy-sequence process-environment))
        (function (or (and (string-match "\\`mailto:" url)
                           browse-url-mailto-function)
-                      browse-url-browser-function)))
+                      browse-url-browser-function))
+        ;; Ensure that `default-directory' exists and is readable (b#6077).
+        (default-directory (if (and (file-directory-p default-directory)
+                                    (file-readable-p default-directory))
+                               default-directory
+                             (expand-file-name "~/"))))
    ;; When connected to various displays, be careful to use the display of
    ;; the currently selected frame, rather than the original start display,
    ;; which may not even exist any more.
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index 1d419dbfa18..1e3ee91092d 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -204,12 +204,14 @@ The ARGUMENTS for each METHOD symbol are:
  `nickserv': NICK PASSWORD [NICKSERV-NICK]
  `chanserv': NICK CHANNEL PASSWORD
  `bitlbee': NICK PASSWORD
+  `quakenet': ACCOUNT PASSWORD
 Examples:
 ((\"freenode\" nickserv \"bob\" \"p455w0rd\")
  (\"freenode\" chanserv \"bob\" \"#bobland\" \"passwd99\")
  (\"bitlbee\" bitlbee \"robert\" \"sekrit\")
-  (\"dal.net\" nickserv \"bob\" \"sekrit\" \"NickServ@services.dal.net\"))"
+  (\"dal.net\" nickserv \"bob\" \"sekrit\" \"NickServ@services.dal.net\")
+  (\"quakenet.org\" quakenet \"bobby\" \"sekrit\"))"
  :type '(alist :key-type (string :tag "Server")
                :value-type (choice (list :tag "NickServ"
                                          (const nickserv)
@@ -223,7 +225,11 @@ Examples:
                                    (list :tag "BitlBee"
                                          (const bitlbee)
                                          (string :tag "Nick")
-                                          (string :tag "Password"))))
+                                          (string :tag "Password"))
+                                    (list :tag "QuakeNet"
+                                          (const quakenet)
+                                          (string :tag "Account")
+                                          (string :tag "Password"))))
  :group 'rcirc)
 (defcustom rcirc-auto-authenticate-flag t
@@ -232,6 +238,13 @@ See also `rcirc-authinfo'."
  :type 'boolean
  :group 'rcirc)
+(defcustom rcirc-authenticate-before-join t
+  "*Non-nil means authenticate to services before joining channels.
+Currently only works with NickServ on some networks."
+  :version "24.1"
+  :type 'boolean
+  :group 'rcirc)
 (defcustom rcirc-prompt "> "
  "Prompt string to use in IRC buffers.
@@ -282,6 +295,9 @@ Called with 5 arguments, PROCESS, SENDER, RESPONSE, TARGET and TEXT."
  :type 'hook
  :group 'rcirc)
+(defvar rcirc-authenticated-hook nil
+  "Hook run after successfully authenticated.")
 (defcustom rcirc-always-use-server-buffer-flag nil
  "Non-nil means messages without a channel target will go to the server buffer."
  :type 'boolean
@@ -524,6 +540,8 @@ If ARG is non-nil, instead prompt for connection parameters."
      (setq rcirc-timeout-timer nil)
      (make-local-variable 'rcirc-user-disconnect)
      (setq rcirc-user-disconnect nil)
+      (make-local-variable 'rcirc-user-authenticated)
+      (setq rcirc-user-authenticated nil)
      (make-local-variable 'rcirc-connecting)
      (setq rcirc-connecting t)
@@ -2104,7 +2122,8 @@ CHANNELS is a comma- or space-separated string of channel names."
  (let* ((split-channels (split-string channels "[ ,]" t))
         (buffers (mapcar (lambda (ch)
                            (rcirc-get-buffer-create process ch))
-                          split-channels)))
+                          split-channels))
+         (channels (mapconcat 'identity split-channels ",")))
    (rcirc-send-string process (concat "JOIN " channels))
    (when (not (eq (selected-window) (minibuffer-window)))
      (dolist (b buffers) ;; order the new channel buffers in the buffer list
@@ -2427,10 +2446,23 @@ keywords when no KEYWORD is given."
    (setq rcirc-server-name sender)
    (setq rcirc-nick (car args))
    (rcirc-update-prompt)
-    (when rcirc-auto-authenticate-flag (rcirc-authenticate))
+    (if rcirc-auto-authenticate-flag
+        (if rcirc-authenticate-before-join
+            (progn
+              (with-rcirc-process-buffer process
+                (add-hook 'rcirc-authenticated-hook 'rcirc-join-channels-post-auth t t))
+              (rcirc-authenticate))
+          (rcirc-authenticate)
+          (rcirc-join-channels process rcirc-startup-channels))
+      (rcirc-join-channels process rcirc-startup-channels))))
+(defun rcirc-join-channels-post-auth (process)
+  "Join `rcirc-startup-channels' after authenticating."
+  (with-rcirc-process-buffer process
    (rcirc-join-channels process rcirc-startup-channels)))
 (defun rcirc-handler-PRIVMSG (process sender args text)
+  (rcirc-check-auth-status process sender args text)
  (let ((target (if (rcirc-channel-p (car args))
                    (car args)
                  sender))
@@ -2443,6 +2475,7 @@ keywords when no KEYWORD is given."
      (rcirc-put-nick-channel process sender target rcirc-current-line))))
 (defun rcirc-handler-NOTICE (process sender args text)
+  (rcirc-check-auth-status process sender args text)
  (let ((target (car args))
        (message (cadr args)))
    (if (string-match "^\C-a\\(.*\\)\C-a$" message)
@@ -2460,6 +2493,33 @@ keywords when no KEYWORD is given."
                            sender)))
                 message t))))
+(defun rcirc-check-auth-status (process sender args text)
+  "Check if the user just authenticated.
+If authenticated, runs `rcirc-authenticated-hook' with PROCESS as
+the only argument."
+  (with-rcirc-process-buffer process
+    (when (and (not rcirc-user-authenticated)
+               rcirc-authenticate-before-join
+               rcirc-auto-authenticate-flag)
+      (let ((target (car args))
+            (message (cadr args)))
+        (when (or
+               (and ;; nickserv
+                (string= sender "NickServ")
+                (string= target rcirc-nick)
+                (member message
+                        (list
+                         (format "You are now identified for \C-b%s\C-b." rcirc-nick)
+                         "Password accepted - you are now recognized."
+                         )))
+               (and ;; quakenet
+                (string= sender "Q")
+                (string= target rcirc-nick)
+                (string-match message "\\`You are now logged in as .+\\.\\'")))
+          (setq rcirc-user-authenticated t)
+          (run-hook-with-args 'rcirc-authenticated-hook process)
+          (remove-hook 'rcirc-authenticated-hook 'rcirc-join-channels-post-auth t))))))
 (defun rcirc-handler-WALLOPS (process sender args text)
  (rcirc-print process sender "WALLOPS" sender (car args) t))
@@ -2704,26 +2764,33 @@ Passwords are stored in `rcirc-authinfo' (which see)."
            (nick (caddr i))
            (method (cadr i))
            (args (cdddr i)))
-        (when (and (string-match server rcirc-server)
+        (when (and (string-match server rcirc-server))
-                   (string-match nick rcirc-nick))
+          (if (and (memq method '(nickserv chanserv bitlbee))
-          (cond ((equal method 'nickserv)
+                   (string-match nick rcirc-nick))
-                 (rcirc-send-privmsg
+              ;; the following methods rely on the user's nickname.
-                  process
+              (case method
+                (nickserv
+                 (rcirc-send-privmsg
+                  process
                  (or (cadr args) "NickServ")
-                  (concat "identify " (car args))))
+                  (concat "IDENTIFY " (car args))))
-                ((equal method 'chanserv)
+                (chanserv
-                 (rcirc-send-privmsg
+                 (rcirc-send-privmsg
-                  process
+                  process
                  "ChanServ"
-                  (format "identify %s %s" (car args) (cadr args))))
+                  (format "IDENTIFY %s %s" (car args) (cadr args))))
-                ((equal method 'bitlbee)
+                (bitlbee
-                 (rcirc-send-privmsg
+                 (rcirc-send-privmsg
-                  process
+                  process
                  "&bitlbee"
-                  (concat "identify " (car args))))
+                  (concat "IDENTIFY " (car args)))))
-                (t
+            ;; quakenet authentication doesn't rely on the user's nickname.
-                 (message "No %S authentication method defined"
+            ;; the variable `nick' here represents the Q account name.
-                          method))))))))
+            (when (eq method 'quakenet)
+              (rcirc-send-privmsg 
+               process
+               "Q@CServe.quakenet.org"
+               (format "AUTH %s %s" nick (car args))))))))))
 (defun rcirc-handler-INVITE (process sender args text)
  (rcirc-print process sender "INVITE" nil (mapconcat 'identity args " ") t))
diff --git a/lisp/net/soap-client.el b/lisp/net/soap-client.el
index b4307223ba8..b5453733d1d 100644
--- a/lisp/net/soap-client.el
+++ b/lisp/net/soap-client.el
@@ -2,9 +2,10 @@
 ;; Copyright (C) 2009-2011  Free Software Foundation, Inc.
-;; Author: Alexandru Harsanyi (AlexHarsanyi@gmail.com)
+;; Author: Alexandru Harsanyi <AlexHarsanyi@gmail.com>
 ;; Created: December, 2009
 ;; Keywords: soap, web-services, comm, hypermedia
+;; Package: soap-client
 ;; Homepage: http://code.google.com/p/emacs-soap-client
 ;; This file is part of GNU Emacs.
@@ -323,13 +324,18 @@ added to the namespace."
    ;; if name is nil, use TARGET as a name...
    (cond ((soap-element-p target)
           (setq name (soap-element-name target)))
+          ((consp target)               ; a fq name: (namespace . name)
+           (setq name (cdr target)))
          ((stringp target)
           (cond ((string-match "^\\(.*\\):\\(.*\\)$" target)
                  (setq name (match-string 2 target)))
                 (t
                  (setq name target))))))
-  (assert name)                         ; by now, name should be valid
+  ;; by now, name should be valid
+  (assert (and name (not (equal name "")))
+          nil
+          "Cannot determine name for namespace link")
  (push (make-soap-namespace-link :name name :target target)
        (gethash name (soap-namespace-elements ns))))
@@ -890,7 +896,11 @@ Return a SOAP-NAMESPACE containing the elements."
      (when (consp c)               ; skip string nodes, which are whitespace
        (let ((node-name (soap-l2wk (xml-node-name c))))
          (cond
-            ((eq node-name 'xsd:sequence)
+            ;; The difference between xsd:all and xsd:sequence is that fields
+            ;; in xsd:all are not ordered and they can occur only once.  We
+            ;; don't care about that difference in soap-client.el
+            ((or (eq node-name 'xsd:sequence)
+                 (eq node-name 'xsd:all))
             (setq type (soap-parse-complex-type-sequence c)))
            ((eq node-name 'xsd:complexContent)
             (setq type (soap-parse-complex-type-complex-content c)))
@@ -909,9 +919,10 @@ NODE is assumed to be an xsd:sequence node.  In that case, each
 of its children is assumed to be a sequence element.  Each
 sequence element is parsed constructing the corresponding type.
 A list of these types is returned."
-  (assert (eq (soap-l2wk (xml-node-name node)) 'xsd:sequence)
+  (assert (let ((n (soap-l2wk (xml-node-name node))))
+            (memq n '(xsd:sequence xsd:all)))
          nil
-          "soap-parse-sequence: expecting xsd:sequence node, got %s"
+          "soap-parse-sequence: expecting xsd:sequence or xsd:all node, got %s"
          (soap-l2wk (xml-node-name node)))
  (let (elements)
    (dolist (e (soap-xml-get-children1 node 'xsd:element))
diff --git a/lisp/net/soap-inspect.el b/lisp/net/soap-inspect.el
index 7cce9844d76..8f67d02dc6f 100644
--- a/lisp/net/soap-inspect.el
+++ b/lisp/net/soap-inspect.el
@@ -2,9 +2,10 @@
 ;; Copyright (C) 2010-2011  Free Software Foundation, Inc.
-;; Author: Alexandru Harsanyi (AlexHarsanyi@gmail.com)
+;; Author: Alexandru Harsanyi <AlexHarsanyi@gmail.com>
 ;; Created: October 2010
 ;; Keywords: soap, web-services, comm, hypermedia
+;; Package: soap-client
 ;; Homepage: http://code.google.com/p/emacs-soap-client
 ;; This file is part of GNU Emacs.
diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el
index a98e523a68b..f8bc594e959 100644
--- a/lisp/net/tramp-cache.el
+++ b/lisp/net/tramp-cache.el
@@ -353,7 +353,8 @@ KEY identifies the connection, it is either a process or a vector."
          (write-region
           (point-min) (point-max) tramp-persistency-file-name))))))
-(add-hook 'kill-emacs-hook 'tramp-dump-connection-properties)
+(unless noninteractive
+  (add-hook 'kill-emacs-hook 'tramp-dump-connection-properties))
 (add-hook 'tramp-cache-unload-hook
          '(lambda ()
             (remove-hook 'kill-emacs-hook
diff --git a/lisp/obsolete/fast-lock.el b/lisp/obsolete/fast-lock.el
index 68d06ef34bc..a59e7871458 100644
--- a/lisp/obsolete/fast-lock.el
+++ b/lisp/obsolete/fast-lock.el
@@ -840,7 +840,8 @@ See `fast-lock-get-face-properties'."
 (add-hook 'after-save-hook 'fast-lock-save-cache-after-save-file)
 (add-hook 'kill-buffer-hook 'fast-lock-save-cache-before-kill-buffer)
-(add-hook 'kill-emacs-hook 'fast-lock-save-caches-before-kill-emacs)
+(unless noninteractive
+  (add-hook 'kill-emacs-hook 'fast-lock-save-caches-before-kill-emacs))
 ;;;###autoload
 (when (fboundp 'add-minor-mode)
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 68d957584c6..e75821b6860 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,13 +1,15 @@
-2011-02-28  Juanma Barranquero  <lekktu@gmail.com>
+2011-03-06  Juanma Barranquero  <lekktu@gmail.com>
-        * org.el (org-maybe-keyword-time-regexp):
+        * org.el (org-blank-before-new-entry, org-context-in-file-links)
-        * org-icalendar.el (org-icalendar-store-UID):
+        (org-refile-targets, org-log-repeat, org-insert-link)
-        * org-agenda.el (org-agenda-scheduled-leaders)
+        (org-speed-command-default-hook, org-speed-command-hook)
-        (org-agenda-deadline-leaders, org-agenda-filter-preset):
+        (org-in-regexps-block-p, org-yank-generic, org-goto-first-child):
-        * org-table.el (org-table-current-line-types)
-        (org-table-current-begin-line, org-table-current-begin-pos):
-        (org-table-current-field-formula):
        Fix typos in docstrings.
+        (org-toggle-pretty-entities): Fix typo in message.
+2011-03-06  Juanma Barranquero  <lekktu@gmail.com>
+        * org-id.el: Don't set `kill-emacs-hook' on noninteractive sessions.
 2011-02-10  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -59,7 +61,7 @@
 2010-12-11  Nicolas Goaziou  <n.goaziou@gmail.com>
        * org-inlinetask.el (org-inlinetask-export-templates): Add
-        Sébastien Vauban's suggestion for LaTeX export in docstring. This is
+        Sébastien Vauban's suggestion for LaTeX export in docstring.  This is
        not default as it requires an additional LaTeX package: "todonotes".
 2010-12-11  Nicolas Goaziou  <n.goaziou@gmail.com>
@@ -113,7 +115,7 @@
        * org.el (org-make-heading-search-string): Optionally limit number
        of lines stored in file link search strings.
-        (org-context-in-file-links) Add option to set to integer specifying
+        (org-context-in-file-links): Add option to set to integer specifying
        number of lines.
 2010-12-11  Carsten Dominik  <carsten.dominik@gmail.com>
@@ -290,7 +292,7 @@
 2010-12-11  Julien Danjou  <julien@danjou.info>
        * org-agenda.el (org-format-agenda-item): Convert category to a string
-        if it is a symbol. This fixes the following call to
+        if it is a symbol.  This fixes the following call to
        org-agenda-get-category-icon which fails if category is not a string.
 2010-12-11  Eric Schulte  <schulte.eric@gmail.com>
@@ -316,7 +318,7 @@
        * ob-python.el (org-babel-execute:python): Use a :return header
        argument for external evaluation in which the code block body need
-        be wrapped in a function
+        to be wrapped in a function.
 2010-12-11  Eric Schulte  <schulte.eric@gmail.com>
@@ -325,7 +327,7 @@
 2010-12-11  Carsten Dominik  <carsten.dominik@gmail.com>
-        * org.el (org-edit-special): Edit formulas when in TBLMF line
+        * org.el (org-edit-special): Edit formulas when in TBLMF line.
 2010-12-11  Allen S. Rout  <asr@ufl.edu>  (tiny change)
@@ -405,7 +407,7 @@
        * org-macs.el (org-called-interactively-p): Wrap function call in
        with-no-warnings.
-        (with-silent-modifications) Declare macro for Emacs < 23.2.
+        (with-silent-modifications): Declare macro for Emacs < 23.2.
 2010-12-11  Eric Schulte  <schulte.eric@gmail.com>
@@ -441,7 +443,7 @@
 2010-12-11  Achim Gratz  <Stromeko@Stromeko.DE>  (tiny change)
        * org-clock.el (org-get-clocktable): Previous patch incorrectly
-        required whitespace in front of #+BEGIN: and #+END:
+        required whitespace in front of #+BEGIN: and #+END:.
 2010-12-11  Dan Davison  <dandavison7@gmail.com>
@@ -478,7 +480,7 @@
 2010-12-11  Nicolas Goaziou  <n.goaziou@gmail.com>
        * org.el (org-indent-line-function): Drawers and blocks have no
-        influence on indentation of text below. Also fix indentation
+        influence on indentation of text below.  Also fix indentation
        problem with a block at column 0 and add a special case for
        literal examples.
@@ -491,7 +493,7 @@
        * ob-ref.el (org-babel-ref-resolve): Recognize `list' as a unique
        type of data
-        (org-babel-ref-at-ref-p): Recognize `list' as a unique type of data
+        (org-babel-ref-at-ref-p): Recognize `list' as a unique type of data.
 2010-12-11  Eric Schulte  <schulte.eric@gmail.com>
@@ -521,7 +523,7 @@
        * org-clock.el (org-get-clocktable):
        (org-in-clocktable-p):
        (org-clocktable-shift):
-        (org-clocktable-steps): Fix regexp to allow for indented clock tables
+        (org-clocktable-steps): Fix regexp to allow for indented clock tables.
 2010-12-11  Puneeth Chaganti  <punchagan@gmail.com>
@@ -536,7 +538,7 @@
        (org-export-latex-href-format): Rename the existing variable
        `org-export-latex-hyperref-format' as `org-export-latex-href-format'
        (org-export-latex-links): Use `org-export-latex-hyperref-format' and
-        `org-export-latex-href-format'
+        `org-export-latex-href-format'.
 2010-12-11  Eric Schulte  <schulte.eric@gmail.com>
@@ -546,7 +548,7 @@
 2010-12-11  Nicolas Goaziou  <n.goaziou@gmail.com>
        * org-exp.el (org-export-preprocess-string): delaying code block
-        processing a bit to allow correct list parsing in the export string
+        processing a bit to allow correct list parsing in the export string.
 2010-12-11  Christopher Allan Webber  <cwebber@dustycloud.org>
@@ -586,7 +588,7 @@
        * org-exp.el (org-export-format-source-code-or-example):
        Remove hard-wired configuration of minted export
-        (org-export-latex-minted-with-line-numbers): Remove variable
+        (org-export-latex-minted-with-line-numbers): Remove variable.
 2010-12-11  Bastien Guerry  <bzg@altern.org>
@@ -603,7 +605,7 @@
 2010-12-11  Eric Schulte  <schulte.eric@gmail.com>
        * ob-lob.el (org-babel-lob-get-info): including pass-through
-        header arguments in results variable header argument string
+        header arguments in results variable header argument string.
 2010-12-11  David Maus  <dmaus@ictsoc.de>
@@ -651,11 +653,11 @@
 2010-12-11  Eric Schulte  <schulte.eric@gmail.com>
        * ob-calc.el (org-babel-execute:calc): support for variables --
-        converts :var variables in calc variables
+        converts :var variables in calc variables.
 2010-12-11  Carsten Dominik  <carsten.dominik@gmail.com>
-        * org.el (org-sparse-tree): Mention [r] in dispatch menu
+        * org.el (org-sparse-tree): Mention [r] in dispatch menu.
 2010-12-11  Carsten Dominik  <carsten.dominik@gmail.com>
@@ -754,10 +756,10 @@
        * org-exp.el (org-export-format-source-code-or-example):
        Use minted for latex source code export if `org-export-latex-listings'
-        has the value 'minted
+        has the value 'minted.
        * org-latex.el (org-export-latex-listings): Document special value
-        'minted
+        'minted.
        * org-latex.el (org-export-latex-minted): Delete variable.
@@ -797,10 +799,10 @@
 2010-11-11  Łukasz Stelmach  <lukasz.stelmach@iem.pw.edu.pl>
        * org-agenda.el (org-agenda-get-sexps): Handle lists as return
-        values from diary entries
+        values from diary entries.
        * org-bbdb.el (org-bbdb-anniversaries): Handle lists of
-        anniversaries
+        anniversaries.
        * org.el (org-diary-sexp-entry): Handle lists as return values
        from diary entries.
@@ -1045,90 +1047,90 @@
        * ob-C.el (org-babel-C-execute): Remove call to
        org-babel-process-params which should no longer be called from
-        within a language file
+        within a language file.
        * ob-R.el (org-babel-execute:R): Remove call to
        org-babel-process-params which should no longer be called from
        within a language file
        (org-babel-R-variable-assignments): Remove call to
        org-babel-process-params which should no longer be called from
-        within a language file
+        within a language file.
        * ob-asymptote.el (org-babel-execute:asymptote): Remove call to
        org-babel-process-params which should no longer be called from
-        within a language file
+        within a language file.
        * ob-clojure.el (org-babel-execute:clojure): Remove call to
        org-babel-process-params which should no longer be called from
-        within a language file
+        within a language file.
        * ob-dot.el (org-babel-execute:dot): Remove call to
        org-babel-process-params which should no longer be called from
-        within a language file
+        within a language file.
        * ob-emacs-lisp.el (org-babel-expand-body:emacs-lisp): Remove
        call to org-babel-process-params which should no longer be called
        from within a language file
        (org-babel-execute:emacs-lisp): Remove call to
        org-babel-process-params which should no longer be called from
-        within a language file
+        within a language file.
        * ob-haskell.el (org-babel-execute:haskell): Remove call to
        org-babel-process-params which should no longer be called from
-        within a language file
+        within a language file.
        * ob-js.el (org-babel-execute:js): Remove call to
        org-babel-process-params which should no longer be called from
-        within a language file
+        within a language file.
        * ob-lisp.el (org-babel-execute:lisp): Remove call to
        org-babel-process-params which should no longer be called from
-        within a language file
+        within a language file.
        * ob-ocaml.el (org-babel-execute:ocaml): Remove call to
        org-babel-process-params which should no longer be called from
-        within a language file
+        within a language file.
        * ob-octave.el (org-babel-execute:octave): Remove call to
        org-babel-process-params which should no longer be called from
-        within a language file
+        within a language file.
        * ob-perl.el (org-babel-execute:perl): Remove call to
        org-babel-process-params which should no longer be called from
-        within a language file
+        within a language file.
        * ob-python.el (org-babel-execute:python): Remove call to
        org-babel-process-params which should no longer be called from
-        within a language file
+        within a language file.
        * ob-ruby.el (org-babel-execute:ruby): Remove call to
        org-babel-process-params which should no longer be called from
-        within a language file
+        within a language file.
        * ob-scheme.el (org-babel-execute:scheme): Remove call to
        org-babel-process-params which should no longer be called from
-        within a language file
+        within a language file.
        * ob-screen.el (org-babel-execute:screen): Remove call to
        org-babel-process-params which should no longer be called from
        within a language file
        (org-babel-prep-session:screen): Remove call to
        org-babel-process-params which should no longer be called from
-        within a language file
+        within a language file.
        * ob-sh.el (org-babel-execute:sh): Remove call to
        org-babel-process-params which should no longer be called from
-        within a language file
+        within a language file.
        * ob-sql.el (org-babel-execute:sql): Remove call to
        org-babel-process-params which should no longer be called from
-        within a language file
+        within a language file.
        * ob-haskell.el (org-babel-execute:haskell): Remove reference to
-        processed params
+        processed params.
        * ob-clojure.el (org-babel-execute:clojure): Remove reference to
-        processed params
+        processed params.
        * ob-R.el (org-babel-execute:R): Remove reference to processed
        params.
@@ -1319,162 +1321,45 @@
 2010-11-11  Eric Schulte  <schulte.eric@gmail.com>
-        * ob-C.el (org-babel-expand-body:c++): Remove obsoleted optional
+        * ob-C.el (org-babel-expand-body:c++, org-babel-C-expand):
-        third argument
+        * ob-R.el (org-babel-expand-body:R, org-babel-execute:R)
-        (org-babel-expand-body:c++): Remove obsoleted optional third
+        (org-babel-R-variable-assignments):
-        argument
+        * ob-asymptote.el (org-babel-expand-body:asymptote)
-        (org-babel-C-expand): Remove obsoleted optional third argument
+        (org-babel-execute:asymptote):
+        * ob-clojure.el (org-babel-expand-body:clojure)
-        * ob-R.el:
+        (org-babel-execute:clojure):
-        (org-babel-expand-body:R): Remove obsoleted optional third
+        * ob-css.el (org-babel-expand-body:css):
-        argument
+        * ob-ditaa.el (org-babel-expand-body:ditaa):
-        (org-babel-execute:R): Remove obsoleted optional third argument
+        * ob-dot.el (org-babel-expand-body:dot, org-babel-execute:dot):
-        (org-babel-R-variable-assignments): Remove obsoleted optional
+        * ob-emacs-lisp.el (org-babel-expand-body:emacs-lisp)
-        third argument
+        (org-babel-execute:emacs-lisp):
+        * ob-gnuplot.el (org-babel-expand-body:gnuplot)
-        * ob-asymptote.el:
+        * ob-haskell.el (org-babel-expand-body:haskell)
-        (org-babel-expand-body:asymptote): Remove obsoleted optional
+        (org-babel-execute:haskell, org-babel-load-session:haskell)
-        third argument
+        (org-babel-prep-session:haskell):
-        (org-babel-execute:asymptote): Remove obsoleted optional third
+        * ob-js.el (org-babel-expand-body:js, org-babel-execute:js):
-        argument
+        * ob-latex.el (org-babel-expand-body:latex):
+        * ob-lisp.el (org-babel-expand-body:lisp, org-babel-execute:lisp):
-        * ob-clojure.el:
+        * ob-mscgen.el (org-babel-expand-body:mscgen):
-        (org-babel-expand-body:clojure): Remove obsoleted optional third
+        * ob-ocaml.el (org-babel-expand-body:ocaml, org-babel-execute:ocaml):
-        argument
+        * ob-octave.el (org-babel-expand-body:matlab)
-        (org-babel-execute:clojure): Remove obsoleted optional third
+        (org-babel-expand-body:octave, org-babel-execute:octave)
-        argument
+        (org-babel-octave-variable-assignments):
+        * ob-org.el (org-babel-expand-body:org):
-        * ob-css.el:
+        * ob-perl.el (org-babel-expand-body:perl, org-babel-execute:perl):
-        (org-babel-expand-body:css): Remove obsoleted optional third
+        * ob-plantuml.el (org-babel-expand-body:plantuml):
-        argument
+        * ob-python.el (org-babel-expand-body:python, org-babel-execute:python)
+        (org-babel-python-variable-assignments):
-        * ob-ditaa.el:
+        * ob-ruby.el (org-babel-expand-body:ruby, org-babel-execute:ruby):
-        (org-babel-expand-body:ditaa): Remove obsoleted optional third
+        * ob-sass.el (org-babel-expand-body:sass):
-        argument
+        * ob-scheme.el (org-babel-expand-body:scheme, org-babel-execute:scheme):
+        * ob-screen.el (org-babel-expand-body:screen):
-        * ob-dot.el:
+        * ob-sh.el (org-babel-expand-body:sh, org-babel-execute:sh)
-        (org-babel-expand-body:dot): Remove obsoleted optional third
+        (org-babel-sh-variable-assignments):
-        argument
+        * ob-sql.el (org-babel-expand-body:sql):
-        (org-babel-execute:dot): Remove obsoleted optional third
+        * ob-sqlite.el (org-babel-expand-body:sqlite, org-babel-execute:sqlite):
-        argument
+        * ob.el (org-babel-expand-body:generic):
+        Remove obsoleted optional third argument.
-        * ob-emacs-lisp.el:
-        (org-babel-expand-body:emacs-lisp): Remove obsoleted optional
-        third argument
-        (org-babel-execute:emacs-lisp): Remove obsoleted optional third
-        argument
-        * ob-gnuplot.el:
-        (org-babel-expand-body:gnuplot): Remove obsoleted optional third
-        argument
-        * ob-haskell.el:
-        (org-babel-expand-body:haskell): Remove obsoleted optional third
-        argument
-        (org-babel-execute:haskell): Remove obsoleted optional third
-        argument
-        (org-babel-load-session:haskell): Remove obsoleted optional
-        third
-        (org-babel-prep-session:haskell): Remove obsoleted optional
-        third
-        * ob-js.el:
-        (org-babel-expand-body:js): Remove obsoleted optional third
-        argument
-        (org-babel-execute:js): Remove obsoleted optional third argument
-        * ob-latex.el:
-        (org-babel-expand-body:latex): Remove obsoleted optional third
-        argument
-        * ob-lisp.el:
-        (org-babel-expand-body:lisp): Remove obsoleted optional third
-        argument
-        (org-babel-execute:lisp): Remove obsoleted optional third
-        argument
-        * ob-mscgen.el:
-        (org-babel-expand-body:mscgen): Remove obsoleted optional third
-        argument
-        * ob-ocaml.el:
-        (org-babel-expand-body:ocaml): Remove obsoleted optional third
-        argument
-        (org-babel-execute:ocaml): Remove obsoleted optional third
-        argument
-        * ob-octave.el:
-        (org-babel-expand-body:matlab): Remove obsoleted optional third
-        argument
-        (org-babel-expand-body:octave): Remove obsoleted optional third
-        argument
-        (org-babel-execute:octave): Remove obsoleted optional third
-        argument
-        (org-babel-octave-variable-assignments): Remove obsoleted
-        optional third
-        * ob-org.el:
-        (org-babel-expand-body:org): Remove obsoleted optional third
-        argument
-        * ob-perl.el:
-        (org-babel-expand-body:perl): Remove obsoleted optional third
-        argument
-        (org-babel-execute:perl): Remove obsoleted optional third
-        argument
-        * ob-plantuml.el:
-        (org-babel-expand-body:plantuml): Remove obsoleted optional
-        third argument
-        * ob-python.el:
-        (org-babel-expand-body:python): Remove obsoleted optional third
-        argument
-        (org-babel-execute:python): Remove obsoleted optional third
-        argument
-        (org-babel-python-variable-assignments): Remove obsoleted
-        optional third
-        * ob-ruby.el:
-        (org-babel-expand-body:ruby): Remove obsoleted optional third
-        argument
-        (org-babel-execute:ruby): Remove obsoleted optional third
-        argument
-        * ob-sass.el:
-        (org-babel-expand-body:sass): Remove obsoleted optional third
-        argument
-        * ob-scheme.el:
-        (org-babel-expand-body:scheme): Remove obsoleted optional third
-        argument
-        (org-babel-execute:scheme): Remove obsoleted optional third
-        argument
-        * ob-screen.el:
-        (org-babel-expand-body:screen): Remove obsoleted optional third
-        argument
-        * ob-sh.el:
-        (org-babel-expand-body:sh): Remove obsoleted optional third
-        argument
-        (org-babel-execute:sh): Remove obsoleted optional third argument
-        (org-babel-sh-variable-assignments): Remove obsoleted optional
-        third
-        * ob-sql.el:
-        (org-babel-expand-body:sql): Remove obsoleted optional third
-        argument
-        * ob-sqlite.el:
-        (org-babel-expand-body:sqlite): Remove obsoleted optional third
-        argument
-        (org-babel-execute:sqlite): Remove obsoleted optional third
-        argument
-        * ob.el:
-        (org-babel-expand-body:generic): Remove obsoleted optional third
-        argument.
 2010-11-11  Eric Schulte  <schulte.eric@gmail.com>
@@ -1504,7 +1389,7 @@
 2010-11-11  Dan Davison  <davison@stats.ox.ac.uk>
        * ob-sh.el (org-babel-sh-variable-assignments): Provide missing
-        docstring
+        docstring.
        * ob-python.el (org-babel-python-variable-assignments):
        Provide missing docstring.
@@ -1600,7 +1485,7 @@
 2010-11-11  Noorul Islam  <noorul@noorul.com>
-        * org-latex.el (org-export-latex-links) : Replaced hard coded
+        * org-latex.el (org-export-latex-links): Replaced hard coded
        hyperref format with custom variable
        `org-export-latex-hyperref-format'.
@@ -1654,7 +1539,7 @@
 2010-11-11  Eric Schulte  <schulte.eric@gmail.com>
-        * ob.el (org-babel-params-from-properties): Max line with at <=80
+        * ob.el (org-babel-params-from-properties): Max line with at <=80.
 2010-11-11  Eric Schulte  <schulte.eric@gmail.com>
@@ -2034,11 +1919,11 @@
 2010-11-11  Jambunathan K  <kjambunathan@gmail.com>  (tiny change)
-        * org.el (org-speed-command-hook): New. Hook for installing
+        * org.el (org-speed-command-hook): New.  Hook for installing
-        additional speed commands. Use this for enabling speed commands on
+        additional speed commands.  Use this for enabling speed commands on
        src blocks.
        (org-speed-command-default-hook): The default hook for
-        org-speed-command-hook. Factored out from org-self-insert-command
+        org-speed-command-hook.  Factored out from org-self-insert-command
        and mimics existing behaviour.
        (org-self-insert-command): Modified to use org-speed-command-hook.
@@ -2102,7 +1987,7 @@
 2010-11-11  Bastien Guerry  <bzg@altern.org>
        * org-capture.el (org-capture-templates): Update docstring to
-        advertize %:org-date.
+        advertise %:org-date.
 2010-11-11  Eric Schulte  <schulte.eric@gmail.com>
@@ -2179,7 +2064,7 @@
 2010-11-11  Eric Schulte  <schulte.eric@gmail.com>
        * ob.el (org-babel-demarcate-block): Interactive demarcation of
-        code blocks
+        code blocks.
        * ob-keys.el (org-babel-key-bindings): Key bindings for block
        demarcation.
@@ -2234,7 +2119,7 @@
        [[elisp:(org-agenda-list)]], org-prepare-agenda erases the buffer
        of the file containing the link, since that buffer is current
        during org-prepare agenda (due to a with-current-buffer in
-        org-agenda-open-link). An additional test now ensures that the
+        org-agenda-open-link).  An additional test now ensures that the
        agenda buffer is in fact current when the buffer is erased and
        local variables for the agenda are set.
@@ -2292,7 +2177,7 @@
 2010-11-11  Eric Schulte  <schulte.eric@gmail.com>
-        * ob-C.el (org): No longer requires org
+        * ob-C.el (org): No longer requires org.
        * ob-ledger.el (org): No longer requires org.
@@ -2356,7 +2241,7 @@
 2010-11-11  Eric Schulte  <schulte.eric@gmail.com>
        * ob-keys.el (org-babel-key-bindings): Adding key-binding for
-        `org-babel-goto-src-block-head'
+        `org-babel-goto-src-block-head'.
        * ob.el (org-babel-goto-src-block-head): Jump to the head of the
        current code block.
@@ -2364,7 +2249,7 @@
 2010-11-11  Eric Schulte  <schulte.eric@gmail.com>
        * ob.el (org-babel-next-src-block): Now raising more informative
-        error when no further code blocks can be found
+        error when no further code blocks can be found.
        (org-babel-previous-src-block): Now raising more informative error
        when no previous code blocks can be found.
@@ -2376,7 +2261,7 @@
 2010-11-11  Eric Schulte  <schulte.eric@gmail.com>
-        * ob-plantuml.el (org-babel-execute:plantuml):
+        * ob-plantuml.el (org-babel-execute:plantuml): ????
 2010-11-11  Dan Davison  <davison@stats.ox.ac.uk>
@@ -2475,7 +2360,7 @@
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
        * org-list.el (org-toggle-checkbox): Ignore items in drawers when
-        used from an heading. Send an error when no item is in region.
+        used from an heading.  Send an error when no item is in region.
 2010-11-11  Dan Davison  <davison@stats.ox.ac.uk>
@@ -2528,7 +2413,7 @@
 2010-11-11  Dan Davison  <davison@stats.ox.ac.uk>
        * org.el (org-fontify-meta-lines-and-blocks): Alter main regexp to
-        match code blocks with switches and header args. Call
+        match code blocks with switches and header args.  Call
        `org-src-font-lock-fontify-block' for automatic fontification of
        code in code blocks, controlled by variable
        `org-src-fontify-natively'.
@@ -2541,14 +2426,14 @@
 2010-11-11  Noorul Islam  <noorul@noorul.com>  (tiny change)
-        * org-html.el (org-html-make-link): (Expand-file-name ) removes
+        * org-html.el (org-html-make-link): (expand-file-name) removes
-        one "/" from "///path-to-file", so add one. Anything other than
+        one "/" from "///path-to-file", so add one.  Anything other than
        'file' type should be exported along with the type.
 2010-11-11  Noorul Islam  <noorul@noorul.com>  (tiny change)
-        * org.el (org-insert-subheading) : Fix compiler warning
+        * org.el (org-insert-subheading): Fix compiler warning
-        (org-insert-todo-subheading) : Fix compiler warning.
+        (org-insert-todo-subheading): Fix compiler warning.
 2010-11-11  Carsten Dominik  <carsten.dominik@gmail.com>
@@ -2589,7 +2474,7 @@
        * org.el (org-indent-line-function): Indentation of source block
        is left to `org-edit-src-exit' and shouldn't be modified by
-        `org-indent-line-function'. Indentation of others blocks should be
+        `org-indent-line-function'.  Indentation of others blocks should be
        the same as the #+begin line.
 2010-11-11  Dan Davison  <davison@stats.ox.ac.uk>
@@ -2621,7 +2506,7 @@
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
        * org-list.el (org-list-ending-method): New customizable variable
-        to tell Org Mode how lists end. See docstring.
+        to tell Org Mode how lists end.  See docstring.
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
@@ -2660,14 +2545,14 @@
        * org-list.el (org-list-insert-item-generic): A single item
        already counting blank lines in his body should be separated with
-        the next one by a blank line. Moreover, if user already provided
+        the next one by a blank line.  Moreover, if user already provided
        blank lines, follow his wishes.
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
        * org-list.el (org-indent-item-tree): When moving top item of a
        *-list to column 0, only the first item had its bullet changed to
-        -. It now changes all items of the top-level list, as expected.
+        -.  It now changes all items of the top-level list, as expected.
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
@@ -2698,12 +2583,12 @@
        change.
        * org-list.el (org-indent-item-tree): Prevent whole list from
-        being moved when user is not moving subtree. Thus)
+        being moved when user is not moving subtree.  Thus
-        (`org-cycle-item-indentation' will not allow to move the list.
+        `org-cycle-item-indentation' will not allow to move the list.
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
-        * org-list.el (org-indent-item-tree): Remove region code. It was
+        * org-list.el (org-indent-item-tree): Remove region code.  It was
        prone to errors and undocumented.
        * org-list.el (org-item-indent-positions): Better heuristics to
@@ -2719,7 +2604,7 @@
        * org-list.el (org-list-bullet-string): Do not modify match-data.
        * org.el (org-toggle-item): Now working again when changing list
-        items into plain text. Moreover take into consideration
+        items into plain text.  Moreover take into consideration
        `org-list-two-spaces-after-bullet-regexp'.
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
@@ -2734,11 +2619,10 @@
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
        * org-docbook.el (org-export-as-docbook): Use override="num" in
-        any listitem matching [@start:num]
+        any listitem matching [@start:num].
        * org-html.el (org-export-as-html): Use value="num" in any li
-        matching
+        matching [@start:num].
-        [@start:num]
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
@@ -2814,14 +2698,14 @@
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
        * org-list.el (org-indent-item-tree): Try to keep relative
-        position on line. It can't if point is in white spaces before
+        position on line.  It can't if point is in white spaces before
        bullet because mixed tabs and spaces make some columns
        unattainable.
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
        * org-list.el (org-cycle-item-indentation): Cycle when the whole
-        item only contains bullet and maybe a checkbox. Previously, TAB
+        item only contains bullet and maybe a checkbox.  Previously, TAB
        would cycle when the first line of the item was blank.
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
@@ -2854,7 +2738,7 @@
        * org-list.el (org-indent-item-tree): If indent rule is activated,
        it should be impossible to outdent an item having children without
-        moving its subtree. Improved reordering of lists modified by
+        moving its subtree.  Improved reordering of lists modified by
        cycling indentation.
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
@@ -2875,7 +2759,7 @@
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
        * org-list.el (org-list-insert-item-generic): When local search
-        doesn't help, search the list globally for blank lines. Moreover,
+        doesn't help, search the list globally for blank lines.  Moreover,
        don't bother with new lists, and add 1 blank line.
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
@@ -2899,7 +2783,7 @@
        heading.
        * org-list.el (org-list-make-subtree): Add protection when used
-        outside of list
+        outside of list.
        * org-list.el (org-insert-item): Remove useless hack now
        `org-in-item-p' is fixed.
@@ -2910,7 +2794,7 @@
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
        * org-list.el (org-cycle-list-bullet): Prevent description items
-        from being numbered. String argument is also recognized now, as
+        from being numbered.  String argument is also recognized now, as
        long as it is a valid bullet.
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
@@ -2979,8 +2863,8 @@
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
-        * org-timer.el (org-timer-item): Refactoring. Compute timer string
+        * org-timer.el (org-timer-item): Refactoring.  Compute timer string
-        before inserting it in the buffer
+        before inserting it in the buffer.
        * org-timer.el (org-timer): Add an optional argument to return
        timer string instead of inserting it.
@@ -3012,8 +2896,8 @@
        a list prior to add a new item.
        * org-timer.el (org-timer-item): When in a timer list, insert a
-        new timer item like `org-insert-item'. If in another list, send an
+        new timer item like `org-insert-item'.  If in another list, send an
-        error. Otherwise, start a new timer list.
+        error.  Otherwise, start a new timer list.
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
@@ -3058,7 +2942,7 @@
        * org-list.el (org-list-send-list): We cannot count on
        `org-list-top-point' and `org-list-bottom-point' before buffer is
-        narrowed. Find bounds of list otherwise.
+        narrowed.  Find bounds of list otherwise.
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
@@ -3094,7 +2978,7 @@
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
        * org-docbook.el (org-export-as-docbook): Properly close any open
-        list when seeing ORG-LIST-END. Removed any reference to now
+        list when seeing ORG-LIST-END.  Removed any reference to now
        unneeded DIDCLOSE variable.
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
@@ -3132,7 +3016,7 @@
        recognize lists.
        * org-latex.el (org-export-latex-lists): Better search for
-        lists. It now only finds items not enclosed and not protected.
+        lists.  It now only finds items not enclosed and not protected.
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
@@ -3167,10 +3051,10 @@
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
        * org-list.el (org-search-forward-unenclosed): Fix behavior when
-        last occurence was enclosed.
+        last occurrence was enclosed.
        * org-list.el (org-search-backward-unenclosed): Fix behavior when
-        last occurence was enclosed.
+        last occurrence was enclosed.
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
@@ -3206,8 +3090,8 @@
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
-        * org-html.el: preprocess buffer string and add ORG-LIST-END where
+        * org-html.el: Preprocess buffer string and add ORG-LIST-END where
-        needed. Lists should not end before seeing this.
+        needed.  Lists should not end before seeing this.
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
@@ -3280,7 +3164,7 @@
        to evaluate code invisibly and block until output file exists.
        * ob-R.el (org-babel-R-evaluate-session): Use `ess-eval-buffer' to
-        evaluate R code in session for :results value. Write result to
+        evaluate R code in session for :results value.  Write result to
        file invisibly using new function
        `org-babel-comint-eval-invisibly-and-wait-for-file'.
@@ -3309,7 +3193,7 @@
 2010-11-11  Eric Schulte  <schulte.eric@gmail.com>
        * ob-scheme.el: very preliminary support for evaluating scheme
-        code blocks
+        code blocks.
        * org.el (org-babel-load-languages): Adding scheme.
@@ -3319,16 +3203,15 @@
 2010-11-11  Eric Schulte  <schulte.eric@gmail.com>
-        * ob-R.el (ess-make-buffer-current):
+        * ob-R.el (ess-make-buffer-current): Declared.
-        Declared (ess-ask-for-ess-directory):
+        (ess-ask-for-ess-directory): Declared.
-        Declared (ess-local-process-name):
+        (ess-local-process-name): Declared.
-        Declared * ob-latex.el (org-babel-latex-tex-to-pdf): Capturing free
+        * ob-latex.el (org-babel-latex-tex-to-pdf): Capturing free variable.
-        variable
-        * ob.el (org-edit-src-code): Fixing arguments
+        * ob.el (org-edit-src-code): Fixing arguments.
-        (org-edit-src-exit):
+        (org-edit-src-exit): Declared.
-        Declared (org-outline-overlay-data):
+        (org-outline-overlay-data): Declared.
-        Declared (org-set-outline-overlay-data): Declared.
+        (org-set-outline-overlay-data): Declared.
 2010-11-11  Glenn Morris  <rgm@gnu.org>
@@ -3376,7 +3259,7 @@
 2010-11-11  Eric Schulte  <schulte.eric@gmail.com>
        * ob-exp.el (org-babel-exp-do-export): Remove hacky ":noeval",
-        which is now an alias to ":eval no"
+        which is now an alias to ":eval no".
 2010-11-11  Eric Schulte  <schulte.eric@gmail.com>
@@ -3559,7 +3442,7 @@
        * ob.el (org-babel-do-in-edit-buffer): New macro to evaluate lisp
        in the language major mode edit buffer.
        (org-babel-do-key-sequence-in-edit-buffer): New function to call
-        an arbitrary key sequence in the language major mode edit buffer
+        an arbitrary key sequence in the language major mode edit buffer.
        * org-src.el (org-src-switch-to-buffer): Add new allowed value
        'switch-invisibly for `org-src-window-setup'.
@@ -3585,7 +3468,7 @@
        * org-src.el (org-edit-src-code): If at src block, store babel
        info as buffer local variable.
        (org-src-associate-babel-session): New function to associate code
-        edit buffer with comint session. Does nothing unless a
+        edit buffer with comint session.  Does nothing unless a
        language-specific function named
        `org-babel-LANG-associate-session' exists.
        (org-src-babel-configure-edit-buffer): New function to be called
@@ -3723,7 +3606,7 @@
 2010-11-11  Noorul Islam  <noorul@noorul.com>
-        * org.el: org-set-visibility-according-to-property () Use backward
+        * org.el (org-set-visibility-according-to-property): Use backward
        search instead of forward, so that top hierarchy gets priority.
 2010-11-11  Carsten Dominik  <carsten.dominik@gmail.com>
@@ -3809,7 +3692,7 @@
 2010-11-11  Dan Davison  <davison@stats.ox.ac.uk>
        * ob-octave.el: Only (require 'matlab) when necessary.
-        (org-babel-octave-initiate-session) (require) octave-inf or matlab
+        (org-babel-octave-initiate-session): (require) octave-inf or matlab
        as appropriate.
        (org-babel-execute:matlab): Remove (require).
        (org-babel-prep-session:matlab): Remove (require).
@@ -3827,7 +3710,7 @@
 2010-11-11  Nicolas Goaziou  <n.goaziou@gmail.com>
-        * org-latex.el (org-export-latex-tables): Add label if any
+        * org-latex.el (org-export-latex-tables): Add label if any.
        * org-latex.el (org-export-latex-convert-table.el-table):
        Fix little mistake when inserting label.
@@ -7328,7 +7211,7 @@
        New customization variable for allowing the user to create an "auto
        exclusion" filter for doing context-aware auto tag filtering.
        (org-agenda-filter-by-tag): Changes to support the use of
-        `org-agenda-auto-exclude-function'.  See the new manual addition,.
+        `org-agenda-auto-exclude-function'.  See the new manual addition.
 2009-11-13  John Wiegley  <johnw@newartisans.com>
@@ -9398,7 +9281,7 @@
        (org-export-latex-first-lines): New argument END, to force the end
        of the region.
        (org-export-region-as-latex): Use the property list.
-        (org-export-as-latex):
+        (org-export-as-latex): ????
        * org-colview-xemacs.el (org-columns-remove-overlays)
        (org-columns): Fix call to `local-variable-p'.
@@ -11772,7 +11655,7 @@
 2008-10-26  Carsten Dominik  <dominik@science.uva.nl>
-        * org-agenda.el (org-agenda-filter-tags,org-agenda-filter-form):
+        * org-agenda.el (org-agenda-filter-tags, org-agenda-filter-form):
        New variables.
        (org-prepare-agenda): Reset the filter tags.
        (org-agenda-filter-by-tag, org-agenda-filter-by-tag-show-all):
@@ -12879,7 +12762,7 @@
        * org.el (org-base-buffer): New function.
-        * org-exp.el (org-icalendar-cleanup-string): Make sure ',"
+        * org-exp.el (org-icalendar-cleanup-string): Make sure ","
        and ";" are escaped.
        (org-print-icalendar-entries): Also apply
        `org-icalendar-cleanup-string' to the headline, not only to the
diff --git a/lisp/org/org-id.el b/lisp/org/org-id.el
index 2f64b8b0bb6..b979097dee3 100644
--- a/lisp/org/org-id.el
+++ b/lisp/org/org-id.el
@@ -519,7 +519,8 @@ When CHECK is given, prepare detailed information about duplicate IDs."
    (puthash id (abbreviate-file-name file) org-id-locations)
    (add-to-list 'org-id-files (abbreviate-file-name file))))
-(add-hook 'kill-emacs-hook 'org-id-locations-save)
+(unless noninteractive
+  (add-hook 'kill-emacs-hook 'org-id-locations-save))
 (defun org-id-hash-to-alist (hash)
  "Turn an org-id hash into an alist, so that it can be written to a file."
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 8f1ef9e5d60..076df5f0d07 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -1078,7 +1078,7 @@ for the duration of the command."
                                        (plain-list-item . auto))
  "Should `org-insert-heading' leave a blank line before new heading/item?
 The value is an alist, with `heading' and `plain-list-item' as car,
-and a boolean flag as cdr. The cdr may lso be the symbol `auto', and then
+and a boolean flag as cdr.  The cdr may lso be the symbol `auto', and then
 Org will look at the surrounding headings/items and try to make an
 intelligent decision wether to insert a blank line or not.
@@ -1384,9 +1384,9 @@ nil   Never use an ID to make a link, instead link using a text search for
 (defcustom org-context-in-file-links t
  "Non-nil means file links from `org-store-link' contain context.
 A search string will be added to the file name with :: as separator and
-used to find the context when the link is activated by the command 
+used to find the context when the link is activated by the command
-`org-open-at-point'. When this option is t, the entire active region 
+`org-open-at-point'.  When this option is t, the entire active region
-will be placed in the search string of the file link. If set to a 
+will be placed in the search string of the file link.  If set to a
 positive integer, only the first n lines of context will be stored.
 Using a prefix arg to the command \\[org-store-link] (`org-store-link')
@@ -1843,7 +1843,7 @@ This is list of cons cells.  Each cell contains:
  - a cons cell (:level . N).  Any headline of level N is considered a target.
    Note that, when `org-odd-levels-only' is set, level corresponds to
    order in hierarchy, not to the number of stars.
-  - a cons cell (:maxlevel . N). Any headline with level <= N is a target.
+  - a cons cell (:maxlevel . N).  Any headline with level <= N is a target.
    Note that, when `org-odd-levels-only' is set, level corresponds to
    order in hierarchy, not to the number of stars.
@@ -2418,7 +2418,7 @@ An auto-repeating task is immediately switched back to TODO when
 marked DONE.  If you are not logging state changes (by adding \"@\"
 or \"!\" to the TODO keyword definition), or set `org-log-done' to
 record a closing note, there will be no record of the task moving
-through DONE. This variable forces taking a note anyway.
+through DONE.  This variable forces taking a note anyway.
 nil     Don't force a record
 time    Record a time stamp
@@ -2624,8 +2624,8 @@ See also `org-agenda-jump-prefer-future'."
 The default is to do the same as configured in `org-read-date-prefer-future'.
 But you can alse set a deviating value here.
 This may t or nil, or the symbol `org-read-date-prefer-future'."
-  :group 'org-agenda 
+  :group 'org-agenda
-  :group 'org-time 
+  :group 'org-time
  :type '(choice
          (const :tag "Use org-read-date-prefer-future"
                 org-read-date-prefer-future)
@@ -5575,7 +5575,7 @@ needs to be inserted at a specific position in the font-lock sequence.")
  (org-set-local 'org-pretty-entities (not org-pretty-entities))
  (org-restart-font-lock)
  (if org-pretty-entities
-      (message "Entities are displayed as UTF8 characers")
+      (message "Entities are displayed as UTF8 characters")
    (save-restriction
      (widen)
      (org-decompose-region (point-min) (point-max))
@@ -8525,9 +8525,9 @@ according to FMT (default from `org-email-link-description-format')."
    (when (and string (integerp lines) (> lines 0))
      (let ((slines (org-split-string s "\n")))
        (when (< lines (length slines))
-          (setq s (mapconcat 
+          (setq s (mapconcat
                   'identity
-                   (reverse (nthcdr (- (length slines) lines) 
+                   (reverse (nthcdr (- (length slines) lines)
                                    (reverse slines))) "\n")))))
    (mapconcat 'identity (org-split-string s "[ \t]+") " ")))
@@ -8672,8 +8672,8 @@ be displayed in the buffer instead of the link.
 If there is already a link at point, this command will allow you to edit link
 and description parts.
-With a \\[universal-argument] prefix, prompts for a file to link to. The file name can
+With a \\[universal-argument] prefix, prompts for a file to link to.  The file name can
-be selected using completion. The path to the file will be relative to the
+be selected using completion.  The path to the file will be relative to the
 current directory if the file is in the current directory or a subdirectory.
 Otherwise, the link will be the absolute path as completed in the minibuffer
 \(i.e. normally ~/path/to/file).  You can configure this behavior using the
@@ -16498,8 +16498,8 @@ If not, return to the original position and throw an error."
 (defun org-speed-command-default-hook (keys)
  "Hook for activating single-letter speed commands.
-`org-speed-commands-default' specifies a minimal command set. Use
+`org-speed-commands-default' specifies a minimal command set.
-`org-speed-commands-user' for further customization."
+Use `org-speed-commands-user' for further customization."
  (when (or (and (bolp) (looking-at outline-regexp))
            (and (functionp org-use-speed-commands)
                 (funcall org-use-speed-commands)))
@@ -16521,11 +16521,11 @@ Each hook takes a single argument, a user-pressed command key
 which is also a `self-insert-command' from the global map.
 Within the hook, examine the cursor position and the command key
-and return nil or a valid handler as appropriate. Handler could
+and return nil or a valid handler as appropriate.  Handler could
 be one of an interactive command, a function, or a form.
 Set `org-use-speed-commands' to non-nil value to enable this
-hook. The default setting is `org-speed-command-default-hook'."
+hook.  The default setting is `org-speed-command-default-hook'."
  :group 'org-structure
  :type 'hook)
@@ -18300,11 +18300,11 @@ really on, so that the block visually is on the match."
 (defun org-in-regexps-block-p (start-re end-re &optional bound)
  "Return t if the current point is between matches of START-RE and END-RE.
 This will also return t if point is on one of the two matches or
-in an unfinished block. END-RE can be a string or a form
+in an unfinished block.  END-RE can be a string or a form
 returning a string.
-An optional third argument bounds the search for START-RE. It
+An optional third argument bounds the search for START-RE.
-defaults to previous heading or `point-min'."
+It defaults to previous heading or `point-min'."
  (let ((pos (point))
        (limit (or bound (save-excursion (outline-previous-heading)))))
    (save-excursion
@@ -19040,7 +19040,7 @@ plainly yank the text as it is.
  "Perform some yank-like command.
 This function implements the behavior described in the `org-yank'
-documentation. However, it has been generalized to work for any
+documentation.  However, it has been generalized to work for any
 interactive command with similar behavior."
  ;; pretend to be command COMMAND
@@ -19247,7 +19247,7 @@ move point."
 (defun org-goto-first-child ()
  "Goto the first child, even if it is invisible.
-Return t when a child was found. Otherwise don't move point and
+Return t when a child was found.  Otherwise don't move point and
 return nil."
  (let (level (pos (point)) (re (concat "^" outline-regexp)))
    (when (condition-case nil (org-back-to-heading t) (error nil))
diff --git a/lisp/outline.el b/lisp/outline.el
index d43afd94a3c..cedc55b3336 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -50,9 +50,9 @@ Note that Outline mode only checks this regexp at the start of a line,
 so the regexp need not (and usually does not) start with `^'.
 The recommended way to set this is with a Local Variables: list
 in the file it applies to.  See also `outline-heading-end-regexp'."
-  :type '(choice regexp (const nil))
+  :type 'regexp
  :group 'outlines)
-;;;###autoload(put 'outline-regexp 'safe-local-variable 'string-or-null-p)
+;;;###autoload(put 'outline-regexp 'safe-local-variable 'stringp)
 (defcustom outline-heading-end-regexp "\n"
  "Regular expression to match the end of a heading line.
@@ -62,6 +62,7 @@ The recommended way to set this is with a `Local Variables:' list
 in the file it applies to."
  :type 'regexp
  :group 'outlines)
+;;;###autoload(put 'outline-heading-end-regexp 'safe-local-variable 'stringp)
 (defvar outline-mode-prefix-map
  (let ((map (make-sparse-keymap)))
diff --git a/lisp/password-cache.el b/lisp/password-cache.el
index a7f75a03add..941428d5291 100644
--- a/lisp/password-cache.el
+++ b/lisp/password-cache.el
@@ -76,6 +76,7 @@ regulate cache behavior."
       key
       (symbol-value (intern-soft key password-data))))
+;;;###autoload
 (defun password-in-cache-p (key)
  "Check if KEY is in the cache."
  (and password-cache
diff --git a/lisp/printing.el b/lisp/printing.el
index 99ed8c04262..e66cca25933 100644
--- a/lisp/printing.el
+++ b/lisp/printing.el
@@ -5707,8 +5707,8 @@ If menu binding was not done, calls `pr-menu-bind'."
  (let* ((dir-name   (file-name-directory (or (buffer-file-name)
                                              default-directory)))
         (fmt-prompt (concat "%s[" mess "] Directory to print: "))
-         (dir        (read-file-name (format fmt-prompt "")
+         (dir        (read-directory-name (format fmt-prompt "")
-                                     "" dir-name nil dir-name))
+                                          "" dir-name nil dir-name))
         prompt)
    (while (cond ((not (file-directory-p dir))
                  (ding)
@@ -5718,8 +5718,8 @@ If menu binding was not done, calls `pr-menu-bind'."
                  (setq prompt "Directory is unreadable! "))
                 (t nil))
      (setq dir-name (file-name-directory dir)
-            dir      (read-file-name (format fmt-prompt prompt)
+            dir      (read-directory-name (format fmt-prompt prompt)
-                                     "" dir-name nil dir-name)))
+                                          "" dir-name nil dir-name)))
    (file-name-as-directory dir)))
diff --git a/lisp/progmodes/ada-prj.el b/lisp/progmodes/ada-prj.el
index d7397144498..dd05ab8f310 100644
--- a/lisp/progmodes/ada-prj.el
+++ b/lisp/progmodes/ada-prj.el
@@ -227,7 +227,7 @@ If FILE-NAME is nil, ask the user for the name."
  ;;  the user to select a directory
  (let ((use-dialog-box nil))
    (unless file-name
-      (set 'file-name (read-file-name "Root directory: " nil nil t))))
+      (set 'file-name (read-directory-name "Root directory: " nil nil t))))
  (set 'ada-prj-current-values
       (plist-put ada-prj-current-values
diff --git a/lisp/progmodes/ebnf2ps.el b/lisp/progmodes/ebnf2ps.el
index 9f8dd79e0fc..f7965d2cd01 100644
--- a/lisp/progmodes/ebnf2ps.el
+++ b/lisp/progmodes/ebnf2ps.el
@@ -2229,8 +2229,8 @@ processed.
 See also `ebnf-print-buffer'."
  (interactive
-   (list (read-file-name "Directory containing EBNF files (print): "
+   (list (read-directory-name "Directory containing EBNF files (print): "
-                         nil default-directory)))
+                              nil default-directory)))
  (ebnf-log-header "(ebnf-print-directory %S)" directory)
  (ebnf-directory 'ebnf-print-buffer directory))
@@ -2287,8 +2287,8 @@ processed.
 See also `ebnf-spool-buffer'."
  (interactive
-   (list (read-file-name "Directory containing EBNF files (spool): "
+   (list (read-directory-name "Directory containing EBNF files (spool): "
-                         nil default-directory)))
+                              nil default-directory)))
  (ebnf-log-header "(ebnf-spool-directory %S)" directory)
  (ebnf-directory 'ebnf-spool-buffer directory))
@@ -2340,8 +2340,8 @@ processed.
 See also `ebnf-eps-buffer'."
  (interactive
-   (list (read-file-name "Directory containing EBNF files (EPS): "
+   (list (read-directory-name "Directory containing EBNF files (EPS): "
-                         nil default-directory)))
+                              nil default-directory)))
  (ebnf-log-header "(ebnf-eps-directory %S)" directory)
  (ebnf-directory 'ebnf-eps-buffer directory))
@@ -2425,8 +2425,8 @@ are processed.
 See also `ebnf-syntax-buffer'."
  (interactive
-   (list (read-file-name "Directory containing EBNF files (syntax): "
+   (list (read-directory-name "Directory containing EBNF files (syntax): "
-                         nil default-directory)))
+                              nil default-directory)))
  (ebnf-log-header "(ebnf-syntax-directory %S)" directory)
  (ebnf-directory 'ebnf-syntax-buffer directory))
diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el
index 32ab52228f9..a4c9b7fccba 100644
--- a/lisp/progmodes/grep.el
+++ b/lisp/progmodes/grep.el
@@ -72,7 +72,9 @@ SYMBOL should be one of `grep-command', `grep-template',
 Some grep programs are able to surround matches with special
 markers in grep output.  Such markers can be used to highlight
-matches in grep mode.
+matches in grep mode.  This requires `font-lock-mode' to be active
+in grep buffers, so if you have globally disabled font-lock-mode,
+you will not get highlighting.
 This option sets the environment variable GREP_COLORS to specify
 markers for highlighting and GREP_OPTIONS to add the --color
@@ -462,6 +464,8 @@ Set up `compilation-exit-message-function' and run `grep-setup-hook'."
  (when (eq grep-highlight-matches 'auto-detect)
    (grep-compute-defaults))
  (unless (or (eq grep-highlight-matches 'auto-detect)
+              ;; Uses font-lock to parse color escapes.  (Bug#8084)
+              (null font-lock-mode)
              (null grep-highlight-matches))
    ;; `setenv' modifies `process-environment' let-bound in `compilation-start'
    ;; Any TERM except "dumb" allows GNU grep to use `--color=auto'
diff --git a/lisp/progmodes/gud.el b/lisp/progmodes/gud.el
index 6e175da1414..53918b903ee 100644
--- a/lisp/progmodes/gud.el
+++ b/lisp/progmodes/gud.el
@@ -3218,7 +3218,7 @@ Treats actions as defuns."
  t)
 ;;;###autoload
-(define-derived-mode gdb-script-mode nil "GDB-Script"
+(define-derived-mode gdb-script-mode prog-mode "GDB-Script"
  "Major mode for editing GDB scripts."
  (set (make-local-variable 'comment-start) "#")
  (set (make-local-variable 'comment-start-skip) "#+\\s-*")
diff --git a/lisp/progmodes/prolog.el b/lisp/progmodes/prolog.el
index 45d967e92d9..62472edfbe4 100644
--- a/lisp/progmodes/prolog.el
+++ b/lisp/progmodes/prolog.el
@@ -1715,7 +1715,7 @@ If COMPILEP is non-nil, compile, otherwise consult."
 ;; Font-lock stuff
 ;;-------------------------------------------------------------------
-;; Auxilliary functions
+;; Auxiliary functions
 (defun prolog-make-keywords-regexp (keywords &optional protect)
  "Create regexp from the list of strings KEYWORDS.
 If PROTECT is non-nil, surround the result regexp by word breaks."
@@ -3777,7 +3777,7 @@ If the point is not on a variable then insert underscore."
 (defun prolog-find-term (functor arity &optional prefix)
-  "Go to the position at the start of the next occurance of a term.
+  "Go to the position at the start of the next occurrence of a term.
 The term is specified with FUNCTOR and ARITY.  The optional argument
 PREFIX is the prefix of the search regexp."
  (let* (;; If prefix is not set then use the default "\\<"
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 19431c30d68..b51eb944696 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -6645,7 +6645,8 @@ If FACE is not a valid face name, use default face."
         (error "Unprinted PostScript"))))
 (cond ((fboundp 'add-hook)
-       (funcall 'add-hook 'kill-emacs-hook 'ps-kill-emacs-check))
+       (unless noninteractive
+         (funcall 'add-hook 'kill-emacs-hook 'ps-kill-emacs-check)))
      (kill-emacs-hook
       (message "Won't override existing `kill-emacs-hook'"))
      (t
diff --git a/lisp/recentf.el b/lisp/recentf.el
index d0be69b51fc..9f9baad8dbd 100644
--- a/lisp/recentf.el
+++ b/lisp/recentf.el
@@ -411,13 +411,14 @@ That is, if it doesn't match any of the `recentf-exclude' checks."
        (checks recentf-exclude)
        (keepit t))
    (while (and checks keepit)
-      (setq keepit (condition-case nil
+      ;; If there was an error in a predicate, err on the side of
-                       (not (if (stringp (car checks))
+      ;; keeping the file.  (Bug#5843)
-                                ;; A regexp
+      (setq keepit (not (ignore-errors
-                                (string-match (car checks) filename)
+                          (if (stringp (car checks))
-                              ;; A predicate
+                              ;; A regexp
-                              (funcall (car checks) filename)))
+                              (string-match (car checks) filename)
-                     (error nil))
+                            ;; A predicate
+                            (funcall (car checks) filename))))
            checks (cdr checks)))
    keepit))
diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index b7d43bd230a..c10b5cbb7ec 100644
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -300,7 +300,8 @@ may have changed\) back to `save-place-alist'."
 (add-hook 'find-file-hook 'save-place-find-file-hook t)
-(add-hook 'kill-emacs-hook 'save-place-kill-emacs-hook)
+(unless noninteractive
+  (add-hook 'kill-emacs-hook 'save-place-kill-emacs-hook))
 (add-hook 'kill-buffer-hook 'save-place-to-alist)
diff --git a/lisp/shell.el b/lisp/shell.el
index ea89ce765c3..2f11cc6314c 100644
--- a/lisp/shell.el
+++ b/lisp/shell.el
@@ -569,9 +569,9 @@ Otherwise, one argument `-i' is passed to the shell.
               ;; of the current-buffer rather than of the *shell* buffer.
               (setq default-directory
                     (expand-file-name
-                      (read-file-name
+                      (read-directory-name
                       "Default directory: " default-directory default-directory
-                       t nil 'file-directory-p))))))))
+                       t nil))))))))
  (require 'ansi-color)
  (setq buffer (if (or buffer (not (derived-mode-p 'shell-mode))
                       (comint-check-proc (current-buffer)))
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index dad2a4c82ac..d160a836359 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -1622,7 +1622,7 @@ Files can be renamed to new names or moved to new directories."
  (let ((f (speedbar-line-file)))
    (if f
        (let* ((basedir (file-name-directory f))
-               (nd (read-file-name "Create directory: "
+               (nd (read-directory-name "Create directory: "
                                   basedir)))
          ;; Make the directory
          (make-directory nd t)
diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el
index 6719a647c36..7e150bff997 100644
--- a/lisp/textmodes/reftex.el
+++ b/lisp/textmodes/reftex.el
@@ -567,7 +567,7 @@ on the menu bar.
  "Save RefTeX's parse file for this buffer if the information has changed."
  ;; Save the parsing information if it was modified.
  ;; This function should be installed in `kill-buffer-hook'.
-  ;; We are careful to make sure nothing goes wring in this function.
+  ;; We are careful to make sure nothing goes wrong in this function.
  (when (and (boundp 'reftex-mode)  reftex-mode
             (boundp 'reftex-save-parse-info)  reftex-save-parse-info
             (boundp 'reftex-docstruct-symbol)  reftex-docstruct-symbol
@@ -2397,7 +2397,7 @@ IGNORE-WORDS List of words which should be removed from the string."
  (define-key reftex-mode-map
    reftex-extra-bindings-prefix
    reftex-extra-bindings-map))
-    
 ;;; =========================================================================
 ;;;
@@ -2568,7 +2568,8 @@ With optional NODE, go directly to that node."
 ;;; Install the kill-buffer and kill-emacs hooks ------------------------------
 (add-hook 'kill-buffer-hook 'reftex-kill-buffer-hook)
-(add-hook 'kill-emacs-hook  'reftex-kill-emacs-hook)
+(unless noninteractive
+  (add-hook 'kill-emacs-hook  'reftex-kill-emacs-hook))
 ;;; Run Hook ------------------------------------------------------------------
diff --git a/lisp/textmodes/sgml-mode.el b/lisp/textmodes/sgml-mode.el
index 2229dc6c9e8..314fbf9671b 100644
--- a/lisp/textmodes/sgml-mode.el
+++ b/lisp/textmodes/sgml-mode.el
@@ -427,7 +427,12 @@ a DOCTYPE or an XML declaration."
                  (format-mode-line mode-name))))))
 (defun sgml-fill-nobreak ()
-  ;; Don't break between a tag name and its first argument.
+  "Don't break between a tag name and its first argument.
+This function is designed for use in `fill-nobreak-predicate'.
+    <a href=\"some://where\" type=\"text/plain\">
+      ^                   ^
+      | no break here     | but still allowed here"
  (save-excursion
    (skip-chars-backward " \t")
    (and (not (zerop (skip-syntax-backward "w_")))
diff --git a/lisp/time.el b/lisp/time.el
index 1bc1cca1112..2e9dd252bd6 100644
--- a/lisp/time.el
+++ b/lisp/time.el
@@ -157,7 +157,7 @@ LABEL is a string to display as the label of that TIMEZONE's time."
  ;; Determine if zoneinfo style timezones are supported by testing that
  ;; America/New York and Europe/London return different timezones.
  (let (gmt nyt)
-    (set-time-zone-rule "America/New York")
+    (set-time-zone-rule "America/New_York")
    (setq nyt (format-time-string "%z"))
    (set-time-zone-rule "Europe/London")
    (setq gmt (format-time-string "%z"))
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index 13d10f02b41..9ccb37f3a55 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -1266,7 +1266,7 @@ a diff with \\[diff-reverse-direction].
  ;; Set up `whitespace-mode' so that turning it on will show trailing
  ;; whitespace problems on the modified lines of the diff.
-  (set (make-local-variable 'whitespace-style) '(trailing))
+  (set (make-local-variable 'whitespace-style) '(face trailing))
  (set (make-local-variable 'whitespace-trailing-regexp)
       "^[-\+!<>].*?\\([\t ]+\\)$")
diff --git a/lisp/vc/ediff-init.el b/lisp/vc/ediff-init.el
index ff1f7f6b017..0d904ec85c4 100644
--- a/lisp/vc/ediff-init.el
+++ b/lisp/vc/ediff-init.el
@@ -560,7 +560,6 @@ See the documentation string of `ediff-focus-on-regexp-matches' for details.")
  :group 'ediff)
-(ediff-defvar-local ediff-use-faces t "")
 (defcustom ediff-use-faces t
  "If t, differences are highlighted using faces, if device supports faces.
 If nil, differences are highlighted using ASCII flags, ediff-before-flag
@@ -568,6 +567,7 @@ and ediff-after-flag.  On a non-window system, differences are always
 highlighted using ASCII flags."
  :type 'boolean
  :group 'ediff-highlighting)
+(ediff-defvar-local ediff-use-faces t "")
 ;; this indicates that diff regions are word-size, so fine diffs are
 ;; permanently nixed; used in ediff-windows-wordwise and ediff-regions-wordwise
@@ -604,13 +604,13 @@ meaning of this variable."
  :type 'boolean
  :group 'ediff)
-(ediff-defvar-local ediff-highlight-all-diffs t "")
 (defcustom ediff-highlight-all-diffs t
  "If nil, only the selected differences are highlighted.
 Otherwise, all difference regions are highlighted, but the selected region is
 shown in brighter colors."
  :type 'boolean
  :group 'ediff-highlighting)
+(ediff-defvar-local ediff-highlight-all-diffs t "")
 ;; The suffix of the control buffer name.
diff --git a/lisp/vc/emerge.el b/lisp/vc/emerge.el
index ee34944e448..601b6b1e597 100644
--- a/lisp/vc/emerge.el
+++ b/lisp/vc/emerge.el
@@ -1271,10 +1271,10 @@ Otherwise, the A or B file present is copied to the output file."
 (defun emerge-merge-directories (a-dir b-dir ancestor-dir output-dir)
  (interactive
   (list
-    (read-file-name "A directory: " nil nil 'confirm)
+    (read-directory-name "A directory: " nil nil 'confirm)
-    (read-file-name "B directory: " nil nil 'confirm)
+    (read-directory-name "B directory: " nil nil 'confirm)
-    (read-file-name "Ancestor directory (null for none): " nil nil 'confirm)
+    (read-directory-name "Ancestor directory (null for none): " nil nil 'confirm)
-    (read-file-name "Output directory (null for none): " nil nil 'confirm)))
+    (read-directory-name "Output directory (null for none): " nil nil 'confirm)))
  ;; Check that we're not on a line
  (if (not (and (bolp) (eolp)))
      (error "There is text on this line"))
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index 5e6e054924c..a0a16601ed7 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -182,10 +182,19 @@ in the repository root directory of FILE."
  ;; format 3' in the first line.
  ;; If the `checkout/dirstate' file cannot be parsed, fall back to
  ;; running `vc-bzr-state'."
+  ;;
+  ;; The format of the dirstate file is explained in bzrlib/dirstate.py
+  ;; in the bzr distribution.  Basically:
+  ;; header-line giving the version of the file format in use.
+  ;; a few lines of stuff
+  ;; entries, one per line, with null-separated fields.  Each line:
+  ;; entry_key = dirname (may be empty), basename, file-id
+  ;; current = common ( = kind, fingerprint, size, executable )
+  ;;           + working ( = packed_stat )
+  ;; parent = common ( as above ) + history ( = rev_id )
+  ;; kinds = (r)elocated, (a)bsent, (d)irectory, (f)ile, (l)ink
  (lexical-let ((root (vc-bzr-root file)))
    (when root    ; Short cut.
-      ;; This looks at internal files.  May break if they change
-      ;; their format.
      (lexical-let ((dirstate (expand-file-name vc-bzr-admin-dirstate root)))
        (condition-case nil
            (with-temp-buffer
@@ -210,13 +219,14 @@ in the repository root directory of FILE."
                               ;; was executable the last time bzr checked?
                               "[^\0]*\0"
                               "[^\0]*\0"       ;?
-                               "\\([^\0]*\\)\0" ;"a/f/d" a=added?
+                               ;; Parent information.  Absent in a new repo.
+                               "\\(?:\\([^\0]*\\)\0" ;"a/f/d" a=added?
                               "\\([^\0]*\\)\0" ;sha1 again?
                               "\\([^\0]*\\)\0" ;size again?
                               ;; y/n.  Whether or not the repo thinks
                               ;; the file should be executable?
                               "\\([^\0]*\\)\0"
-                               "[^\0]*\0" ;last revid?
+                               "[^\0]*\0\\)?" ;last revid?
                               ;; There are more fields when merges are pending.
                               )
                       nil t)
@@ -226,7 +236,10 @@ in the repository root directory of FILE."
                      ;; conflict markers).
                      (cond
                       ((eq (char-after (match-beginning 1)) ?a) 'removed)
-                       ((eq (char-after (match-beginning 4)) ?a) 'added)
+                       ;; If there is no parent, this must be a new repo.
+                       ;; If file is in dirstate, can only be added (b#8025).
+                       ((or (not (match-beginning 4))
+                            (eq (char-after (match-beginning 4)) ?a)) 'added)
                       ((or (and (eq (string-to-number (match-string 3))
                                 (nth 7 (file-attributes file)))
                                 (equal (match-string 5)
@@ -866,38 +879,40 @@ stream.  Standard error output is discarded."
        (result nil))
      (goto-char (point-min))
      (while (not (eobp))
-        (setq status-str
+        ;; Bzr 2.3.0 added this if there are shelves.  (Bug#8170)
-              (buffer-substring-no-properties (point) (+ (point) 3)))
+        (unless (looking-at "[1-9]+ shel\\(f\\|ves\\) exists?\\.")
-        (setq translated (cdr (assoc status-str translation)))
+          (setq status-str
-        (cond
+                (buffer-substring-no-properties (point) (+ (point) 3)))
-         ((eq translated 'conflict)
+          (setq translated (cdr (assoc status-str translation)))
-          ;; For conflicts the file appears twice in the listing: once
+          (cond
-          ;; with the M flag and once with the C flag, so take care
+           ((eq translated 'conflict)
-          ;; not to add it twice to `result'.  Ugly.
+            ;; For conflicts the file appears twice in the listing: once
-          (let* ((file
+            ;; with the M flag and once with the C flag, so take care
-                  (buffer-substring-no-properties
+            ;; not to add it twice to `result'.  Ugly.
-                   ;;For files with conflicts the format is:
+            (let* ((file
-                   ;;C   Text conflict in FILENAME
+                    (buffer-substring-no-properties
-                   ;; Bah.
+                     ;;For files with conflicts the format is:
-                   (+ (point) 21) (line-end-position)))
+                     ;;C   Text conflict in FILENAME
-                 (entry (assoc file result)))
+                     ;; Bah.
-            (when entry
+                     (+ (point) 21) (line-end-position)))
-              (setf (nth 1 entry) 'conflict))))
+                   (entry (assoc file result)))
-         ((eq translated 'renamed)
+              (when entry
-          (re-search-forward "R[ M]  \\(.*\\) => \\(.*\\)$" (line-end-position) t)
+                (setf (nth 1 entry) 'conflict))))
-          (let ((new-name (file-relative-name (match-string 2) relative-dir))
+           ((eq translated 'renamed)
-                (old-name (file-relative-name (match-string 1) relative-dir)))
+            (re-search-forward "R[ M]  \\(.*\\) => \\(.*\\)$" (line-end-position) t)
-            (push (list new-name 'edited
+            (let ((new-name (file-relative-name (match-string 2) relative-dir))
-                      (vc-bzr-create-extra-fileinfo old-name)) result)))
+                  (old-name (file-relative-name (match-string 1) relative-dir)))
-         ;; do nothing for non existent files
+              (push (list new-name 'edited
-         ((eq translated 'not-found))
+                          (vc-bzr-create-extra-fileinfo old-name)) result)))
-         (t
+           ;; do nothing for non existent files
-          (push (list (file-relative-name
+           ((eq translated 'not-found))
-                       (buffer-substring-no-properties
+           (t
-                        (+ (point) 4)
+            (push (list (file-relative-name
-                        (line-end-position)) relative-dir)
+                         (buffer-substring-no-properties
-                      translated) result)))
+                          (+ (point) 4)
-        (forward-line))
+                          (line-end-position)) relative-dir)
+                        translated) result))))
+        (forward-line))
      (funcall update-function result)))
 (defun vc-bzr-dir-status (dir update-function)
diff --git a/lisp/vc/vc-dir.el b/lisp/vc/vc-dir.el
index 38fbaaedd32..d4970207b94 100644
--- a/lisp/vc/vc-dir.el
+++ b/lisp/vc/vc-dir.el
@@ -265,6 +265,7 @@ See `run-hooks'."
    (define-key map [C-up] 'vc-dir-previous-directory)
    ;; The remainder.
    (define-key map "f" 'vc-dir-find-file)
+    (define-key map "e" 'vc-dir-find-file) ; dired-mode compatibility
    (define-key map "\C-m" 'vc-dir-find-file)
    (define-key map "o" 'vc-dir-find-file-other-window)
    (define-key map "\C-c\C-c" 'vc-dir-kill-dir-status-process)
@@ -1184,9 +1185,9 @@ These are the commands available for use in the file status buffer:
    ;; therefore it makes sense to always do that.
    ;; Otherwise if you do C-x v d -> C-x C-f -> C-c v d
    ;; you may get a new *vc-dir* buffer, different from the original
-    (file-truename (read-file-name "VC status for directory: "
+    (file-truename (read-directory-name "VC status for directory: "
-                                   default-directory default-directory t
+                                        default-directory default-directory t
-                                   nil #'file-directory-p))
+                                        nil))
    (if current-prefix-arg
        (intern
         (completing-read
diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el
index d3a64f15f9e..488efaa3522 100644
--- a/lisp/vc/vc-rcs.el
+++ b/lisp/vc/vc-rcs.el
@@ -25,14 +25,10 @@
 ;; See vc.el
-;; Some features will not work with old RCS versions.  Where
+;; Some features will not work with ancient RCS versions.  Where
 ;; appropriate, VC finds out which version you have, and allows or
-;; disallows those features (stealing locks, for example, works only
+;; disallows those features.
-;; from 5.6.2 onwards).
-;; Even initial checkins will fail if your RCS version is so old that ci
-;; doesn't understand -t-; this has been known to happen to people running
-;; NExTSTEP 3.0.
-;;
 ;; You can support the RCS -x option by customizing vc-rcs-master-templates.
 ;;; Code:
@@ -391,7 +387,7 @@ whether to remove it."
          (vc-rcs-set-default-branch file
                                     (if (vc-rcs-trunk-p new-version) nil
                                       (vc-branch-part new-version)))
-          ;; If this is an old RCS release, we might have
+          ;; If this is an old (pre-1992!) RCS release, we might have
          ;; to remove a remaining lock.
          (if (not (vc-rcs-release-p "5.6.2"))
              ;; exit status of 1 is also accepted.
diff --git a/lisp/vc/vc-svn.el b/lisp/vc/vc-svn.el
index 20c7689f401..7362258a42d 100644
--- a/lisp/vc/vc-svn.el
+++ b/lisp/vc/vc-svn.el
@@ -174,7 +174,9 @@ If you want to force an empty list of arguments, use t."
    (while (re-search-forward re nil t)
      (let ((state (cdr (assq (aref (match-string 1) 0) state-map)))
            (propstat (cdr (assq (aref (match-string 2) 0) state-map)))
-            (filename (match-string 4)))
+            (filename (if (memq system-type '(windows-nt ms-dos))
+                          (replace-regexp-in-string "\\\\" "/" (match-string 4))
+                        (match-string 4))))
        (and (memq propstat '(conflict edited))
             (not (eq state 'conflict)) ; conflict always wins
             (setq state propstat))
diff --git a/lisp/vc/vc.el b/lisp/vc/vc.el
index 02743847800..200291bd925 100644
--- a/lisp/vc/vc.el
+++ b/lisp/vc/vc.el
@@ -1954,7 +1954,7 @@ checked out in that new branch."
          ;; For VC's that do not work at file level, it's pointless
          ;; to ask for a directory, branches are created at repository level.
          default-directory
-        (read-file-name "Directory: " default-directory default-directory t))
+        (read-directory-name "Directory: " default-directory default-directory t))
      (read-string (if current-prefix-arg "New branch name: " "New tag name: "))
      current-prefix-arg)))
  (message "Making %s... " (if branchp "branch" "tag"))
@@ -1980,7 +1980,7 @@ allowed and simply skipped)."
          ;; For VC's that do not work at file level, it's pointless
          ;; to ask for a directory, branches are created at repository level.
          default-directory
-        (read-file-name "Directory: " default-directory default-directory t))
+        (read-directory-name "Directory: " default-directory default-directory t))
      (read-string "Tag name to retrieve (default latest revisions): "))))
  (let ((update (yes-or-no-p "Update any affected buffers? "))
        (msg (if (or (not name) (string= name ""))
diff --git a/lisp/window.el b/lisp/window.el
index af5d9a5b16b..c3f8de6f9dd 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -106,11 +106,12 @@ even if it is active.  Otherwise, the minibuffer is counted
 when it is active.
 The optional arg ALL-FRAMES t means count windows on all frames.
-If it is `visible', count windows on all visible frames.
+If it is `visible', count windows on all visible frames on the
-ALL-FRAMES nil or omitted means count only the selected frame,
+current terminal.  ALL-FRAMES nil or omitted means count only the
-plus the minibuffer it uses (which may be on another frame).
+selected frame, plus the minibuffer it uses (which may be on
-ALL-FRAMES 0 means count all windows in all visible or iconified frames.
+another frame).  ALL-FRAMES 0 means count all windows in all
-If ALL-FRAMES is anything else, count only the selected frame."
+visible or iconified frames on the current terminal.  If
+ALL-FRAMES is anything else, count only the selected frame."
  (let ((base-window (selected-window)))
    (if (and nomini (eq base-window (minibuffer-window)))
        (setq base-window (next-window base-window)))
@@ -169,9 +170,9 @@ ALL-FRAMES nil or omitted means cycle through all windows on the
 ALL-FRAMES t means cycle through all windows on all existing
 frames.
 ALL-FRAMES `visible' means cycle through all windows on all
- visible frames.
+ visible frames on the current terminal.
 ALL-FRAMES 0 means cycle through all windows on all visible and
- iconified frames.
+ iconified frames on the current terminal.
 ALL-FRAMES a frame means cycle through all windows on that frame
 only.
 Anything else means cycle through all windows on the selected
@@ -1067,9 +1068,11 @@ when the specified buffer is already displayed.  If the buffer is
 already displayed in some window on one of these frames simply
 return that window.  Possible values of FRAME are:
-`visible' - consider windows on all visible frames.
+`visible' - consider windows on all visible frames on the current
+terminal.
-0 - consider windows on all visible or iconified frames.
+0 - consider windows on all visible or iconified frames on the
+current terminal.
 t - consider windows on all frames.
@@ -1079,7 +1082,7 @@ nil - consider windows on the selected frame \(actually the
 last non-minibuffer frame\) only.  If, however, either
 `display-buffer-reuse-frames' or `pop-up-frames' is non-nil
 \(non-nil and not graphic-only on a text-only terminal),
-consider all visible or iconified frames."
+consider all visible or iconified frames on the current terminal."
  (interactive "BDisplay buffer:\nP")
  (let* ((can-use-selected-window
          ;; The selected window is usable unless either NOT-THIS-WINDOW
diff --git a/nextstep/ChangeLog b/nextstep/ChangeLog
index 79d9a2f382c..d16785e56c1 100644
--- a/nextstep/ChangeLog
+++ b/nextstep/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-03  Glenn Morris  <rgm@gnu.org>
+        * GNUstep/Emacs.base/Resources/Info-gnustep.plist:
+        Refer to etc/NEXTSTEP rather than emacs-app.sf.net.
 2011-01-02  Glenn Morris  <rgm@gnu.org>
        * Cocoa/Emacs.base/Contents/Info.plist:
diff --git a/nextstep/Cocoa/Emacs.xcodeproj/project.pbxproj b/nextstep/Cocoa/Emacs.xcodeproj/project.pbxproj
index f4c5b050b69..fe5acce2c3c 100644
--- a/nextstep/Cocoa/Emacs.xcodeproj/project.pbxproj
+++ b/nextstep/Cocoa/Emacs.xcodeproj/project.pbxproj
@@ -245,7 +245,7 @@
                        name = Products;
                        sourceTree = "<group>";
                };
-                289FC26B00C69A287F000001 /* NeXTStep */ = {
+                289FC26B00C69A287F000001 /* NeXTstep */ = {
                        isa = PBXGroup;
                        children = (
                                3C4D6D710DE50D5D00B20D4E /* nsfont.m */,
@@ -257,13 +257,13 @@
                                090AF68100C61DCD7F000001 /* nsselect.m */,
                                090AF68300C61DCD7F000001 /* nsterm.m */,
                        );
-                        name = NeXTStep;
+                        name = NeXTstep;
                        sourceTree = "<group>";
                };
                29B97314FDCFA39411CA2CEA /* Emacs */ = {
                        isa = PBXGroup;
                        children = (
-                                289FC26B00C69A287F000001 /* NeXTStep */,
+                                289FC26B00C69A287F000001 /* NeXTstep */,
                                3C15C23E0902E6B000A8542F /* emacs-hdr */,
                                3CDCED4D0902EA6800B2EF7E /* emacs-src */,
                                29B97317FDCFA39411CA2CEA /* Resources */,
diff --git a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
index e92d45ae686..9c893ed4e3d 100644
--- a/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
+++ b/nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
@@ -7,9 +7,9 @@
        "Adrian Robert (GNUstep)",
        "Christophe de Dinechin (MacOS X)",
        "Scott Bender (OpenStep)",
-        "Christian Limpach (NeXTStep)",
+        "Christian Limpach (NeXTstep)",
-        "Carl Edman (NeXTStep)",
+        "Carl Edman (NeXTstep)",
-        "..see http://emacs-app.sf.net/authorship.html"
+        "..see etc/NEXTSTEP"
    );
    Copyright = "Copyright (C) 2011 Free Software Foundation, Inc.";
    CopyrightDescription = "Released under the GNU General Public License Version 3 or later";
diff --git a/src/ChangeLog b/src/ChangeLog
index 29514f03177..920355b1723 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -9,6 +9,18 @@
        (mouse_face_from_buffer_pos, note_mouse_highlight, expose_frame):
        Rename or move local decls.
+2011-03-06  Michael Shields  <shields@msrl.com>  (tiny change)
+        * window.c (Fnext_window): Doc fix.  (Bug#5567)
+2011-03-05  Chong Yidong  <cyd@stupidchicken.com>
+        * nsterm.m (ns_draw_window_cursor): Fix typo in 2011-02-23 commit.
+2011-03-02  Ken Brown  <kbrown@cornell.edu>
+        * sheap.c (STATIC_HEAP_SIZE): Increase to 13MB.
 2011-03-02  Paul Eggert  <eggert@cs.ucla.edu>
        Work around some portability problems with symlinks.
@@ -32,7 +44,7 @@
        * msdos.c (readlink) [DJGPP < 2.04]: New stub function.
-        * msdos.h: (readlink) [DJGPP < 2.04]: Declare prototype.
+        * msdos.h (readlink) [DJGPP < 2.04]: Declare prototype.
        * w32.c (symlink, readlink): New stub functions.
@@ -1178,7 +1190,7 @@
        (x_underline_at_descent_line): Remove declaration.
        (syms_of_nsterm): Remove & from DEFVAR_LISP and DEFVAR_BOOL.
-        * nsselect.m (Vns_sent_selection_hooks, Vns_lost_selection_hooks
+        * nsselect.m (Vns_sent_selection_hooks, Vns_lost_selection_hooks)
        (Vselection_alist, Vselection_converter_alist): Move to globals.h.
        (syms_of_nsselect): Remove & from DEFVAR_LISP.
@@ -2895,7 +2907,7 @@
        (Qglyphless_char_display, Qhexa_code, Qempty_box, Qthin_space)
        (Qzero_width): New variables.
        (THIN_SPACE_WIDTH): New macro.
-        (lookup_glyphless_char_display): New funciton.
+        (lookup_glyphless_char_display): New function.
        (last_glyphless_glyph_frame, last_glyphless_glyph_face_id)
        (last_glyphless_glyph_merged_face_id): New variables.
        (get_next_display_element): Check glyphless characters.
@@ -3181,7 +3193,7 @@
 2010-10-12  Jan Djärv  <jan.h.d@swipnet.se>
        * nsterm.m (Qleft): Declare.
-        (ns_right_alternate_modifier): New variable
+        (ns_right_alternate_modifier): New variable.
        (NSRightAlternateKeyMask): New define.
        (EV_MODIFIERS): Parse NSRightAlternateKeyMask if
        ns_right_alternate_modifier isn't Qleft.
@@ -3205,7 +3217,7 @@
        * Makefile.in (temacs): Use $(ALL_CFLAGS) on the link line.
        (PROFILING_LDFLAGS): Remove, not needed anymore.
-        * Makefile.in: Use $(...) everywhere instead of ${...}
+        * Makefile.in: Use $(...) everywhere instead of ${...}.
        (CRT_DIR): Move near potential user.
        (START_FILE): Move near CRT_DIR, it might use it.
@@ -6142,7 +6154,7 @@
        * eval.c: Fix indentation problem.
-        * keyboard.c: Include "process.h"
+        * keyboard.c: Include "process.h".
        * eval.c: Remove obsolete noinline declaration.
        * fns.c: Likewise.
@@ -8548,7 +8560,7 @@
        Qtool_bar_style.  Initialize current_tool_bar_style to nil.
        defsubr Stool_bar_get_system_style.  Fprovide on
        dynamic-setting.
-        Move misplaced HAVE_GCONF
+        Move misplaced HAVE_GCONF.
        * xsettings.h (Ftool_bar_get_system_style): Declare.
diff --git a/src/config.in b/src/config.in
index 4e49b4df170..7f33727c0b1 100644
--- a/src/config.in
+++ b/src/config.in
@@ -1203,9 +1203,6 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 # define __restrict__
 #endif
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#undef size_t
 /* Define to any substitute for sys_siglist. */
 #undef sys_siglist
diff --git a/src/nsterm.m b/src/nsterm.m
index 8e77c89c3f7..cc2c4cf9807 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -189,7 +189,7 @@ static NSMutableArray *ns_pending_files, *ns_pending_service_names,
  *ns_pending_service_args;
 static BOOL inNsSelect = 0;
-/* Convert modifiers in a NeXTSTEP event to emacs style modifiers.  */
+/* Convert modifiers in a NeXTstep event to emacs style modifiers.  */
 #define NS_FUNCTION_KEY_MASK 0x800000
 #define NSLeftControlKeyMask    (0x000001 | NSControlKeyMask)
 #define NSRightControlKeyMask   (0x002000 | NSControlKeyMask)
@@ -2282,9 +2282,8 @@ ns_draw_window_cursor (struct window *w, struct glyph_row *glyph_row,
     to the glyph width; replace with CURSOR_WIDTH for bar cursors. */
  if (cursor_type == BAR_CURSOR || cursor_type == HBAR_CURSOR)
    {
-      if (cursor_width < 0)
+      if (cursor_width < 1)
-        cursor_width = FRAME_CURSOR_WIDTH (f);
+        cursor_width = max (FRAME_CURSOR_WIDTH (f), 1);
-      cursor_width = min (cursor_width, 1);
      w->phys_cursor_width = cursor_width;
    }
diff --git a/src/sheap.c b/src/sheap.c
index 65fbab538bb..31414fbe5c6 100644
--- a/src/sheap.c
+++ b/src/sheap.c
@@ -25,7 +25,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <unistd.h>
-#define STATIC_HEAP_SIZE        (12 * 1024 * 1024)
+#define STATIC_HEAP_SIZE        (13 * 1024 * 1024)
 int debug_sheap = 0;
diff --git a/src/window.c b/src/window.c
index 7965269f0e7..7c55be972b2 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1769,8 +1769,10 @@ window_list (void)
   ALL_FRAMES   t means search all frames,
                nil means search just current frame,
-                `visible' means search just visible frames,
+                `visible' means search just visible frames on the
-                0 means search visible and iconified frames,
+                current terminal,
+                0 means search visible and iconified frames on the
+                current terminal,
                a window means search the frame that window belongs to,
                a frame means consider windows on that frame, only.  */
@@ -1836,8 +1838,8 @@ candidate_window_p (Lisp_Object window, Lisp_Object owindow, Lisp_Object minibuf
 /* Decode arguments as allowed by Fnext_window, Fprevious_window, and
-   Fwindow_list.  See there for the meaning of WINDOW, MINIBUF, and
+   Fwindow_list.  See candidate_window_p for the meaning of WINDOW,
-   ALL_FRAMES.  */
+   MINIBUF, and ALL_FRAMES.  */
 static void
 decode_next_window_args (Lisp_Object *window, Lisp_Object *minibuf, Lisp_Object *all_frames)
@@ -1871,12 +1873,6 @@ decode_next_window_args (Lisp_Object *window, Lisp_Object *minibuf, Lisp_Object
    ;
  else if (!EQ (*all_frames, Qt))
    *all_frames = Qnil;
-  /* Now *ALL_FRAMES is t meaning search all frames, nil meaning
-     search just current frame, `visible' meaning search just visible
-     frames, 0 meaning search visible and iconified frames, or a
-     window, meaning search the frame that window belongs to, or a
-     frame, meaning consider windows on that frame, only.  */
 }
@@ -1974,9 +1970,9 @@ ALL-FRAMES nil or omitted means consider all windows on WINDOW's
 windows on all frames that share that minibuffer too.
 ALL-FRAMES t means consider all windows on all existing frames.
 ALL-FRAMES `visible' means consider all windows on all visible
- frames.
+ frames on the current terminal.
 ALL-FRAMES 0 means consider all windows on all visible and
- iconified frames.
+ iconified frames on the current terminal.
 ALL-FRAMES a frame means consider all windows on that frame only.
 Anything else means consider all windows on WINDOW's frame and no
 others.
diff --git a/test/ChangeLog b/test/ChangeLog
index dbfc6c6cefe..b247b88bc94 100644
--- a/test/ChangeLog
+++ b/test/ChangeLog
@@ -1,3 +1,12 @@
+2011-03-05  Glenn Morris  <rgm@gnu.org>
+        * eshell.el: Move here from lisp/eshell/esh-test.el.
+2011-03-03  Christian Ohler  <ohler@gnu.org>
+        * automated/ert-tests.el (ert-test-explain-not-equal-keymaps):
+        New test.
 2011-02-20  Ulf Jasper  <ulf.jasper@web.de>
        * automated/icalendar-tests.el: Move from icalendar-testsuite.el;
diff --git a/test/automated/ert-tests.el b/test/automated/ert-tests.el
index b6d70dee7e2..cea994f64b8 100644
--- a/test/automated/ert-tests.el
+++ b/test/automated/ert-tests.el
@@ -796,27 +796,32 @@ This macro is used to test if macroexpansion in `should' works."
  (should (equal (ert--string-first-line "foo\nbar") "foo"))
  (should (equal (ert--string-first-line " foo\nbar\nbaz\n") " foo")))
-(ert-deftest ert-test-explain-not-equal ()
+(ert-deftest ert-test-explain-equal ()
-  (should (equal (ert--explain-not-equal nil 'foo)
+  (should (equal (ert--explain-equal nil 'foo)
                 '(different-atoms nil foo)))
-  (should (equal (ert--explain-not-equal '(a a) '(a b))
+  (should (equal (ert--explain-equal '(a a) '(a b))
                 '(list-elt 1 (different-atoms a b))))
-  (should (equal (ert--explain-not-equal '(1 48) '(1 49))
+  (should (equal (ert--explain-equal '(1 48) '(1 49))
                 '(list-elt 1 (different-atoms (48 "#x30" "?0")
                                               (49 "#x31" "?1")))))
-  (should (equal (ert--explain-not-equal 'nil '(a))
+  (should (equal (ert--explain-equal 'nil '(a))
                 '(different-types nil (a))))
-  (should (equal (ert--explain-not-equal '(a b c) '(a b c d))
+  (should (equal (ert--explain-equal '(a b c) '(a b c d))
                 '(proper-lists-of-different-length 3 4 (a b c) (a b c d)
                                                    first-mismatch-at 3)))
  (let ((sym (make-symbol "a")))
-    (should (equal (ert--explain-not-equal 'a sym)
+    (should (equal (ert--explain-equal 'a sym)
                   `(different-symbols-with-the-same-name a ,sym)))))
-(ert-deftest ert-test-explain-not-equal-improper-list ()
+(ert-deftest ert-test-explain-equal-improper-list ()
-  (should (equal (ert--explain-not-equal '(a . b) '(a . c))
+  (should (equal (ert--explain-equal '(a . b) '(a . c))
                 '(cdr (different-atoms b c)))))
+(ert-deftest ert-test-explain-equal-keymaps ()
+  ;; This used to be very slow.
+  (should (equal (make-keymap) (make-keymap)))
+  (should (equal (make-sparse-keymap) (make-sparse-keymap))))
 (ert-deftest ert-test-significant-plist-keys ()
  (should (equal (ert--significant-plist-keys '()) '()))
  (should (equal (ert--significant-plist-keys '(a b c d e f c g p q r nil s t))
@@ -852,21 +857,21 @@ This macro is used to test if macroexpansion in `should' works."
  (should (equal (ert--abbreviate-string "bar" 1 t) "r"))
  (should (equal (ert--abbreviate-string "bar" 0 t) "")))
-(ert-deftest ert-test-explain-not-equal-string-properties ()
+(ert-deftest ert-test-explain-equal-string-properties ()
  (should
-   (equal (ert--explain-not-equal-including-properties #("foo" 0 1 (a b))
+   (equal (ert--explain-equal-including-properties #("foo" 0 1 (a b))
-                                                       "foo")
+                                                   "foo")
          '(char 0 "f"
                 (different-properties-for-key a (different-atoms b nil))
                 context-before ""
                 context-after "oo")))
-  (should (equal (ert--explain-not-equal-including-properties
+  (should (equal (ert--explain-equal-including-properties
                  #("foo" 1 3 (a b))
                  #("goo" 0 1 (c d)))
                 '(array-elt 0 (different-atoms (?f "#x66" "?f")
                                                (?g "#x67" "?g")))))
  (should
-   (equal (ert--explain-not-equal-including-properties
+   (equal (ert--explain-equal-including-properties
           #("foo" 0 1 (a b c d) 1 3 (a b))
           #("foo" 0 1 (c d a b) 1 2 (a foo)))
          '(char 1 "o" (different-properties-for-key a (different-atoms b foo))
diff --git a/lisp/eshell/esh-test.el b/test/eshell.el
index f5c55dd8ae7..3b392e84c24 100644
--- a/lisp/eshell/esh-test.el
+++ b/test/eshell.el
@@ -28,6 +28,7 @@
 ;;; Code:
 (eval-when-compile
+  (require 'cl)                         ; assert
  (require 'eshell)
  (require 'esh-util))
 (require 'esh-mode)
@@ -166,9 +167,9 @@
      (insert "Testing Eshell under " (emacs-version))
      (switch-to-buffer test-buffer)
      (delete-other-windows))
-    (eshell-for funcname (sort (all-completions "eshell-test--"
+    (dolist (funcname (sort (all-completions "eshell-test--"
                                                obarray 'functionp)
-                               'string-lessp)
+                               'string-lessp))
      (with-current-buffer test-buffer
        (insert "\n"))
      (funcall (intern-soft funcname)))
@@ -228,6 +229,193 @@
                 "\n"))))
            nil t))
+;;; The tests.
+(defmacro eshell-deftest (module name label &rest forms)
+  (declare (indent 2))
+  (if (and (fboundp 'cl-compiling-file) (cl-compiling-file))
+      nil
+    (let ((fsym (intern (concat "eshell-test--" (symbol-name name)))))
+      `(eval-when-compile
+         (ignore
+          (defun ,fsym () ,label
+            (eshell-run-test (quote ,module) (quote ,fsym) ,label
+                             (quote (progn ,@forms)))))))))
+(eshell-deftest mode same-window-buffer-names
+  "`eshell-buffer-name' is a member of `same-window-buffer-names'"
+  (member eshell-buffer-name same-window-buffer-names))
+(eshell-deftest mode eshell-directory-exists
+  "`eshell-directory-name' exists and is writable"
+  (file-writable-p eshell-directory-name))
+(eshell-deftest mode eshell-directory-modes
+  "`eshell-directory-name' has correct access protections"
+  (or (eshell-under-windows-p)
+      (= (file-modes eshell-directory-name)
+         eshell-private-directory-modes)))
+(eshell-deftest mode simple-command-result
+  "`eshell-command-result' works with a simple command."
+  (= (eshell-command-result "+ 1 2") 3))
+(require 'em-banner)
+(eshell-deftest banner banner-displayed
+  "Startup banner is displayed at point-min"
+  (assert eshell-banner-message)
+  (let ((msg (eval eshell-banner-message)))
+    (assert msg)
+    (goto-char (point-min))
+    (looking-at msg)))
+(require 'esh-cmd)
+(eshell-deftest var last-result-var
+  "\"last result\" variable"
+  (eshell-command-result-p "+ 1 2; + $$ 2" "3\n5\n"))
+(eshell-deftest var last-result-var2
+  "\"last result\" variable"
+  (eshell-command-result-p "+ 1 2; + $$ $$" "3\n6\n"))
+(eshell-deftest var last-arg-var
+  "\"last arg\" variable"
+  (eshell-command-result-p "+ 1 2; + $_ 4" "3\n6\n"))
+(eshell-deftest cmd lisp-command
+  "Evaluate Lisp command"
+  (eshell-command-result-p "(+ 1 2)" "3"))
+(eshell-deftest cmd lisp-command-args
+  "Evaluate Lisp command (ignore args)"
+  (eshell-command-result-p "(+ 1 2) 3" "3"))
+(eshell-deftest cmd subcommand
+  "Run subcommand"
+  (eshell-command-result-p "{+ 1 2}" "3\n"))
+(eshell-deftest cmd subcommand-args
+  "Run subcommand (ignore args)"
+  (eshell-command-result-p "{+ 1 2} 3" "3\n"))
+(eshell-deftest cmd subcommand-lisp
+  "Run subcommand + Lisp form"
+  (eshell-command-result-p "{(+ 1 2)}" "3\n"))
+(eshell-deftest cmd named-command
+  "Execute named command"
+  (eshell-command-result-p "+ 1 2" "3\n"))
+(require 'esh-mode)
+(eshell-deftest mode major-mode
+  "Major mode is correct"
+  (eq major-mode 'eshell-mode))
+(eshell-deftest mode eshell-mode-variable
+  "`eshell-mode' is true"
+  (eq eshell-mode t))
+(eshell-deftest var window-height
+  "LINES equals window height"
+  (let ((eshell-stringify-t t))
+    (eshell-command-result-p "= $LINES (window-height)" "t\n")))
+(eshell-deftest mode command-running-p
+  "Modeline shows no command running"
+  (or (featurep 'xemacs)
+      (not eshell-status-in-modeline)
+      (and (memq 'eshell-command-running-string mode-line-format)
+           (equal eshell-command-running-string "--"))))
+(eshell-deftest arg forward-arg
+  "Move across command arguments"
+  (eshell-insert-command "echo $(+ 1 (- 4 3)) \"alpha beta\" file" 'ignore)
+  (let ((here (point)) begin valid)
+    (eshell-bol)
+    (setq begin (point))
+    (eshell-forward-argument 4)
+    (setq valid (= here (point)))
+    (eshell-backward-argument 4)
+    (prog1
+        (and valid (= begin (point)))
+      (eshell-bol)
+      (delete-region (point) (point-max)))))
+(eshell-deftest mode queue-input
+  "Queue command input"
+  (eshell-insert-command "sleep 2")
+  (eshell-insert-command "echo alpha" 'eshell-queue-input)
+  (let ((count 10))
+    (while (and eshell-current-command
+                (> count 0))
+      (sit-for 1 0)
+      (setq count (1- count))))
+  (eshell-match-result "alpha\n"))
+; (eshell-deftest proc send-to-subprocess
+;   "Send input to a subprocess"
+;   ;; jww (1999-12-06): what about when bc is unavailable?
+;   (if (not (eshell-search-path "bc"))
+;       t
+;     (eshell-insert-command "bc")
+;     (eshell-insert-command "1 + 2")
+;     (sit-for 1 0)
+;     (forward-line -1)
+;     (prog1
+;       (looking-at "3\n")
+;       (eshell-insert-command "quit")
+;       (sit-for 1 0))))
+(eshell-deftest io flush-output
+  "Flush previous output"
+  (eshell-insert-command "echo alpha")
+  (eshell-kill-output)
+  (and (eshell-match-result (regexp-quote "*** output flushed ***\n"))
+       (forward-line)
+       (= (point) eshell-last-output-start)))
+(eshell-deftest mode run-old-command
+  "Re-run an old command"
+  (eshell-insert-command "echo alpha")
+  (goto-char eshell-last-input-start)
+  (string= (eshell-get-old-input) "echo alpha"))
+(require 'esh-var)
+(eshell-deftest var interp-cmd
+  "Interpolate command result"
+  (eshell-command-result-p "+ ${+ 1 2} 3" "6\n"))
+(eshell-deftest var interp-lisp
+  "Interpolate Lisp form evalution"
+  (eshell-command-result-p "+ $(+ 1 2) 3" "6\n"))
+(eshell-deftest var interp-concat
+  "Interpolate and concat command"
+  (eshell-command-result-p "+ ${+ 1 2}3 3" "36\n"))
+(eshell-deftest var interp-concat-lisp
+  "Interpolate and concat Lisp form"
+  (eshell-command-result-p "+ $(+ 1 2)3 3" "36\n"))
+(eshell-deftest var interp-concat2
+  "Interpolate and concat two commands"
+  (eshell-command-result-p "+ ${+ 1 2}${+ 1 2} 3" "36\n"))
+(eshell-deftest var interp-concat-lisp2
+  "Interpolate and concat two Lisp forms"
+  (eshell-command-result-p "+ $(+ 1 2)$(+ 1 2) 3" "36\n"))
 (provide 'esh-test)
 ;;; esh-test.el ends here
author	Paul Eggert	2011-03-05 23:53:03 -0800
committer	Paul Eggert	2011-03-05 23:53:03 -0800
commit	58635e4de85621d4f16befe15b1df44a637bd078 (patch)
tree	b5dc80332d5912ba795e59ee86cea1527324709e
parent	5489860be109ec6fa2a7d143cdecb6887e37f5d5 (diff)
parent	555e9b5c69d70acca13310fbe533594a8f1eab98 (diff)
download	emacs-58635e4de85621d4f16befe15b1df44a637bd078.tar.gz emacs-58635e4de85621d4f16befe15b1df44a637bd078.zip