#!/bin/sh
#### Patch script - GNU Emacs - version 20.5 to 20.6.

#### This file contains patches to turn version 20.5 of GNU Emacs into
#### 20.6.  To apply them, cd to the top of the Emacs source tree, and
#### then type 'sh <this file>'.

#### After this script applies the patches, it will attempt to use an
#### existing Emacs to recompile the changed Emacs Lisp files.  (You may
#### use the environment variable $emacs to specify the location of the
#### binary, if it's not in your search path.)  When this is finished,
#### you can build the new Emacs version.

#### We don't include patches for Info files since you can
#### regenerate them from the Texinfo files that we do include.
#### To update the changed info files, do
#### (cd man; make)

if [ "$0" = sh -o ! -f "$0" ]; then
  echo "use \`sh PATCHKIT', not \`sh <PATCHKIT'" >&2
  exit 1
fi
if [ -d lisp ] ; then
  me=$0
elif [ -d emacs-20.5/lisp ] ; then
  cd emacs-20.5
  case $0 in /*) me=$0;; *) me=../$0;; esac
else
  (echo "$0: In order to apply this patch, the current directory"
   echo "must be the top of the Emacs distribution tree.") >&2
  exit 1
fi

### moves and renames
#none

tail +66 $me | patch -p1

cd lisp
for e in $emacs ../src/emacs emacs emacs20 emacs-20 ''; do
  if [ -n "$e" ]; then
    v=`$e --version </dev/null 2>/dev/null | sed -e 's/.* //' -e 's/\.[0-9]*$//'`
    case $v in 20.5*) break;; esac
  fi
done
if [ -z "$e" ]; then
  (echo "I can't find an Emacs to execute."
   echo "You'll have to byte-compile the lisp directory by hand.") >&2
  exit 0
fi
echo "byte compiling with $e (version $v)..." >&2
loadpath=${TMPDIR-/tmp}/$$.el
trap "rm -f $loadpath; exit 1" 1 2 3 15
echo "(setq load-path (cons \"`pwd`\" load-path))" >$loadpath
# First do the new files, and any older files that might need to be compiled
# in a particular order.  Then do the rest of the directory.
list=

for f in $list; do
  echo Compiling $f...
  $e -batch -l $loadpath -f batch-byte-compile $f
done
$e -batch -l $loadpath -f batch-byte-recompile-directory .
rm $loadpath
exit 0
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/ChangeLog emacs-20.6/ChangeLog
*** emacs-20.5/ChangeLog	Fri Dec 10 17:24:47 1999
--- emacs-20.6/ChangeLog	Sat Feb 26 11:17:01 2000
***************
*** 1,2 ****
--- 1,14 ----
+ 2000-02-26  Gerd Moellmann  <gerd@gnu.org>
+ 
+ 	* Version 20.6 released.
+ 	
+ 2000-02-18  Dave Love  <fx@gnu.org>
+ 
+ 	* configure.in: Define NON_GNU_CPP on alpha-dec-osf5+.
+ 
+ 2000-02-15  Gerd Moellmann  <gerd@gnu.org>
+ 
+ 	* configure.in: Add support for arm*-g*-linux-gnu* systems.
+ 
  1999-12-04  Gerd Moellmann  <gerd@gnu.org>
  
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/README emacs-20.6/README
*** emacs-20.5/README	Fri Dec  3 08:34:46 1999
--- emacs-20.6/README	Sat Feb 26 11:33:56 2000
***************
*** 1,3 ****
! This directory tree holds version 20.5 of GNU Emacs, the extensible,
  customizable, self-documenting real-time display editor.
  
--- 1,3 ----
! This directory tree holds version 20.6 of GNU Emacs, the extensible,
  customizable, self-documenting real-time display editor.
  
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/configure emacs-20.6/configure
*** emacs-20.5/configure	Fri Dec  3 08:41:15 1999
--- emacs-20.6/configure	Sat Feb 26 13:07:06 2000
***************
*** 2,6 ****
  
  # Guess values for system-dependent variables and create Makefiles.
! # Generated automatically using autoconf version 2.12 
  # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
  #
--- 2,6 ----
  
  # Guess values for system-dependent variables and create Makefiles.
! # Generated automatically using autoconf version 2.13 
  # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
  #
*************** mandir='${prefix}/man'
*** 60,63 ****
--- 60,64 ----
  subdirs=
  MFLAGS= MAKEFLAGS=
+ SHELL=${CONFIG_SHELL-/bin/sh}
  # Maximum number of lines to put in a shell here document.
  ac_max_here_lines=12
*************** EOF
*** 343,347 ****
  
    -version | --version | --versio | --versi | --vers)
!     echo "configure generated by autoconf version 2.12"
      exit 0 ;;
  
--- 344,348 ----
  
    -version | --version | --versio | --versi | --vers)
!     echo "configure generated by autoconf version 2.13"
      exit 0 ;;
  
*************** ac_ext=c
*** 513,519 ****
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cc_cross
  
  if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
    # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
--- 514,522 ----
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cc_cross
  
+ ac_exeext=
+ ac_objext=o
  if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
    # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
*************** ac_configure=$ac_aux_dir/configure # Thi
*** 650,659 ****
  
  # Make sure we can run config.sub.
! if $ac_config_sub sun4 >/dev/null 2>&1; then :
  else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
  fi
  
  echo $ac_n "checking host system type""... $ac_c" 1>&6
! echo "configure:658: checking host system type" >&5
  
  host_alias=$host
--- 653,662 ----
  
  # Make sure we can run config.sub.
! if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
  else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
  fi
  
  echo $ac_n "checking host system type""... $ac_c" 1>&6
! echo "configure:661: checking host system type" >&5
  
  host_alias=$host
*************** NONE)
*** 662,666 ****
    case $nonopt in
    NONE)
!     if host_alias=`$ac_config_guess`; then :
      else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
      fi ;;
--- 665,669 ----
    case $nonopt in
    NONE)
!     if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
      else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
      fi ;;
*************** NONE)
*** 669,673 ****
  esac
  
! host=`$ac_config_sub $host_alias`
  host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
  host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
--- 672,676 ----
  esac
  
! host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
  host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
  host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
*************** case "${canonical}" in
*** 782,785 ****
--- 785,794 ----
      NON_GCC_LINK_TEST_OPTIONS=-Wl,-rpath,/usr/X11R6/lib
      GCC_LINK_TEST_OPTIONS=-Wl,-rpath,/usr/X11R6/lib
+     case "${canonical}" in
+     # This is necessary on 5.0 to avoid mangling src/Makefile.
+     # Separated out in case it causes problems on earlier versions.
+     alpha*-dec-osf[5-9]*)
+       NON_GNU_CPP='cc -E -std0' ;;
+     esac
    ;;
  
*************** case "${canonical}" in
*** 788,791 ****
--- 797,804 ----
    ;;
  
+   arm*-*-linux-gnu* )
+     machine=arm opsys=gnu-linux       
+   ;;
+ 
    ## Altos 3068
    m68*-altos-sysv* )
*************** case ${with_gcc} in
*** 1596,1600 ****
  set dummy gcc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1599: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1609,1613 ----
  set dummy gcc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1612: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** else
*** 1603,1608 ****
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
--- 1616,1622 ----
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
!   ac_dummy="$PATH"
!   for ac_dir in $ac_dummy; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
*************** if test -z "$CC"; then
*** 1625,1629 ****
  set dummy cc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1628: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1639,1643 ----
  set dummy cc; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1642: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** else
*** 1632,1638 ****
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
    ac_prog_rejected=no
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
--- 1646,1653 ----
    ac_cv_prog_CC="$CC" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
    ac_prog_rejected=no
!   ac_dummy="$PATH"
!   for ac_dir in $ac_dummy; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
*************** else
*** 1669,1677 ****
  fi
  
    test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
  fi
  
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:1676: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  
  ac_ext=c
--- 1684,1726 ----
  fi
  
+   if test -z "$CC"; then
+     case "`uname -s`" in
+     *win32* | *WIN32*)
+       # Extract the first word of "cl", so it can be a program name with args.
+ set dummy cl; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+ echo "configure:1693: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   if test -n "$CC"; then
+   ac_cv_prog_CC="$CC" # Let the user override the test.
+ else
+   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+   ac_dummy="$PATH"
+   for ac_dir in $ac_dummy; do
+     test -z "$ac_dir" && ac_dir=.
+     if test -f $ac_dir/$ac_word; then
+       ac_cv_prog_CC="cl"
+       break
+     fi
+   done
+   IFS="$ac_save_ifs"
+ fi
+ fi
+ CC="$ac_cv_prog_CC"
+ if test -n "$CC"; then
+   echo "$ac_t""$CC" 1>&6
+ else
+   echo "$ac_t""no" 1>&6
+ fi
+  ;;
+     esac
+   fi
    test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
  fi
  
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
! echo "configure:1725: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
  
  ac_ext=c
*************** ac_ext=c
*** 1679,1691 ****
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
! ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cc_cross
  
! cat > conftest.$ac_ext <<EOF
! #line 1686 "configure"
  #include "confdefs.h"
  main(){return(0);}
  EOF
! if { (eval echo configure:1690: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    ac_cv_prog_cc_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
--- 1728,1742 ----
  ac_cpp='$CPP $CPPFLAGS'
  ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
! ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
  cross_compiling=$ac_cv_prog_cc_cross
  
! cat > conftest.$ac_ext << EOF
! 
! #line 1736 "configure"
  #include "confdefs.h"
+ 
  main(){return(0);}
  EOF
! if { (eval echo configure:1741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    ac_cv_prog_cc_works=yes
    # If we can't run a trivial program, we are probably using a cross compiler.
*************** else
*** 1701,1704 ****
--- 1752,1761 ----
  fi
  rm -fr conftest*
+ ac_ext=c
+ # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+ ac_cpp='$CPP $CPPFLAGS'
+ ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+ ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+ cross_compiling=$ac_cv_prog_cc_cross
  
  echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
*************** if test $ac_cv_prog_cc_works = no; then
*** 1707,1716 ****
  fi
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
! echo "configure:1710: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
  echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
! echo "configure:1715: checking whether we are using GNU C" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1764,1773 ----
  fi
  echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
! echo "configure:1767: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
  echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
  cross_compiling=$ac_cv_prog_cc_cross
  
  echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
! echo "configure:1772: checking whether we are using GNU C" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** else
*** 1721,1725 ****
  #endif
  EOF
! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1724: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    ac_cv_prog_gcc=yes
  else
--- 1778,1782 ----
  #endif
  EOF
! if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
    ac_cv_prog_gcc=yes
  else
*************** echo "$ac_t""$ac_cv_prog_gcc" 1>&6
*** 1732,1740 ****
  if test $ac_cv_prog_gcc = yes; then
    GCC=yes
!   ac_test_CFLAGS="${CFLAGS+set}"
!   ac_save_CFLAGS="$CFLAGS"
!   CFLAGS=
!   echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
! echo "configure:1739: checking whether ${CC-cc} accepts -g" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1789,1801 ----
  if test $ac_cv_prog_gcc = yes; then
    GCC=yes
! else
!   GCC=
! fi
! 
! ac_test_CFLAGS="${CFLAGS+set}"
! ac_save_CFLAGS="$CFLAGS"
! CFLAGS=
! echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
! echo "configure:1800: checking whether ${CC-cc} accepts -g" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** fi
*** 1751,1764 ****
  
  echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
!   if test "$ac_test_CFLAGS" = set; then
!     CFLAGS="$ac_save_CFLAGS"
!   elif test $ac_cv_prog_cc_g = yes; then
      CFLAGS="-g -O2"
    else
!     CFLAGS="-O2"
    fi
  else
!   GCC=
!   test "${CFLAGS+set}" = set || CFLAGS="-g"
  fi
  
--- 1812,1829 ----
  
  echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
! if test "$ac_test_CFLAGS" = set; then
!   CFLAGS="$ac_save_CFLAGS"
! elif test $ac_cv_prog_cc_g = yes; then
!   if test "$GCC" = yes; then
      CFLAGS="-g -O2"
    else
!     CFLAGS="-g"
    fi
  else
!   if test "$GCC" = yes; then
!     CFLAGS="-O2"
!   else
!     CFLAGS=
!   fi
  fi
  
*************** fi
*** 1812,1816 ****
  
  echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
! echo "configure:1815: checking whether ln -s works" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1877,1881 ----
  
  echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
! echo "configure:1880: checking whether ln -s works" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** fi
*** 1833,1837 ****
  
  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
! echo "configure:1836: checking how to run the C preprocessor" >&5
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
--- 1898,1902 ----
  
  echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
! echo "configure:1901: checking how to run the C preprocessor" >&5
  # On Suns, sometimes $CPP names a directory.
  if test -n "$CPP" && test -d "$CPP"; then
*************** else
*** 1848,1852 ****
    # not just through cpp.
    cat > conftest.$ac_ext <<EOF
! #line 1851 "configure"
  #include "confdefs.h"
  #include <assert.h>
--- 1913,1917 ----
    # not just through cpp.
    cat > conftest.$ac_ext <<EOF
! #line 1916 "configure"
  #include "confdefs.h"
  #include <assert.h>
*************** Syntax Error
*** 1854,1859 ****
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1857: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    :
--- 1919,1924 ----
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
*************** else
*** 1865,1869 ****
    CPP="${CC-cc} -E -traditional-cpp"
    cat > conftest.$ac_ext <<EOF
! #line 1868 "configure"
  #include "confdefs.h"
  #include <assert.h>
--- 1930,1951 ----
    CPP="${CC-cc} -E -traditional-cpp"
    cat > conftest.$ac_ext <<EOF
! #line 1933 "configure"
! #include "confdefs.h"
! #include <assert.h>
! Syntax Error
! EOF
! ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1939: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
! if test -z "$ac_err"; then
!   :
! else
!   echo "$ac_err" >&5
!   echo "configure: failed program was:" >&5
!   cat conftest.$ac_ext >&5
!   rm -rf conftest*
!   CPP="${CC-cc} -nologo -E"
!   cat > conftest.$ac_ext <<EOF
! #line 1950 "configure"
  #include "confdefs.h"
  #include <assert.h>
*************** Syntax Error
*** 1871,1876 ****
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    :
--- 1953,1958 ----
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:1956: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    :
*************** rm -f conftest*
*** 1885,1888 ****
--- 1967,1972 ----
  fi
  rm -f conftest*
+ fi
+ rm -f conftest*
    ac_cv_prog_CPP="$CPP"
  fi
*************** echo "$ac_t""$CPP" 1>&6
*** 1900,1913 ****
  # IRIX /sbin/install
  # AIX /bin/install
  # AFS /usr/afsws/bin/install, which mishandles nonexistent args
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # ./install, which can be erroneously created by make from ./install.sh.
  echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
! echo "configure:1907: checking for a BSD compatible install" >&5
  if test -z "$INSTALL"; then
  if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
!     IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS="${IFS}:"
    for ac_dir in $PATH; do
      # Account for people who put trailing slashes in PATH elements.
--- 1984,1998 ----
  # IRIX /sbin/install
  # AIX /bin/install
+ # AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
  # AFS /usr/afsws/bin/install, which mishandles nonexistent args
  # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
  # ./install, which can be erroneously created by make from ./install.sh.
  echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
! echo "configure:1992: checking for a BSD compatible install" >&5
  if test -z "$INSTALL"; then
  if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
!     IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
    for ac_dir in $PATH; do
      # Account for people who put trailing slashes in PATH elements.
*************** else
*** 1916,1925 ****
      *)
        # OSF1 and SCO ODT 3.0 have their own names for install.
!       for ac_prog in ginstall installbsd scoinst install; do
          if test -f $ac_dir/$ac_prog; then
  	  if test $ac_prog = install &&
              grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
  	    # AIX install.  It has an incompatible calling convention.
- 	    # OSF/1 installbsd also uses dspmsg, but is usable.
  	    :
  	  else
--- 2001,2011 ----
      *)
        # OSF1 and SCO ODT 3.0 have their own names for install.
!       # Don't use installbsd from OSF since it installs stuff as root
!       # by default.
!       for ac_prog in ginstall scoinst install; do
          if test -f $ac_dir/$ac_prog; then
  	  if test $ac_prog = install &&
              grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then
  	    # AIX install.  It has an incompatible calling convention.
  	    :
  	  else
*************** echo "$ac_t""$INSTALL" 1>&6
*** 1951,1954 ****
--- 2037,2042 ----
  test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
  
+ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+ 
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
*************** do
*** 1958,1962 ****
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:1961: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2046,2050 ----
  set dummy $ac_prog; ac_word=$2
  echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
! echo "configure:2049: checking for $ac_word" >&5
  if eval "test \"`echo '$''{'ac_cv_prog_YACC'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** else
*** 1965,1970 ****
    ac_cv_prog_YACC="$YACC" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
!   for ac_dir in $PATH; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
--- 2053,2059 ----
    ac_cv_prog_YACC="$YACC" # Let the user override the test.
  else
!   IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
!   ac_dummy="$PATH"
!   for ac_dir in $ac_dummy; do
      test -z "$ac_dir" && ac_dir=.
      if test -f $ac_dir/$ac_word; then
*************** test -n "$YACC" || YACC="yacc"
*** 1989,1995 ****
  
  echo $ac_n "checking for AIX""... $ac_c" 1>&6
! echo "configure:1992: checking for AIX" >&5
  cat > conftest.$ac_ext <<EOF
! #line 1994 "configure"
  #include "confdefs.h"
  #ifdef _AIX
--- 2078,2084 ----
  
  echo $ac_n "checking for AIX""... $ac_c" 1>&6
! echo "configure:2081: checking for AIX" >&5
  cat > conftest.$ac_ext <<EOF
! #line 2083 "configure"
  #include "confdefs.h"
  #ifdef _AIX
*************** do
*** 2017,2032 ****
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:2020: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2025 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
--- 2106,2121 ----
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:2109: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2114 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2119: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
*************** done
*** 2054,2063 ****
  
  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
! echo "configure:2057: checking for ANSI C header files" >&5
  if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2062 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
--- 2143,2152 ----
  
  echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
! echo "configure:2146: checking for ANSI C header files" >&5
  if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2151 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
*************** else
*** 2067,2072 ****
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
--- 2156,2161 ----
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2159: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
*************** if test $ac_cv_header_stdc = yes; then
*** 2084,2088 ****
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 2087 "configure"
  #include "confdefs.h"
  #include <string.h>
--- 2173,2177 ----
    # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 2176 "configure"
  #include "confdefs.h"
  #include <string.h>
*************** if test $ac_cv_header_stdc = yes; then
*** 2102,2106 ****
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 2105 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
--- 2191,2195 ----
    # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
  cat > conftest.$ac_ext <<EOF
! #line 2194 "configure"
  #include "confdefs.h"
  #include <stdlib.h>
*************** if test "$cross_compiling" = yes; then
*** 2123,2127 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 2126 "configure"
  #include "confdefs.h"
  #include <ctype.h>
--- 2212,2216 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 2215 "configure"
  #include "confdefs.h"
  #include <ctype.h>
*************** exit (0); }
*** 2134,2138 ****
  
  EOF
! if { (eval echo configure:2137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
  then
    :
--- 2223,2227 ----
  
  EOF
! if { (eval echo configure:2226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    :
*************** fi
*** 2158,2167 ****
  
  echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
! echo "configure:2161: checking whether time.h and sys/time.h may both be included" >&5
  if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2166 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 2247,2256 ----
  
  echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
! echo "configure:2250: checking whether time.h and sys/time.h may both be included" >&5
  if eval "test \"`echo '$''{'ac_cv_header_time'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2255 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
*************** struct tm *tp;
*** 2172,2176 ****
  ; return 0; }
  EOF
! if { (eval echo configure:2175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_header_time=yes
--- 2261,2265 ----
  ; return 0; }
  EOF
! if { (eval echo configure:2264: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_header_time=yes
*************** fi
*** 2193,2202 ****
  
  echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
! echo "configure:2196: checking for sys_siglist declaration in signal.h or unistd.h" >&5
  if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2201 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 2282,2291 ----
  
  echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
! echo "configure:2285: checking for sys_siglist declaration in signal.h or unistd.h" >&5
  if eval "test \"`echo '$''{'ac_cv_decl_sys_siglist'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2290 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
*************** char *msg = *(sys_siglist + 1);
*** 2210,2214 ****
  ; return 0; }
  EOF
! if { (eval echo configure:2213: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_decl_sys_siglist=yes
--- 2299,2303 ----
  ; return 0; }
  EOF
! if { (eval echo configure:2302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_decl_sys_siglist=yes
*************** fi
*** 2232,2241 ****
  
  echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6
! echo "configure:2235: checking for struct utimbuf" >&5
  if eval "test \"`echo '$''{'emacs_cv_struct_utimbuf'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2240 "configure"
  #include "confdefs.h"
  #ifdef TIME_WITH_SYS_TIME
--- 2321,2330 ----
  
  echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6
! echo "configure:2324: checking for struct utimbuf" >&5
  if eval "test \"`echo '$''{'emacs_cv_struct_utimbuf'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2329 "configure"
  #include "confdefs.h"
  #ifdef TIME_WITH_SYS_TIME
*************** static struct utimbuf x; x.actime = x.mo
*** 2256,2260 ****
  ; return 0; }
  EOF
! if { (eval echo configure:2259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    emacs_cv_struct_utimbuf=yes
--- 2345,2349 ----
  ; return 0; }
  EOF
! if { (eval echo configure:2348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    emacs_cv_struct_utimbuf=yes
*************** fi
*** 2277,2286 ****
  
  echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
! echo "configure:2280: checking return type of signal handlers" >&5
  if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2285 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 2366,2375 ----
  
  echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
! echo "configure:2369: checking return type of signal handlers" >&5
  if eval "test \"`echo '$''{'ac_cv_type_signal'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2374 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
*************** int i;
*** 2299,2303 ****
  ; return 0; }
  EOF
! if { (eval echo configure:2302: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_signal=void
--- 2388,2392 ----
  ; return 0; }
  EOF
! if { (eval echo configure:2391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_type_signal=void
*************** EOF
*** 2319,2328 ****
  
  echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
! echo "configure:2322: checking for struct timeval" >&5
  if eval "test \"`echo '$''{'emacs_cv_struct_timeval'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2327 "configure"
  #include "confdefs.h"
  #ifdef TIME_WITH_SYS_TIME
--- 2408,2417 ----
  
  echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
! echo "configure:2411: checking for struct timeval" >&5
  if eval "test \"`echo '$''{'emacs_cv_struct_timeval'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2416 "configure"
  #include "confdefs.h"
  #ifdef TIME_WITH_SYS_TIME
*************** static struct timeval x; x.tv_sec = x.tv
*** 2340,2344 ****
  ; return 0; }
  EOF
! if { (eval echo configure:2343: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    emacs_cv_struct_timeval=yes
--- 2429,2433 ----
  ; return 0; }
  EOF
! if { (eval echo configure:2432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    emacs_cv_struct_timeval=yes
*************** fi
*** 2362,2371 ****
  
  echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
! echo "configure:2365: checking whether struct tm is in sys/time.h or time.h" >&5
  if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2370 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 2451,2460 ----
  
  echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
! echo "configure:2454: checking whether struct tm is in sys/time.h or time.h" >&5
  if eval "test \"`echo '$''{'ac_cv_struct_tm'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2459 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
*************** struct tm *tp; tp->tm_sec;
*** 2375,2379 ****
  ; return 0; }
  EOF
! if { (eval echo configure:2378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_struct_tm=time.h
--- 2464,2468 ----
  ; return 0; }
  EOF
! if { (eval echo configure:2467: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_struct_tm=time.h
*************** fi
*** 2396,2405 ****
  
  echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
! echo "configure:2399: checking for tm_zone in struct tm" >&5
  if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2404 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
--- 2485,2494 ----
  
  echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
! echo "configure:2488: checking for tm_zone in struct tm" >&5
  if eval "test \"`echo '$''{'ac_cv_struct_tm_zone'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2493 "configure"
  #include "confdefs.h"
  #include <sys/types.h>
*************** struct tm tm; tm.tm_zone;
*** 2409,2413 ****
  ; return 0; }
  EOF
! if { (eval echo configure:2412: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_struct_tm_zone=yes
--- 2498,2502 ----
  ; return 0; }
  EOF
! if { (eval echo configure:2501: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_struct_tm_zone=yes
*************** EOF
*** 2429,2438 ****
  else
    echo $ac_n "checking for tzname""... $ac_c" 1>&6
! echo "configure:2432: checking for tzname" >&5
  if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2437 "configure"
  #include "confdefs.h"
  #include <time.h>
--- 2518,2527 ----
  else
    echo $ac_n "checking for tzname""... $ac_c" 1>&6
! echo "configure:2521: checking for tzname" >&5
  if eval "test \"`echo '$''{'ac_cv_var_tzname'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2526 "configure"
  #include "confdefs.h"
  #include <time.h>
*************** atoi(*tzname);
*** 2444,2448 ****
  ; return 0; }
  EOF
! if { (eval echo configure:2447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    ac_cv_var_tzname=yes
--- 2533,2537 ----
  ; return 0; }
  EOF
! if { (eval echo configure:2536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_var_tzname=yes
*************** fi
*** 2467,2476 ****
  
  echo $ac_n "checking for working const""... $ac_c" 1>&6
! echo "configure:2470: checking for working const" >&5
  if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2475 "configure"
  #include "confdefs.h"
  
--- 2556,2565 ----
  
  echo $ac_n "checking for working const""... $ac_c" 1>&6
! echo "configure:2559: checking for working const" >&5
  if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 2564 "configure"
  #include "confdefs.h"
  
*************** ccp = (char const *const *) p;
*** 2521,2525 ****
  ; return 0; }
  EOF
! if { (eval echo configure:2524: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_c_const=yes
--- 2610,2614 ----
  ; return 0; }
  EOF
! if { (eval echo configure:2613: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    ac_cv_c_const=yes
*************** fi
*** 2543,2547 ****
  
  echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
! echo "configure:2546: checking whether ${MAKE-make} sets \${MAKE}" >&5
  set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
--- 2632,2636 ----
  
  echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
! echo "configure:2635: checking whether ${MAKE-make} sets \${MAKE}" >&5
  set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_prog_make_${ac_make}_set'+set}'`\" = set"; then
*************** fi
*** 2571,2575 ****
  
  echo $ac_n "checking for long file names""... $ac_c" 1>&6
! echo "configure:2574: checking for long file names" >&5
  if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 2660,2664 ----
  
  echo $ac_n "checking for long file names""... $ac_c" 1>&6
! echo "configure:2663: checking for long file names" >&5
  if eval "test \"`echo '$''{'ac_cv_sys_long_file_names'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** fi
*** 2622,2626 ****
  # --without-x overrides everything else, but does not touch the cache.
  echo $ac_n "checking for X""... $ac_c" 1>&6
! echo "configure:2625: checking for X" >&5
  
  # Check whether --with-x or --without-x was given.
--- 2711,2715 ----
  # --without-x overrides everything else, but does not touch the cache.
  echo $ac_n "checking for X""... $ac_c" 1>&6
! echo "configure:2714: checking for X" >&5
  
  # Check whether --with-x or --without-x was given.
*************** if test "$ac_x_includes" = NO; then
*** 2684,2694 ****
    # First, try using that file with no special directory specified.
  cat > conftest.$ac_ext <<EOF
! #line 2687 "configure"
  #include "confdefs.h"
  #include <$x_direct_test_include>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2692: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
--- 2773,2783 ----
    # First, try using that file with no special directory specified.
  cat > conftest.$ac_ext <<EOF
! #line 2776 "configure"
  #include "confdefs.h"
  #include <$x_direct_test_include>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:2781: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
*************** if test "$ac_x_libraries" = NO; then
*** 2758,2762 ****
    LIBS="-l$x_direct_test_library $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2761 "configure"
  #include "confdefs.h"
  
--- 2847,2851 ----
    LIBS="-l$x_direct_test_library $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 2850 "configure"
  #include "confdefs.h"
  
*************** ${x_direct_test_function}()
*** 2765,2769 ****
  ; return 0; }
  EOF
! if { (eval echo configure:2768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    LIBS="$ac_save_LIBS"
--- 2854,2858 ----
  ; return 0; }
  EOF
! if { (eval echo configure:2857: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    LIBS="$ac_save_LIBS"
*************** echo "checking the machine- and system-d
*** 2940,2944 ****
   - which libraries the lib-src programs will want, and
   - whether the GNU malloc routines are usable" 1>&6
! echo "configure:2943: checking the machine- and system-dependent files to find out
   - which libraries the lib-src programs will want, and
   - whether the GNU malloc routines are usable" >&5
--- 3029,3033 ----
   - which libraries the lib-src programs will want, and
   - whether the GNU malloc routines are usable" 1>&6
! echo "configure:3032: checking the machine- and system-dependent files to find out
   - which libraries the lib-src programs will want, and
   - whether the GNU malloc routines are usable" >&5
*************** GNU_MALLOC=yes
*** 3070,3079 ****
  doug_lea_malloc=yes
  echo $ac_n "checking for malloc_get_state""... $ac_c" 1>&6
! echo "configure:3073: checking for malloc_get_state" >&5
  if eval "test \"`echo '$''{'ac_cv_func_malloc_get_state'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3078 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 3159,3168 ----
  doug_lea_malloc=yes
  echo $ac_n "checking for malloc_get_state""... $ac_c" 1>&6
! echo "configure:3162: checking for malloc_get_state" >&5
  if eval "test \"`echo '$''{'ac_cv_func_malloc_get_state'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3167 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
*************** malloc_get_state();
*** 3098,3102 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_func_malloc_get_state=yes"
--- 3187,3191 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_malloc_get_state=yes"
*************** fi
*** 3119,3128 ****
  
  echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6
! echo "configure:3122: checking for malloc_set_state" >&5
  if eval "test \"`echo '$''{'ac_cv_func_malloc_set_state'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3127 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 3208,3217 ----
  
  echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6
! echo "configure:3211: checking for malloc_set_state" >&5
  if eval "test \"`echo '$''{'ac_cv_func_malloc_set_state'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3216 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
*************** malloc_set_state();
*** 3147,3151 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_func_malloc_set_state=yes"
--- 3236,3240 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_malloc_set_state=yes"
*************** fi
*** 3168,3177 ****
  
  echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6
! echo "configure:3171: checking whether __after_morecore_hook exists" >&5
  if eval "test \"`echo '$''{'emacs_cv_var___after_morecore_hook'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3176 "configure"
  #include "confdefs.h"
  extern void (* __after_morecore_hook)();
--- 3257,3266 ----
  
  echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6
! echo "configure:3260: checking whether __after_morecore_hook exists" >&5
  if eval "test \"`echo '$''{'emacs_cv_var___after_morecore_hook'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3265 "configure"
  #include "confdefs.h"
  extern void (* __after_morecore_hook)();
*************** __after_morecore_hook = 0
*** 3180,3184 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    emacs_cv_var___after_morecore_hook=yes
--- 3269,3273 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    emacs_cv_var___after_morecore_hook=yes
*************** LIBS="$libsrc_libs $LIBS"
*** 3230,3234 ****
  
  echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
! echo "configure:3233: checking for dnet_ntoa in -ldnet" >&5
  ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 3319,3323 ----
  
  echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
! echo "configure:3322: checking for dnet_ntoa in -ldnet" >&5
  ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
*************** else
*** 3238,3242 ****
  LIBS="-ldnet  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3241 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 3327,3331 ----
  LIBS="-ldnet  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3330 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
*************** dnet_ntoa()
*** 3249,3253 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
--- 3338,3342 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
*************** fi
*** 3278,3282 ****
  
  echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
! echo "configure:3281: checking for main in -lXbsd" >&5
  ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 3367,3371 ----
  
  echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
! echo "configure:3370: checking for main in -lXbsd" >&5
  ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
*************** else
*** 3286,3290 ****
  LIBS="-lXbsd  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3289 "configure"
  #include "confdefs.h"
  
--- 3375,3379 ----
  LIBS="-lXbsd  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3378 "configure"
  #include "confdefs.h"
  
*************** main()
*** 3293,3297 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
--- 3382,3386 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
*************** fi
*** 3315,3319 ****
  
  echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
! echo "configure:3318: checking for cma_open in -lpthreads" >&5
  ac_lib_var=`echo pthreads'_'cma_open | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 3404,3408 ----
  
  echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
! echo "configure:3407: checking for cma_open in -lpthreads" >&5
  ac_lib_var=`echo pthreads'_'cma_open | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
*************** else
*** 3323,3327 ****
  LIBS="-lpthreads  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3326 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 3412,3416 ----
  LIBS="-lpthreads  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3415 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
*************** cma_open()
*** 3334,3338 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
--- 3423,3427 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3426: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
*************** fi
*** 3363,3367 ****
  
  echo $ac_n "checking for XFree86 in /usr/X386""... $ac_c" 1>&6
! echo "configure:3366: checking for XFree86 in /usr/X386" >&5
  if test -d /usr/X386/include; then
    HAVE_XFREE386=yes
--- 3452,3456 ----
  
  echo $ac_n "checking for XFree86 in /usr/X386""... $ac_c" 1>&6
! echo "configure:3455: checking for XFree86 in /usr/X386" >&5
  if test -d /usr/X386/include; then
    HAVE_XFREE386=yes
*************** if test "${HAVE_X11}" = "yes"; then
*** 3392,3398 ****
    if test "${opsys}" = "gnu-linux"; then
      echo $ac_n "checking whether X on GNU/Linux needs -b to link""... $ac_c" 1>&6
! echo "configure:3395: checking whether X on GNU/Linux needs -b to link" >&5
      cat > conftest.$ac_ext <<EOF
! #line 3397 "configure"
  #include "confdefs.h"
  
--- 3481,3487 ----
    if test "${opsys}" = "gnu-linux"; then
      echo $ac_n "checking whether X on GNU/Linux needs -b to link""... $ac_c" 1>&6
! echo "configure:3484: checking whether X on GNU/Linux needs -b to link" >&5
      cat > conftest.$ac_ext <<EOF
! #line 3486 "configure"
  #include "confdefs.h"
  
*************** XOpenDisplay ("foo");
*** 3401,3405 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    xlinux_first_failure=no
--- 3490,3494 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    xlinux_first_failure=no
*************** rm -f conftest*
*** 3421,3425 ****
        LIBS="$LIBS -b i486-linuxaout"
        cat > conftest.$ac_ext <<EOF
! #line 3424 "configure"
  #include "confdefs.h"
  
--- 3510,3514 ----
        LIBS="$LIBS -b i486-linuxaout"
        cat > conftest.$ac_ext <<EOF
! #line 3513 "configure"
  #include "confdefs.h"
  
*************** XOpenDisplay ("foo");
*** 3428,3432 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    xlinux_second_failure=no
--- 3517,3521 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    xlinux_second_failure=no
*************** XScreenNumberOfScreen XSetWMProtocols
*** 3458,3467 ****
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3461: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3466 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 3547,3556 ----
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3550: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3555 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
*************** $ac_func();
*** 3486,3490 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
--- 3575,3579 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3578: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
*************** fi
*** 3514,3523 ****
  if test "${window_system}" = "x11"; then
    echo $ac_n "checking X11 version 6""... $ac_c" 1>&6
! echo "configure:3517: checking X11 version 6" >&5
    if eval "test \"`echo '$''{'emacs_cv_x11_version_6'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3522 "configure"
  #include "confdefs.h"
  #include <X11/Xlib.h>
--- 3603,3612 ----
  if test "${window_system}" = "x11"; then
    echo $ac_n "checking X11 version 6""... $ac_c" 1>&6
! echo "configure:3606: checking X11 version 6" >&5
    if eval "test \"`echo '$''{'emacs_cv_x11_version_6'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3611 "configure"
  #include "confdefs.h"
  #include <X11/Xlib.h>
*************** fail;
*** 3529,3533 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    emacs_cv_x11_version_6=yes
--- 3618,3622 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    emacs_cv_x11_version_6=yes
*************** fi
*** 3554,3563 ****
  if test "${window_system}" = "x11"; then
    echo $ac_n "checking X11 version 5""... $ac_c" 1>&6
! echo "configure:3557: checking X11 version 5" >&5
    if eval "test \"`echo '$''{'emacs_cv_x11_version_5'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3562 "configure"
  #include "confdefs.h"
  #include <X11/Xlib.h>
--- 3643,3652 ----
  if test "${window_system}" = "x11"; then
    echo $ac_n "checking X11 version 5""... $ac_c" 1>&6
! echo "configure:3646: checking X11 version 5" >&5
    if eval "test \"`echo '$''{'emacs_cv_x11_version_5'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3651 "configure"
  #include "confdefs.h"
  #include <X11/Xlib.h>
*************** fail;
*** 3569,3573 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    emacs_cv_x11_version_5=yes
--- 3658,3662 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    emacs_cv_x11_version_5=yes
*************** if test x"${USE_X_TOOLKIT}" = xmaybe; th
*** 3597,3606 ****
    if test x"${HAVE_X11R5}" = xyes; then
      echo $ac_n "checking X11 version 5 with Xaw""... $ac_c" 1>&6
! echo "configure:3600: checking X11 version 5 with Xaw" >&5
      if eval "test \"`echo '$''{'emacs_cv_x11_version_5_with_xaw'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3605 "configure"
  #include "confdefs.h"
  
--- 3686,3695 ----
    if test x"${HAVE_X11R5}" = xyes; then
      echo $ac_n "checking X11 version 5 with Xaw""... $ac_c" 1>&6
! echo "configure:3689: checking X11 version 5 with Xaw" >&5
      if eval "test \"`echo '$''{'emacs_cv_x11_version_5_with_xaw'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3694 "configure"
  #include "confdefs.h"
  
*************** int main() {
*** 3611,3615 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    emacs_cv_x11_version_5_with_xaw=yes
--- 3700,3704 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    emacs_cv_x11_version_5_with_xaw=yes
*************** X_TOOLKIT_TYPE=$USE_X_TOOLKIT
*** 3639,3648 ****
  if test "${USE_X_TOOLKIT}" != "none"; then
    echo $ac_n "checking X11 toolkit version""... $ac_c" 1>&6
! echo "configure:3642: checking X11 toolkit version" >&5
    if eval "test \"`echo '$''{'emacs_cv_x11_toolkit_version_6'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3647 "configure"
  #include "confdefs.h"
  #include <X11/Intrinsic.h>
--- 3728,3737 ----
  if test "${USE_X_TOOLKIT}" != "none"; then
    echo $ac_n "checking X11 toolkit version""... $ac_c" 1>&6
! echo "configure:3731: checking X11 toolkit version" >&5
    if eval "test \"`echo '$''{'emacs_cv_x11_toolkit_version_6'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3736 "configure"
  #include "confdefs.h"
  #include <X11/Intrinsic.h>
*************** fail;
*** 3654,3658 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3657: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    emacs_cv_x11_toolkit_version_6=yes
--- 3743,3747 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3746: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    emacs_cv_x11_toolkit_version_6=yes
*************** EOF
*** 3684,3688 ****
    fi
    echo $ac_n "checking for XmuConvertStandardSelection in -lXmu""... $ac_c" 1>&6
! echo "configure:3687: checking for XmuConvertStandardSelection in -lXmu" >&5
  ac_lib_var=`echo Xmu'_'XmuConvertStandardSelection | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 3773,3777 ----
    fi
    echo $ac_n "checking for XmuConvertStandardSelection in -lXmu""... $ac_c" 1>&6
! echo "configure:3776: checking for XmuConvertStandardSelection in -lXmu" >&5
  ac_lib_var=`echo Xmu'_'XmuConvertStandardSelection | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
*************** else
*** 3692,3696 ****
  LIBS="-lXmu  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3695 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 3781,3785 ----
  LIBS="-lXmu  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3784 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
*************** XmuConvertStandardSelection()
*** 3703,3707 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
--- 3792,3796 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
*************** fi
*** 3735,3744 ****
  if test "${USE_X_TOOLKIT}" = "MOTIF"; then
    echo $ac_n "checking for Motif version 2.1""... $ac_c" 1>&6
! echo "configure:3738: checking for Motif version 2.1" >&5
  if eval "test \"`echo '$''{'emacs_cv_motif_version_2_1'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3743 "configure"
  #include "confdefs.h"
  #include <Xm/Xm.h>
--- 3824,3833 ----
  if test "${USE_X_TOOLKIT}" = "MOTIF"; then
    echo $ac_n "checking for Motif version 2.1""... $ac_c" 1>&6
! echo "configure:3827: checking for Motif version 2.1" >&5
  if eval "test \"`echo '$''{'emacs_cv_motif_version_2_1'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3832 "configure"
  #include "confdefs.h"
  #include <Xm/Xm.h>
*************** Motif version prior to 2.1.
*** 3751,3755 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3754: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    emacs_cv_motif_version_2_1=yes
--- 3840,3844 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3843: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
    rm -rf conftest*
    emacs_cv_motif_version_2_1=yes
*************** EOF
*** 3771,3775 ****
  
      echo $ac_n "checking for XpCreateContext in -lXp""... $ac_c" 1>&6
! echo "configure:3774: checking for XpCreateContext in -lXp" >&5
  ac_lib_var=`echo Xp'_'XpCreateContext | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 3860,3864 ----
  
      echo $ac_n "checking for XpCreateContext in -lXp""... $ac_c" 1>&6
! echo "configure:3863: checking for XpCreateContext in -lXp" >&5
  ac_lib_var=`echo Xp'_'XpCreateContext | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
*************** else
*** 3779,3783 ****
  LIBS="-lXp  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3782 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 3868,3872 ----
  LIBS="-lXp  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 3871 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
*************** XpCreateContext()
*** 3790,3794 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
--- 3879,3883 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
*************** fi
*** 3822,3831 ****
  # If netdb.h doesn't declare h_errno, we must declare it by hand.
  echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
! echo "configure:3825: checking whether netdb declares h_errno" >&5
  if eval "test \"`echo '$''{'emacs_cv_netdb_declares_h_errno'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3830 "configure"
  #include "confdefs.h"
  #include <netdb.h>
--- 3911,3920 ----
  # If netdb.h doesn't declare h_errno, we must declare it by hand.
  echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
! echo "configure:3914: checking whether netdb declares h_errno" >&5
  if eval "test \"`echo '$''{'emacs_cv_netdb_declares_h_errno'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3919 "configure"
  #include "confdefs.h"
  #include <netdb.h>
*************** return h_errno;
*** 3834,3838 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    emacs_cv_netdb_declares_h_errno=yes
--- 3923,3927 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    emacs_cv_netdb_declares_h_errno=yes
*************** fi
*** 3857,3866 ****
  # for constant arguments.  Useless!
  echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
! echo "configure:3860: checking for working alloca.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3865 "configure"
  #include "confdefs.h"
  #include <alloca.h>
--- 3946,3955 ----
  # for constant arguments.  Useless!
  echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
! echo "configure:3949: checking for working alloca.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3954 "configure"
  #include "confdefs.h"
  #include <alloca.h>
*************** char *p = alloca(2 * sizeof(int));
*** 3869,3873 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3872: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    ac_cv_header_alloca_h=yes
--- 3958,3962 ----
  ; return 0; }
  EOF
! if { (eval echo configure:3961: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_header_alloca_h=yes
*************** fi
*** 3890,3899 ****
  
  echo $ac_n "checking for alloca""... $ac_c" 1>&6
! echo "configure:3893: checking for alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3898 "configure"
  #include "confdefs.h"
  
--- 3979,3988 ----
  
  echo $ac_n "checking for alloca""... $ac_c" 1>&6
! echo "configure:3982: checking for alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3987 "configure"
  #include "confdefs.h"
  
*************** else
*** 3901,3912 ****
  # define alloca __builtin_alloca
  #else
! # if HAVE_ALLOCA_H
! #  include <alloca.h>
  # else
! #  ifdef _AIX
!  #pragma alloca
  #  else
! #   ifndef alloca /* predefined by HP cc +Olibcalls */
  char *alloca ();
  #   endif
  #  endif
--- 3990,4006 ----
  # define alloca __builtin_alloca
  #else
! # ifdef _MSC_VER
! #  include <malloc.h>
! #  define alloca _alloca
  # else
! #  if HAVE_ALLOCA_H
! #   include <alloca.h>
  #  else
! #   ifdef _AIX
!  #pragma alloca
! #   else
! #    ifndef alloca /* predefined by HP cc +Olibcalls */
  char *alloca ();
+ #    endif
  #   endif
  #  endif
*************** char *p = (char *) alloca(1);
*** 3918,3922 ****
  ; return 0; }
  EOF
! if { (eval echo configure:3921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    ac_cv_func_alloca_works=yes
--- 4012,4016 ----
  ; return 0; }
  EOF
! if { (eval echo configure:4015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    ac_cv_func_alloca_works=yes
*************** if test $ac_cv_func_alloca_works = no; t
*** 3943,3947 ****
    # contain a buggy version.  If you still want to use their alloca,
    # use ar to extract alloca.o from them instead of compiling alloca.c.
!   ALLOCA=alloca.o
    cat >> confdefs.h <<\EOF
  #define C_ALLOCA 1
--- 4037,4041 ----
    # contain a buggy version.  If you still want to use their alloca,
    # use ar to extract alloca.o from them instead of compiling alloca.c.
!   ALLOCA=alloca.${ac_objext}
    cat >> confdefs.h <<\EOF
  #define C_ALLOCA 1
*************** EOF
*** 3950,3959 ****
  
  echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
! echo "configure:3953: checking whether alloca needs Cray hooks" >&5
  if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3958 "configure"
  #include "confdefs.h"
  #if defined(CRAY) && ! defined(CRAY2)
--- 4044,4053 ----
  
  echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
! echo "configure:4047: checking whether alloca needs Cray hooks" >&5
  if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4052 "configure"
  #include "confdefs.h"
  #if defined(CRAY) && ! defined(CRAY2)
*************** if test $ac_cv_os_cray = yes; then
*** 3980,3989 ****
  for ac_func in _getb67 GETB67 getb67; do
    echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:3983: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 3988 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 4074,4083 ----
  for ac_func in _getb67 GETB67 getb67; do
    echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:4077: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4082 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
*************** $ac_func();
*** 4008,4012 ****
  ; return 0; }
  EOF
! if { (eval echo configure:4011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
--- 4102,4106 ----
  ; return 0; }
  EOF
! if { (eval echo configure:4105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
*************** fi
*** 4035,4039 ****
  
  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
! echo "configure:4038: checking stack direction for C alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 4129,4133 ----
  
  echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
! echo "configure:4132: checking stack direction for C alloca" >&5
  if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** else
*** 4043,4047 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 4046 "configure"
  #include "confdefs.h"
  find_stack_direction ()
--- 4137,4141 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 4140 "configure"
  #include "confdefs.h"
  find_stack_direction ()
*************** main ()
*** 4062,4066 ****
  }
  EOF
! if { (eval echo configure:4065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
  then
    ac_cv_c_stack_direction=1
--- 4156,4160 ----
  }
  EOF
! if { (eval echo configure:4159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    ac_cv_c_stack_direction=1
*************** fi
*** 4087,4091 ****
  # On HPUX 9.01, -lm does not contain logb, so check for sqrt.
  echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6
! echo "configure:4090: checking for sqrt in -lm" >&5
  ac_lib_var=`echo m'_'sqrt | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 4181,4185 ----
  # On HPUX 9.01, -lm does not contain logb, so check for sqrt.
  echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6
! echo "configure:4184: checking for sqrt in -lm" >&5
  ac_lib_var=`echo m'_'sqrt | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
*************** else
*** 4095,4099 ****
  LIBS="-lm  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 4098 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 4189,4193 ----
  LIBS="-lm  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 4192 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
*************** sqrt()
*** 4106,4110 ****
  ; return 0; }
  EOF
! if { (eval echo configure:4109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
--- 4200,4204 ----
  ; return 0; }
  EOF
! if { (eval echo configure:4203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
*************** fi
*** 4136,4140 ****
  # Check for mail-locking functions in a "mail" library
  echo $ac_n "checking for maillock in -lmail""... $ac_c" 1>&6
! echo "configure:4139: checking for maillock in -lmail" >&5
  ac_lib_var=`echo mail'_'maillock | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 4230,4234 ----
  # Check for mail-locking functions in a "mail" library
  echo $ac_n "checking for maillock in -lmail""... $ac_c" 1>&6
! echo "configure:4233: checking for maillock in -lmail" >&5
  ac_lib_var=`echo mail'_'maillock | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
*************** else
*** 4144,4148 ****
  LIBS="-lmail  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 4147 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 4238,4242 ----
  LIBS="-lmail  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 4241 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
*************** maillock()
*** 4155,4159 ****
  ; return 0; }
  EOF
! if { (eval echo configure:4158: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
--- 4249,4253 ----
  ; return 0; }
  EOF
! if { (eval echo configure:4252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
*************** EOF
*** 4177,4186 ****
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:4180: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4185 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 4271,4280 ----
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:4274: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4279 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
*************** $ac_func();
*** 4205,4209 ****
  ; return 0; }
  EOF
! if { (eval echo configure:4208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
--- 4299,4303 ----
  ; return 0; }
  EOF
! if { (eval echo configure:4302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
*************** do
*** 4233,4248 ****
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:4236: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4241 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:4246: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
--- 4327,4342 ----
  ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
! echo "configure:4330: checking for $ac_hdr" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4335 "configure"
  #include "confdefs.h"
  #include <$ac_hdr>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:4340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
*************** utimes setrlimit setpgid getcwd shutdown
*** 4281,4290 ****
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:4284: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4289 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 4375,4384 ----
  do
  echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
! echo "configure:4378: checking for $ac_func" >&5
  if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4383 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
*************** $ac_func();
*** 4309,4313 ****
  ; return 0; }
  EOF
! if { (eval echo configure:4312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
--- 4403,4407 ----
  ; return 0; }
  EOF
! if { (eval echo configure:4406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_$ac_func=yes"
*************** done
*** 4339,4343 ****
  # than to expect to find it in ncurses.
  echo $ac_n "checking for tparm in -lncurses""... $ac_c" 1>&6
! echo "configure:4342: checking for tparm in -lncurses" >&5
  ac_lib_var=`echo ncurses'_'tparm | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 4433,4437 ----
  # than to expect to find it in ncurses.
  echo $ac_n "checking for tparm in -lncurses""... $ac_c" 1>&6
! echo "configure:4436: checking for tparm in -lncurses" >&5
  ac_lib_var=`echo ncurses'_'tparm | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
*************** else
*** 4347,4351 ****
  LIBS="-lncurses  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 4350 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 4441,4445 ----
  LIBS="-lncurses  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 4444 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
*************** tparm()
*** 4358,4362 ****
  ; return 0; }
  EOF
! if { (eval echo configure:4361: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
--- 4452,4456 ----
  ; return 0; }
  EOF
! if { (eval echo configure:4455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
*************** fi
*** 4389,4393 ****
  # to return localized messages.
  echo $ac_n "checking for dgettext in -lintl""... $ac_c" 1>&6
! echo "configure:4392: checking for dgettext in -lintl" >&5
  ac_lib_var=`echo intl'_'dgettext | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--- 4483,4487 ----
  # to return localized messages.
  echo $ac_n "checking for dgettext in -lintl""... $ac_c" 1>&6
! echo "configure:4486: checking for dgettext in -lintl" >&5
  ac_lib_var=`echo intl'_'dgettext | sed 'y%./+-%__p_%'`
  if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
*************** else
*** 4397,4401 ****
  LIBS="-lintl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 4400 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
--- 4491,4495 ----
  LIBS="-lintl  $LIBS"
  cat > conftest.$ac_ext <<EOF
! #line 4494 "configure"
  #include "confdefs.h"
  /* Override any gcc2 internal prototype to avoid an error.  */
*************** dgettext()
*** 4408,4412 ****
  ; return 0; }
  EOF
! if { (eval echo configure:4411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
--- 4502,4506 ----
  ; return 0; }
  EOF
! if { (eval echo configure:4505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_lib_$ac_lib_var=yes"
*************** fi
*** 4437,4441 ****
  
  echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
! echo "configure:4440: checking whether localtime caches TZ" >&5
  if eval "test \"`echo '$''{'emacs_cv_localtime_cache'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 4531,4535 ----
  
  echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
! echo "configure:4534: checking whether localtime caches TZ" >&5
  if eval "test \"`echo '$''{'emacs_cv_localtime_cache'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
*************** emacs_cv_localtime_cache=yes
*** 4447,4451 ****
  else
    cat > conftest.$ac_ext <<EOF
! #line 4450 "configure"
  #include "confdefs.h"
  #include <time.h>
--- 4541,4545 ----
  else
    cat > conftest.$ac_ext <<EOF
! #line 4544 "configure"
  #include "confdefs.h"
  #include <time.h>
*************** main()
*** 4482,4486 ****
  }
  EOF
! if { (eval echo configure:4485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>/dev/null
  then
    emacs_cv_localtime_cache=no
--- 4576,4580 ----
  }
  EOF
! if { (eval echo configure:4579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
  then
    emacs_cv_localtime_cache=no
*************** fi
*** 4510,4519 ****
  if test "x$HAVE_TIMEVAL" = xyes; then
  echo $ac_n "checking whether gettimeofday can accept two arguments""... $ac_c" 1>&6
! echo "configure:4513: checking whether gettimeofday can accept two arguments" >&5
  if eval "test \"`echo '$''{'emacs_cv_gettimeofday_two_arguments'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4518 "configure"
  #include "confdefs.h"
  
--- 4604,4613 ----
  if test "x$HAVE_TIMEVAL" = xyes; then
  echo $ac_n "checking whether gettimeofday can accept two arguments""... $ac_c" 1>&6
! echo "configure:4607: checking whether gettimeofday can accept two arguments" >&5
  if eval "test \"`echo '$''{'emacs_cv_gettimeofday_two_arguments'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4612 "configure"
  #include "confdefs.h"
  
*************** int main() {
*** 4537,4541 ****
  ; return 0; }
  EOF
! if { (eval echo configure:4540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    emacs_cv_gettimeofday_two_arguments=yes
--- 4631,4635 ----
  ; return 0; }
  EOF
! if { (eval echo configure:4634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    emacs_cv_gettimeofday_two_arguments=yes
*************** fi
*** 4560,4569 ****
  ok_so_far=yes
  echo $ac_n "checking for socket""... $ac_c" 1>&6
! echo "configure:4563: checking for socket" >&5
  if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4568 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
--- 4654,4663 ----
  ok_so_far=yes
  echo $ac_n "checking for socket""... $ac_c" 1>&6
! echo "configure:4657: checking for socket" >&5
  if eval "test \"`echo '$''{'ac_cv_func_socket'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4662 "configure"
  #include "confdefs.h"
  /* System header to define __stub macros and hopefully few prototypes,
*************** socket();
*** 4588,4592 ****
  ; return 0; }
  EOF
! if { (eval echo configure:4591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
    rm -rf conftest*
    eval "ac_cv_func_socket=yes"
--- 4682,4686 ----
  ; return 0; }
  EOF
! if { (eval echo configure:4685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
    rm -rf conftest*
    eval "ac_cv_func_socket=yes"
*************** if test $ok_so_far = yes; then
*** 4611,4626 ****
    ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6
! echo "configure:4614: checking for netinet/in.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4619 "configure"
  #include "confdefs.h"
  #include <netinet/in.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:4624: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
--- 4705,4720 ----
    ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6
! echo "configure:4708: checking for netinet/in.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4713 "configure"
  #include "confdefs.h"
  #include <netinet/in.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:4718: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
*************** if test $ok_so_far = yes; then
*** 4647,4662 ****
    ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6
! echo "configure:4650: checking for arpa/inet.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4655 "configure"
  #include "confdefs.h"
  #include <arpa/inet.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:4660: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out`
  if test -z "$ac_err"; then
    rm -rf conftest*
--- 4741,4756 ----
    ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'`
  echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6
! echo "configure:4744: checking for arpa/inet.h" >&5
  if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
  else
    cat > conftest.$ac_ext <<EOF
! #line 4749 "configure"
  #include "confdefs.h"
  #include <arpa/inet.h>
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
! { (eval echo configure:4754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
! ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
  if test -z "$ac_err"; then
    rm -rf conftest*
*************** do
*** 4941,4945 ****
      exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
    -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
!     echo "$CONFIG_STATUS generated by autoconf version 2.12"
      exit 0 ;;
    -help | --help | --hel | --he | --h)
--- 5035,5039 ----
      exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
    -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
!     echo "$CONFIG_STATUS generated by autoconf version 2.13"
      exit 0 ;;
    -help | --help | --hel | --he | --h)
*************** sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g
*** 4963,4969 ****
--- 5057,5065 ----
  $ac_vpsub
  $extrasub
+ s%@SHELL@%$SHELL%g
  s%@CFLAGS@%$CFLAGS%g
  s%@CPPFLAGS@%$CPPFLAGS%g
  s%@CXXFLAGS@%$CXXFLAGS%g
+ s%@FFLAGS@%$FFLAGS%g
  s%@DEFS@%$DEFS%g
  s%@LDFLAGS@%$LDFLAGS%g
*************** s%@LN_S@%$LN_S%g
*** 4993,4996 ****
--- 5089,5093 ----
  s%@CPP@%$CPP%g
  s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
+ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
  s%@INSTALL_DATA@%$INSTALL_DATA%g
  s%@YACC@%$YACC%g
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/configure.in emacs-20.6/configure.in
*** emacs-20.5/configure.in	Sun Nov 28 19:18:39 1999
--- emacs-20.6/configure.in	Sat Feb 26 13:07:02 2000
*************** case "${canonical}" in
*** 225,232 ****
--- 225,242 ----
      NON_GCC_LINK_TEST_OPTIONS=-Wl,-rpath,/usr/X11R6/lib
      GCC_LINK_TEST_OPTIONS=-Wl,-rpath,/usr/X11R6/lib
+     case "${canonical}" in
+     # This is necessary on 5.0 to avoid mangling src/Makefile.
+     # Separated out in case it causes problems on earlier versions.
+     alpha*-dec-osf[5-9]*)
+       NON_GNU_CPP='cc -E -std0' ;;
+     esac
    ;;
  
    alpha*-*-linux-gnu* )
      machine=alpha opsys=gnu-linux
+   ;;
+ 
+   arm*-*-linux-gnu* )
+     machine=arm opsys=gnu-linux       
    ;;
  
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/etc/ChangeLog emacs-20.6/etc/ChangeLog
*** emacs-20.5/etc/ChangeLog	Fri Dec 10 17:27:06 1999
--- emacs-20.6/etc/ChangeLog	Sat Feb 26 11:17:21 2000
***************
*** 1,2 ****
--- 1,6 ----
+ 2000-02-26  Gerd Moellmann  <gerd@gnu.org>
+ 
+ 	* Version 20.6 released.
+ 	
  1999-12-04  Gerd Moellmann  <gerd@gnu.org>
  
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/etc/MORE.STUFF emacs-20.6/etc/MORE.STUFF
*** emacs-20.5/etc/MORE.STUFF	Thu Sep  9 21:17:56 1999
--- emacs-20.6/etc/MORE.STUFF	Sat Feb  5 16:38:05 2000
*************** listed here fail.
*** 20,24 ****
  There is a large collection of Emacs Lisp code available for FTP at
  ftp.cis.ohio-state.edu and various mirrors.  Unfortunately its
! maintenance is currently very slow.
  
  To get started using this archive, do:
--- 20,25 ----
  There is a large collection of Emacs Lisp code available for FTP at
  ftp.cis.ohio-state.edu and various mirrors.  Unfortunately its
! maintenance is currently very slow.  A project to replace it is
! underway; see <URL:http://www.emacs.org/>.
  
  To get started using this archive, do:
*************** LCD-datafile, which is a list of the arc
*** 41,44 ****
--- 42,49 ----
  fetch them for you on command.
  
+ * The `Emacs Lisp List' at
+   <URL:http://www.anc.ed.ac.uk/~stephen/emacs/ell.html> has pointers
+   to sources of a large number of packages.
+ 
  * gnu.emacs.sources
  
*************** You might find bug-fixes or enhancements
*** 86,89 ****
--- 91,96 ----
     (And some addons for it.)
  
+  * Hideshow: <URL:http://www.glug.org/people/ttn/software/hideshow/>
+ 
   * Ispell: <URL:http://www.kdstevens.com/%7Estevens/ispell-page.html>
  
*************** You might find bug-fixes or enhancements
*** 102,106 ****
   * Webjump: <URL:http://nwv.www.media.mit.edu/people/nwv/projects/webjump>
  
! *Auxilliary files
  
   * (Tex)info files for use with Info-look that don't come from GNU
--- 109,113 ----
   * Webjump: <URL:http://nwv.www.media.mit.edu/people/nwv/projects/webjump>
  
! * Auxilliary files
  
   * (Tex)info files for use with Info-look that don't come from GNU
*************** the future.
*** 154,159 ****
     <URL:http://simon.cs.cornell.edu/info/people/raman/emacspeak/emacspeak.html>
  
-  * Erik Naggum's hacks: <URL:ftp://ftp.naggum.no/emacs/>
- 
   * Gnuserv:
     <URL:ftp://ftp.splode.com/pub/users/friedman/packages/fgnuserv-1.0.tar.gz>
--- 161,164 ----
*************** the future.
*** 178,182 ****
  
   * MULE-UCS: Universal enCoding System
!    <URL:ftp://ftp.jaist.ac.jp/pub/GNU/elisp/mule-ucs/himi/>: 
     Extended coding systems for MULE, specifically for reading and
     writing UTF-8 encoded Unicode.
--- 183,187 ----
  
   * MULE-UCS: Universal enCoding System
!    <URL:ftp://ftp.jaist.ac.jp/pub/GNU/mule/Mule-UCS/>: 
     Extended coding systems for MULE, specifically for reading and
     writing UTF-8 encoded Unicode.
*************** the future.
*** 188,191 ****
--- 193,199 ----
     <URL:http://www.gnupg.org/>.
  
+  * PCL-CVS: <URL:ftp://rum.cs.yale.edu/pub/monnier/pcl-cvs>
+    Interface to CVS providing extended `vc-dired'-style functionality.
+ 
   * Pointers to MIME packages:
     <URL:http://bmrc.berkeley.edu/%7Etrey/emacs/mime.html>
*************** the future.
*** 208,211 ****
  * Unpacked Emacs sources
  
! An unpacked current source tree is available from
  <URL:ftp://ftp.emacs.org/pub/>.
--- 216,219 ----
  * Unpacked Emacs sources
  
! An unpacked current source tree may be available from
  <URL:ftp://ftp.emacs.org/pub/>.
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/etc/NEWS emacs-20.6/etc/NEWS
*** emacs-20.5/etc/NEWS	Mon Nov 29 15:20:47 1999
--- emacs-20.6/etc/NEWS	Sat Feb 26 17:59:26 2000
*************** Please send Emacs bug reports to bug-gnu
*** 6,9 ****
--- 6,14 ----
  For older news, see the file ONEWS.
  
+ * Emacs 20.6 is a bug-fix release with one user-visible change
+ 
+ ** Support for ARM-based non-RISCiX machines has been added.
+ 
+ 
  * Emacs 20.5 is a bug-fix release with no user-visible changes.
  
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/lib-src/ChangeLog emacs-20.6/lib-src/ChangeLog
*** emacs-20.5/lib-src/ChangeLog	Fri Dec 10 17:25:36 1999
--- emacs-20.6/lib-src/ChangeLog	Sat Feb 26 11:18:39 2000
***************
*** 1,2 ****
--- 1,6 ----
+ 2000-02-26  Gerd Moellmann  <gerd@gnu.org>
+ 
+ 	* Version 20.6 released.
+ 	
  1999-12-04  Gerd Moellmann  <gerd@gnu.org>
  
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/lisp/ChangeLog emacs-20.6/lisp/ChangeLog
*** emacs-20.5/lisp/ChangeLog	Fri Dec 10 17:25:02 1999
--- emacs-20.6/lisp/ChangeLog	Sat Feb 26 11:15:31 2000
***************
*** 1,2 ****
--- 1,52 ----
+ 2000-02-26  Gerd Moellmann  <gerd@gnu.org>
+ 
+ 	* Version 20.6 released.
+ 	
+ 2000-02-25  Gerd Moellmann  <gerd@gnu.org>
+ 
+ 	* emacs-lisp/helper.el (Helper-describe-mode): Make buffer
+ 	writable.
+ 
+ 2000-02-20  Andrew Innes  <andrewi@gnu.org>
+ 
+ 	* dos-w32.el (file-name-buffer-file-type-alist): Add missing $ to
+ 	the end of one of the regexps.
+ 
+ 2000-02-17  Gerd Moellmann  <gerd@gnu.org>
+ 	
+ 	* progmodes/pascal.el (pascal-mode-syntax-table): Change syntax
+ 	of `*' to handle `(* ... *)' comments.
+ 	
+ 2000-02-03  Francesco Potorti`  <F.Potorti@cnuce.cnr.it>
+ 
+ 	* mail/rmail.el (rmail-retry-failure): Use
+ 	rmail-beginning-of-message before rmail-toggle-header, because the
+ 	former toggles headers.
+ 
+ 2000-02-02  Gerd Moellmann  <gerd@gnu.org>
+ 
+ 	* ange-ftp.el (ange-ftp-write-region): Handle case that
+ 	succeeding process operation sets a different coding system.
+ 
+ 2000-01-29  Dave Love  <fx@gnu.org>
+ 
+ 	* timezone.el (timezone-fix-time): Window against 69 for two-digit
+ 	years.  Deal with three-digit years.
+ 	
+ 2000-01-25  Andre Spiegel  <spiegel@gnu.org>
+ 
+ 	* vc.el (vc-version-diff): Make sure file name is
+ 	expanded.
+ 
+ 2000-01-07  Gerd Moellmann  <gerd@gnu.org>
+ 
+ 	* vc-hooks.el (vc-parse-buffer): Handle mixtures of dates
+ 	before and after the year 2000.
+ 
+ 2000-01-05  Dave Love  <fx@gnu.org>
+ 
+ 	* browse-url.el (browse-url): Fix case of
+ 	browse-url-browser-function being an alist.
+ 	
  1999-12-04  Gerd Moellmann  <gerd@gnu.org>
  
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/lisp/ange-ftp.el emacs-20.6/lisp/ange-ftp.el
*** emacs-20.5/lisp/ange-ftp.el	Thu Jul  1 21:39:37 1999
--- emacs-20.6/lisp/ange-ftp.el	Mon Feb 21 23:30:30 2000
*************** system TYPE.")
*** 3209,3212 ****
--- 3209,3213 ----
  				       '(unix dumb-unix))))
  		     (abbr (ange-ftp-abbreviate-filename filename))
+ 		     (coding-system-used last-coding-system-used)
  		     size)
  		(unwind-protect
*************** system TYPE.")
*** 3231,3234 ****
--- 3232,3236 ----
  			   (nth 1 (ange-ftp-real-insert-file-contents
  				   temp visit beg end replace))
+ 			   coding-system-used last-coding-system-used
  			   ;; override autodetection of buffer file type
  			   ;; to ensure buffer is saved in DOS format
*************** system TYPE.")
*** 3247,3250 ****
--- 3249,3253 ----
  		      (set-visited-file-modtime '(0 0))
  		      (setq buffer-file-name filename)))
+ 		(setq last-coding-system-used coding-system-used)
  		(list filename size))
  	    (signal 'file-error
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/lisp/browse-url.el emacs-20.6/lisp/browse-url.el
*** emacs-20.5/lisp/browse-url.el	Sun May  2 15:43:17 1999
--- emacs-20.6/lisp/browse-url.el	Sat Jan 29 12:51:56 2000
***************
*** 1,5 ****
  ;;; browse-url.el --- Pass a URL to a WWW browser
  
! ;; Copyright (C) 1995, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
  
  ;; Author: Denis Howe <dbh@doc.ic.ac.uk>
--- 1,5 ----
  ;;; browse-url.el --- Pass a URL to a WWW browser
  
! ;; Copyright (C) 1995, 96, 97, 98, 99, 2000 Free Software Foundation, Inc.
  
  ;; Author: Denis Howe <dbh@doc.ic.ac.uk>
***************
*** 86,92 ****
  ;; browse-url.el written by Barry Warsaw <bwarsaw@python.org>.
  
! ;; MMM is the freely available WWW browser implemented in Objective
! ;; Caml, a cool impure functional programming language, by Francois
! ;; Rouaix.  See the MMM home page
  ;; <URL:http://pauillac.inria.fr/%7Erouaix/mmm/>.
  
--- 86,91 ----
  ;; browse-url.el written by Barry Warsaw <bwarsaw@python.org>.
  
! ;; MMM is a semi-free WWW browser implemented in Objective Caml, an
! ;; interesting impure functional programming language.  See
  ;; <URL:http://pauillac.inria.fr/%7Erouaix/mmm/>.
  
***************
*** 99,103 ****
  ;; <URL:ftp://ftp.yggdrasil.com/pub/dist/web/arena> and Amaya
  ;; <URL:ftp://ftp.w3.org/pub/amaya>.  mMosaic
! ;; <URL:ftp://sig.enst.fr/pub/multicast/mMosaic/> (with development
  ;; support for Java applets and multicast) can be used like Mosaic by
  ;; setting `browse-url-mosaic-program' appropriately.
--- 98,103 ----
  ;; <URL:ftp://ftp.yggdrasil.com/pub/dist/web/arena> and Amaya
  ;; <URL:ftp://ftp.w3.org/pub/amaya>.  mMosaic
! ;; <URL:ftp://sig.enst.fr/pub/multicast/mMosaic/>,
! ;; <URL:http://sig.enst.fr/~dauphin/mMosaic/> (with development
  ;; support for Java applets and multicast) can be used like Mosaic by
  ;; setting `browse-url-mosaic-program' appropriately.
*************** Prompts for a URL, defaulting to the URL
*** 616,629 ****
  `browse-url-browser-function' says which browser to use."
    (interactive (browse-url-interactive-arg "URL: "))
!   (let ((bf browse-url-browser-function) re)
!     (unless (functionp bf)
!       (while (consp bf)
! 	(setq re (car (car bf))
! 	      bf (if (string-match re url)
! 		     (cdr (car bf))	; The function
! 		   (cdr bf)))))		; More pairs
!     (or bf (error "No browser in browse-url-browser-function matching URL %s"
!                   url))
!     (apply bf url args)))
  
  ;;;###autoload
--- 616,632 ----
  `browse-url-browser-function' says which browser to use."
    (interactive (browse-url-interactive-arg "URL: "))
!   (if (functionp browse-url-browser-function)
!       (apply browse-url-browser-function url args)
!     ;; The `function' can be an alist; look down it for first match
!     ;; and apply the function (which might be a lambda).
!     (catch 'done
!       (mapcar
!        (lambda (bf)
! 	 (when (string-match (car bf) url)
! 	   (apply (cdr bf) url args)
! 	   (throw 'done t)))
!        browse-url-browser-function)
!       (error "No browser in browse-url-browser-function matching URL %s"
! 	     url))))
  
  ;;;###autoload
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/lisp/dos-w32.el emacs-20.6/lisp/dos-w32.el
*** emacs-20.5/lisp/dos-w32.el	Mon Nov  8 15:42:26 1999
--- emacs-20.6/lisp/dos-w32.el	Wed Feb 23 15:00:41 2000
***************
*** 51,55 ****
      ("\\.\\(dll\\|drv\\|386\\|vxd\\|fon\\|fnt\\|fot\\|ttf\\|grp\\)$" . t)
  					; Windows stuff
!     ("\\.\\(bmp\\|wav\\|avi\\|mpg\\|jpg\\|tif\\|mov\\|au\\)" . t)
  					; known binary data files
      ("\\.\\(arc\\|zip\\|pak\\|lzh\\|zoo\\)$" . t)
--- 51,55 ----
      ("\\.\\(dll\\|drv\\|386\\|vxd\\|fon\\|fnt\\|fot\\|ttf\\|grp\\)$" . t)
  					; Windows stuff
!     ("\\.\\(bmp\\|wav\\|avi\\|mpg\\|jpg\\|tif\\|mov\\|au\\)$" . t)
  					; known binary data files
      ("\\.\\(arc\\|zip\\|pak\\|lzh\\|zoo\\)$" . t)
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/lisp/emacs-lisp/helper.el emacs-20.6/lisp/emacs-lisp/helper.el
*** emacs-20.5/lisp/emacs-lisp/helper.el	Sun Jan 14 08:34:30 1996
--- emacs-20.6/lisp/emacs-lisp/helper.el	Fri Feb 25 10:49:12 2000
***************
*** 122,125 ****
--- 122,126 ----
      (save-excursion
        (set-buffer (get-buffer-create "*Help*"))
+       (setq buffer-read-only nil)
        (erase-buffer)
        (insert name " Mode\n" documentation)
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/lisp/mail/rmail.el emacs-20.6/lisp/mail/rmail.el
*** emacs-20.5/lisp/mail/rmail.el	Mon Sep  6 23:38:41 1999
--- emacs-20.6/lisp/mail/rmail.el	Thu Feb  3 18:46:10 2000
***************
*** 1,5 ****
  ;;; rmail.el --- main code of "RMAIL" mail reader for Emacs.
  
! ;; Copyright (C) 1985,86,87,88,93,94,95,96,97,1998
  ;;		Free Software Foundation, Inc.
  
--- 1,5 ----
  ;;; rmail.el --- main code of "RMAIL" mail reader for Emacs.
  
! ;; Copyright (C) 1985,86,87,88,93,94,95,96,97,1998,2000
  ;;		Free Software Foundation, Inc.
  
*************** specifying headers which should not be c
*** 3061,3067 ****
      (save-excursion
        ;; Narrow down to just the quoted original message
        (if pruned
  	  (rmail-toggle-header 0))
-       (rmail-beginning-of-message)
        (let* ((case-fold-search t)
  	     (top (point))
--- 3061,3067 ----
      (save-excursion
        ;; Narrow down to just the quoted original message
+       (rmail-beginning-of-message)
        (if pruned
  	  (rmail-toggle-header 0))
        (let* ((case-fold-search t)
  	     (top (point))
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/lisp/progmodes/pascal.el emacs-20.6/lisp/progmodes/pascal.el
*** emacs-20.5/lisp/progmodes/pascal.el	Mon Jul 12 18:01:14 1999
--- emacs-20.6/lisp/progmodes/pascal.el	Thu Feb 17 14:25:26 2000
***************
*** 141,145 ****
    (modify-syntax-entry ?( "()1"  pascal-mode-syntax-table)  
    (modify-syntax-entry ?) ")(4"  pascal-mode-syntax-table)
!   (modify-syntax-entry ?* ". 23" pascal-mode-syntax-table)
    (modify-syntax-entry ?{ "<"    pascal-mode-syntax-table)
    (modify-syntax-entry ?} ">"    pascal-mode-syntax-table)
--- 141,145 ----
    (modify-syntax-entry ?( "()1"  pascal-mode-syntax-table)  
    (modify-syntax-entry ?) ")(4"  pascal-mode-syntax-table)
!   (modify-syntax-entry ?* ". 23b" pascal-mode-syntax-table)
    (modify-syntax-entry ?{ "<"    pascal-mode-syntax-table)
    (modify-syntax-entry ?} ">"    pascal-mode-syntax-table)
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/lisp/timezone.el emacs-20.6/lisp/timezone.el
*** emacs-20.5/lisp/timezone.el	Tue Sep  7 00:06:02 1999
--- emacs-20.6/lisp/timezone.el	Mon Jan 31 10:33:16 2000
***************
*** 26,31 ****
  ;;; Code:
  
- (provide 'timezone)
- 
  (defvar timezone-world-timezones
    '(("PST" .  -800)
--- 26,29 ----
*************** Understands the following styles:
*** 197,238 ****
  	   (setq year 1 month 2 day 3 time 4 zone nil))
  	  )
!     (if year
! 	(progn
! 	  (setq year
! 		(substring date (match-beginning year) (match-end year)))
! 	  ;; Guess ambiguous years.  Assume years < 69 don't predate the
! 	  ;; Unix Epoch, so are 2000+.  Three-digit years -- do they ever
! 	  ;; occur? -- are (arbitrarily) assumed to be 21st century.
! 	  (if (< (length year) 4)
! 	      (let ((y (string-to-int year)))
! 		(if (< y 69)
! 		    (setq y (+ y 100)))
! 		(setq year (int-to-string (+ 1900 y)))))
        (setq month
! 		(if (= (aref date (+ (match-beginning month) 2)) ?-)
! 		    ;; Handle numeric months, spanning exactly two digits.
! 		    (substring date
! 			       (match-beginning month)
! 			       (+ (match-beginning month) 2))
!  	          (let* ((string (substring date
! 					    (match-beginning month)
! 					    (+ (match-beginning month) 3)))
! 			 (monthnum
! 			  (cdr (assoc (upcase string) timezone-months-assoc))))
! 		    (if monthnum
! 			(int-to-string monthnum)
! 		      nil))))
! 	  (setq day
! 		(substring date (match-beginning day) (match-end day)))
! 	  (setq time
! 		(substring date (match-beginning time) (match-end time)))))
!     (if zone
! 	(setq zone
! 	      (substring date (match-beginning zone) (match-end zone))))
      ;; Return a vector.
      (if (and year month)
  	(vector year month day time zone)
!       (vector "0" "0" "0" "0" nil))
!     ))
  
  (defun timezone-parse-time (time)
--- 195,228 ----
  	   (setq year 1 month 2 day 3 time 4 zone nil))
  	  )
!     (when year
!       (setq year (match-string year date))
!       ;; Guess ambiguous years.  Assume years < 69 don't predate the
!       ;; Unix Epoch, so are 2000+.  Three-digit years are assumed to
!       ;; be relative to 1900.
!       (if (< (length year) 4)
! 	  (let ((y (string-to-int year)))
! 	    (if (< y 69)
! 		(setq y (+ y 100)))
! 	    (setq year (int-to-string (+ 1900 y)))))
        (setq month
! 	    (if (= (aref date (+ (match-beginning month) 2)) ?-)
! 		;; Handle numeric months, spanning exactly two digits.
! 		(substring date
! 			   (match-beginning month)
! 			   (+ (match-beginning month) 2))
! 	      (let* ((string (substring date
! 					(match-beginning month)
! 					(+ (match-beginning month) 3)))
! 		     (monthnum
! 		      (cdr (assoc (upcase string) timezone-months-assoc))))
! 		(if monthnum
! 		    (int-to-string monthnum)))))
!       (setq day (match-string day date))
!       (setq time (match-string time date)))
!     (if zone (setq zone (match-string zone date)))
      ;; Return a vector.
      (if (and year month)
  	(vector year month day time zone)
!       (vector "0" "0" "0" "0" nil))))
  
  (defun timezone-parse-time (time)
*************** Understands the following styles:
*** 240,246 ****
  Recognize HH:MM:SS, HH:MM, HHMMSS, HHMM."
    (let ((time (or time ""))
! 	(hour nil)
! 	(minute nil)
! 	(second nil))
      (cond ((string-match "\\`\\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\)\\'" time)
  	   ;; HH:MM:SS
--- 230,234 ----
  Recognize HH:MM:SS, HH:MM, HHMMSS, HHMM."
    (let ((time (or time ""))
! 	hour minute second)
      (cond ((string-match "\\`\\([0-9]+\\):\\([0-9]+\\):\\([0-9]+\\)\\'" time)
  	   ;; HH:MM:SS
*************** Recognize HH:MM:SS, HH:MM, HHMMSS, HHMM.
*** 258,268 ****
      ;; Return [hour minute second]
      (vector
!      (if hour
! 	 (substring time (match-beginning hour) (match-end hour)) "0")
!      (if minute
! 	 (substring time (match-beginning minute) (match-end minute)) "0")
!      (if second
! 	 (substring time (match-beginning second) (match-end second)) "0"))
!     ))
  
  
--- 246,252 ----
      ;; Return [hour minute second]
      (vector
!      (if hour (match-string hour time) "0")
!      (if minute (match-string minute time) "0")
!      (if second (match-string second time) "0"))))
  
  
*************** If TIMEZONE is nil, use the local time z
*** 327,334 ****
    (let* ((date   (timezone-parse-date date))
  	 (year   (string-to-int (aref date 0)))
! 	 (year	 (cond ((< year 50)
  			(+ year 2000))
  		       ((< year 100)
  			(+ year 1900))
  		       (t year)))
  	 (month  (string-to-int (aref date 1)))
--- 311,320 ----
    (let* ((date   (timezone-parse-date date))
  	 (year   (string-to-int (aref date 0)))
! 	 (year	 (cond ((< year 69)
  			(+ year 2000))
  		       ((< year 100)
  			(+ year 1900))
+ 		       ((< year 1000)	; possible 3-digit years.
+ 			(+ year 1900))
  		       (t year)))
  	 (month  (string-to-int (aref date 1)))
*************** The Gregorian date Sunday, December 31, 
*** 413,416 ****
--- 399,404 ----
       (- (/ (1- year) 100));;	- century years
       (/ (1- year) 400)));;	+ Gregorian leap years
+ 
+ (provide 'timezone)
  
  ;;; timezone.el ends here
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/lisp/vc-hooks.el emacs-20.6/lisp/vc-hooks.el
*** emacs-20.5/lisp/vc-hooks.el	Wed Jun 30 09:11:15 1999
--- emacs-20.6/lisp/vc-hooks.el	Wed Jan 26 15:39:59 2000
***************
*** 4,8 ****
  
  ;; Author:     Eric S. Raymond <esr@snark.thyrsus.com>
! ;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de>
  
  ;; $Id: vc-hooks.el,v 1.114 1999/06/30 07:10:20 spiegel Exp $
--- 4,8 ----
  
  ;; Author:     Eric S. Raymond <esr@snark.thyrsus.com>
! ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
  
  ;; $Id: vc-hooks.el,v 1.114 1999/06/30 07:10:20 spiegel Exp $
*************** similarly for other version control syst
*** 195,199 ****
    ;; a third element (also the number of a subexpression), that 
    ;; subexpression is assumed to be a date field and we want the most
!   ;; recent entry matching the template.
    ;; If FILE and PROPERTIES are given, the latter must be a list of
    ;; properties of the same length as PATTERNS; each property is assigned 
--- 195,199 ----
    ;; a third element (also the number of a subexpression), that 
    ;; subexpression is assumed to be a date field and we want the most
!   ;; recent entry matching the template; this works for RCS format dates only.
    ;; If FILE and PROPERTIES are given, the latter must be a list of
    ;; properties of the same length as PATTERNS; each property is assigned 
*************** similarly for other version control syst
*** 214,217 ****
--- 214,224 ----
  		(while (re-search-forward (car p) nil t)
  		  (let ((date (vc-match-substring (elt p 2))))
+ 		    ;; Most (but not all) versions of RCS use two-digit years
+ 		    ;; to represent dates in the range 1900 through 1999.
+ 		    ;; The two-digit and four-digit notations can both appear
+ 		    ;; in the same file.  Normalize the two-digit versions.
+ 		    (save-match-data
+ 		      (if (string-match "\\`[0-9][0-9]\\." date)
+                           (setq date (concat "19" date))))
  		    (if (string< latest-date date)
  			(progn
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/lisp/vc.el emacs-20.6/lisp/vc.el
*** emacs-20.5/lisp/vc.el	Thu Dec  2 15:28:54 1999
--- emacs-20.6/lisp/vc.el	Wed Jan 26 15:39:26 2000
***************
*** 4,8 ****
  
  ;; Author:     Eric S. Raymond <esr@snark.thyrsus.com>
! ;; Maintainer: Andre Spiegel <spiegel@inf.fu-berlin.de>
  
  ;; Id: vc.el,v 1.256 1999/10/02 10:53:18 *** with changes
--- 4,8 ----
  
  ;; Author:     Eric S. Raymond <esr@snark.thyrsus.com>
! ;; Maintainer: Andre Spiegel <spiegel@gnu.org>
  
  ;; Id: vc.el,v 1.256 1999/10/02 10:53:18 *** with changes
*************** If FILE is a directory, generate diffs b
*** 1405,1412 ****
  files in or below it."
    (interactive 
!    (let ((file (read-file-name (if buffer-file-name
! 				   "File or dir to diff: (default visited file) "
! 				 "File or dir to diff: ")
!                                 default-directory buffer-file-name t))
           (rel1-default nil) (rel2-default nil))
       ;; compute default versions based on the file state
--- 1405,1413 ----
  files in or below it."
    (interactive 
!    (let ((file (expand-file-name
!                 (read-file-name (if buffer-file-name
!                                     "File or dir to diff: (default visited file) "
!                                   "File or dir to diff: ")
!                                 default-directory buffer-file-name t)))
           (rel1-default nil) (rel2-default nil))
       ;; compute default versions based on the file state
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/lisp/version.el emacs-20.6/lisp/version.el
*** emacs-20.5/lisp/version.el	Fri Dec  3 08:35:23 1999
--- emacs-20.6/lisp/version.el	Sat Feb 26 11:32:27 2000
***************
*** 25,29 ****
  ;;; Code:
  
! (defconst emacs-version "20.5" "\
  Version numbers of this version of Emacs.")
  
--- 25,29 ----
  ;;; Code:
  
! (defconst emacs-version "20.6" "\
  Version numbers of this version of Emacs.")
  
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/lwlib/ChangeLog emacs-20.6/lwlib/ChangeLog
*** emacs-20.5/lwlib/ChangeLog	Fri Dec 10 17:26:08 1999
--- emacs-20.6/lwlib/ChangeLog	Sat Feb 26 11:19:04 2000
***************
*** 1,2 ****
--- 1,6 ----
+ 2000-02-26  Gerd Moellmann  <gerd@gnu.org>
+ 
+ 	* Version 20.6 released.
+ 	
  1999-12-04  Gerd Moellmann  <gerd@gnu.org>
  
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/man/ChangeLog emacs-20.6/man/ChangeLog
*** emacs-20.5/man/ChangeLog	Fri Dec 10 17:25:51 1999
--- emacs-20.6/man/ChangeLog	Sat Feb 26 11:19:14 2000
***************
*** 1,2 ****
--- 1,6 ----
+ 2000-02-26  Gerd Moellmann  <gerd@gnu.org>
+ 
+ 	* Version 20.6 released.
+ 	
  1999-12-04  Gerd Moellmann  <gerd@gnu.org>
  
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/man/emacs.texi emacs-20.6/man/emacs.texi
*** emacs-20.5/man/emacs.texi	Fri Dec  3 08:36:24 1999
--- emacs-20.6/man/emacs.texi	Sat Feb 26 11:34:35 2000
***************
*** 9,13 ****
  @c The edition number appears in several places in this file
  This is the thirteenth edition of the @cite{GNU Emacs Manual},
! updated for Emacs version 20.5.
  @c Please REMEMBER to update edition number in *three* places in this file.
  
--- 9,13 ----
  @c The edition number appears in several places in this file
  This is the thirteenth edition of the @cite{GNU Emacs Manual},
! updated for Emacs version 20.6.
  @c Please REMEMBER to update edition number in *three* places in this file.
  
*************** original English.
*** 72,76 ****
  @center @titlefont{GNU Emacs Manual}
  @sp 4
! @center Thirteenth Edition, Updated for Emacs Version 20.5
  @sp 5
  @center Richard Stallman
--- 72,76 ----
  @center @titlefont{GNU Emacs Manual}
  @sp 4
! @center Thirteenth Edition, Updated for Emacs Version 20.6
  @sp 5
  @center Richard Stallman
*************** Copyright @copyright{} 1985, 1986, 1987,
*** 81,85 ****
  @sp 2
  Thirteenth Edition @*
! Updated for Emacs Version 20.5, @*
  February 1999
  
--- 81,85 ----
  @sp 2
  Thirteenth Edition @*
! Updated for Emacs Version 20.6, @*
  February 1999
  
*************** Cover art by Etienne Suvasa.
*** 119,123 ****
  Emacs is the extensible, customizable, self-documenting real-time
  display editor.  This Info file describes how to edit with Emacs and
! some of how to customize it; it corresponds to GNU Emacs version 20.5.
  For information on extending Emacs, see @ref{,Emacs Lisp,, elisp, The
  Emacs Lisp Reference Manual}.
--- 119,123 ----
  Emacs is the extensible, customizable, self-documenting real-time
  display editor.  This Info file describes how to edit with Emacs and
! some of how to customize it; it corresponds to GNU Emacs version 20.6.
  For information on extending Emacs, see @ref{,Emacs Lisp,, elisp, The
  Emacs Lisp Reference Manual}.
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/man/killing.texi emacs-20.6/man/killing.texi
*** emacs-20.5/man/killing.texi	Mon May 10 20:38:21 1999
--- emacs-20.6/man/killing.texi	Thu Feb 17 16:49:13 2000
***************
*** 1,4 ****
  @c This is part of the Emacs manual.
! @c Copyright (C) 1985, 86, 87, 93, 94, 95, 1997 Free Software Foundation, Inc.
  @c See file emacs.texi for copying conditions.
  @iftex
--- 1,4 ----
  @c This is part of the Emacs manual.
! @c Copyright (C) 1985,86,87,93,94,95,97,2000 Free Software Foundation, Inc.
  @c See file emacs.texi for copying conditions.
  @iftex
*************** Clear the region-rectangle by replacing 
*** 478,482 ****
  Delete whitespace in each of the lines on the specified rectangle,
  starting from the left edge column of the rectangle.
! @item C-x r t @key{RET} @var{string} @key{RET}
  Insert @var{string} on each line of the region-rectangle
  (@code{string-rectangle}).
--- 478,482 ----
  Delete whitespace in each of the lines on the specified rectangle,
  starting from the left edge column of the rectangle.
! @item C-x r t @var{string} @key{RET}
  Insert @var{string} on each line of the region-rectangle
  (@code{string-rectangle}).
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/man/trouble.texi emacs-20.6/man/trouble.texi
*** emacs-20.5/man/trouble.texi	Sat Jan 16 10:26:21 1999
--- emacs-20.6/man/trouble.texi	Wed Feb 16 14:00:20 2000
*************** To make Lisp errors stop Emacs and retur
*** 699,705 ****
  @code{Fsignal}.
  
! To find out which Lisp functions are running, using GDB, move up the
! stack, and each time you get to a frame for the function
! @code{Ffuncall}, type these GDB commands:
  
  @example
--- 699,708 ----
  @code{Fsignal}.
  
! For a short listing of Lisp functions running, type the GDB
! command @code{xbacktrace}.  
! 
! If you want to examine Lisp function arguments, move up the stack, and
! each time you get to a frame for the function @code{Ffuncall}, type
! these GDB commands:
  
  @example
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/msdos/ChangeLog emacs-20.6/msdos/ChangeLog
*** emacs-20.5/msdos/ChangeLog	Fri Dec 10 17:26:20 1999
--- emacs-20.6/msdos/ChangeLog	Sat Feb 26 11:19:24 2000
***************
*** 1,2 ****
--- 1,6 ----
+ 2000-02-26  Gerd Moellmann  <gerd@gnu.org>
+ 
+ 	* Version 20.6 released.
+ 	
  1999-12-04  Gerd Moellmann  <gerd@gnu.org>
  
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/nt/ChangeLog emacs-20.6/nt/ChangeLog
*** emacs-20.5/nt/ChangeLog	Mon Nov 22 23:39:34 1999
--- emacs-20.6/nt/ChangeLog	Wed Feb 23 15:04:01 2000
***************
*** 1,2 ****
--- 1,10 ----
+ 2000-02-20  Andrew Innes  <andrewi@gnu.org>
+ 
+ 	* makefile.nt: Remove all references to emacs.bat and debug.bat.
+ 
+ 	* emacs.bat.in: Remove obsolete file.
+ 
+ 	* debug.bat.in: Remove obsolete file.
+ 
  1999-11-22  Andrew Innes  <andrewi@gnu.org>
  
Only in emacs-20.5/nt: debug.bat.in
Only in emacs-20.5/nt: emacs.bat.in
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/nt/makefile.nt emacs-20.6/nt/makefile.nt
*** emacs-20.5/nt/makefile.nt	Mon Nov 22 15:57:14 1999
--- emacs-20.6/nt/makefile.nt	Wed Feb 23 15:02:28 2000
*************** $(INSTALL_DIR)\bin:
*** 101,126 ****
  		- mkdir $(INSTALL_DIR)\bin
  
- $(INSTALL_DIR)\bin\emacs.bat:	emacs.bat.in
- 		echo @echo off > $@
- 		echo REM !!! Warning: This file automatically generated !!! >> emacs.bat
- 		echo set emacs_dir=$(INSTALL_DIR)>> $@
- 		type emacs.bat.in >> $@
- 
- $(INSTALL_DIR)\bin\debug.bat:	debug.bat.in
- 		echo @echo off > $@
- 		echo REM !!! Warning: This file automatically generated !!! >> debug.bat
- 		echo set emacs_dir=$(INSTALL_DIR)>> $@
- 		type debug.bat.in >> $@
- 
- batch_files: $(INSTALL_DIR) \
- 	     $(INSTALL_DIR)\bin \
- 	     $(INSTALL_DIR)\bin\emacs.bat \
- 	     $(INSTALL_DIR)\bin\debug.bat
- 
  #
  # Build and install emacs in INSTALL_DIR
  #
  INSTALL_CMD	= $(MAKE) -f makefile.nt install
! install:	all $(INSTALL_DIR) batch_files
  		cd ..\lib-src
  		$(INSTALL_CMD)
--- 101,109 ----
  		- mkdir $(INSTALL_DIR)\bin
  
  #
  # Build and install emacs in INSTALL_DIR
  #
  INSTALL_CMD	= $(MAKE) -f makefile.nt install
! install:	all $(INSTALL_DIR)
  		cd ..\lib-src
  		$(INSTALL_CMD)
*************** install:	all $(INSTALL_DIR) batch_files
*** 151,155 ****
  # without building anything.
  #
! fast_install:	batch_files
  		- mkdir $(INSTALL_DIR)\data
  		$(CP) ..\lib-src\DOC $(INSTALL_DIR)\etc
--- 134,138 ----
  # without building anything.
  #
! fast_install:
  		- mkdir $(INSTALL_DIR)\data
  		$(CP) ..\lib-src\DOC $(INSTALL_DIR)\etc
*************** clean:;		- $(DEL) *~ *.pdb
*** 199,204 ****
  		- $(DEL_TREE) ..\bin
  		- $(DEL) ..\etc\DOC ..\etc\DOC-X
- 		- $(DEL) emacs.bat
- 		- $(DEL) debug.bat
  		cd ..\lib-src
  		$(CLEAN_CMD)
--- 182,185 ----
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/oldXMenu/ChangeLog emacs-20.6/oldXMenu/ChangeLog
*** emacs-20.5/oldXMenu/ChangeLog	Fri Dec 10 17:26:54 1999
--- emacs-20.6/oldXMenu/ChangeLog	Sat Feb 26 11:20:07 2000
***************
*** 1,2 ****
--- 1,6 ----
+ 2000-02-26  Gerd Moellmann  <gerd@gnu.org>
+ 
+ 	* Version 20.6 released.
+ 	
  1999-12-04  Gerd Moellmann  <gerd@gnu.org>
  
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/src/.gdbinit emacs-20.6/src/.gdbinit
*** emacs-20.5/src/.gdbinit	Sun May 10 03:04:51 1998
--- emacs-20.6/src/.gdbinit	Thu Feb 17 11:34:40 2000
*************** Print $ as a scrollbar pointer.
*** 292,295 ****
--- 292,327 ----
  end
  
+ define xprintsym
+   set $sym = (struct Lisp_Symbol *) ((((int) $arg0) & $valmask) | gdb_data_seg_bits)
+   output (char*)&$sym->name->data
+   echo \n
+ end
+ document xprintsym
+   Print argument as a symbol.
+ end
+ 
+ define xbacktrace
+   set $bt = backtrace_list
+   while $bt 
+     xprintsym *$bt->function
+     set $bt = $bt->next
+   end
+ end
+ document xbacktrace
+   Print a backtrace of Lisp function calls from backtrace_list.
+   Set a breakpoint at Fsignal and call this to see from where 
+   an error was signalled.
+ end
+ 
+ define xreload
+   set $valmask = ((long)1 << gdb_valbits) - 1
+   set $nonvalbits = gdb_emacs_intbits - gdb_valbits
+ end
+ document xreload
+   When starting Emacs a second time in the same gdb session under
+   FreeBSD 2.2.5, gdb 4.13, $valmask and $nonvalbits have lost
+   their values.  This function reloads them.
+ end
+ 
  set print pretty on
  set print sevenbit-strings
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/src/ChangeLog emacs-20.6/src/ChangeLog
*** emacs-20.5/src/ChangeLog	Fri Dec 10 17:25:22 1999
--- emacs-20.6/src/ChangeLog	Sat Feb 26 11:15:09 2000
***************
*** 1,2 ****
--- 1,139 ----
+ 2000-02-26  Gerd Moellmann  <gerd@gnu.org>
+ 
+ 	* Version 20.6 released.
+ 	
+ 2000-02-25  Miyashita Hisashi  <himi@bird.scphys.kyoto-u.ac.jp>
+ 
+ 	* ccl.c (ccl_driver) [CCL_MapMultiple]: When the mapped value is
+ 	`lambda', set reg[RRR] to the map index.
+ 	(ccl_driver) [CCL_MapSingle]: When the mapped value is found, set
+ 	reg[RRR] to 0.  Otherwise, set it to -1.
+ 
+ 2000-02-25  Andrew Innes  <andrewi@gnu.org>
+ 
+ 	* w32fns.c (w32_wnd_proc) <WM_GETMINMAXINFO>: Allow resizing
+ 	the Emacs frame above the screen size.
+ 
+ 2000-02-23  Andrew Innes  <andrewi@gnu.org>
+ 
+ 	* w32select.c (Fw32_get_clipboard_data): Force data to be decoded
+ 	even if it doesn't contain non-ascii characters, as if it were
+ 	compound text.
+ 
+ 	* w32menu.c: Include charset.h and coding.h.
+ 	(single_submenu, w32_menu_show) [!HAVE_MULTILINGUAL_MENU]: Encode
+ 	mulitbyte strings with w32-system-coding-system before using in
+ 	menus.
+ 
+ 	* w32fns.c (x_set_name): Encode multibyte name with
+ 	w32-system-coding-system before using as frame title.
+ 	(x_set_title): Ditto.
+ 
+ 	* coding.h (ENCODE_SYSTEM) [WINDOWSNT]: New macro.
+ 	(DECODE_SYSTEM) [WINDOWSNT]: New macro.
+ 	[WINDOWSNT]: Add extern for Vw32_system_coding_system.
+ 
+ 	* fileio.c (Ffile_writable_p) [WINDOWSNT]: If a file (or
+ 	directory) doesn't exist, assume it can be created regardless of
+ 	whether the parent directory is writable.  This is the correct
+ 	thing to do, if we are not going to check the ACLs.
+ 
+ 	* w32.c (init_environment): Provide default values for all
+ 	required environment variables, and always set emacs_dir based on
+ 	the location of emacs.exe if it appears to be in a standard
+ 	location.
+ 	(init_user_info): Abort if HOME or SHELL isn't set.
+ 
+ 2000-02-23  Eli Zaretskii  <eliz@is.elta.co.il>
+ 
+ 	* msdos.c (IT_write_glyphs): Allocate a screen_buf buffer as
+ 	large as CODING_MODE_LAST_BLOCK requires.
+ 
+ xxxxr2000-02-20  Dave Love  <fx@gnu.org>
+ 
+ 	* gmalloc.c: Don't define away `const'; config.h does that.
+ 
+ 2000-02-17  Kenichi Handa  <handa@etl.go.jp>
+ 
+ 	* xdisp.c (decode_mode_spec_coding): Delete superfluous code to
+ 	avoid infinite error signalling.
+ 
+ 2000-02-16  Gerd Moellmann  <gerd@gnu.org>
+ 
+ 	* .gdbinit (xbacktrace, xprintsym, xreload): New commands.
+ 
+ 2000-02-15  Andrew Innes  <andrewi@gnu.org>
+ 
+ 	* w32proc.c (sys_kill): Fake Ctrl-C keystroke to simulate SIGINT,
+ 	and Ctrl-Break to simulate SIGQUIT (known as SIGBREAK in MSVC).
+ 
+ 2000-02-15  Gerd Moellmann  <gerd@gnu.org>
+ 
+ 	* m/arm.h: New file.
+ 	
+ 	* s/freebsd.h (BROKEN_PTY_READ_AFTER_EAGAIN): Define.
+ 
+ 	* process.c (send_process) [BROKEN_PTY_READ_AFTER_EAGAIN]:
+ 	Workaround for FreeBSD bug.  Clear output queue after EAGAIN in
+ 	write(2).
+ 
+ 2000-02-12  Gerd Moellmann  <gerd@gnu.org>
+ 
+ 	* s/hpux10.h (HAVE_XRMSETDATABASE): Define if not already defined.
+ 
+ 2000-02-09  Kenichi Handa  <handa@etl.go.jp>
+ 
+ 	* ccl.c (CCL_MAKE_CHAR): New macro.
+ 	(ccl_driver) <CCL_TranslateCharacter>: Check the validity of
+ 	registers by CCL_MAKE_CHAR before calling translate_char.
+ 	<CCL_TranslateCharacterConstTbl> Likewise.
+ 	
+ 2000-02-05  Gerd Moellmann  <gerd@gnu.org>
+ 
+ 	* s/irix6-5.h: Undo previous change.
+ 
+ 	* s/irix5-0.h (LD_SWITCH_SYSTEM): Define only for GCC < 2.95.
+ 
+ 2000-02-03  Gerd Moellmann  <gerd@gnu.org>
+ 
+ 	* m/alpha.h: Revert to version from 20.5.
+ 
+ 2000-02-02  Kenichi Handa  <handa@etl.go.jp>
+ 
+ 	* ccl.c (ccl_driver) <CCL_WriteExprRegister>: Set jump_address
+ 	instead of incrementing ic directly.
+ 	<CCL_WriteExprConst> Likewise.
+ 	<ccl_set_expr>: Set ic to jump_address.
+ 
+ 2000-01-26  Gerd Moellmann  <gerd@gnu.org>
+ 
+ 	* s/irix6-5.h [__GNUC__ && __GNUC_MINOR__ >= 95]: Undef
+ 	LD_SWITCH_SYSTEM inherited from irix5-0.h.
+ 
+ 2000-01-17  Gerd Moellmann  <gerd@gnu.org>
+ 
+ 	* m/news-risc.h (LD_SWITCH_MACHINE): Define differently for GCC.
+ 	
+ 2000-01-03  Gerd Moellmann  <gerd@gnu.org>
+ 
+ 	* s/hpux9.h (NO_EDITRES): Define even if HAVE_LIBXMU.
+ 
+ 1999-12-02  Gerd Moellmann  <gerd@gnu.org>
+ 
+ 	* s/usg5-4.h (LIBS_SYSTEM): Add -lgen because that's needed
+ 	for building with Motif.
+ 	
+ 1999-11-22  Paul Eggert  <eggert@twinsun.com>
+ 
+ 	* m/alpha.h (malloc, realloc, calloc): Remove decls;
+ 	stdlib.h now does this.
+ 
+ 1999-08-21  Dave Love  <fx@gnu.org>
+ 
+ 	* aix3-2-5.h (C_DEBUG_SWITCH): Use -g -O.
+ 	* aix4-1.h: Likewise.
+ 
+ 	* irix6-5.h (C_DEBUG_SWITCH): Set for debug and optimize.
+ 	
  1999-12-04  Gerd Moellmann  <gerd@gnu.org>
  
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/src/ccl.c emacs-20.6/src/ccl.c
*** emacs-20.5/src/ccl.c	Tue May  4 07:40:09 1999
--- emacs-20.6/src/ccl.c	Sat Feb 26 11:11:31 2000
*************** static tr_stack *mapping_stack_pointer;
*** 708,711 ****
--- 708,736 ----
  
  
+ /* Set C to the character code made from CHARSET and CODE.  This is
+    like MAKE_CHAR but check the validity of CHARSET and CODE.  If they
+    are not valid, set C to (CODE & 0xFF) because that is usually the
+    case that CCL_ReadMultibyteChar2 read an invalid code and it set
+    CODE to that invalid byte.  */
+ 
+ #define CCL_MAKE_CHAR(charset, code, c)				\
+   do {								\
+     if (charset == CHARSET_ASCII)				\
+       c = code & 0xFF;						\
+     else if (CHARSET_DEFINED_P (charset)			\
+ 	     && (code & 0x7F) >= 32				\
+ 	     && (code < 256 || ((code >> 7) & 0x7F) >= 32))	\
+       {								\
+ 	int c1 = code & 0x7F, c2 = 0;				\
+ 								\
+ 	if (code >= 256)					\
+ 	  c2 = c1, c1 = (code >> 7) & 0x7F;			\
+ 	c = MAKE_NON_ASCII_CHAR (charset, c1, c2);		\
+       }								\
+     else							\
+       c = code & 0xFF;					\
+   } while (0)
+ 
+ 
  /* Execute CCL code on SRC_BYTES length text at SOURCE.  The resulting
     text goes to a place pointed by DESTINATION, the length of which
*************** ccl_driver (ccl, source, destination, sr
*** 903,907 ****
  	  j = XINT (ccl_prog[ic]);
  	  op = field1 >> 6;
! 	  ic++;
  	  goto ccl_set_expr;
  
--- 928,932 ----
  	  j = XINT (ccl_prog[ic]);
  	  op = field1 >> 6;
! 	  jump_address = ic + 1;
  	  goto ccl_set_expr;
  
*************** ccl_driver (ccl, source, destination, sr
*** 923,926 ****
--- 948,952 ----
  	  j = reg[Rrr];
  	  op = field1 >> 6;
+ 	  jump_address = ic;
  	  goto ccl_set_expr;
  
*************** ccl_driver (ccl, source, destination, sr
*** 1088,1091 ****
--- 1114,1118 ----
  	      i = reg[rrr];
  	      CCL_WRITE_CHAR (i);
+ 	      ic = jump_address;
  	    }
  	  else if (!reg[rrr])
*************** ccl_driver (ccl, source, destination, sr
*** 1229,1246 ****
  	    case CCL_TranslateCharacter:
  	      i = reg[RRR]; /* charset */
! 	      if (i == CHARSET_ASCII)
! 		i = reg[rrr];
! 	      else if (i == CHARSET_COMPOSITION)
  		{
  		  reg[RRR] = -1;
  		  break;
  		}
! 	      else if (CHARSET_DIMENSION (i) == 1)
! 		i = ((i - 0x70) << 7) | (reg[rrr] & 0x7F);
! 	      else if (i < MIN_CHARSET_PRIVATE_DIMENSION2)
! 		i = ((i - 0x8F) << 14) | (reg[rrr] & 0x3FFF);
! 	      else
! 		i = ((i - 0xE0) << 14) | (reg[rrr] & 0x3FFF);
! 
  	      op = translate_char (GET_TRANSLATION_TABLE (reg[Rrr]),
  				   i, -1, 0, 0);
--- 1256,1265 ----
  	    case CCL_TranslateCharacter:
  	      i = reg[RRR]; /* charset */
! 	      if (i == CHARSET_COMPOSITION)
  		{
  		  reg[RRR] = -1;
  		  break;
  		}
! 	      CCL_MAKE_CHAR (i, reg[rrr], i);
  	      op = translate_char (GET_TRANSLATION_TABLE (reg[Rrr]),
  				   i, -1, 0, 0);
*************** ccl_driver (ccl, source, destination, sr
*** 1256,1273 ****
  	      ic++;
  	      i = reg[RRR]; /* charset */
! 	      if (i == CHARSET_ASCII)
! 		i = reg[rrr];
! 	      else if (i == CHARSET_COMPOSITION)
  		{
  		  reg[RRR] = -1;
  		  break;
  		}
! 	      else if (CHARSET_DIMENSION (i) == 1)
! 		i = ((i - 0x70) << 7) | (reg[rrr] & 0x7F);
! 	      else if (i < MIN_CHARSET_PRIVATE_DIMENSION2)
! 		i = ((i - 0x8F) << 14) | (reg[rrr] & 0x3FFF);
! 	      else
! 		i = ((i - 0xE0) << 14) | (reg[rrr] & 0x3FFF);
! 
  	      op = translate_char (GET_TRANSLATION_TABLE (op), i, -1, 0, 0);
  	      SPLIT_CHAR (op, reg[RRR], i, j);
--- 1275,1284 ----
  	      ic++;
  	      i = reg[RRR]; /* charset */
! 	      if (i == CHARSET_COMPOSITION)
  		{
  		  reg[RRR] = -1;
  		  break;
  		}
! 	      CCL_MAKE_CHAR (i, reg[rrr], i);
  	      op = translate_char (GET_TRANSLATION_TABLE (op), i, -1, 0, 0);
  	      SPLIT_CHAR (op, reg[RRR], i, j);
*************** ccl_driver (ccl, source, destination, sr
*** 1476,1479 ****
--- 1487,1491 ----
  		    else if (EQ (content, Qlambda))
  		      {
+ 			reg[RRR] = i;
  			break;
  		      }
*************** ccl_driver (ccl, source, destination, sr
*** 1518,1521 ****
--- 1530,1534 ----
  		else
  		  {
+ 		    reg[RRR] = 0;
  		    content = XVECTOR (map)->contents[point];
  		    if (NILP (content))
*************** ccl_driver (ccl, source, destination, sr
*** 1523,1528 ****
  		    else if (NUMBERP (content))
  		      reg[rrr] = XINT (content);
! 		    else if (EQ (content, Qt))
! 		      reg[RRR] = i;
  		    else if (CONSP (content))
  		      {
--- 1536,1540 ----
  		    else if (NUMBERP (content))
  		      reg[rrr] = XINT (content);
! 		    else if (EQ (content, Qt));
  		    else if (CONSP (content))
  		      {
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/src/coding.h emacs-20.6/src/coding.h
*** emacs-20.5/src/coding.h	Wed Jan 27 10:49:37 1999
--- emacs-20.6/src/coding.h	Wed Feb 23 15:08:09 2000
*************** struct coding_system
*** 518,521 ****
--- 518,539 ----
        : name))
  
+ #ifdef WINDOWSNT
+ /* Encode the string STR using the specified coding system
+    for w32 system functions, if any.  */
+ #define ENCODE_SYSTEM(str)						   \
+   (! NILP (Vw32_system_coding_system)					   \
+    && XFASTINT (Vw32_system_coding_system) != 0				   \
+    ? code_convert_string_norecord (str, Vw32_system_coding_system, 1)	   \
+    : str)
+ 
+ /* Decode the string STR using the specified coding system
+    for w32 system functions, if any.  */
+ #define DECODE_SYSTEM(name)						   \
+   (! NILP (Vw32_system_coding_system)					   \
+    && XFASTINT (Vw32_system_coding_system) != 0				   \
+    ? code_convert_string_norecord (str, Vw32_system_coding_system, 0)	   \
+    : str)
+ #endif
+ 
  /* Extern declarations.  */
  extern int decode_coding P_ ((struct coding_system *, unsigned char *,
*************** extern Lisp_Object Vfile_name_coding_sys
*** 593,596 ****
--- 611,619 ----
     Vfile_name_coding_system is nil.  */
  extern Lisp_Object Vdefault_file_name_coding_system;
+ 
+ #ifdef WINDOWSNT
+ /* Coding system for w32 system strings, or nil if none.  */
+ extern Lisp_Object Vw32_system_coding_system;
+ #endif
  #endif
  
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/src/fileio.c emacs-20.6/src/fileio.c
*** emacs-20.5/src/fileio.c	Sun Dec  5 12:59:52 1999
--- emacs-20.6/src/fileio.c	Wed Feb 23 15:08:09 2000
*************** DEFUN ("file-writable-p", Ffile_writable
*** 2930,2933 ****
--- 2930,2939 ----
  	    ? Qt : Qnil);
  
+ #ifdef WINDOWSNT
+   /* The read-only attribute of the parent directory doesn't affect
+      whether a file or directory can be created within it.  Some day we
+      should check ACLs though, which do affect this.  */
+   return Qt;
+ #else
    dir = Ffile_name_directory (absname);
  #ifdef VMS
*************** DEFUN ("file-writable-p", Ffile_writable
*** 2943,2946 ****
--- 2949,2953 ----
    return (check_writable (!NILP (dir) ? (char *) XSTRING (dir)->data : "")
  	  ? Qt : Qnil);
+ #endif
  }
  
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/src/gmalloc.c emacs-20.6/src/gmalloc.c
*** emacs-20.5/src/gmalloc.c	Wed Apr  8 08:14:27 1998
--- emacs-20.6/src/gmalloc.c	Mon Feb 21 14:21:51 2000
*************** Cambridge, MA 02139, USA.
*** 45,50 ****
  #undef	PP
  #define	PP(args)	()
- #undef	const
- #define	const
  #undef	__ptr_t
  #define	__ptr_t		char *
--- 45,48 ----
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/src/m/arm.h emacs-20.6/src/m/arm.h
*** emacs-20.5/src/m/arm.h	Thu Jan  1 01:00:00 1970
--- emacs-20.6/src/m/arm.h	Tue Feb 15 11:37:11 2000
***************
*** 0 ****
--- 1,63 ----
+ /* Machine description file for ARM-based non-RISCiX machines.
+    Copyright (C) 1994 Free Software Foundation, Inc.
+ 
+ This file is part of GNU Emacs.
+ 
+ GNU Emacs is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+ 
+ GNU Emacs is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ 
+ You should have received a copy of the GNU General Public License
+ along with GNU Emacs; see the file COPYING.  If not, write to
+ the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.  */
+ 
+ 
+ 
+ /* Define WORDS_BIG_ENDIAN iff lowest-numbered byte in a word
+    is the most significant byte.  */
+ 
+ #undef WORDS_BIG_ENDIAN
+ 
+ /* Define NO_ARG_ARRAY if you cannot take the address of the first of a
+  * group of arguments and treat it as an array of the arguments.  We can't
+  * do this on the arm with gcc, since the first 4 args are in registers.  */
+ 
+ #ifdef __GNUC__
+ #define NO_ARG_ARRAY
+ #else
+ #undef NO_ARG_ARRAY
+ #endif
+ 
+ /* Define WORD_MACHINE if addresses and such have
+  * to be corrected before they can be used as byte counts.  */
+ 
+ #undef WORD_MACHINE
+ 
+ /* Define how to take a char and sign-extend into an int.
+    On machines where char is signed, this is a no-op.  */
+ 
+ #define SIGN_EXTEND_CHAR(c) (((int)(c) << 24) >> 24)
+ 
+ #define NO_UNION_TYPE
+ 
+ #ifdef __GNUC__
+ 
+ /* Use builtin alloca. Also be sure that no other ones are tried out. */
+ #define alloca __builtin_alloca
+ #define HAVE_ALLOCA
+ 
+ #else
+ #define C_ALLOCA
+ #undef HAVE_ALLOCA
+ #endif  /* __GNUC__ */
+ 
+ #define NO_REMAP
+ 
+ #define STACK_DIRECTION -1
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/src/m/news-risc.h emacs-20.6/src/m/news-risc.h
*** emacs-20.5/src/m/news-risc.h	Sun Jun 22 21:24:59 1997
--- emacs-20.6/src/m/news-risc.h	Wed Jan 26 14:11:32 2000
***************
*** 27,31 ****
--- 27,35 ----
  #define COFF
  #undef LD_SWITCH_MACHINE
+ #ifdef __GNUC__
+ #define LD_SWITCH_MACHINE -Xlinker -x -Xlinker -D -Xlinker 800000
+ #else
  #define LD_SWITCH_MACHINE -x -D 800000
+ #endif
  
  /* #define C_OPTIMIZE_SWITCH -O2 */
***************
*** 43,46 ****
--- 47,51 ----
  /* Don't use the definitions in m/mips.h.  */
  #undef LINKER
+ #define LINKER $(CC) -nostdlib
  #undef LIBS_MACHINE
  #define LIBS_MACHINE -lmld
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/src/msdos.c emacs-20.6/src/msdos.c
*** emacs-20.5/src/msdos.c	Thu Jul 29 12:53:26 1999
--- emacs-20.6/src/msdos.c	Wed Feb 23 11:47:01 2000
*************** IT_write_glyphs (GLYPH *str, int str_len
*** 867,870 ****
--- 867,871 ----
        if (coding->produced > 0)
  	{
+ 	  screen_buf = alloca (coding->produced * 2);
  	  for (screen_bp = screen_buf, bp = conversion_buffer;
  	       coding->produced--; bp++)
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/src/process.c emacs-20.6/src/process.c
*** emacs-20.5/src/process.c	Thu Jul  8 00:36:24 1999
--- emacs-20.6/src/process.c	Tue Feb 15 11:16:26 2000
*************** send_process (proc, buf, len, object)
*** 3342,3345 ****
--- 3342,3371 ----
  		    int offset;
  
+ #ifdef BROKEN_PTY_READ_AFTER_EAGAIN
+ 		    /* A gross hack to work around a bug in FreeBSD.
+ 		       In the following sequence, read(2) returns
+ 		       bogus data:
+ 
+ 		       write(2)	 1022 bytes
+ 		       write(2)   954 bytes, get EAGAIN
+ 		       read(2)   1024 bytes in process_read_output
+ 		       read(2)     11 bytes in process_read_output
+ 
+ 		       That is, read(2) returns more bytes than have
+ 		       ever been written successfully.  The 1033 bytes
+ 		       read are the 1022 bytes written successfully
+ 		       after processing (for example with CRs added if
+ 		       the terminal is set up that way which it is
+ 		       here).  The same bytes will be seen again in a
+ 		       later read(2), without the CRs.  */
+ 		    
+ 		    if (errno == EAGAIN)
+ 		      {
+ 			int flags = FWRITE;
+ 			ioctl (XINT (XPROCESS (proc)->outfd), TIOCFLUSH,
+ 			       &flags);
+ 		      }
+ #endif /* BROKEN_PTY_READ_AFTER_EAGAIN */
+ 		    
  		    /* Running filters might relocate buffers or strings.
  		       Arrange to relocate BUF.  */
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/src/s/aix3-2-5.h emacs-20.6/src/s/aix3-2-5.h
*** emacs-20.5/src/s/aix3-2-5.h	Sun Mar 17 19:03:45 1996
--- emacs-20.6/src/s/aix3-2-5.h	Wed Jan 26 14:01:52 2000
***************
*** 6,15 ****
     because "cc -O" crashes. Under AIX 3.2.5, "cc -O" is required because
     "cc -g" crashes. Go figure.  --floppy@merlin.mit.edu */
! #ifndef __GNUC__
  #undef C_DEBUG_SWITCH
! #undef C_OPTIMIZE_SWITCH
! #define C_DEBUG_SWITCH -O
! #define C_OPTIMIZE_SWITCH -O
! #endif
  
  /* Perry Smith <pedz@ddivt1.austin.ibm.com> says these are correct.  */
--- 6,16 ----
     because "cc -O" crashes. Under AIX 3.2.5, "cc -O" is required because
     "cc -g" crashes. Go figure.  --floppy@merlin.mit.edu */
! /* The above isn't generally true.  If it occurs with some compiler
!    release, seek a fixed version, be it XLC or GCC.  The XLC version
!    isn't tied to the OS version on AIX any more than elsewhere.  XLC
!    (the IBM compiler) can use -g with -O.  (-O3 is also a possibility
!    for the optimization level.)  -- fx, after David Edelsohn.  */
  #undef C_DEBUG_SWITCH
! #define C_DEBUG_SWITCH -g -O
  
  /* Perry Smith <pedz@ddivt1.austin.ibm.com> says these are correct.  */
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/src/s/aix4-1.h emacs-20.6/src/s/aix4-1.h
*** emacs-20.5/src/s/aix4-1.h	Wed Oct  1 19:20:54 1997
--- emacs-20.6/src/s/aix4-1.h	Wed Jan 26 14:01:13 2000
***************
*** 18,25 ****
--- 18,29 ----
     on the version of XLC, which can't be predicted from the system version.
     What a mess!  */
+ /* No more of a mess than other systems, GNU+GCC included.  See
+    comments in aix3-2-5.h.  -- fx */
+ #if 0
  #ifndef __GNUC__
  #undef C_DEBUG_SWITCH
  #undef C_OPTIMIZE_SWITCH
  #define C_DEBUG_SWITCH -g
+ #endif
  #endif
  
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/src/s/freebsd.h emacs-20.6/src/s/freebsd.h
*** emacs-20.5/src/s/freebsd.h	Mon Apr 12 20:22:12 1999
--- emacs-20.6/src/s/freebsd.h	Tue Feb 15 11:19:14 2000
***************
*** 133,134 ****
--- 133,150 ----
     To avoid this problem, you could #undef it to use no file lock. */
  /* #undef CLASH_DETECTION */
+ 
+ /* Circumvent a bug in FreeBSD.  In the following sequence of
+    writes/reads on a PTY, read(2) returns bogus data:
+ 
+    write(2)  1022 bytes
+    write(2)   954 bytes, get EAGAIN
+    read(2)   1024 bytes in process_read_output
+    read(2)     11 bytes in process_read_output
+ 
+    That is, read(2) returns more bytes than have ever been written
+    successfully.  The 1033 bytes read are the 1022 bytes written
+    successfully after processing (for example with CRs added if the
+    terminal is set up that way which it is here).  The same bytes will
+    be seen again in a later read(2), without the CRs.  */
+ 
+ #define BROKEN_PTY_READ_AFTER_EAGAIN 1
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/src/s/hpux10.h emacs-20.6/src/s/hpux10.h
*** emacs-20.5/src/s/hpux10.h	Mon Jun 23 00:55:12 1997
--- emacs-20.6/src/s/hpux10.h	Sat Feb 12 13:45:22 2000
***************
*** 27,30 ****
--- 27,38 ----
  #endif
  
+ /* Rainer Malzbender <rainer@displaytech.com> says definining
+    HAVE_XRMSETDATABASE allows Emacs to compile on HP-UX 10.20
+    using GCC.  */
+ 
+ #ifndef HAVE_XRMSETDATABASE
+ #define HAVE_XRMSETDATABASE
+ #endif
+ 
  /* Make sure we get select from libc rather than from libcurses
     because libcurses on HPUX 10.10 has a broken version of select.
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/src/s/hpux9.h emacs-20.6/src/s/hpux9.h
*** emacs-20.5/src/s/hpux9.h	Thu Sep  4 01:00:29 1997
--- emacs-20.6/src/s/hpux9.h	Wed Jan 26 14:13:42 2000
***************
*** 51,57 ****
  #define LIBXMU
  
- /* Unfortunately without libXmu we cannot support EditRes.  */
- #define NO_EDITRES
  #endif
  
  /* zoo@armadillo.com says we don't need -lXext in HPUX 9.  */
--- 51,59 ----
  #define LIBXMU
  
  #endif
+ 
+ /* Assar Westerlund <assar@sics.se> says this is necessary for
+    HP-UX 10.20, and that it works for HP-UX 0 as well.  */
+ #define NO_EDITRES
  
  /* zoo@armadillo.com says we don't need -lXext in HPUX 9.  */
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/src/s/irix5-0.h emacs-20.6/src/s/irix5-0.h
*** emacs-20.5/src/s/irix5-0.h	Sun Sep 29 00:25:47 1996
--- emacs-20.6/src/s/irix5-0.h	Thu Feb 17 13:24:19 2000
*************** char *_getpty();
*** 103,107 ****
     tell the linker to avoid making one.  SGI's cc does this by
     default, but GCC (at least 2.5.8 and 2.6.0) doesn't. */
! #ifdef __GNUC__
  #define LD_SWITCH_SYSTEM -G 0
  #endif
--- 103,107 ----
     tell the linker to avoid making one.  SGI's cc does this by
     default, but GCC (at least 2.5.8 and 2.6.0) doesn't. */
! #if __GNUC__ == 2 && __GNUC_MINOR__ < 8
  #define LD_SWITCH_SYSTEM -G 0
  #endif
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/src/s/irix6-5.h emacs-20.6/src/s/irix6-5.h
*** emacs-20.5/src/s/irix6-5.h	Wed Dec 16 22:35:43 1998
--- emacs-20.6/src/s/irix6-5.h	Sat Feb  5 18:06:53 2000
***************
*** 27,30 ****
--- 27,35 ----
  #undef C_DEBUG_SWITCH
  #define C_DEBUG_SWITCH -g
+ #else
+ /* Optimize, inaccurate debugging.  This should also be applicable
+    other than on Irix 6.5, but I don't know for which compiler
+    versions.  -- fx */
+ #define C_DEBUG_SWITCH -g3 -O
  #endif
  
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/src/s/usg5-4.h emacs-20.6/src/s/usg5-4.h
*** emacs-20.5/src/s/usg5-4.h	Wed Dec 16 22:35:44 1998
--- emacs-20.6/src/s/usg5-4.h	Wed Jan 26 14:18:27 2000
*************** Boston, MA 02111-1307, USA.  */
*** 206,207 ****
--- 206,212 ----
  #define bzero(s,n)		memset (s,0,n)
  #endif
+ 
+ /* Markus Weiand <weiand@khof.com> says this is needed for Motif on
+    SINIX.  */
+ #undef LIBS_SYSTEM
+ #define LIBS_SYSTEM -lgen
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/src/w32.c emacs-20.6/src/w32.c
*** emacs-20.5/src/w32.c	Mon Nov  8 15:46:25 1999
--- emacs-20.6/src/w32.c	Wed Feb 23 15:08:09 2000
*************** init_user_info ()
*** 289,295 ****
    /* Ensure HOME and SHELL are defined. */
    if (getenv ("HOME") == NULL)
!     putenv ("HOME=c:/");
    if (getenv ("SHELL") == NULL)
!     putenv (os_subtype == OS_WIN95 ? "SHELL=command" : "SHELL=cmd");
  
    /* Set dir and shell from environment variables. */
--- 289,295 ----
    /* Ensure HOME and SHELL are defined. */
    if (getenv ("HOME") == NULL)
!     abort ();
    if (getenv ("SHELL") == NULL)
!     abort ();
  
    /* Set dir and shell from environment variables. */
*************** init_environment (char ** argv)
*** 680,684 ****
         "While setting TMPDIR: ");
  
!   /* Check for environment variables and use registry if they don't exist */
    {
      int i;
--- 680,685 ----
         "While setting TMPDIR: ");
  
!   /* Check for environment variables and use registry settings if they
!      don't exist.  Fallback on default values where applicable.  */
    {
      int i;
*************** init_environment (char ** argv)
*** 686,729 ****
      DWORD dwType;
  
!     static char * env_vars[] = 
      {
!       "HOME",
!       "PRELOAD_WINSOCK",
!       "emacs_dir",
!       "EMACSLOADPATH",
!       "SHELL",
!       "CMDPROXY",
!       "EMACSDATA",
!       "EMACSPATH",
!       "EMACSLOCKDIR",
        /* We no longer set INFOPATH because Info-default-directory-list
! 	 is then ignored.  We use a hook in winnt.el instead.  */
!       /*      "INFOPATH", */
!       "EMACSDOC",
!       "TERM",
      };
  
      for (i = 0; i < (sizeof (env_vars) / sizeof (env_vars[0])); i++) 
        {
! 	if (!getenv (env_vars[i])
! 	    && (lpval = w32_get_resource (env_vars[i], &dwType)) != NULL)
  	  {
! 	    if (dwType == REG_EXPAND_SZ)
! 	      {
! 		char buf1[500], buf2[500];
  
! 		ExpandEnvironmentStrings ((LPSTR) lpval, buf1, 500);
! 		_snprintf (buf2, 499, "%s=%s", env_vars[i], buf1);
! 		putenv (strdup (buf2));
  	      }
! 	    else if (dwType == REG_SZ)
  	      {
! 		char buf[500];
  		  
! 		_snprintf (buf, 499, "%s=%s", env_vars[i], lpval);
! 		putenv (strdup (buf));
! 	      }
  
! 	    xfree (lpval);
  	  }
        }
--- 687,773 ----
      DWORD dwType;
  
!     static struct env_entry
      {
!       char * name;
!       char * def_value;
!     } env_vars[] = 
!     {
!       {"HOME", "C:/"},
!       {"PRELOAD_WINSOCK", NULL},
!       {"emacs_dir", "C:/emacs"},
!       {"EMACSLOADPATH", "%emacs_dir%/site-lisp;%emacs_dir%/lisp;%emacs_dir%/leim"},
!       {"SHELL", "%emacs_dir%/bin/cmdproxy.exe"},
!       {"EMACSDATA", "%emacs_dir%/etc"},
!       {"EMACSPATH", "%emacs_dir%/bin"},
!       {"EMACSLOCKDIR", "%emacs_dir%/lock"},
        /* We no longer set INFOPATH because Info-default-directory-list
! 	 is then ignored.  */
!       /*  {"INFOPATH", "%emacs_dir%/info"},  */
!       {"EMACSDOC", "%emacs_dir%/etc"},
!       {"TERM", "cmd"}
      };
  
+ #define SET_ENV_BUF_SIZE (4 * MAX_PATH)	/* to cover EMACSLOADPATH */
+ 
+     /* Treat emacs_dir specially: set it unconditionally based on our
+        location, if it appears that we are running from the bin subdir
+        of a standard installation.  */
+     {
+       char *p;
+       char modname[MAX_PATH];
+ 
+       if (!GetModuleFileName (NULL, modname, MAX_PATH))
+ 	abort ();
+       if ((p = strrchr (modname, '\\')) == NULL)
+ 	abort ();
+       *p = 0;
+ 
+       if ((p = strrchr (modname, '\\')) && stricmp (p, "\\bin") == 0)
+ 	{
+ 	  char buf[SET_ENV_BUF_SIZE];
+ 
+ 	  *p = 0;
+ 	  for (p = modname; *p; p++)
+ 	    if (*p == '\\') *p = '/';
+ 		  
+ 	  _snprintf (buf, sizeof(buf)-1, "emacs_dir=%s", modname);
+ 	  putenv (strdup (buf));
+ 	}
+     }
+ 
      for (i = 0; i < (sizeof (env_vars) / sizeof (env_vars[0])); i++) 
        {
! 	if (!getenv (env_vars[i].name))
  	  {
! 	    int dont_free = 0;
  
! 	    if ((lpval = w32_get_resource (env_vars[i].name, &dwType)) == NULL)
! 	      {
! 		lpval = env_vars[i].def_value;
! 		dwType = REG_EXPAND_SZ;
! 		dont_free = 1;
  	      }
! 
! 	    if (lpval)
  	      {
! 		if (dwType == REG_EXPAND_SZ)
! 		  {
! 		    char buf1[SET_ENV_BUF_SIZE], buf2[SET_ENV_BUF_SIZE];
! 
! 		    ExpandEnvironmentStrings ((LPSTR) lpval, buf1, sizeof(buf1));
! 		    _snprintf (buf2, sizeof(buf2)-1, "%s=%s", env_vars[i].name, buf1);
! 		    putenv (strdup (buf2));
! 		  }
! 		else if (dwType == REG_SZ)
! 		  {
! 		    char buf[SET_ENV_BUF_SIZE];
  		  
! 		    _snprintf (buf, sizeof(buf)-1, "%s=%s", env_vars[i].name, lpval);
! 		    putenv (strdup (buf));
! 		  }
  
! 		if (!dont_free)
! 		  xfree (lpval);
! 	      }
  	  }
        }
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/src/w32fns.c emacs-20.6/src/w32fns.c
*** emacs-20.5/src/w32fns.c	Mon Nov 22 22:41:37 1999
--- emacs-20.6/src/w32fns.c	Fri Feb 25 20:49:01 2000
*************** x_set_name (f, name, explicit)
*** 2343,2347 ****
      {
        if (STRING_MULTIBYTE (name))
! 	name = string_make_unibyte (name);
        BLOCK_INPUT;
        SetWindowText(FRAME_W32_WINDOW (f), XSTRING (name)->data);
--- 2343,2347 ----
      {
        if (STRING_MULTIBYTE (name))
! 	name = ENCODE_SYSTEM (name);
        BLOCK_INPUT;
        SetWindowText(FRAME_W32_WINDOW (f), XSTRING (name)->data);
*************** x_set_title (f, name)
*** 2402,2406 ****
      {
        if (STRING_MULTIBYTE (name))
! 	name = string_make_unibyte (name);
        BLOCK_INPUT;
        SetWindowText(FRAME_W32_WINDOW (f), XSTRING (name)->data);
--- 2402,2406 ----
      {
        if (STRING_MULTIBYTE (name))
! 	name = ENCODE_SYSTEM (name);
        BLOCK_INPUT;
        SetWindowText(FRAME_W32_WINDOW (f), XSTRING (name)->data);
*************** w32_wnd_proc (hwnd, msg, wParam, lParam)
*** 4482,4485 ****
--- 4482,4488 ----
  	 below the Minimum Tracking Size.  */
        ((LPMINMAXINFO) lParam)->ptMinTrackSize.y++;
+       /* Hack to allow resizing the Emacs frame above the screen size */
+       ((LPMINMAXINFO) lParam)->ptMaxTrackSize.x = LONG_MAX;
+       ((LPMINMAXINFO) lParam)->ptMaxTrackSize.y = LONG_MAX;
        return 0;
  
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/src/w32menu.c emacs-20.6/src/w32menu.c
*** emacs-20.5/src/w32menu.c	Mon Nov  8 15:46:27 1999
--- emacs-20.6/src/w32menu.c	Wed Feb 23 15:08:09 2000
*************** Boston, MA 02111-1307, USA.  */
*** 30,33 ****
--- 30,35 ----
  #include "blockinput.h"
  #include "buffer.h"
+ #include "charset.h"
+ #include "coding.h"
  
  /* This may include sys/types.h, and that somehow loses
*************** single_submenu (item_key, item_name, map
*** 1236,1240 ****
  #ifndef HAVE_MULTILINGUAL_MENU
  	  if (STRINGP (pane_name) && STRING_MULTIBYTE (pane_name))
! 	    pane_name = string_make_unibyte (pane_name);
  #endif
  	  pane_string = (NILP (pane_name)
--- 1238,1242 ----
  #ifndef HAVE_MULTILINGUAL_MENU
  	  if (STRINGP (pane_name) && STRING_MULTIBYTE (pane_name))
! 	    pane_name = ENCODE_SYSTEM (pane_name);
  #endif
  	  pane_string = (NILP (pane_name)
*************** single_submenu (item_key, item_name, map
*** 1278,1284 ****
  #ifndef HAVE_MULTILINGUAL_MENU
  	  if (STRING_MULTIBYTE (item_name))
! 	    item_name = string_make_unibyte (item_name);
  	  if (STRINGP (descrip) && STRING_MULTIBYTE (descrip))
! 	    descrip = string_make_unibyte (descrip);
  #endif
  	  wv = xmalloc_widget_value ();
--- 1280,1286 ----
  #ifndef HAVE_MULTILINGUAL_MENU
  	  if (STRING_MULTIBYTE (item_name))
! 	    item_name = ENCODE_SYSTEM (item_name);
  	  if (STRINGP (descrip) && STRING_MULTIBYTE (descrip))
! 	    descrip = ENCODE_SYSTEM (descrip);
  #endif
  	  wv = xmalloc_widget_value ();
*************** w32_menu_show (f, x, y, for_click, keyma
*** 1681,1685 ****
  #ifndef HAVE_MULTILINGUAL_MENU
  	  if (!NILP (pane_name) && STRING_MULTIBYTE (pane_name))
! 	    pane_name = string_make_unibyte (pane_name);
  #endif
  	  pane_string = (NILP (pane_name)
--- 1683,1687 ----
  #ifndef HAVE_MULTILINGUAL_MENU
  	  if (!NILP (pane_name) && STRING_MULTIBYTE (pane_name))
! 	    pane_name = ENCODE_SYSTEM (pane_name);
  #endif
  	  pane_string = (NILP (pane_name)
*************** w32_menu_show (f, x, y, for_click, keyma
*** 1758,1762 ****
  #ifndef HAVE_MULTILINGUAL_MENU
        if (STRING_MULTIBYTE (title))
! 	title = string_make_unibyte (title);
  #endif
        wv_title->name = (char *) XSTRING (title)->data;
--- 1760,1764 ----
  #ifndef HAVE_MULTILINGUAL_MENU
        if (STRING_MULTIBYTE (title))
! 	title = ENCODE_SYSTEM (title);
  #endif
        wv_title->name = (char *) XSTRING (title)->data;
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/src/w32proc.c emacs-20.6/src/w32proc.c
*** emacs-20.5/src/w32proc.c	Thu Jul  1 21:46:16 1999
--- emacs-20.6/src/w32proc.c	Wed Feb 16 12:43:15 2000
*************** sys_kill (int pid, int sig)
*** 1368,1377 ****
      }
    
!   if (sig == SIGINT)
      {
        if (NILP (Vw32_start_process_share_console) && cp && cp->hwnd)
  	{
  	  BYTE control_scan_code = (BYTE) MapVirtualKey (VK_CONTROL, 0);
! 	  BYTE vk_break_code = VK_CANCEL;
  	  BYTE break_scan_code = (BYTE) MapVirtualKey (vk_break_code, 0);
  	  HWND foreground_window;
--- 1368,1378 ----
      }
    
!   if (sig == SIGINT || sig == SIGQUIT)
      {
        if (NILP (Vw32_start_process_share_console) && cp && cp->hwnd)
  	{
  	  BYTE control_scan_code = (BYTE) MapVirtualKey (VK_CONTROL, 0);
! 	  /* Fake Ctrl-C for SIGINT, and Ctrl-Break for SIGQUIT.  */
! 	  BYTE vk_break_code = (sig == SIGINT) ? 'C' : VK_CANCEL;
  	  BYTE break_scan_code = (BYTE) MapVirtualKey (vk_break_code, 0);
  	  HWND foreground_window;
*************** sys_kill (int pid, int sig)
*** 1379,1383 ****
  	  if (break_scan_code == 0)
  	    {
! 	      /* Fake Ctrl-C if we can't manage Ctrl-Break. */
  	      vk_break_code = 'C';
  	      break_scan_code = (BYTE) MapVirtualKey (vk_break_code, 0);
--- 1380,1384 ----
  	  if (break_scan_code == 0)
  	    {
! 	      /* Fake Ctrl-C for SIGQUIT if we can't manage Ctrl-Break. */
  	      vk_break_code = 'C';
  	      break_scan_code = (BYTE) MapVirtualKey (vk_break_code, 0);
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/src/w32select.c emacs-20.6/src/w32select.c
*** emacs-20.5/src/w32select.c	Sun May  2 12:29:10 1999
--- emacs-20.6/src/w32select.c	Wed Feb 23 15:08:09 2000
*************** DEFUN ("w32-get-clipboard-data", Fw32_ge
*** 268,271 ****
--- 268,278 ----
  	)
        {
+ #if 1
+ 	/* We have to assume clipboard might contain "compound" text (to
+            use the X terminology), since Emacs itself will default to
+            using iso-2022 encoding which doesn't contain non-ascii
+            characters.  */
+ 	require_decoding = 1;
+ #else
  	/* If the clipboard data contains any non-ascii code, we
  	   need to decode it.  */
*************** DEFUN ("w32-get-clipboard-data", Fw32_ge
*** 280,283 ****
--- 287,291 ----
  	      }
  	  }
+ #endif
        }
      
diff -2rcpP --exclude=info/* --exclude=*.elc --exclude=*.aux --exclude=*.cps --exclude=*.fns --exclude=*.kys --exclude=*.vrs emacs-20.5/src/xdisp.c emacs-20.6/src/xdisp.c
*** emacs-20.5/src/xdisp.c	Wed Jul  7 12:24:11 1999
--- emacs-20.6/src/xdisp.c	Thu Feb 17 11:32:28 2000
*************** decode_mode_spec_coding (coding_system, 
*** 4582,4588 ****
    Lisp_Object eoltype;
  
!   val = coding_system;
  
!   if (NILP (val))		/* Not yet decided.  */
      {
        if (multibyte)
--- 4582,4588 ----
    Lisp_Object eoltype;
  
!   val = Fget (coding_system, Qcoding_system);
  
!   if (!VECTORP (val))		/* Not yet decided.  */
      {
        if (multibyte)
*************** decode_mode_spec_coding (coding_system, 
*** 4597,4607 ****
  
        eolvalue = Fget (coding_system, Qeol_type);
- 
-       while (!NILP (val) && SYMBOLP (val))
- 	{
- 	  val = Fget (val, Qcoding_system);
- 	  if (NILP (eolvalue))
- 	    eolvalue = Fget (val, Qeol_type);
- 	}
  
        if (multibyte)
--- 4597,4600 ----