changeset 369:1d62742628b6 r21-1-14

Import from CVS: tag r21-1-14
author cvs
date Mon, 13 Aug 2007 11:01:51 +0200
parents 397a7324211a
children bd866891f083
files ChangeLog PROBLEMS README.packages configure configure.in etc/PACKAGES etc/package-index.LATEST.pgp lib-src/ChangeLog lib-src/gnuclient.c lib-src/gnuserv.c lib-src/gnuserv.h lisp/ChangeLog lisp/about.el lisp/auto-autoloads.el lisp/files.el lisp/gnuserv.el lisp/help.el lisp/lisp-mnt.el lisp/mule/auto-autoloads.el lisp/mule/custom-load.el lisp/package-get.el lisp/packages.el lisp/replace.el lisp/xpm-button.el lwlib/ChangeLog man/ChangeLog man/lispref/eval.texi man/lispref/extents.texi man/lispref/variables.texi man/xemacs-faq.texi nt/ChangeLog src/ChangeLog src/alloc.c src/config.h.in src/console.c src/data.c src/depend src/process-unix.c src/s/netbsd.h src/sysproc.h src/syssignal.h src/unexelf.c version.sh
diffstat 43 files changed, 2466 insertions(+), 1433 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Aug 13 11:01:11 2007 +0200
+++ b/ChangeLog	Mon Aug 13 11:01:51 2007 +0200
@@ -1,3 +1,44 @@
+2001-01-27  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.1.14 is released
+
+2001-01-21  Steve Youngs  <youngs@xemacs.org>
+
+	* ./etc/PACKAGES: Doc fix.
+
+	* README.packages: Doc fix.
+
+2001-01-20  Stephen J. Turnbull  <stephen@xemacs.org>
+
+    * xemacs-faq.texi (Q3.5.12): New FAQ.  XEmacs bitches about xmodmap.
+
+2001-01-21  Steve Youngs  <youngs@xemacs.org>
+
+    * etc/PACKAGES: Sync with 21.2 version, because everyone uses the
+    same packages.
+
+    * README.packages: Ditto.
+
+2001-01-18  Martin Buchholz  <martin@xemacs.org>
+
+	* PROBLEMS (Sun/Solaris): Yet another microimprovement.
+
+2001-01-18  Martin Buchholz  <martin@xemacs.org>
+
+	* xemacs-faq.texi (Q1.0.11): Change XEmacs for MacOS URL.
+
+2001-01-16  Martin Buchholz  <martin@xemacs.org>
+
+	* PROBLEMS: Document MIPSpro ICE problem workaround.
+
+2001-01-12  Martin Buchholz  <martin@xemacs.org>
+
+	Pty fixes for HP-UX and AIX and BSD and SunOS4 backported from 21.2.
+	Makes ``M-x shell; sleep 1000; Signals->Send KILL'' work.
+	(See src/ChangeLog for more detail.)
+
+	* configure.in: Detect killpg.
+
 2001-01-07  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.1.13 is released
@@ -594,7 +635,7 @@
 
 	* config.guess: Synched with latest FSF version.
 
-1998-07-12  Bjrn Torkelsson  <torkel@hpc2n.umu.se>
+1998-07-12  Björn Torkelsson  <torkel@hpc2n.umu.se>
 
 	* Makefile.in: added LDFLAGS. 
 
--- a/PROBLEMS	Mon Aug 13 11:01:11 2007 +0200
+++ b/PROBLEMS	Mon Aug 13 11:01:51 2007 +0200
@@ -168,6 +168,37 @@
 
 
 ** SunOS/Solaris
+*** Dumping error when using GNU binutils / GNU ld on a Sun.
+
+Errors similar to the following:
+
+   Dumping under the name xemacs unexec():
+   dldump(/space/rpluim/xemacs-obj/src/xemacs): ld.so.1: ./temacs:
+   fatal: /space/rpluim/xemacs-obj/src/xemacs: unknown dynamic entry:
+   1879048176
+
+are caused by using GNU ld.  There are several workarounds available:
+
+In XEmacs 21.2 or later, configure using the new portable dumper
+(--pdump).
+
+Alternatively, you can link using the Sun version of ld, which is
+normally held in /usr/ccs/bin.  This can be done by one of:
+
+- building gcc with these configure flags:
+  configure --with-ld=/usr/ccs/bin/ld --with-as=/usr/ccs/bin/as
+
+- adding -B/usr/ccs/bin/ to CFLAGS used to configure XEmacs
+  (Note: The trailing '/' there is significant.)
+
+- uninstalling GNU ld.
+
+The Solaris2 FAQ claims:
+
+    When you install gcc, don't make the mistake of installing
+    GNU binutils or GNU libc, they are not as capable as their
+    counterparts you get with Solaris 2.x.
+
 *** Link failure when using acc on a Sun.
 
 To use acc, you need additional options just before the libraries, such as
@@ -279,6 +310,14 @@
 an earlier version.  The solution is to upgrade your old library.
 
 ** IRIX
+
+*** On Irix 6.5, the MIPSpro compiler gets an internal compiler error
+
+The MIPSpro Compiler (at least version 7.2.1) can't seem to handle the
+union type properly, and fails to compile src/glyphs.c.  To avoid this
+problem, always build ---use-union-type=3Dno (but that's the default, so
+you should only see this problem if you're an XEmacs maintainer).
+
 *** Linking with -rpath on IRIX.
 
 Darrell Kindred <dkindred@cmu.edu> writes:
--- a/README.packages	Mon Aug 13 11:01:11 2007 +0200
+++ b/README.packages	Mon Aug 13 11:01:51 2007 +0200
@@ -1,3 +1,12 @@
+                                                            -*- Outline -*-
+This file is in Outline mode.  It is best viewed under XEmacs.
+
+Press C-c C-o (Ctrl+c Ctrl+o) now to see a list of headings.
+  To expand a heading:  Put the cursor on the heading and press C-c C-s
+To collapse a heading:  Press C-c C-d
+
+For general XEmacs navigation tips: Press C-h t
+
 The XEmacs Packages Quick Start Guide
 -------------------------------------
 
@@ -5,8 +14,8 @@
 and its packages from start.  For details see the 'Startup Paths' and
 'Packages' sections of the XEmacs info manual.
 
-Real Real Quickstart FAQ
-------------------------
+* Real Real Quickstart FAQ
+--------------------------
 
 Q. Do I need to have the packages to compile XEmacs?
 A. No, XEmacs will build and install just fine without any packages
@@ -26,8 +35,8 @@
    you.  You can either track it down and install it, or install the
    `Sumo Tarball' (see the second FAQ).
 
-A note of caution
------------------
+* A note of caution
+-------------------
 
 The XEmacs package system is still in its infancy. Please expect a few 
 minor hurdles on the way. Also neither the interface nor the structure is 
@@ -35,8 +44,8 @@
 backwards compatibility as quirks are worked out over the coming
 releases. 
 
-Some Package Theory
--------------------
+* Some Package Theory
+---------------------
 
 In order to reduce the size and increase the maintainability of XEmacs,
 the majority of the Elisp packages that came with previous releases
@@ -48,147 +57,174 @@
 the right place. On startup XEmacs will find them, set up the load
 path correctly, install autoloads, etc, etc.
 
-Package hierarchies
--------------------
+* Package hierarchies
+---------------------
 
 On Startup XEmacs looks for packages in so called package hierarchies.
 These can be specified by the 'package-path' parameter to the
 'configure' script. However by default there are three system wide
-hierarchies.
-
-$prefix/lib/xemacs/site-packages
-     Local and 3rd party packages go here.
-
-$prefix/lib/xemacs/mule-packages
-     Only searched by MULE-enabled XEmacsen.
+hierarchies. ("$prefix" defaults to "/usr/local")
 
 $prefix/lib/xemacs/xemacs-packages
      Normal packages go here.
 
-Where to get the packages
--------------------------
+$prefix/lib/xemacs/mule-packages
+     Mule packages go here and are only searched by MULE-enabled XEmacsen.
+
+$prefix/lib/xemacs/site-packages/
+     Local and 3rd party packages go here.
+
+
+* Where to get the packages
+---------------------------
 
 Packages are available from ftp://ftp.xemacs.org/pub/xemacs/packages
 and its mirrors.
 
-How to install the packages
----------------------------
+* How to install the packages
+-----------------------------
+There are a few different ways to install packages:
 
-1. All at once, using the 'Sumo Tarball'.
-2. By hand.
+    1. Manually, all at once, using the 'Sumo Tarball'.
+    2. Manually, using individual package tarballs.
 3. Automatically, using the package tools from XEmacs.
 
-The Sumo Tarball
-----------------
+** Manually, all at once, using the 'Sumo Tarball'
+--------------------------------------------------
 
 Those with little time, cheap connections and plenty of disk space can
 install all the packages at once using the sumo tarballs.
-Download the file
+Download the file:
 
 xemacs-sumo.tar.gz
 
-For an XEmacs compiled with Mule you also need
+For an XEmacs compiled with Mule you also need:
 
 xemacs-mule-sumo.tar.gz
 
 N.B. They are called 'Sumo Tarballs' for good reason. They are
-currently about 15MB and 2.3MB (gzipped) respectively.
+currently about 19MB and 4.5MB (gzipped) respectively.
+
+Install them by:
 
-Install them by
+   cd $prefix/lib/xemacs ; gunzip -c <tarballname> | tar xvf - RET
 
-cd $prefix/lib/xemacs ; gunzip -c <tarballname> | tar xf -
+Or, if you have GNU tar:
+
+   cd $prefix/lib/xemacs ; tar zxvf /path/to/<tarballname> RET
 
 As the Sumo tarballs are not regenerated as often as the individual
 packages, it is recommended that you use the automatic package tools
 afterwards to pick up any recent updates.
 
-Installing by Hand
-------------------
+** Manually, using individual package tarballs
+----------------------------------------------
 
-Fetch the packages from the ftp site, CDROM whatever. The filenames
+Fetch the packages from the FTP site, CD-ROM whatever. The filenames
 have the form name-<version>-pkg.tar.gz and are gzipped tar files. For
 a fresh install it is sufficient to untar the file at the top of the
-package hierarchy. For example if we are installing the 'xemacs-base'
-package in version 1.27:
+package hierarchy. 
+
+Note: If you are upgrading packages already installed, it's best to
+remove the old package first (see 'Upgrading/Removing Packages' below).
 
-mkdir $prefix/lib/xemacs/xemacs-packages # if it does not exist yet
-cd $prefix/lib/xemacs/xemacs-packages
-gunzip -c ...../xemacs-base-1.27-pkg.tar.gz | tar xf -
+For example if we are installing the 'xemacs-base'
+package (version 1.48):
+
+   mkdir $prefix/lib/xemacs/xemacs-packages RET # if it does not exist yet
+   cd $prefix/lib/xemacs/xemacs-packages RET
+   gunzip -c /path/to/xemacs-base-1.48-pkg.tar.gz | tar xvf - RET
+
+Or if you have GNU tar, the last step can be:
 
-For MULE related packages, it is best to untar in the mule-packages
-hierarchy, i.e. for the mule-base package, version 1.25
+   tar zxvf /path/to/xemacs-base-1.48-pkg.tar.gz RET
+
+For MULE related packages, it is best to untar into the mule-packages
+hierarchy, i.e. for the mule-base package, version 1.37:
 
-mkdir $prefix/lib/xemacs/mule-packages # if it does not exist yet
-cd $prefix/lib/xemacs/mule-packages
-gunzip -c ...../mule-base-1.25-pkg.tar.gz | tar xf -
+   mkdir $prefix/lib/xemacs/mule-packages RET # if it does not exist yet
+   cd $prefix/lib/xemacs/mule-packages RET
+   gunzip -c /path/to/mule-base-1.37-pkg.tar.gz | tar xvf - RET
+
+Or if you have GNU tar, the last step can be:
 
-Installing automatically
-------------------------
+   tar zxvf /path/to/mule-base-1.37-pkg.tar.gz RET
+
+
+** Automatically, using the package tools from XEmacs
+-----------------------------------------------------
 
 XEmacs comes with some tools to make the periodic updating and
 installing easier. It will notice if new packages or versions are
-available and will fetch them from the ftp site.
+available and will fetch them from the FTP site.
 
 Unfortunately this requires that a few packages are already in place. 
 You will have to install them by hand as above or use a SUMO tarball. 
 This requirement will hopefully go away in the future. The packages
 you need are:
 
-   efs          - To fetch the files from the ftp site or mirrors.
+   efs          - To fetch the files from the FTP site or mirrors.
    xemacs-base  - Needed by efs.
 
 and optionally:
 
-   mailcrypt    - If you have PGP installed and want to verify the
-                  signature of the index file.
    mule-base    - Needed if you want to use XEmacs with MULE.
 
-After installing these by hand, you can start XEmacs. (It is a good
-idea to use 'xemacs -vanilla' here as your startup files might need
-things now moved to packages.)
+After installing these by hand, fire up XEmacs and follow these
+steps.
+    
+Note: The menus in XEmacs 21.2.x and up have changed slightly, so
+where I mention "Options -> Manage Packages", substitute "Tools ->
+Packages".
 
- - First you need to specify an FTP site to use.
-      Use Options->Manage Packages->Add Download Site
-       or M-x customize-variable RET package-get-remote RET
+  (1) Choose a download site.
+      - via menu: Options -> Manages Packages -> Add Download Site 
+      - via keyb: M-x customize-variable RET package-get-remote RET
+        (put in the details of remote host and directory)
 
-   Alternatively, if you already have the packages on a local disk
-   then you can specify this directly using 'M-x
-   pui-add-install-directory'. Please make sure you also have a
-   corresponding copy of the package index there.
+      If the package tarballs _AND_ the package-index file are in a
+      local directory, you can: M-x pui-add-install-directory RET
+
+  (2) Obtain a list of packages and display the list in a buffer named
+      "*Packages*".
+      - menu: Options -> Manage Packages -> List & Install
+      - keyb: M-x pui-list-packages RET
 
- - Invoke Options->Manage Packages->List & Install
-      or M-x pui-list-packages RET
-   XEmacs will now first try to fetch a new version of the package
-   index from the FTP site. Depending on whether you are using
-   'mailcrypt/PGP', you will get some question about keys to fetch or
-   whether to use the index without verifying the signature. If the
-   new index was different from the one already on disk, XEmacs will
-   offer you to overwrite the old index.
+      XEmacs will now connect to the remote site and download the
+      latest package-index file.  If you see an error about the
+      package-index entries not being PGP signed, you can safely
+      ignore this because PGP has not been integrated into the XEmacs
+      package tools yet.
+
+      The resulting buffer, "*Packages*" has brief instructions at the
+      end of the buffer.
+
+  (3) Choose the packages you wish to install.
+      - mouse: Click button 2 on the package name.
+      -  keyb: RET on the package name
 
--  XEmacs will show you a buffer named "*Packages*" with an overview
-   of available and installed packages, including a short description.
-   In this buffer you can select which packages you want using the
-   mouse or using RET.
+  (4) Make sure you have everything you need.
+      - menu: Packages -> Add Required
+      - keyb: r
+
+      XEmacs will now search for packages that are required by the
+      ones that you have chosen to install and offer to select
+      those packages also.
 
--  When you are finished choosing packages, invoke
-   'Packages->Install/Remove Select' from the menu or type 'x' to
-   begin installing packages.
-    
-After Installation
-------------------
+      For novices and gurus alike, this step can save your bacon.
+      It's easy to forget to install a critical package.
+
+  (5) Download and install the packages.
+      - menu: Packages -> Install/Remove Selected
+      - keyb: x
+
+* After Installation
+--------------------
 
 New packages can only be used by XEmacs after a restart.
 
-Note to MULE users
-------------------
-
-It is a good idea to keep packages that are MULE-only separate by
-putting them in the mule-packages hierarchy.  Non-Mule XEmacsen will
-ignore packages in mule-packages so it is safe to have that directory
-in the package path of a Non-Mule XEmacs.
-
-Which Packages to install?
---------------------------
+* Which Packages to install?
+----------------------------
 
 This is difficult to say. When in doubt install a package. If you
 administrate a big site it might be a good idea to just install
@@ -198,25 +234,18 @@
 edit-utils, fsf-compat, mail-lib, net-utils, os-utils, prog-modes,
 text-modes, time
 
-Unfortunately the package system currently provides neither
-dependencies nor conflicts. This will be a future enhancement. The
-above set includes most packages that are used by others.
+If you are using the XEmacs package tools, don't forget to do:
+
+    Packages -> Add Required
+
+To make sure you have everything that the packages you have chosen to
+install need.
 
 See also '.../etc/PACKAGES' for further descriptions of the individual
-packages (currently outdated).
-
-Finding the Right Packages
---------------------------
+packages.
 
-If you want to find out which package contains the functionality you
-are looking for, use M-x package-get-package-provider, and give it a
-symbol that is likely to be in that package.  For example, if some
-code you want to use has a (require 'thingatpt) in it, try doing
-M-x package-get-package-provider RET thingatpt , which will return
-something like: (fsf-compat "1.06").
-
-Upgrading/Removing Packages
----------------------------
+* Upgrading/Removing Packages
+-----------------------------
 
 As the exact files and their locations contained in a package may
 change it is recommended to remove a package first before installing a
@@ -228,19 +257,32 @@
 Note that the interactive package tools included with XEmacs already do
 this for you.
 
-User Package directories
-------------------------
+* User Package directories
+--------------------------
 
 In addition to the system wide packages, each user can have his own
-packages installed in "~/.xemacs" (Note that this will most likely
-change to "~/.xemacs/packages" in the near future). If you want to
+packages installed in "~/.xemacs/xemacs-packages". If you want to
 install packages there using the interactive tools, you need to set
-'pui-package-install-dest-dir' to "~/.xemacs"
+'pui-package-install-dest-dir' to "~/.xemacs/xemacs-packages"
 
-Site lisp/Site start
---------------------
+* Site lisp/Site start
+----------------------
 
 The site-packages hierarchy replaces the old 'site-lisp' directory.
 XEmacs no longer looks into a 'site-lisp' directly by default.
 A good place to put 'site-start.el' would be in
 $prefix/lib/xemacs/site-packages/lisp/
+
+* Finding the right packages
+----------------------------
+
+If you want to find out which package contains the functionality you
+are looking for, use M-x package-get-package-provider, and give it a
+symbol that is likely to be in that package.  
+
+For example, if some code you want to use has a (require 'thingatpt)
+in it:
+
+    M-x package-get-package-provider RET thingatpt RET
+
+which will return something like: (fsf-compat "1.08").
--- a/configure	Mon Aug 13 11:01:11 2007 +0200
+++ b/configure	Mon Aug 13 11:01:51 2007 +0200
@@ -9014,7 +9014,7 @@
 # Check for UNIX98 PTYs.
 # getpt is a glibc addition which emulates the master device on
 # systems without kernel support.
-for ac_func in grantpt unlockpt getpt ptsname
+for ac_func in grantpt unlockpt getpt ptsname killpg
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
 echo "configure:9021: checking for $ac_func" >&5
@@ -9071,23 +9071,55 @@
 done
 
 
-
-case "$opsys" in
-  linuxaout* | bsdos3* | freebsd* | decosf4-0* | aix4* ) extra_objs="$extra_objs realpath.o" &&  if test "$extra_verbose" = "yes"; then
-   echo "    xemacs will be linked with \"realpath.o\""
- fi ;;
-  * )
-    case "$canonical" in
-      *-*-sysv4.2uw2* ) extra_objs="$extra_objs realpath.o" &&  if test "$extra_verbose" = "yes"; then
-   echo "    xemacs will be linked with \"realpath.o\""
- fi ;;
-      * ) for ac_func in realpath
+for ac_hdr in stropts.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:9079: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9082 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9087: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  { test "$extra_verbose" = "yes" && cat << EOF
+    Defining $ac_tr_hdr
+EOF
+cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+}
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+if test "$ac_cv_header_stropts_h" = "yes"; then
+  for ac_func in isastream
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9088: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9091 "configure"
+echo "configure:9120: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9123 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -9110,7 +9142,115 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:9114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9146: \"$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"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_func_$ac_func=no"
+fi
+rm -f conftest*
+
+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
+  { test "$extra_verbose" = "yes" && cat << EOF
+    Defining $ac_tr_func
+EOF
+cat >> confdefs.h <<EOF
+#define $ac_tr_func 1
+EOF
+}
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+
+  for ac_hdr in strtio.h
+do
+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+echo "configure:9177: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9180 "configure"
+#include "confdefs.h"
+#include <$ac_hdr>
+EOF
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+{ (eval echo configure:9185: \"$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*
+  eval "ac_cv_header_$ac_safe=yes"
+else
+  echo "$ac_err" >&5
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_header_$ac_safe=no"
+fi
+rm -f conftest*
+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
+  { test "$extra_verbose" = "yes" && cat << EOF
+    Defining $ac_tr_hdr
+EOF
+cat >> confdefs.h <<EOF
+#define $ac_tr_hdr 1
+EOF
+}
+ 
+else
+  echo "$ac_t""no" 1>&6
+fi
+done
+ fi
+
+
+case "$opsys" in
+  linuxaout* | bsdos3* | freebsd* | decosf4-0* | aix4* ) extra_objs="$extra_objs realpath.o" &&  if test "$extra_verbose" = "yes"; then
+   echo "    xemacs will be linked with \"realpath.o\""
+ fi ;;
+  * )
+    case "$canonical" in
+      *-*-sysv4.2uw2* ) extra_objs="$extra_objs realpath.o" &&  if test "$extra_verbose" = "yes"; then
+   echo "    xemacs will be linked with \"realpath.o\""
+ fi ;;
+      * ) for ac_func in realpath
+do
+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+echo "configure:9228: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9231 "configure"
+#include "confdefs.h"
+/* System header to define __stub macros and hopefully few prototypes,
+    which can conflict with char $ac_func(); below.  */
+#include <assert.h>
+/* Override any gcc2 internal prototype to avoid an error.  */
+/* We use char because int might match the return type of a gcc2
+    builtin and then its argument prototype would still apply.  */
+char $ac_func();
+
+int main() {
+
+/* The GNU C library defines this for functions which it implements
+    to always fail with ENOSYS.  Some functions are actually named
+    something starting with __ and the normal name is an alias.  */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+$ac_func();
+#endif
+
+; return 0; }
+EOF
+if { (eval echo configure:9254: \"$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"
 else
@@ -9144,16 +9284,16 @@
 esac
 
 echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:9148: checking whether netdb declares h_errno" >&5
-cat > conftest.$ac_ext <<EOF
-#line 9150 "configure"
+echo "configure:9288: checking whether netdb declares h_errno" >&5
+cat > conftest.$ac_ext <<EOF
+#line 9290 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 return h_errno;
 ; return 0; }
 EOF
-if { (eval echo configure:9157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
    { test "$extra_verbose" = "yes" && cat << \EOF
@@ -9173,16 +9313,16 @@
 rm -f conftest*
 
 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:9177: checking for sigsetjmp" >&5
-cat > conftest.$ac_ext <<EOF
-#line 9179 "configure"
+echo "configure:9317: checking for sigsetjmp" >&5
+cat > conftest.$ac_ext <<EOF
+#line 9319 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigjmp_buf bar; sigsetjmp (bar, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:9186: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9326: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
    { test "$extra_verbose" = "yes" && cat << \EOF
@@ -9202,11 +9342,11 @@
 rm -f conftest*
 
 echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
-echo "configure:9206: checking whether localtime caches TZ" >&5
+echo "configure:9346: checking whether localtime caches TZ" >&5
 
 if test "$ac_cv_func_tzset" = "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 9210 "configure"
+#line 9350 "configure"
 #include "confdefs.h"
 #include <time.h>
 #if STDC_HEADERS
@@ -9241,7 +9381,7 @@
   exit (0);
 }
 EOF
-if { (eval echo configure:9245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:9385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   emacs_cv_localtime_cache=no
 else
@@ -9271,9 +9411,9 @@
 
 if test "$HAVE_TIMEVAL" = "yes"; then
 echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6
-echo "configure:9275: checking whether gettimeofday accepts one or two arguments" >&5
-cat > conftest.$ac_ext <<EOF
-#line 9277 "configure"
+echo "configure:9415: checking whether gettimeofday accepts one or two arguments" >&5
+cat > conftest.$ac_ext <<EOF
+#line 9417 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -9295,7 +9435,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:9299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""two" 1>&6
 else
@@ -9317,19 +9457,19 @@
 
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:9321: checking for inline" >&5
+echo "configure:9461: checking for inline" >&5
 
 ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 9326 "configure"
+#line 9466 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:9333: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9473: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -9380,17 +9520,17 @@
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:9384: checking for working alloca.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9387 "configure"
+echo "configure:9524: checking for working alloca.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9527 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:9394: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -9414,10 +9554,10 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:9418: checking for alloca" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9421 "configure"
+echo "configure:9558: checking for alloca" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9561 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -9445,7 +9585,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:9449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -9484,10 +9624,10 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:9488: checking whether alloca needs Cray hooks" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9491 "configure"
+echo "configure:9628: checking whether alloca needs Cray hooks" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9631 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -9511,10 +9651,10 @@
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9515: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9518 "configure"
+echo "configure:9655: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9658 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -9537,7 +9677,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:9541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9681: \"$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"
 else
@@ -9567,10 +9707,10 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:9571: checking stack direction for C alloca" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9574 "configure"
+echo "configure:9711: checking stack direction for C alloca" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9714 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -9589,7 +9729,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:9593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:9733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_c_stack_direction=1
 else
@@ -9619,15 +9759,15 @@
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:9623: checking for vfork.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9626 "configure"
+echo "configure:9763: checking for vfork.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9766 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9631: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9771: \"$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*
@@ -9655,10 +9795,10 @@
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:9659: checking for working vfork" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9662 "configure"
+echo "configure:9799: checking for working vfork" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9802 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -9753,7 +9893,7 @@
   }
 }
 EOF
-if { (eval echo configure:9757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:9897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_vfork_works=yes
 else
@@ -9779,10 +9919,10 @@
 
 
 echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:9783: checking for working strcoll" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9786 "configure"
+echo "configure:9923: checking for working strcoll" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9926 "configure"
 #include "confdefs.h"
 #include <string.h>
 main ()
@@ -9792,7 +9932,7 @@
 	strcoll ("123", "456") >= 0);
 }
 EOF
-if { (eval echo configure:9796: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:9936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_strcoll_works=yes
 else
@@ -9820,10 +9960,10 @@
 for ac_func in getpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:9824: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9827 "configure"
+echo "configure:9964: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9967 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -9846,7 +9986,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:9850: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9990: \"$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"
 else
@@ -9874,10 +10014,10 @@
 done
 
 echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:9878: checking whether getpgrp takes no argument" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9881 "configure"
+echo "configure:10018: checking whether getpgrp takes no argument" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10021 "configure"
 #include "confdefs.h"
 
 /*
@@ -9932,7 +10072,7 @@
 }
 
 EOF
-if { (eval echo configure:9936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:10076: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_getpgrp_void=yes
 else
@@ -9959,10 +10099,10 @@
 
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:9963: checking for working mmap" >&5
+echo "configure:10103: checking for working mmap" >&5
 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 cat > conftest.$ac_ext <<EOF
-#line 9966 "configure"
+#line 10106 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <unistd.h>
@@ -9995,7 +10135,7 @@
   return 1;
 }
 EOF
-if { (eval echo configure:9999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:10139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   have_mmap=yes
 else
@@ -10030,15 +10170,15 @@
 
 ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:10034: checking for termios.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10037 "configure"
+echo "configure:10174: checking for termios.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10177 "configure"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10042: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10182: \"$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*
@@ -10081,15 +10221,15 @@
   echo "$ac_t""no" 1>&6
 ac_safe=`echo "termio.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termio.h""... $ac_c" 1>&6
-echo "configure:10085: checking for termio.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10088 "configure"
+echo "configure:10225: checking for termio.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10228 "configure"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10233: \"$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*
@@ -10121,10 +10261,10 @@
 
 
 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:10125: checking for socket" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10128 "configure"
+echo "configure:10265: checking for socket" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10268 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -10147,7 +10287,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else
@@ -10162,15 +10302,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6
-echo "configure:10166: checking for netinet/in.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10169 "configure"
+echo "configure:10306: checking for netinet/in.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10309 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10174: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10314: \"$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*
@@ -10187,15 +10327,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6
-echo "configure:10191: checking for arpa/inet.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10194 "configure"
+echo "configure:10331: checking for arpa/inet.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10334 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10199: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10339: \"$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*
@@ -10220,9 +10360,9 @@
 }
 
       echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:10224: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:10364: checking "for sun_len member in struct sockaddr_un"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 10226 "configure"
+#line 10366 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -10233,7 +10373,7 @@
 static struct sockaddr_un x; x.sun_len = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:10237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_SOCKADDR_SUN_LEN
@@ -10251,9 +10391,9 @@
 fi
 rm -f conftest*
       echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6
-echo "configure:10255: checking "for ip_mreq struct in netinet/in.h"" >&5
+echo "configure:10395: checking "for ip_mreq struct in netinet/in.h"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 10257 "configure"
+#line 10397 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -10263,7 +10403,7 @@
 static struct ip_mreq x;
 ; return 0; }
 EOF
-if { (eval echo configure:10267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_MULTICAST
@@ -10294,10 +10434,10 @@
 
 
 echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:10298: checking for msgget" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10301 "configure"
+echo "configure:10438: checking for msgget" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10441 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char msgget(); below.  */
@@ -10320,7 +10460,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_msgget=yes"
 else
@@ -10335,15 +10475,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6
-echo "configure:10339: checking for sys/ipc.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10342 "configure"
+echo "configure:10479: checking for sys/ipc.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10482 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10347: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10487: \"$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*
@@ -10360,15 +10500,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6
-echo "configure:10364: checking for sys/msg.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10367 "configure"
+echo "configure:10504: checking for sys/msg.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10507 "configure"
 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10372: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10512: \"$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*
@@ -10406,15 +10546,15 @@
 
 ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:10410: checking for dirent.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10413 "configure"
+echo "configure:10550: checking for dirent.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10553 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10418: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10558: \"$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*
@@ -10441,15 +10581,15 @@
   echo "$ac_t""no" 1>&6
 ac_safe=`echo "sys/dir.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/dir.h""... $ac_c" 1>&6
-echo "configure:10445: checking for sys/dir.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10448 "configure"
+echo "configure:10585: checking for sys/dir.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10588 "configure"
 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10453: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10593: \"$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*
@@ -10482,15 +10622,15 @@
 
 ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:10486: checking for nlist.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10489 "configure"
+echo "configure:10626: checking for nlist.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10629 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10494: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10634: \"$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*
@@ -10520,7 +10660,7 @@
 
 
 echo "checking "for sound support"" 1>&6
-echo "configure:10524: checking "for sound support"" >&5
+echo "configure:10664: checking "for sound support"" >&5
 case "$with_sound" in
   native | both ) with_native_sound=yes;;
   nas    | no   ) with_native_sound=no;;
@@ -10531,15 +10671,15 @@
     if test -n "$native_sound_lib"; then
     ac_safe=`echo "multimedia/audio_device.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for multimedia/audio_device.h""... $ac_c" 1>&6
-echo "configure:10535: checking for multimedia/audio_device.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10538 "configure"
+echo "configure:10675: checking for multimedia/audio_device.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10678 "configure"
 #include "confdefs.h"
 #include <multimedia/audio_device.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10543: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10683: \"$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*
@@ -10587,15 +10727,15 @@
       if test -z "$native_sound_lib"; then
        ac_safe=`echo "audio.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for audio.h""... $ac_c" 1>&6
-echo "configure:10591: checking for audio.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10594 "configure"
+echo "configure:10731: checking for audio.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10734 "configure"
 #include "confdefs.h"
 #include <audio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10599: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10739: \"$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*
@@ -10613,12 +10753,12 @@
   
         
 echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:10617: checking for ALopenport in -laudio" >&5
+echo "configure:10757: checking for ALopenport in -laudio" >&5
 ac_lib_var=`echo audio'_'ALopenport | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -laudio "
 cat > conftest.$ac_ext <<EOF
-#line 10622 "configure"
+#line 10762 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10629,7 +10769,7 @@
 ALopenport()
 ; return 0; }
 EOF
-if { (eval echo configure:10633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10773: \"$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"
 else
@@ -10665,12 +10805,12 @@
       if test -z "$native_sound_lib"; then
 	
 echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:10669: checking for AOpenAudio in -lAlib" >&5
+echo "configure:10809: checking for AOpenAudio in -lAlib" >&5
 ac_lib_var=`echo Alib'_'AOpenAudio | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lAlib "
 cat > conftest.$ac_ext <<EOF
-#line 10674 "configure"
+#line 10814 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10681,7 +10821,7 @@
 AOpenAudio()
 ; return 0; }
 EOF
-if { (eval echo configure:10685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10825: \"$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"
 else
@@ -10719,15 +10859,15 @@
     for dir in "machine" "sys" "linux"; do
       ac_safe=`echo "${dir}/soundcard.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ${dir}/soundcard.h""... $ac_c" 1>&6
-echo "configure:10723: checking for ${dir}/soundcard.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10726 "configure"
+echo "configure:10863: checking for ${dir}/soundcard.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 10866 "configure"
 #include "confdefs.h"
 #include <${dir}/soundcard.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10731: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10871: \"$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*
@@ -10797,7 +10937,7 @@
  fi
   libs_x="-laudio $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-laudio\" to \$libs_x"; fi
       cat > conftest.$ac_ext <<EOF
-#line 10801 "configure"
+#line 10941 "configure"
 #include "confdefs.h"
 #include <audio/Xtutil.h>
 EOF
@@ -10818,7 +10958,7 @@
 rm -f conftest*
 
       cat > conftest.$ac_ext <<EOF
-#line 10822 "configure"
+#line 10962 "configure"
 #include "confdefs.h"
 #include <audio/fileutil.h>
 #ifdef NAS_BIG_ENDIAN
@@ -10847,7 +10987,7 @@
 
 if test "$with_tty" = "yes"  ; then
   echo "checking for TTY-related features" 1>&6
-echo "configure:10851: checking for TTY-related features" >&5
+echo "configure:10991: checking for TTY-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_TTY
 EOF
@@ -10863,12 +11003,12 @@
     if test -z "$with_ncurses"; then
     
 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:10867: checking for tgetent in -lncurses" >&5
+echo "configure:11007: checking for tgetent in -lncurses" >&5
 ac_lib_var=`echo ncurses'_'tgetent | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lncurses "
 cat > conftest.$ac_ext <<EOF
-#line 10872 "configure"
+#line 11012 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10879,7 +11019,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:10883: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11023: \"$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"
 else
@@ -10912,15 +11052,15 @@
 
     ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:10916: checking for ncurses/curses.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10919 "configure"
+echo "configure:11056: checking for ncurses/curses.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11059 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10924: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11064: \"$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*
@@ -10942,15 +11082,15 @@
 
     ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
-echo "configure:10946: checking for ncurses/term.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10949 "configure"
+echo "configure:11086: checking for ncurses/term.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11089 "configure"
 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10954: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11094: \"$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*
@@ -10980,15 +11120,15 @@
       c_switch_site="$c_switch_site -I/usr/include/ncurses"
       ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:10984: checking for ncurses/curses.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 10987 "configure"
+echo "configure:11124: checking for ncurses/curses.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11127 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10992: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11132: \"$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*
@@ -11023,12 +11163,12 @@
 	for lib in curses termlib termcap; do
 	  
 echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:11027: checking for tgetent in -l$lib" >&5
+echo "configure:11167: checking for tgetent in -l$lib" >&5
 ac_lib_var=`echo $lib'_'tgetent | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$lib "
 cat > conftest.$ac_ext <<EOF
-#line 11032 "configure"
+#line 11172 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11039,7 +11179,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:11043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11183: \"$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"
 else
@@ -11070,12 +11210,12 @@
       else
 	
 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:11074: checking for tgetent in -lcurses" >&5
+echo "configure:11214: checking for tgetent in -lcurses" >&5
 ac_lib_var=`echo curses'_'tgetent | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lcurses "
 cat > conftest.$ac_ext <<EOF
-#line 11079 "configure"
+#line 11219 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11086,7 +11226,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:11090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11230: \"$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"
 else
@@ -11104,12 +11244,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:11108: checking for tgetent in -ltermcap" >&5
+echo "configure:11248: checking for tgetent in -ltermcap" >&5
 ac_lib_var=`echo termcap'_'tgetent | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ltermcap "
 cat > conftest.$ac_ext <<EOF
-#line 11113 "configure"
+#line 11253 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11120,7 +11260,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:11124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11264: \"$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"
 else
@@ -11168,15 +11308,15 @@
 
     test -z "$with_gpm" && { ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for gpm.h""... $ac_c" 1>&6
-echo "configure:11172: checking for gpm.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11175 "configure"
+echo "configure:11312: checking for gpm.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11315 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11180: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11320: \"$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*
@@ -11199,12 +11339,12 @@
  }
   test -z "$with_gpm" && { 
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:11203: checking for Gpm_Open in -lgpm" >&5
+echo "configure:11343: checking for Gpm_Open in -lgpm" >&5
 ac_lib_var=`echo gpm'_'Gpm_Open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lgpm "
 cat > conftest.$ac_ext <<EOF
-#line 11208 "configure"
+#line 11348 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11215,7 +11355,7 @@
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:11219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11359: \"$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"
 else
@@ -11264,20 +11404,20 @@
 
 
 echo "checking for database support" 1>&6
-echo "configure:11268: checking for database support" >&5
+echo "configure:11408: checking for database support" >&5
 
 if test "$with_database_gnudbm $with_database_dbm" != "no no"; then
   ac_safe=`echo "ndbm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ndbm.h""... $ac_c" 1>&6
-echo "configure:11273: checking for ndbm.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11276 "configure"
+echo "configure:11413: checking for ndbm.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11416 "configure"
 #include "confdefs.h"
 #include <ndbm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11421: \"$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*
@@ -11307,12 +11447,12 @@
 if test "$with_database_gnudbm" != "no"; then
   
 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:11311: checking for dbm_open in -lgdbm" >&5
+echo "configure:11451: checking for dbm_open in -lgdbm" >&5
 ac_lib_var=`echo gdbm'_'dbm_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lgdbm "
 cat > conftest.$ac_ext <<EOF
-#line 11316 "configure"
+#line 11456 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11323,7 +11463,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:11327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11467: \"$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"
 else
@@ -11351,10 +11491,10 @@
 
 if test "$with_database_dbm" != "no"; then
   echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:11355: checking for dbm_open" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11358 "configure"
+echo "configure:11495: checking for dbm_open" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11498 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */
@@ -11377,7 +11517,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_dbm_open=yes"
 else
@@ -11396,12 +11536,12 @@
 
     
 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:11400: checking for dbm_open in -ldbm" >&5
+echo "configure:11540: checking for dbm_open in -ldbm" >&5
 ac_lib_var=`echo dbm'_'dbm_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldbm "
 cat > conftest.$ac_ext <<EOF
-#line 11405 "configure"
+#line 11545 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11412,7 +11552,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:11416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11556: \"$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"
 else
@@ -11454,10 +11594,10 @@
 
 if test "$with_database_berkdb" != "no"; then
   echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
-echo "configure:11458: checking for Berkeley db.h" >&5
+echo "configure:11598: checking for Berkeley db.h" >&5
   for path in "db/db.h" "db.h"; do
     cat > conftest.$ac_ext <<EOF
-#line 11461 "configure"
+#line 11601 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -11479,7 +11619,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11483: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11623: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   db_h_path="$path"; break
 else
@@ -11495,9 +11635,9 @@
 
   if test "$with_database_berkdb" != "no"; then
     echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6
-echo "configure:11499: checking for Berkeley DB version" >&5
+echo "configure:11639: checking for Berkeley DB version" >&5
     cat > conftest.$ac_ext <<EOF
-#line 11501 "configure"
+#line 11641 "configure"
 #include "confdefs.h"
 #include <$db_h_path>
 #if DB_VERSION_MAJOR > 1
@@ -11516,10 +11656,10 @@
 rm -f conftest*
 
     echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6
-echo "configure:11520: checking for $dbfunc" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11523 "configure"
+echo "configure:11660: checking for $dbfunc" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11663 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $dbfunc(); below.  */
@@ -11542,7 +11682,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_$dbfunc=yes"
 else
@@ -11561,12 +11701,12 @@
 
     
 echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
-echo "configure:11565: checking for $dbfunc in -ldb" >&5
+echo "configure:11705: checking for $dbfunc in -ldb" >&5
 ac_lib_var=`echo db'_'$dbfunc | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldb "
 cat > conftest.$ac_ext <<EOF
-#line 11570 "configure"
+#line 11710 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11577,7 +11717,7 @@
 $dbfunc()
 ; return 0; }
 EOF
-if { (eval echo configure:11581: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11721: \"$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"
 else
@@ -11641,12 +11781,12 @@
 if test "$with_socks" = "yes"; then
   
 echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:11645: checking for SOCKSinit in -lsocks" >&5
+echo "configure:11785: checking for SOCKSinit in -lsocks" >&5
 ac_lib_var=`echo socks'_'SOCKSinit | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lsocks "
 cat > conftest.$ac_ext <<EOF
-#line 11650 "configure"
+#line 11790 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11657,7 +11797,7 @@
 SOCKSinit()
 ; return 0; }
 EOF
-if { (eval echo configure:11661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11801: \"$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"
 else
@@ -11716,15 +11856,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11720: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 11723 "configure"
+echo "configure:11860: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 11863 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11728: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11868: \"$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*
@@ -11755,12 +11895,12 @@
 
 test -z "$with_shlib" && test ! -z "$have_dlfcn" && { 
 echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:11759: checking for dlopen in -ldl" >&5
+echo "configure:11899: checking for dlopen in -ldl" >&5
 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldl "
 cat > conftest.$ac_ext <<EOF
-#line 11764 "configure"
+#line 11904 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11771,7 +11911,7 @@
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:11775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11915: \"$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"
 else
@@ -11800,12 +11940,12 @@
  }
 test -z "$with_shlib" && test ! -z "$have_dlfcn" && { 
 echo $ac_n "checking for _dlopen in -lc""... $ac_c" 1>&6
-echo "configure:11804: checking for _dlopen in -lc" >&5
+echo "configure:11944: checking for _dlopen in -lc" >&5
 ac_lib_var=`echo c'_'_dlopen | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lc "
 cat > conftest.$ac_ext <<EOF
-#line 11809 "configure"
+#line 11949 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11816,7 +11956,7 @@
 _dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:11820: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11960: \"$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"
 else
@@ -11845,12 +11985,12 @@
  }
 test -z "$with_shlib" && test ! -z "$have_dlfcn" && { 
 echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6
-echo "configure:11849: checking for dlopen in -lc" >&5
+echo "configure:11989: checking for dlopen in -lc" >&5
 ac_lib_var=`echo c'_'dlopen | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lc "
 cat > conftest.$ac_ext <<EOF
-#line 11854 "configure"
+#line 11994 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11861,7 +12001,7 @@
 dlopen()
 ; return 0; }
 EOF
-if { (eval echo configure:11865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12005: \"$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"
 else
@@ -11890,12 +12030,12 @@
  }
 test -z "$with_shlib" && { 
 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:11894: checking for shl_load in -ldld" >&5
+echo "configure:12034: checking for shl_load in -ldld" >&5
 ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldld "
 cat > conftest.$ac_ext <<EOF
-#line 11899 "configure"
+#line 12039 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11906,7 +12046,7 @@
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo configure:11910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12050: \"$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"
 else
@@ -11935,12 +12075,12 @@
  }
 test -z "$with_shlib" && { 
 echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
-echo "configure:11939: checking for dld_init in -ldld" >&5
+echo "configure:12079: checking for dld_init in -ldld" >&5
 ac_lib_var=`echo dld'_'dld_init | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldld "
 cat > conftest.$ac_ext <<EOF
-#line 11944 "configure"
+#line 12084 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -11951,7 +12091,7 @@
 dld_init()
 ; return 0; }
 EOF
-if { (eval echo configure:11955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12095: \"$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"
 else
@@ -12001,7 +12141,7 @@
 dll_oflags="-o "
 
 echo $ac_n "checking how to build a shared library""... $ac_c" 1>&6
-echo "configure:12005: checking how to build a shared library" >&5
+echo "configure:12145: checking how to build a shared library" >&5
 case `uname -rs` in
 	UNIX_SV*|UNIX_System_V*)
 		dll_lflags="-G"
@@ -12092,10 +12232,10 @@
   for ac_func in dlerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12096: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 12099 "configure"
+echo "configure:12236: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 12239 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -12118,7 +12258,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12262: \"$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"
 else
@@ -12154,11 +12294,11 @@
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 12158 "configure"
+#line 12298 "configure"
 #include "confdefs.h"
 int main(int c,char *v[]){return 0;}
 EOF
-if { (eval echo configure:12162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
--- a/configure.in	Mon Aug 13 11:01:11 2007 +0200
+++ b/configure.in	Mon Aug 13 11:01:51 2007 +0200
@@ -3128,7 +3128,15 @@
 # Check for UNIX98 PTYs.
 # getpt is a glibc addition which emulates the master device on
 # systems without kernel support.
-AC_CHECK_FUNCS(grantpt unlockpt getpt ptsname)
+AC_CHECK_FUNCS(grantpt unlockpt getpt ptsname killpg)
+
+dnl Check for STREAM support functions.
+dnl Confusingly, "str" means both "string" and "SysV Streams".
+AC_CHECK_HEADERS(stropts.h)
+if test "$ac_cv_header_stropts_h" = "yes"; then
+  AC_CHECK_FUNCS(isastream)
+  AC_CHECK_HEADERS(strtio.h) dnl TIOCSIGNAL
+fi
 
 dnl realpath is buggy on linux, decosf and aix4
 
--- a/etc/PACKAGES	Mon Aug 13 11:01:11 2007 +0200
+++ b/etc/PACKAGES	Mon Aug 13 11:01:51 2007 +0200
@@ -1,322 +1,324 @@
-* Description of available packages by category
-===============================================
+                                                            -*- Outline -*-
+This file is in Outline mode.  It is best viewed under XEmacs.
 
-This data is up-to-date as of 10 February 1999.
+Press C-c C-o (Ctrl+c Ctrl+o) now to see a list of headings.
+  To expand a heading:  Put the cursor on the heading and press C-c C-s
+To collapse a heading:  Press C-c C-d
+
+For general XEmacs navigation tips: Press C-h t
+
+Description of available packages by category
+=============================================
+This data is up-to-date as of January 17, 2001.
 
 ** Library Packages (libs)
 ==========================
-
 These packages are required to build and support most of the rest of
 XEmacs.  By design, xemacs-base is a `regular' package.  Use restraint 
 when adding new files there as it is required by almost everything.
 
 *** Sun
-
 Support for Sparcworks.
 
 *** apel
-
 A Portable Emacs Library.  Used by XEmacs MIME support.
 
-*** edebug
-
-A Lisp debugger.
-
 *** dired
-
 The DIRectory EDitor is for manipulating, and running commands on
 files in a directory.
 
+*** edebug
+A Lisp debugger.
+
 *** efs
+Treat files on remote systems the same as local files.
 
-Treat files on remote systems the same as local files.
+*** elib
+Portable Emacs Lisp utilities library.
+
+*** fsf-compat
+FSF Emacs compatibility files.
 
 *** mail-lib
-
 Fundamental lisp files for providing email support.
 
+*** sounds-au
+XEmacs Sun sound files.
+
+*** sounds-wav
+XEmacs Microsoft sound files.
+
 *** tooltalk
-
 Support for building with Tooltalk.
 
 *** xemacs-base
-
 Fundamental XEmacs support.  Install this unless you wish a totally
 naked XEmacs.
 
 *** xemacs-devel
-
 XEmacs Lisp developer support.  This package contains utilities for
 supporting Lisp development.  It is a single-file package so it may be 
 tailored.
 
 ** Communications Packages (comm)
 =================================
-
 These packages provide support for various communications, primarily
 email and usenet.
 
+*** bbdb
+The Big Brother Data Base
+
+*** eicq
+ICQ Client developed and tested on Linux x86; 
+only supported on that platform
+
+*** eudc
+Emacs Unified Directory Client (LDAP, PH).
+
 *** footnote
-
 Footnoting in mail message editing modes.
 
 *** gnats
-
 XEmacs bug reports.
 
 *** gnus
-
 The Gnus Newsreader and Mailreader.
 
 *** mailcrypt
-
 Support for messaging encryption with PGP.
 
+*** mew
+Messaging in an Emacs World.
+
 *** mh-e
-
 Front end support for MH.
 
 *** net-utils
-
 Miscellaneous Networking Utilities.  This is a single-file package and 
 files may be deleted at will.
 
-*** ph
-
-Emacs implementation of the ph client to CCSO/qi directory servers.
-
 *** rmail
-
 An obsolete Emacs mailer.  If you do not already use it don't start.
 
 *** supercite
-
 An Emacs citation tool.  Useful with all Emacs Mailers and Newsreaders.
 
 *** tm
-
-Emacs MIME support.
+Emacs MIME support. Not needed for Gnus >= 5.8.0
 
 *** vm
-
 An Emacs mailer.
 
 *** w3
+A Web browser.
 
-A Web browser.
+*** zenirc
+ZENIRC IRC Client.
 
 ** Games and Amusements (games)
 ===============================
+All work and no play...
 
 *** cookie
-
 Spook and Yow (Zippy quotes).
 
 *** games
-
 Tetris, Sokoban, and Snake.
 
 *** mine
-
 Minehunt.
 
 *** misc-games
-
 Other amusements and diversions.
 
 ** Mule Support (mule)
 ======================
+MULti-lingual Enhancement.  Support for world scripts such as
+Latin, Arabic, Cyrillic, Chinese, Japanese, Greek, Hebrew etc.
+To use these packages your XEmacs must be compiled with Mule
+support.
+
+*** edict
+Lisp Interface to EDICT, Kanji Dictionary.
 
 *** egg-its
-
 Wnn (4.2 and 6) support.  SJ3 support.  Must be installed prior to
 XEmacs build.
 
 *** leim
-
 Quail.  Used for everything other than English and Japanese.
 
 *** locale
-
 Used for localized menubars (French and Japanese) and localized splash
 screens (Japanese).
 
+*** lookup
+Dictionary support
+
 *** mule-base
-
 Basic Mule support.  Must be installed prior to building with Mule.
 
 *** skk
-
 Another Japanese Language Input Method.  Can be used without a
 separate process running as a dictionary server.
 
 ** Productivity Packages (oa)
 =============================
+Things to make life a little easier.
+
+*** calc
+Emacs calculator.
 
 *** calendar
-
 Calendar and diary support.
 
 *** edit-utils
-
 Single file lisp packages for various XEmacs goodies.  Load this and
 weed out the junk you don't want.
 
 *** forms
-
-Forms editing support (obsolete, use the builtin Widget instead).
+Forms editing support (obsolete, use the built-in Widget instead).
 
 *** frame-icon
-
 Provide a WM icon based on major mode.
 
 *** hm--html-menus
-
 HTML editing.
 
 *** ispell
-
 Spell-checking with ispell.
 
 *** pc
-
 PC style interface emulation.
 
 *** psgml
-
 Validated HTML/SGML editing.
 
 *** sgml
-
 SGML/Linuxdoc-SGML editing.
 
 *** slider
-
 User interface tool.
 
 *** speedbar
-
-??? Document me.
+Provides a separate frame with convenient references.
 
 *** strokes
-
 Mouse enhancement utility.
 
 *** text-modes
-
 Various single file lisp packages for editing text files.
 
 *** time
-
 Display time & date on the modeline.
 
 ** Operating System Utilities (os)
 ==================================
+Tools for working with the operating system.
+
+*** eshell
+Command shell implemented entirely in Emacs Lisp.
 
 *** eterm
-
 Terminal emulator.
 
 *** igrep
-
 Enhanced front-end for Grep.
 
 *** ilisp
-
 Front-end for Inferior Lisp.
 
 *** os-utils
-
 Miscellaneous single-file O/S utilities, for printing, archiving,
 compression, remote shells, etc.
 
+*** pcomplete
+Provides programmatic completion.
+
+*** ps-print-nomule
+Old, but no-Mule safe ps-print.
+
 *** view-process
-
 A Unix process browsing tool.
 
 ** Program Editing Support (prog)
 =================================
+XEmacs supports a multitude of programming languages.  These
+packages will help your coding.
 
 *** ada
-
 Ada language support.
 
 *** c-support
-
 Basic single-file add-ons for editing C code.
 
 *** cc-mode
-
 C, C++ and Java language support.
 
 *** debug
-
 GUD, gdb, dbx debugging support.
 
 *** ediff
-
 Interface over patch.
 
 *** emerge
-
 Another interface over patch.
 
+*** idlwave
+Editing and Shell mode for the Interactive Data Language.
+
+*** jde
+Java language and development support.
+
 *** pcl-cvs
-
 CVS frontend.
 
 *** prog-modes
-
 Miscellaneous single-file lisp files for various programming languages.
 
 *** scheme
-
 Front-end support for Inferior Scheme.
 
+*** semantic
+Semantic bovinator.
+
 *** sh-script
-
 Support for editing shell scripts.
 
 *** vc
-
 Version Control for Free systems.
 
 *** vc-cc
-
-Version Control for ClearCase.  This package must be installed prior
-to building XEmacs [broken as of XEmacs 20.5-beta19].
+Version Control for ClearCase.  This package will shortly be
+replaced with clearcase.el
 
 *** vhdl
-
 Support for VHDL.
 
 ** Word Processing (wp)
 =======================
+Working with text.
 
 *** auctex
-
 Basic TeX/LaTeX support.
 
 *** crisp
-
 Crisp/Brief emulation.
 
 *** edt
-
 DEC EDIT/EDT emulation.
 
+*** reftex
+Emacs support for LaTeX cross-references, citations.
+
 *** texinfo
-
 XEmacs TeXinfo support.
 
 *** textools
-
 Single-file TeX support.
 
 *** tpu
-
 DEC EDIT/TPU support.
 
 *** viper
-
 VI emulation support.
--- a/etc/package-index.LATEST.pgp	Mon Aug 13 11:01:11 2007 +0200
+++ b/etc/package-index.LATEST.pgp	Mon Aug 13 11:01:51 2007 +0200
@@ -1,109 +1,43 @@
 ;; Package Index file -- Do not edit manually.
 ;;;@@@
 (package-get-update-base-entry (quote
-(ediff
-  (standards-version 1.0
-   version "1.19"
-   author-version "2.72"
-   date "1999-04-06"
-   build-date "1999-05-13"
-   maintainer "Michael Kifer <kifer@cs.sunysb.edu>"
-   distribution stable
-   priority medium
-   category "prog"
-   dump nil
-   description "Interface over GNU patch."
-   filename "ediff-1.19-pkg.tar.gz"
-   md5sum "d6e0edc88c5d09279df71ce9aff41b25"
-   size 281804
-   provides (ediff)
-   requires (pcl-cvs elib dired xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(hm--html-menus
-  (standards-version 1.0
-   version "1.12"
-   author-version "5.9"
-   date "1999-02-05"
-   build-date "1999-02-05"
+(skk
+  (standards-version 1.1
+   version "1.16"
+   author-version "10.60"
+   date "2000-10-05"
+   build-date "2000-10-23"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
-   priority low
-   category "oa"
-   dump nil
-   description "HTML editing."
-   filename "hm--html-menus-1.12-pkg.tar.gz"
-   md5sum "fc80ef260cc0682bde6e706cdc8ddae4"
-   size 177442
-   provides (adapt hm--date hm--html-configuration hm--html-drag-and-drop hm--html-indentation hm--html-keys hm--html-menu hm--html-mode hm--html-not-standard hm--html html-view tmpl-minor-mode)
-   requires (dired xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(jde
-  (standards-version 1.0
-   version "1.14"
-   author-version "2.14"
-   date "1999-02-05"
-   build-date "1999-02-05"
-   maintainer "Andy Piper <andy@xemacs.org>"
-   distribution stable
-   priority medium
-   category "prog"
-   dump nil
-   description "Java language and development support."
-   filename "jde-1.14-pkg.tar.gz"
-   md5sum "1028c54ef317d8dd4d4c78e5b9c004e6"
-   size 320702
-   provides (jde)
-   requires (cc-mode debug speedbar edit-utils mail-lib xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(skk
-  (standards-version 1.0
-   version "1.12"
-   author-version "10.38"
-   date "1998-10-01"
-   build-date "1999-02-02"
-   maintainer "SL Baur <steve@altair.xemacs.org>"
    distribution mule
    priority medium
    category "mule"
-   dump t
+   dump nil
    description "Japanese Language Input Method."
-   filename "skk-1.12-pkg.tar.gz"
-   md5sum "f690c518a0da65c4dc9fe2a867026c26"
-   size 1514106
+   filename "skk-1.16-pkg.tar.gz"
+   md5sum "f90947bfce7dbda3b9b6b43ed40bd3d6"
+   size 1490221
    provides (skk skk-tut)
-   requires (viper mule-base elib xemacs-base)
+   requires (viper mule-base elib xemacs-base apel)
    type regular
 ))
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
 (egg-its
-  (standards-version 1.0
-   version "1.16"
-   author-version "21.0b65"
-   date "1999-03-05"
-   build-date "1999-03-11"
+  (standards-version 1.1
+   version "1.23"
+   author-version "21.2b36"
+   date "2000-10-05"
+   build-date "2000-10-23"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution mule
    priority high
    category "mule"
-   dump t
+   dump nil
    description "Wnn (4.2 and 6) support.  SJ3 support."
-   filename "egg-its-1.16-pkg.tar.gz"
-   md5sum "5a3b23dbe609feeabfc108ae142715c3"
-   size 257562
+   filename "egg-its-1.23-pkg.tar.gz"
+   md5sum "87f8fe23666fe556a1be99ec60c05009"
+   size 260965
    provides (egg-cnpinyin egg-cnzhuyin egg-cwnn-leim egg-jisx0201 egg-jsymbol egg-kwnn-leim egg-leim egg-sj3-client egg-sj3-leim egg-sj3 egg-wnn egg)
    requires (leim mule-base fsf-compat xemacs-base)
    type regular
@@ -112,20 +46,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (edict
-  (standards-version 1.0
-   version "1.07"
+  (standards-version 1.1
+   version "1.10"
    author-version "0.9.8"
-   date "1998-07-23"
-   build-date "1999-02-02"
+   date "2000-10-05"
+   build-date "2000-10-23"
    maintainer "Stephen J. Turnbull <turnbull@sk.tsukuba.ac.jp>"
    distribution mule
    priority high
    category "mule"
    dump nil
    description "Lisp Interface to EDICT, Kanji Dictionary"
-   filename "edict-1.07-pkg.tar.gz"
-   md5sum "493ef0ec6f2760e5c94423c23c9d124e"
-   size 71661
+   filename "edict-1.10-pkg.tar.gz"
+   md5sum "7fa93ebd0de834b614fc5155446e4efb"
+   size 71870
    provides (dui-registry dui edict-edit edict-english edict-japanese edict-morphology edict-test edict ts-mode)
    requires (mule-base xemacs-base)
    type regular
@@ -133,21 +67,43 @@
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
+(lookup
+  (standards-version 1.1
+   version "1.05"
+   author-version "1.0"
+   date "2000-10-05"
+   build-date "2000-10-23"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution mule
+   priority high
+   category "mule"
+   dump nil
+   description "Dictionary support"
+   filename "lookup-1.05-pkg.tar.gz"
+   md5sum "3fd722465103b4d2956fa6de44cd407d"
+   size 214050
+   provides (lookup)
+   requires (cookie lookup)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
 (leim
-  (standards-version 1.0
-   version "1.12"
-   author-version "21.0b62"
-   date "1998-07-23"
-   build-date "1999-02-02"
+  (standards-version 1.1
+   version "1.15"
+   author-version "21.2b35"
+   date "2000-08-22"
+   build-date "2000-09-26"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution mule
    priority medium
    category "mule"
    dump nil
    description "Quail.  All non-English and non-Japanese language support."
-   filename "leim-1.12-pkg.tar.gz"
-   md5sum "07cc5be34a0d9d312b883b430349a882"
-   size 1671757
+   filename "leim-1.15-pkg.tar.gz"
+   md5sum "badce6b115ad1311587f8673c22cbc18"
+   size 1707863
    provides ()
    requires (mule-base fsf-compat xemacs-base)
    type regular
@@ -156,20 +112,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (locale
-  (standards-version 1.0
-   version "1.13"
-   author-version "21.0"
-   date "1999-05-11"
-   build-date "1999-05-13"
+  (standards-version 1.1
+   version "1.16"
+   author-version "21.2b35"
+   date "2000-08-22"
+   build-date "2000-09-26"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution mule
    priority high
    category "mule"
    dump nil
    description "Localized menubars and localized splash screens."
-   filename "locale-1.13-pkg.tar.gz"
-   md5sum "4735b4005dfce55cf3581885add18836"
-   size 33964
+   filename "locale-1.16-pkg.tar.gz"
+   md5sum "e91d79bd8ef22802ce792d845a4c7abb"
+   size 38692
    provides ()
    requires (mule-base)
    type regular
@@ -178,42 +134,42 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (mule-base
-  (standards-version 1.0
-   version "1.29"
-   author-version "21.0"
-   date "1999-05-13"
-   build-date "1999-05-13"
-   maintainer "SL Baur <steve@altair.xemacs.org>"
+  (standards-version 1.1
+   version "1.35"
+   author-version "21.2b36"
+   date "2000-10-05"
+   build-date "2000-10-23"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution mule
    priority high
    category "mule"
-   dump t
+   dump nil
    description "Basic Mule support, required for building with Mule."
-   filename "mule-base-1.29-pkg.tar.gz"
-   md5sum "9b713b6f95c4016dc29d7b584c78f7d1"
-   size 420205
+   filename "mule-base-1.35-pkg.tar.gz"
+   md5sum "2f30fe5b0563547ebe7fddb5bc9c9f64"
+   size 443084
    provides (canna-leim canna char-table china-util cyril-util isearch-ext japan-util ccl can-n-egg mule-help)
-   requires (fsf-compat xemacs-base)
+   requires (fsf-compat xemacs-base apel)
    type regular
 ))
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
 (strokes
-  (standards-version 1.0
-   version "1.04"
-   author-version "21.0b62"
-   date "1998-01-25"
-   build-date "1999-02-02"
+  (standards-version 1.1
+   version "1.07"
+   author-version "21.2b36"
+   date "2000-10-05"
+   build-date "2000-10-24"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority medium
    category "oa"
    dump nil
    description "Mouse enhancement utility."
-   filename "strokes-1.04-pkg.tar.gz"
-   md5sum "9a83020e888d140da2360dcac83c7c86"
-   size 43481
+   filename "strokes-1.07-pkg.tar.gz"
+   md5sum "a51a7bbcd452dada9b27b17ea6d32781"
+   size 43427
    provides (strokes)
    requires (text-modes edit-utils mail-lib xemacs-base)
    type regular
@@ -222,20 +178,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (time
-  (standards-version 1.0
-   version "1.07"
+  (standards-version 1.1
+   version "1.10"
    author-version "1.17"
-   date "1998-04-24"
-   build-date "1999-02-02"
+   date "2000-10-05"
+   build-date "2000-10-24"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority medium
    category "oa"
    dump nil
    description "Display time & date on the modeline."
-   filename "time-1.07-pkg.tar.gz"
-   md5sum "4cc97d84357412fb7d737a88b6f05cbe"
-   size 20006
+   filename "time-1.10-pkg.tar.gz"
+   md5sum "4d393ce1373550cc78f450aac980a928"
+   size 19922
    provides (time)
    requires (xemacs-base)
    type regular
@@ -244,20 +200,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (text-modes
-  (standards-version 1.0
-   version "1.19"
-   author-version "21.0"
-   date "1999-04-22"
-   build-date "1999-05-13"
+  (standards-version 1.1
+   version "1.28"
+   author-version "21.2b36"
+   date "2000-11-01"
+   build-date "2000-11-01"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority high
    category "oa"
    dump nil
    description "Miscellaneous support for editing text files."
-   filename "text-modes-1.19-pkg.tar.gz"
-   md5sum "9031e37912506b87a9a4fc4aa8107c13"
-   size 207865
+   filename "text-modes-1.28-pkg.tar.gz"
+   md5sum "af1a7a1b3f8403b0e431574bc72caf9f"
+   size 212988
    provides (autoinsert crontab-edit filladapt fold-isearch folding image-mode iso-acc iso-ascii iso-cvt iso-insert iso-swed swedish tabify whitespace-mode winmgr-mode xpm-mode xrdb-mode)
    requires (ispell fsf-compat xemacs-base)
    type regular
@@ -266,20 +222,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (slider
-  (standards-version 1.0
-   version "1.09"
+  (standards-version 1.1
+   version "1.12"
    author-version "0.3x1"
-   date "1998-08-13"
-   build-date "1999-02-02"
+   date "2000-10-05"
+   build-date "2000-10-23"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution experimental
+   distribution xemacs
    priority low
    category "oa"
    dump nil
    description "User interface tool."
-   filename "slider-1.09-pkg.tar.gz"
-   md5sum "b211a950179fee88712fc5c38e395069"
-   size 12004
+   filename "slider-1.12-pkg.tar.gz"
+   md5sum "27c1051dab23fd8627ceb1e96fd36f23"
+   size 12023
    provides (slider color-selector)
    requires ()
    type regular
@@ -288,20 +244,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (sgml
-  (standards-version 1.0
-   version "1.04"
-   author-version "21.0b62"
-   date "1998-01-25"
-   build-date "1999-02-02"
+  (standards-version 1.1
+   version "1.07"
+   author-version "21.2b36"
+   date "2000-10-05"
+   build-date "2000-10-23"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution contrib
+   distribution xemacs
    priority low
    category "oa"
    dump nil
    description "SGML/Linuxdoc-SGML editing."
-   filename "sgml-1.04-pkg.tar.gz"
-   md5sum "2b762a0fbdda616916624dc2fa53e647"
-   size 26938
+   filename "sgml-1.07-pkg.tar.gz"
+   md5sum "a1b1f84fa1ab4ced2f53a7ac333521bb"
+   size 26878
    provides (sgml linuxdoc-sgml)
    requires (xemacs-base)
    type regular
@@ -310,42 +266,42 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (psgml
-  (standards-version 1.0
-   version "1.12"
-   author-version "1.01"
-   date "1999-03-05"
-   build-date "1999-03-05"
+  (standards-version 1.1
+   version "1.20"
+   author-version "1.21"
+   date "2000-10-05"
+   build-date "2000-10-23"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority medium
    category "oa"
    dump nil
    description "Validated HTML/SGML editing."
-   filename "psgml-1.12-pkg.tar.gz"
-   md5sum "7303b3a604659b64f24b0847b3a686d5"
-   size 425458
+   filename "psgml-1.20-pkg.tar.gz"
+   md5sum "0cb458f0bb5b0033cd8289569a627a59"
+   size 537616
    provides (psgml sgml)
-   requires (edit-utils)
+   requires (xemacs-base edit-utils edebug xemacs-devel mail-lib)
    type regular
 ))
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
 (pc
-  (standards-version 1.0
-   version "1.15"
-   author-version "21.0"
-   date "1999-04-13"
-   build-date "1999-05-13"
+  (standards-version 1.1
+   version "1.18"
+   author-version "21.2b36"
+   date "2000-10-05"
+   build-date "2000-10-23"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority low
    category "oa"
    dump nil
    description "PC style interface emulation."
-   filename "pc-1.15-pkg.tar.gz"
-   md5sum "99ad6b816d02360a4a9ccb5425974818"
-   size 16315
+   filename "pc-1.18-pkg.tar.gz"
+   md5sum "b0d410fdcd54b02a9840c049b49d6991"
+   size 16495
    provides (delbs fusion pc-select pending-del s-region)
    requires (xemacs-base)
    type regular
@@ -354,20 +310,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (ispell
-  (standards-version 1.0
-   version "1.15"
+  (standards-version 1.1
+   version "1.21"
    author-version "3.2"
-   date "1999-05-13"
-   build-date "1999-05-13"
+   date "2000-10-26"
+   build-date "2000-10-28"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority low
    category "oa"
    dump nil
    description "Spell-checking with GNU ispell."
-   filename "ispell-1.15-pkg.tar.gz"
-   md5sum "23632bd9fc2f7e4c0303865c35c5f4a5"
-   size 68118
+   filename "ispell-1.21-pkg.tar.gz"
+   md5sum "a036811e426eb3a390ccc36e35efc3f5"
+   size 72464
    provides (ispell)
    requires ()
    type regular
@@ -375,21 +331,43 @@
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
+(hm--html-menus
+  (standards-version 1.1
+   version "1.15"
+   author-version "5.9"
+   date "2000-10-05"
+   build-date "2000-10-23"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution xemacs
+   priority low
+   category "oa"
+   dump nil
+   description "HTML editing."
+   filename "hm--html-menus-1.15-pkg.tar.gz"
+   md5sum "69aecc277ac8754318bfdd5f8613ec7f"
+   size 178950
+   provides (adapt hm--date hm--html-configuration hm--html-drag-and-drop hm--html-indentation hm--html-keys hm--html-menu hm--html-mode hm--html-not-standard hm--html html-view tmpl-minor-mode)
+   requires (dired xemacs-base)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
 (frame-icon
-  (standards-version 1.0
-   version "1.06"
-   author-version "21.0b62"
+  (standards-version 1.1
+   version "1.08"
+   author-version "21.2b35"
    date "1998-07-14"
-   build-date "1999-02-02"
+   build-date "2000-09-26"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution contrib
+   distribution xemacs
    priority low
    category "oa"
    dump nil
    description "Set up mode-specific icons for each frame under XEmacs"
-   filename "frame-icon-1.06-pkg.tar.gz"
-   md5sum "bc4f6e838a4fa12d7f3b8b1996b3a9ac"
-   size 33483
+   filename "frame-icon-1.08-pkg.tar.gz"
+   md5sum "e5dc58b3416e150be9250615d801ce76"
+   size 33435
    provides (forms forms-mode)
    requires ()
    type regular
@@ -398,20 +376,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (forms
-  (standards-version 1.0
-   version "1.10"
+  (standards-version 1.1
+   version "1.12"
    author-version "2.37"
-   date "1999-05-11"
-   build-date "1999-05-13"
+   date "1999-10-07"
+   build-date "2000-09-26"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution contrib
+   distribution xemacs
    priority low
    category "oa"
    dump nil
    description "Forms editing support (obsolete, use Widget instead)."
-   filename "forms-1.10-pkg.tar.gz"
-   md5sum "a8ad3a114859c0981a1f884072bf4b1b"
-   size 48264
+   filename "forms-1.12-pkg.tar.gz"
+   md5sum "1af268d079f28f65b0695e8e798715f0"
+   size 48394
    provides (forms forms-mode)
    requires ()
    type regular
@@ -420,20 +398,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (calendar
-  (standards-version 1.0
-   version "1.10"
-   author-version "21.0b63"
-   date "1999-02-08"
-   build-date "1999-03-01"
+  (standards-version 1.1
+   version "1.15"
+   author-version "21.2b36"
+   date "2000-09-12"
+   build-date "2000-10-23"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority low
    category "oa"
    dump nil
    description "Calendar and diary support."
-   filename "calendar-1.10-pkg.tar.gz"
-   md5sum "09e93d157d2853a35e735a6a04f54055"
-   size 248580
+   filename "calendar-1.15-pkg.tar.gz"
+   md5sum "dc269f755a13d49b324091ede7996c61"
+   size 251800
    provides (appt cal-dst cal-french cal-mayan cal-x cal-xemacs calendar diary-ins diary-lib holidays lunar solar)
    requires (xemacs-base)
    type regular
@@ -442,20 +420,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (calc
-  (standards-version 1.0
-   version "1.10"
+  (standards-version 1.1
+   version "1.13"
    author-version "2.02fX3"
-   date "1998-07-25"
-   build-date "1999-02-02"
+   date "2000-10-05"
+   build-date "2000-10-23"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority low
    category "oa"
    dump nil
    description "Emacs calculator"
-   filename "calc-1.10-pkg.tar.gz"
-   md5sum "148c82bf6f213d6e2fb234e1f21e4699"
-   size 1616821
+   filename "calc-1.13-pkg.tar.gz"
+   md5sum "2059f9e5ee5a7f180ce7ec9d50d59dd4"
+   size 1613852
    provides (calc)
    requires ()
    type regular
@@ -464,20 +442,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (speedbar
-  (standards-version 1.0
-   version "1.12"
-   author-version "0.6.2x"
-   date "1999-03-05"
-   build-date "1999-03-12"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+  (standards-version 1.1
+   version "1.17"
+   author-version "0.13"
+   date "2000-10-19"
+   build-date "2000-10-24"
+   maintainer "Eric M. Ludlam <zappo@gnu.org>"
+   distribution xemacs
    priority low
    category "oa"
    dump nil
-   description "Provides a seperate frame with convenient references."
-   filename "speedbar-1.12-pkg.tar.gz"
-   md5sum "3b578d06426921193ac2b8337a669bfa"
-   size 64892
+   description "Provides a separate frame with convenient references."
+   filename "speedbar-1.17-pkg.tar.gz"
+   md5sum "3dfb78465546a9c9a64df8f9a873c07b"
+   size 135848
    provides (speedbar)
    requires (xemacs-base)
    type regular
@@ -486,20 +464,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (edit-utils
-  (standards-version 1.0
-   version "1.39"
-   author-version "21.0"
-   date "1999-05-11"
-   build-date "1999-05-13"
+  (standards-version 1.1
+   version "1.53"
+   author-version "21.2b36"
+   date "2000-10-18"
+   build-date "2000-10-24"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority high
    category "oa"
    dump nil
    description "Miscellaneous editor extensions, you probably need this."
-   filename "edit-utils-1.39-pkg.tar.gz"
-   md5sum "f129277008f56e86ec8630a299df7408"
-   size 577970
+   filename "edit-utils-1.53-pkg.tar.gz"
+   md5sum "c38383534157176dee793184543e2422"
+   size 622850
    provides (abbrevlist atomic-extents avoid backup-dir balloon-help big-menubar blink-cursor blink-paren bookmark compare-w completion dabbrev desktop detached-minibuf edit-toolbar fast-lock file-part floating-toolbar flow-ctrl foldout func-menu hippie-exp icomplete id-select info-look iswitchb lazy-lock lazy-shot live-icon man mic-paren paren popper mode-motion+ outl-mouse page-ext blink-paren paren permanent-buffers recent-files redo reportmail rsz-minibuf saveconfsavehist saveplace scroll-in-place tempo toolbar-utils tree-menu uniquify where-was-i-db)
    requires (xemacs-base)
    type single
@@ -508,20 +486,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (view-process
-  (standards-version 1.0
-   version "1.06"
+  (standards-version 1.1
+   version "1.10"
    author-version "2.4"
-   date "1998-01-24"
-   build-date "1999-02-02"
+   date "2000-10-05"
+   build-date "2000-10-24"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority low
    category "os"
    dump nil
    description "A Unix process browsing tool."
-   filename "view-process-1.06-pkg.tar.gz"
-   md5sum "61c4c7175f23cb4cfd314e10303b238c"
-   size 59958
+   filename "view-process-1.10-pkg.tar.gz"
+   md5sum "5d590a8cae1c54bd7da67685f94be125"
+   size 60413
    provides (view-process-mode)
    requires (xemacs-base)
    type regular
@@ -529,22 +507,44 @@
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
+(ps-print-nomule
+  (standards-version 1.1
+   version "1.04"
+   author-version "3.05x1"
+   date "2000-10-28"
+   build-date "2000-10-29"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution xemacs
+   priority medium
+   category "os"
+   dump nil
+   description "Old, but no-Mule safe ps-print"
+   filename "ps-print-nomule-1.04-pkg.tar.gz"
+   md5sum "2532858db76dff62fc6e7b62c42c01ee"
+   size 52926
+   provides (ps-print)
+   requires (xemacs-base)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
 (os-utils
-  (standards-version 1.0
-   version "1.15"
-   author-version "21.0"
-   date "1999-03-19"
-   build-date "1999-05-13"
+  (standards-version 1.1
+   version "1.24"
+   author-version "21.2b36"
+   date "2000-10-05"
+   build-date "2000-10-24"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority medium
    category "os"
    dump nil
    description "Miscellaneous O/S utilities."
-   filename "os-utils-1.15-pkg.tar.gz"
-   md5sum "92a3d72b0df1fb79fef2aee88a4d4f50"
-   size 228261
-   provides (archive-mode background crypt crypt++ inf-lisp jka-compr lpr mchat ps-print tar-mode telnet terminal uncompress)
+   filename "os-utils-1.24-pkg.tar.gz"
+   md5sum "2aaf6d347b58ade3a32d5eecd059e04a"
+   size 202277
+   provides (archive-mode background crypt crypt++ inf-lisp jka-compr lpr mchat tar-mode telnet terminal uncompress)
    requires (xemacs-base)
    type single
 ))
@@ -552,42 +552,42 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (ilisp
-  (standards-version 1.0
-   version "1.07"
-   author-version "5.8"
-   date "1998-01-24"
-   build-date "1999-02-02"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+  (standards-version 1.1
+   version "1.13"
+   author-version "5.10.1"
+   date "2000-10-05"
+   build-date "2000-10-24"
+   maintainer "ilisp Maintainers <ilisp@cons.org>"
+   distribution xemacs
    priority low
    category "os"
    dump nil
    description "Front-end for Inferior Lisp."
-   filename "ilisp-1.07-pkg.tar.gz"
-   md5sum "38cb2d94926e310a6e71ec1be854d636"
-   size 262173
+   filename "ilisp-1.13-pkg.tar.gz"
+   md5sum "8a32b2e231744c945a479e6cc15595f0"
+   size 355918
    provides (ilisp completer)
-   requires (xemacs-base)
+   requires (xemacs-base mail-lib fsf-compat eterm)
    type regular
 ))
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
 (igrep
-  (standards-version 1.0
-   version "1.05"
+  (standards-version 1.1
+   version "1.07"
    author-version "2.83"
    date "1998-08-11"
-   build-date "1999-02-02"
+   build-date "2000-09-26"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority low
    category "os"
    dump nil
    description "Enhanced front-end for Grep."
-   filename "igrep-1.05-pkg.tar.gz"
-   md5sum "e70d4973a2af4dbd6222f5943bfa1a50"
-   size 14935
+   filename "igrep-1.07-pkg.tar.gz"
+   md5sum "b4cfb4223622464c17fa9b03da34e55c"
+   size 15188
    provides (igrep)
    requires (dired xemacs-base)
    type regular
@@ -596,20 +596,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (eterm
-  (standards-version 1.0
-   version "1.08"
-   author-version "21.0b62"
-   date "1998-06-28"
-   build-date "1999-02-02"
+  (standards-version 1.1
+   version "1.12"
+   author-version "21.2b36"
+   date "2000-10-05"
+   build-date "2000-10-24"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority medium
    category "os"
    dump nil
    description "Terminal emulation."
-   filename "eterm-1.08-pkg.tar.gz"
-   md5sum "77e56529b5de6a0a0dd46c5d1634eebf"
-   size 108905
+   filename "eterm-1.12-pkg.tar.gz"
+   md5sum "db348c584302b0a45547ae467b7defa1"
+   size 108948
    provides (eterm)
    requires (xemacs-base)
    type regular
@@ -618,20 +618,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (viper
-  (standards-version 1.0
-   version "1.14"
-   author-version "3.061"
-   date "1999-03-03"
-   build-date "1999-03-05"
+  (standards-version 1.1
+   version "1.22"
+   author-version "3.09"
+   date "2000-10-29"
+   build-date "2000-10-30"
    maintainer "Michael Kifer <kifer@cs.sunysb.edu>"
-   distribution stable
+   distribution xemacs
    priority low
    category "wp"
    dump nil
    description "VI emulation support."
-   filename "viper-1.14-pkg.tar.gz"
-   md5sum "0e118822906e195dc352f28c8efc01e0"
-   size 317899
+   filename "viper-1.22-pkg.tar.gz"
+   md5sum "c49bf9ba3326647363ee34e1a619d0ee"
+   size 324026
    provides (viper)
    requires (xemacs-base)
    type regular
@@ -640,20 +640,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (tpu
-  (standards-version 1.0
-   version "1.08"
+  (standards-version 1.1
+   version "1.11"
    author-version "4.2X"
-   date "1998-07-23"
-   build-date "1999-02-02"
+   date "2000-10-05"
+   build-date "2000-10-24"
    maintainer "Kevin Oberman <oberman@es.net>"
-   distribution normal
+   distribution xemacs
    priority medium
    category "wp"
    dump nil
    description "DEC EDIT/TPU support."
-   filename "tpu-1.08-pkg.tar.gz"
-   md5sum "2306ac55a0a1ed23da02a85c91f881bb"
-   size 58804
+   filename "tpu-1.11-pkg.tar.gz"
+   md5sum "abd2888c0293e0204775a1e44ed2428e"
+   size 58937
    provides (tpu)
    requires ()
    type regular
@@ -662,20 +662,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (textools
-  (standards-version 1.0
-   version "1.08"
-   author-version "21.0b62"
-   date "1998-04-29"
-   build-date "1999-02-02"
+  (standards-version 1.1
+   version "1.11"
+   author-version "21.2b36"
+   date "2000-10-05"
+   build-date "2000-10-24"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stabl
+   distribution xemacs
    priority medium
    category "wp"
    dump nil
    description "Miscellaneous TeX support."
-   filename "textools-1.08-pkg.tar.gz"
-   md5sum "22dd0e16433a96547fde5757c6793388"
-   size 79176
+   filename "textools-1.11-pkg.tar.gz"
+   md5sum "f93c42ee9915c8fdcda3b99f485e26ea"
+   size 79133
    provides (bib-mode bibtex refer-to-bibtex)
    requires (xemacs-base)
    type single
@@ -684,20 +684,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (texinfo
-  (standards-version 1.0
-   version "1.14"
-   author-version "21.0b62"
-   date "1998-07-20"
-   build-date "1999-02-02"
+  (standards-version 1.1
+   version "1.19"
+   author-version "21.2b35"
+   date "2000-03-18"
+   build-date "2000-09-26"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority high
    category "wp"
    dump nil
    description "XEmacs TeXinfo support."
-   filename "texinfo-1.14-pkg.tar.gz"
-   md5sum "b1b6a7f4c1ff10be38d3e27d1213f1c8"
-   size 127830
+   filename "texinfo-1.19-pkg.tar.gz"
+   md5sum "209b3f985c6a1af8be9bd7485c6b611d"
+   size 133070
    provides (makeinfo tex-mode texinfmt texinfo texnfo-tex texnfo-upd)
    requires (xemacs-base)
    type regular
@@ -706,20 +706,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (reftex
-  (standards-version 1.0
-   version "1.13"
-   author-version "3.43"
-   date "1999-04-06"
-   build-date "1999-05-13"
-   maintainer "Carsten Dominik <dominik@strw.LeidenUniv.nl>"
-   distribution stable
+  (standards-version 1.1
+   version "1.21"
+   author-version "4.14"
+   date "2000-10-05"
+   build-date "2000-10-24"
+   maintainer "Carsten Dominik <dominik@astro.uva.nl>"
+   distribution xemacs
    priority medium
    category "wp"
    dump nil
    description "Emacs support for LaTeX cross-references, citations.."
-   filename "reftex-1.13-pkg.tar.gz"
-   md5sum "5e9196a6fdda2587bec1aff19d6322ec"
-   size 216008
+   filename "reftex-1.21-pkg.tar.gz"
+   md5sum "6d89c671de6a52eb381e94e381e1fdb2"
+   size 329316
    provides (reftex)
    requires (fsf-compat xemacs-base)
    type regular
@@ -728,20 +728,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (edt
-  (standards-version 1.0
-   version "1.07"
-   author-version "21.0b62"
-   date "1998-04-07"
-   build-date "1999-02-02"
+  (standards-version 1.1
+   version "1.10"
+   author-version "21.2b36"
+   date "2000-10-05"
+   build-date "2000-10-24"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution contrib
+   distribution xemacs
    priority low
    category "wp"
    dump nil
    description "DEC EDIT/EDT emulation."
-   filename "edt-1.07-pkg.tar.gz"
-   md5sum "6c48ceb9686c50058be3938288940bc5"
-   size 46131
+   filename "edt-1.10-pkg.tar.gz"
+   md5sum "31098bfe40f1c0faf65cea68e8065c6d"
+   size 46133
    provides (edt)
    requires (xemacs-base)
    type regular
@@ -750,20 +750,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (crisp
-  (standards-version 1.0
-   version "1.09"
+  (standards-version 1.1
+   version "1.11"
    author-version "1.34"
    date "1998-08-18"
-   build-date "1999-02-02"
+   build-date "2000-09-26"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority low
    category "wp"
    dump nil
    description "Crisp/Brief emulation."
-   filename "crisp-1.09-pkg.tar.gz"
-   md5sum "faa9b6f2868a7e5b212d1094039cf526"
-   size 10067
+   filename "crisp-1.11-pkg.tar.gz"
+   md5sum "3d97e6f3b03d660e1e3b27f8e410c747"
+   size 10090
    provides (crisp scroll-lock)
    requires ()
    type regular
@@ -772,20 +772,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (auctex
-  (standards-version 1.0
-   version "1.16"
-   author-version "9.7p"
-   date "1998-09-30"
-   build-date "1999-02-02"
+  (standards-version 1.1
+   version "1.22"
+   author-version "9.9p"
+   date "2000-10-05"
+   build-date "2000-10-24"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority medium
    category "wp"
    dump nil
    description "Basic TeX/LaTeX support."
-   filename "auctex-1.16-pkg.tar.gz"
-   md5sum "56e3454a1162c25db93fc84bdab61d0f"
-   size 365136
+   filename "auctex-1.22-pkg.tar.gz"
+   md5sum "c4f99bfa9b2b6aa3f08d0b25e9a8fcbf"
+   size 375765
    provides (auc-old bib-cite font-latex latex multi-prompt tex-buf tex-info tex-jp tex-site tex)
    requires (xemacs-base)
    type regular
@@ -794,42 +794,42 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (vhdl
-  (standards-version 1.0
-   version "1.07"
-   author-version "2.74"
-   date "1998-01-24"
-   build-date "1999-02-02"
+  (standards-version 1.1
+   version "1.11"
+   author-version "3.30"
+   date "2000-10-05"
+   build-date "2000-10-24"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority low
    category "prog"
    dump nil
    description "Support for VHDL."
-   filename "vhdl-1.07-pkg.tar.gz"
-   md5sum "0eae8d15cff7d7b6dd7e1d00029c0e3a"
-   size 65961
+   filename "vhdl-1.11-pkg.tar.gz"
+   md5sum "39654fae4d8119fc5b7cc765ab1ac3ba"
+   size 215878
    provides (vhdl-mode)
-   requires ()
+   requires (xemacs-base edit-utils c-support speedbar ps-print-nomule os-utils)
    type regular
 ))
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
 (vc
-  (standards-version 1.0
-   version "1.17"
-   author-version "21.0b63"
-   date "1999-02-25"
-   build-date "1999-03-01"
+  (standards-version 1.1
+   version "1.24"
+   author-version "21.2b36"
+   date "2000-10-05"
+   build-date "2000-10-24"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority low
    category "prog"
    dump nil
    description "Version Control for Free systems."
-   filename "vc-1.17-pkg.tar.gz"
-   md5sum "4e80458c0e6d4cf2805ed6a46135e1c6"
-   size 84499
+   filename "vc-1.24-pkg.tar.gz"
+   md5sum "53540948e4e07c38c89a5208fc4bc6fd"
+   size 86561
    provides (vc)
    requires (dired xemacs-base)
    type regular
@@ -838,20 +838,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (vc-cc
-  (standards-version 1.0
-   version "1.11"
-   author-version "21.0b62"
-   date "1998-12-09"
-   build-date "1999-02-02"
+  (standards-version 1.1
+   version "1.14"
+   author-version "21.2b35"
+   date "2000-06-20"
+   build-date "2000-09-26"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution contrib
+   distribution xemacs
    priority low
    category "prog"
    dump nil
    description "Version Control for ClearCase (UnFree) systems."
-   filename "vc-cc-1.11-pkg.tar.gz"
-   md5sum "561ab60400e3fa6bfef8ad8567a3702d"
-   size 96544
+   filename "vc-cc-1.14-pkg.tar.gz"
+   md5sum "b8e018dd38554ef60be1a1689cdccd4d"
+   size 98701
    provides (vc)
    requires (dired xemacs-base)
    type regular
@@ -860,20 +860,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (sh-script
-  (standards-version 1.0
-   version "1.08"
+  (standards-version 1.1
+   version "1.12"
    author-version "2.0e"
-   date "1998-05-12"
-   build-date "1999-02-02"
+   date "2000-07-11"
+   build-date "2000-09-26"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority low
    category "prog"
    dump nil
    description "Support for editing shell scripts."
-   filename "sh-script-1.08-pkg.tar.gz"
-   md5sum "f2f584ab19761b1db14160d9d3cbc6f3"
-   size 33900
+   filename "sh-script-1.12-pkg.tar.gz"
+   md5sum "87adf4c99303febf5f8b35d5453ee5d1"
+   size 35330
    provides (sh-script executable)
    requires (xemacs-base)
    type regular
@@ -882,20 +882,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (scheme
-  (standards-version 1.0
-   version "1.07"
-   author-version "21.0b62"
-   date "1998-09-08"
-   build-date "1999-02-02"
+  (standards-version 1.1
+   version "1.10"
+   author-version "21.2b35"
+   date "1999-06-15"
+   build-date "2000-09-26"
    maintainer "Karl M. Hegbloom <karlheg@bittersweet.inetarena.com>"
-   distribution contrib
+   distribution xemacs
    priority low
    category "prog"
    dump nil
    description "Front-end support for Inferior Scheme."
-   filename "scheme-1.07-pkg.tar.gz"
-   md5sum "998d46aee749b32493cae61cac3888d2"
-   size 36292
+   filename "scheme-1.10-pkg.tar.gz"
+   md5sum "93e6a748ad46d54258a7e8767afd4be8"
+   size 36533
    provides (scheme xscheme cmuscheme cmuscheme48)
    requires (xemacs-base)
    type regular
@@ -904,20 +904,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (prog-modes
-  (standards-version 1.0
-   version "1.19"
-   author-version "21.0"
-   date "1999-05-12"
-   build-date "1999-05-13"
+  (standards-version 1.1
+   version "1.30"
+   author-version "21.2b36"
+   date "2000-10-05"
+   build-date "2000-10-24"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority medium
    category "prog"
    dump nil
    description "Support for various programming languages."
-   filename "prog-modes-1.19-pkg.tar.gz"
-   md5sum "11da842b17ee65837bc56c13d76f49af"
-   size 596965
+   filename "prog-modes-1.30-pkg.tar.gz"
+   md5sum "9e3573c49de15a3525ebcca6f8e715b8"
+   size 698108
    provides (autoconf-mode cperl-mode eiffel3 f90 fortran ksh-mode m4-mode makefile perl-mode postscript python-mode rexx-mode simula-mode tcl teco verilog-mod)
    requires (mail-lib xemacs-devel xemacs-base)
    type regular
@@ -925,21 +925,65 @@
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
+(jde
+  (standards-version 1.1
+   version "1.23"
+   author-version "2.1.9"
+   date "2000-10-23"
+   build-date "2000-10-24"
+   maintainer "Paul Kinnucan <paulk@mathworks.com>"
+   distribution xemacs
+   priority medium
+   category "prog"
+   dump nil
+   description "Java language and development support."
+   filename "jde-1.23-pkg.tar.gz"
+   md5sum "ad52bc3f55da8d5f6cfcce0d0c8a12c2"
+   size 1530290
+   provides (jde)
+   requires (jde cc-mode semantic debug speedbar edit-utils eterm mail-lib xemacs-base fsf-compat)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(idlwave
+  (standards-version 1.1
+   version "1.22"
+   author-version "4.5"
+   date "2000-10-06"
+   build-date "2000-10-24"
+   maintainer "Carsten Dominik <dominik@astro.uva.nl>"
+   distribution xemacs
+   priority medium
+   category "prog"
+   dump nil
+   description "Editing and Shell mode for the Interactive Data Language"
+   filename "idlwave-1.22-pkg.tar.gz"
+   md5sum "beea0962702132927131dc50a08ba81c"
+   size 325421
+   provides (idlwave)
+   requires (fsf-compat xemacs-base)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
 (emerge
-  (standards-version 1.0
-   version "1.05"
-   author-version "21.0b62"
-   date "1998-04-07"
-   build-date "1999-02-02"
+  (standards-version 1.1
+   version "1.08"
+   author-version "21.2b36"
+   date "2000-10-05"
+   build-date "2000-10-24"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority low
    category "prog"
    dump nil
    description "Another interface over GNU patch."
-   filename "emerge-1.05-pkg.tar.gz"
-   md5sum "1f4d70d7f4e73290837b2dbd2189be99"
-   size 61009
+   filename "emerge-1.08-pkg.tar.gz"
+   md5sum "5e31a6d694254c6cdcba10b168a71986"
+   size 60970
    provides (emerge)
    requires ()
    type regular
@@ -947,21 +991,43 @@
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
+(ediff
+  (standards-version 1.1
+   version "1.27"
+   author-version "2.75"
+   date "2000-10-29"
+   build-date "2000-10-30"
+   maintainer "Michael Kifer <kifer@cs.sunysb.edu>"
+   distribution xemacs
+   priority medium
+   category "prog"
+   dump nil
+   description "Interface over GNU patch."
+   filename "ediff-1.27-pkg.tar.gz"
+   md5sum "5804c0cb0cac69c381b05786812bec6f"
+   size 289262
+   provides (ediff)
+   requires (pcl-cvs elib dired xemacs-base)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
 (debug
-  (standards-version 1.0
-   version "1.09"
-   author-version "21.0"
-   date "1999-05-12"
-   build-date "1999-05-13"
+  (standards-version 1.1
+   version "1.12"
+   author-version "21.2b36"
+   date "2000-10-05"
+   build-date "2000-10-24"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution contrib
+   distribution xemacs
    priority low
    category "prog"
    dump nil
    description "GUD, gdb, dbx debugging support."
-   filename "debug-1.09-pkg.tar.gz"
-   md5sum "24442a34f07cdd97ed52aa2c88c3de0b"
-   size 103161
+   filename "debug-1.12-pkg.tar.gz"
+   md5sum "0a90aa36cdffd13e8fc2413cd78449dc"
+   size 103491
    provides (dbx gdb-highlight gdb gdbsrc gud history)
    requires (xemacs-base)
    type regular
@@ -970,20 +1036,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (c-support
-  (standards-version 1.0
-   version "1.12"
-   author-version "21.0b64"
-   date "1999-03-02"
-   build-date "1999-03-02"
+  (standards-version 1.1
+   version "1.15"
+   author-version "21.2b36"
+   date "2000-10-05"
+   build-date "2000-10-24"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution contrib
+   distribution xemacs
    priority low
    category "prog"
    dump nil
    description "Basic single-file add-ons for editing C code."
-   filename "c-support-1.12-pkg.tar.gz"
-   md5sum "a793cd83bb595d34771332a46d2abfd4"
-   size 69913
+   filename "c-support-1.15-pkg.tar.gz"
+   md5sum "9acb70d0ee0d1d4804abf461e94915fa"
+   size 70376
    provides (c-comment-edit cmacexp ctypes hideif hideshow)
    requires (cc-mode xemacs-base)
    type regular
@@ -992,20 +1058,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (ada
-  (standards-version 1.0
-   version "1.06"
+  (standards-version 1.1
+   version "1.09"
    author-version "2.27"
-   date "1998-01-24"
-   build-date "1999-02-02"
+   date "2000-10-05"
+   build-date "2000-10-24"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority low
    category "prog"
    dump nil
    description "Ada language support."
-   filename "ada-1.06-pkg.tar.gz"
-   md5sum "0f3d2dc2ff33d40092b324a7a5a363d6"
-   size 54364
+   filename "ada-1.09-pkg.tar.gz"
+   md5sum "6eb9287ffa10e193aadac531d17cc3e2"
+   size 54454
    provides (ada-mode ada-stmt)
    requires ()
    type regular
@@ -1014,42 +1080,42 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (pcl-cvs
-  (standards-version 1.0
-   version "1.38"
-   author-version "R-2_0-Beta_2"
-   date "1998-11-17"
-   build-date "1999-02-02"
+  (standards-version 1.1
+   version "1.50"
+   author-version "R-2_9_9"
+   date "2000-10-05"
+   build-date "2000-10-24"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority low
    category "prog"
    dump nil
    description "CVS frontend."
-   filename "pcl-cvs-1.38-pkg.tar.gz"
-   md5sum "a5ff4e61dffe3985c20385eb741d4783"
-   size 163524
+   filename "pcl-cvs-1.50-pkg.tar.gz"
+   md5sum "844efc1a7cd25c9f8d7c9d4af2b1d3c4"
+   size 160082
    provides (pcl-cvs generic-sc)
-   requires (xemacs-base elib dired)
+   requires (xemacs-base elib vc dired edebug edit-utils)
    type regular
 ))
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
 (cc-mode
-  (standards-version 1.0
-   version "1.15"
-   author-version "5.25"
-   date "1998-12-30"
-   build-date "1999-02-02"
-   maintainer "Barry Warsaw <bug-cc-mode@gnu.org>"
-   distribution stable
+  (standards-version 1.1
+   version "1.21"
+   author-version "5.27"
+   date "2000-10-05"
+   build-date "2000-10-24"
+   maintainer "Martin Stjernholm <bug-cc-mode@gnu.org>"
+   distribution xemacs
    priority medium
    category "prog"
    dump nil
    description "C, C++ and Java language support."
-   filename "cc-mode-1.15-pkg.tar.gz"
-   md5sum "ca73b190e79f96ab928eecd12af94222"
-   size 212611
+   filename "cc-mode-1.21-pkg.tar.gz"
+   md5sum "588594447ca22a7fdbe580e53ce7fe69"
+   size 247912
    provides (cc-mode)
    requires (xemacs-base)
    type regular
@@ -1057,21 +1123,43 @@
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
+(semantic
+  (standards-version 1.1
+   version "1.03"
+   author-version "1.3.1"
+   date "2000-10-19"
+   build-date "2000-10-25"
+   maintainer "Eric M. Ludlam <zappo@gnu.org>"
+   distribution xemacs
+   priority low
+   category "prog"
+   dump nil
+   description "Semantic bovinator."
+   filename "semantic-1.03-pkg.tar.gz"
+   md5sum "3729448fb909c2d05f76efcdff9aae69"
+   size 132807
+   provides (semantic)
+   requires (semantic xemacs-base speedbar)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
 (misc-games
-  (standards-version 1.0
-   version "1.11"
-   author-version "21.0b65"
-   date "1999-03-05"
-   build-date "1999-03-11"
+  (standards-version 1.1
+   version "1.14"
+   author-version "21.2b35"
+   date "2000-09-18"
+   build-date "2000-09-26"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority low
    category "games"
    dump nil
    description "Other amusements and diversions."
-   filename "misc-games-1.11-pkg.tar.gz"
-   md5sum "80149e00e5698d0a48945c918bd2d0ba"
-   size 166197
+   filename "misc-games-1.14-pkg.tar.gz"
+   md5sum "6057ad875f06d2447e40c81bb9920900"
+   size 166291
    provides (decipher gomoku hanoi life morse rot13)
    requires (xemacs-base)
    type single
@@ -1080,20 +1168,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (mine
-  (standards-version 1.0
-   version "1.10"
+  (standards-version 1.1
+   version "1.13"
    author-version "1.9"
-   date "1998-05-09"
-   build-date "1999-02-02"
+   date "2000-10-05"
+   build-date "2000-10-23"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority low
    category "games"
    dump nil
    description "Minehunt Game."
-   filename "mine-1.10-pkg.tar.gz"
-   md5sum "a2d4f93830fe86e4d4e2f081ec0517fb"
-   size 66679
+   filename "mine-1.13-pkg.tar.gz"
+   md5sum "84b938a5b0b00658c1fd218036bdb222"
+   size 66823
    provides (xmine)
    requires (xemacs-base)
    type regular
@@ -1102,20 +1190,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (games
-  (standards-version 1.0
-   version "1.09"
+  (standards-version 1.1
+   version "1.12"
    author-version "1.04"
-   date "1998-06-04"
-   build-date "1999-02-02"
+   date "2000-03-23"
+   build-date "2000-09-26"
    maintainer "Glynn Clements <glynn@sensei.co.uk>"
-   distribution stable
+   distribution xemacs
    priority low
    category "games"
    dump nil
    description "Tetris, Sokoban, and Snake."
-   filename "games-1.09-pkg.tar.gz"
-   md5sum "76a327a228745576538711180a9e444e"
-   size 32146
+   filename "games-1.12-pkg.tar.gz"
+   md5sum "8bdb114159eb32be1f72bdf8898d5d99"
+   size 32436
    provides (gamegrid snake tetris sokoban)
    requires (xemacs-base)
    type regular
@@ -1124,20 +1212,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (cookie
-  (standards-version 1.0
-   version "1.10"
-   author-version "21.0b62"
+  (standards-version 1.1
+   version "1.12"
+   author-version "21.2b35"
    date "1998-04-07"
-   build-date "1999-02-02"
+   build-date "2000-09-26"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority low
    category "games"
    dump nil
    description "Spook and Yow (Zippy quotes)."
-   filename "cookie-1.10-pkg.tar.gz"
-   md5sum "1c5599fa30e346af452c126d872121be"
-   size 34198
+   filename "cookie-1.12-pkg.tar.gz"
+   md5sum "04d769cfefe99d8bf0247cf4d47fac77"
+   size 34194
    provides (cookie1 yow)
    requires (xemacs-base)
    type regular
@@ -1145,43 +1233,65 @@
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
+(eicq
+  (standards-version 1.1
+   version "1.02"
+   author-version "0.2.7"
+   date "2000-10-23"
+   build-date "2000-10-23"
+   maintainer "Steve Youngs <youngs@xemacs.org>"
+   distribution xemacs
+   priority low
+   category "comm"
+   dump nil
+   description "ICQ Client developed and tested on Linux x86; only supported on that platform"
+   filename "eicq-1.02-pkg.tar.gz"
+   md5sum "588e7e8efce2302ede8abe078904973e"
+   size 120361
+   provides (eicq eicq-toolbar)
+   requires (xemacs-base mail-lib)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
 (bbdb
-  (standards-version 1.0
-   version "1.07"
-   author-version "2.00.02"
-   date "1998-10-08"
-   build-date "1999-02-02"
+  (standards-version 1.1
+   version "1.10"
+   author-version "2.00.06"
+   date "2000-10-05"
+   build-date "2000-10-23"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority medium
    category "comm"
    dump nil
    description "The Big Brother Data Base"
-   filename "bbdb-1.07-pkg.tar.gz"
-   md5sum "e28c4aed70df000812d34cb3795c2f72"
-   size 282200
+   filename "bbdb-1.10-pkg.tar.gz"
+   md5sum "5eb98c70c4b515434ad80e0ee084502b"
+   size 281948
    provides (bbdb)
-   requires (bbdb edit-utils gnus mh-e rmail supercite vm tm apel mail-lib xemacs-base)
+   requires (bbdb edit-utils gnus mh-e rmail supercite vm tm apel mail-lib xemacs-base w3)
    type regular
 ))
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
 (zenirc
-  (standards-version 1.0
-   version "1.05"
+  (standards-version 1.1
+   version "1.08"
    author-version "2.112"
-   date "1998-08-15"
-   build-date "1999-02-02"
+   date "2000-10-05"
+   build-date "2000-10-23"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority medium
    category "comm"
    dump nil
    description "ZENIRC IRC Client."
-   filename "zenirc-1.05-pkg.tar.gz"
-   md5sum "df432e4987ddd0dd65e0124d7d910967"
-   size 276054
+   filename "zenirc-1.08-pkg.tar.gz"
+   md5sum "2f3756f35d55bd9ae35d109ac8399cd9"
+   size 275756
    provides (zenirc)
    requires (zenirc)
    type regular
@@ -1190,20 +1300,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (mew
-  (standards-version 1.0
-   version "1.07"
-   author-version "1.93b38x1"
-   date "1998-12-09"
-   build-date "1999-02-02"
+  (standards-version 1.1
+   version "1.11"
+   author-version "1.94.2"
+   date "2000-10-05"
+   build-date "2000-10-23"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution contrib
+   distribution xemacs
    priority low
    category "comm"
    dump nil
    description "Messaging in an Emacs World."
-   filename "mew-1.07-pkg.tar.gz"
-   md5sum "04ed302d5a3735169835e52dadc9e84d"
-   size 518432
+   filename "mew-1.11-pkg.tar.gz"
+   md5sum "fd524d4f2bc440fc96c7e0a98386da6c"
+   size 654780
    provides (mew)
    requires (mew)
    type regular
@@ -1212,64 +1322,64 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (tm
-  (standards-version 1.0
-   version "1.18"
-   author-version "21.0"
-   date "1999-02-06"
-   build-date "1999-05-13"
+  (standards-version 1.1
+   version "1.24"
+   author-version "21.2b36"
+   date "2000-10-05"
+   build-date "2000-10-23"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority low
    category "comm"
    dump nil
-   description "Emacs MIME support."
-   filename "tm-1.18-pkg.tar.gz"
-   md5sum "3d7641bd11adb085686384ffee80bf04"
-   size 330163
+   description "Emacs MIME support. Not needed for gnus >= 5.8.0"
+   filename "tm-1.24-pkg.tar.gz"
+   md5sum "d1d55362e3ef4a2fa7c1681e7befea14"
+   size 332337
    provides (tm tm-edit tm-view mime-setup)
-   requires (gnus mh-e rmail vm mailcrypt mail-lib apel xemacs-base)
+   requires (gnus w3 mh-e rmail vm mailcrypt mail-lib apel xemacs-base fsf-compat)
    type regular
 ))
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
 (gnus
-  (standards-version 1.0
-   version "1.40"
-   author-version "5.6.45x1"
-   date "1999-03-12"
-   build-date "1999-05-13"
+  (standards-version 1.1
+   version "1.51"
+   author-version "5.8.7"
+   date "2000-10-05"
+   build-date "2000-10-23"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority medium
    category "comm"
    dump nil
    description "The Gnus Newsreader and Mailreader."
-   filename "gnus-1.40-pkg.tar.gz"
-   md5sum "df916949c14fc6a1dcd5b3f3158a5497"
-   size 1873480
+   filename "gnus-1.51-pkg.tar.gz"
+   md5sum "c04280df500a7096b71868de2ec8c7b5"
+   size 2273704
    provides (gnus message)
-   requires (gnus tm apel w3 mh-e mailcrypt rmail mail-lib xemacs-base)
+   requires (gnus w3 mh-e mailcrypt rmail eterm mail-lib xemacs-base fsf-compat)
    type regular
 ))
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
 (rmail
-  (standards-version 1.0
-   version "1.08"
-   author-version "21.0b62"
+  (standards-version 1.1
+   version "1.11"
+   author-version "21.2b35"
    date "1998-06-28"
-   build-date "1999-02-02"
+   build-date "2000-09-26"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution contrib
+   distribution xemacs
    priority low
    category "comm"
    dump nil
    description "An obsolete Emacs mailer."
-   filename "rmail-1.08-pkg.tar.gz"
-   md5sum "90f98f9043e0c6f2180ffec9c6904eca"
-   size 96450
+   filename "rmail-1.11-pkg.tar.gz"
+   md5sum "952e90ca16ed236665c8e927985dce0d"
+   size 96417
    provides (rmail rmailsum)
    requires (tm apel mail-lib xemacs-base)
    type regular
@@ -1278,42 +1388,42 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (mailcrypt
-  (standards-version 1.0
-   version "1.07"
-   author-version "3.4"
-   date "1998-01-24"
-   build-date "1999-02-02"
+  (standards-version 1.1
+   version "2.06"
+   author-version "3.5.5"
+   date "2000-10-28"
+   build-date "2000-10-29"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority low
    category "comm"
    dump nil
    description "Support for messaging encryption with PGP."
-   filename "mailcrypt-1.07-pkg.tar.gz"
-   md5sum "350dccab50ef0800b95d44ef62cca359"
-   size 86362
+   filename "mailcrypt-2.06-pkg.tar.gz"
+   md5sum "a91b84af146d8a36619f545ae12fbe31"
+   size 140846
    provides (mailcrypt)
-   requires (gnus vm mail-lib xemacs-base)
+   requires (mail-lib fsf-compat xemacs-base cookie gnus mh-e rmail vm)
    type regular
 ))
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
 (supercite
-  (standards-version 1.0
-   version "1.12"
+  (standards-version 1.1
+   version "1.16"
    author-version "3.55x3"
-   date "1999-04-06"
-   build-date "1999-05-13"
+   date "2000-10-05"
+   build-date "2000-10-23"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority low
    category "comm"
    dump nil
    description "An Emacs citation tool for News & Mail messages."
-   filename "supercite-1.12-pkg.tar.gz"
-   md5sum "7188738f17ec05c1561fe054fdf120dd"
-   size 99564
+   filename "supercite-1.16-pkg.tar.gz"
+   md5sum "d5b510de86a71e0a1c1d301fa377bfa4"
+   size 99844
    provides (supercite)
    requires (mail-lib xemacs-base)
    type regular
@@ -1322,20 +1432,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (mh-e
-  (standards-version 1.0
-   version "1.09"
-   author-version "21.0b62"
-   date "1998-07-12"
-   build-date "1999-02-02"
+  (standards-version 1.1
+   version "1.12"
+   author-version "21.2b35"
+   date "2000-05-08"
+   build-date "2000-09-26"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution contrib
+   distribution xemacs
    priority low
    category "comm"
    dump nil
    description "Front end support for MH."
-   filename "mh-e-1.09-pkg.tar.gz"
-   md5sum "89e6f44e8dca03f6be10068391831262"
-   size 176469
+   filename "mh-e-1.12-pkg.tar.gz"
+   md5sum "2cf056d60b4d146c23cd56b7355aaea0"
+   size 176699
    provides (mh-e)
    requires (mail-lib xemacs-base)
    type regular
@@ -1344,20 +1454,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (gnats
-  (standards-version 1.0
-   version "1.08"
+  (standards-version 1.1
+   version "1.11"
    author-version "3.101"
-   date "1998-08-01"
-   build-date "1999-02-02"
+   date "2000-10-05"
+   build-date "2000-10-23"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority high
    category "comm"
    dump nil
    description "XEmacs bug reports."
-   filename "gnats-1.08-pkg.tar.gz"
-   md5sum "8c1e3100399aac86c63683b1836d4a61"
-   size 189265
+   filename "gnats-1.11-pkg.tar.gz"
+   md5sum "e67642bdbdf6c1b54f3bdc8f05763326"
+   size 189385
    provides (gnats gnats-admin send-pr)
    requires (mail-lib xemacs-base)
    type regular
@@ -1366,20 +1476,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (footnote
-  (standards-version 1.0
-   version "1.10"
+  (standards-version 1.1
+   version "1.12"
    author-version "0.18x"
-   date "1999-03-11"
-   build-date "1999-05-13"
+   date "2000-05-23"
+   build-date "2000-09-26"
    maintainer "SL Baur <steve@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority low
    category "comm"
    dump nil
    description "Footnoting in mail message editing modes."
-   filename "footnote-1.10-pkg.tar.gz"
-   md5sum "124d7e58ba9905db7488ee142470249f"
-   size 18356
+   filename "footnote-1.12-pkg.tar.gz"
+   md5sum "79c50a833299b4b3de7d12b592ec6396"
+   size 18406
    provides (footnote)
    requires (mail-lib xemacs-base)
    type regular
@@ -1388,21 +1498,21 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (eudc
-  (standards-version 1.0
-   version "1.28"
-   author-version "1.28"
-   date "1999-02-13"
-   build-date "1999-03-01"
-   maintainer "Oscar Figueiredo <Oscar.Figueiredo@epfl.ch>"
-   distribution stable
+  (standards-version 1.1
+   version "1.32"
+   author-version "1.30"
+   date "2000-10-05"
+   build-date "2000-10-23"
+   maintainer "Oscar Figueiredo <oscar@xemacs.org>"
+   distribution xemacs
    priority low
    category "comm"
    dump nil
    description "Emacs Unified Directory Client (LDAP, PH)."
-   filename "eudc-1.28-pkg.tar.gz"
-   md5sum "e88e7ed791d16105824812edcd743bc6"
-   size 62476
-   provides (eudc eudc-ldap eudc-ph)
+   filename "eudc-1.32-pkg.tar.gz"
+   md5sum "36f2fdae71d773daf933b90ef440ef76"
+   size 73981
+   provides (eudc eudc-vars eudc-hotlist eudc-export eudc-bob eudcb-ldap eudcb-ph eudcb-bbdb)
    requires (fsf-compat xemacs-base bbdb)
    type regular
 ))
@@ -1410,20 +1520,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (net-utils
-  (standards-version 1.0
-   version "1.11"
-   author-version "21.0b62"
-   date "1998-07-01"
-   build-date "1999-02-02"
+  (standards-version 1.1
+   version "1.14"
+   author-version "21.2b36"
+   date "2000-10-05"
+   build-date "2000-10-23"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority low
    category "comm"
    dump nil
    description "Miscellaneous Networking Utilities."
-   filename "net-utils-1.11-pkg.tar.gz"
-   md5sum "f9d52e6e6b4f53ccf5cdd3521403e276"
-   size 107193
+   filename "net-utils-1.14-pkg.tar.gz"
+   md5sum "17d7330c573535ab02c3e2582ae880d7"
+   size 107267
    provides (ilisp-browse-cltl2 emacsbug feedmail metamail net-utils rcompile shadowfile webjump webster-www)
    requires (w3 efs mail-lib xemacs-base)
    type single
@@ -1432,20 +1542,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (w3
-  (standards-version 1.0
-   version "1.13"
-   author-version "4.0pre39x1"
-   date "1999-03-02"
-   build-date "1999-03-02"
+  (standards-version 1.1
+   version "1.16"
+   author-version "4.0pre46"
+   date "2000-10-05"
+   build-date "2000-10-23"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution experimental
+   distribution xemacs
    priority high
    category "comm"
    dump nil
    description "A Web browser."
-   filename "w3-1.13-pkg.tar.gz"
-   md5sum "8e9f70ef2c4b43090cfbf86974517c66"
-   size 682040
+   filename "w3-1.16-pkg.tar.gz"
+   md5sum "ad9f1d8ed60dfdf75b6354d93c1c0a46"
+   size 691317
    provides (w3 url)
    requires (w3 mail-lib xemacs-base)
    type regular
@@ -1454,20 +1564,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (vm
-  (standards-version 1.0
-   version "1.20"
-   author-version "6.71"
-   date "1999-05-13"
-   build-date "1999-05-13"
+  (standards-version 1.1
+   version "1.25"
+   author-version "6.75"
+   date "2000-10-05"
+   build-date "2000-10-23"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority medium
    category "comm"
    dump nil
    description "An Emacs mailer."
-   filename "vm-1.20-pkg.tar.gz"
-   md5sum "120d25d3541fc7ef4bb34659a4aba89c"
-   size 614987
+   filename "vm-1.25-pkg.tar.gz"
+   md5sum "bd9e3d0d0d7e95da703abc70611e8238"
+   size 626225
    provides (vm)
    requires (mail-lib xemacs-base)
    type regular
@@ -1476,20 +1586,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (sounds-wav
-  (standards-version 1.0
-   version "1.07"
-   author-version "21.0b64"
-   date "1999-02-02"
-   build-date "1999-03-05"
+  (standards-version 1.1
+   version "1.09"
+   author-version "21.2b35"
+   date "2000-05-23"
+   build-date "2000-09-26"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority high
    category "libs"
    dump nil
    description "XEmacs Microsoft sound files."
-   filename "sounds-wav-1.07-pkg.tar.gz"
-   md5sum "60a70b85e8711fb1c9a1c7d0f4bf8ee0"
-   size 149045
+   filename "sounds-wav-1.09-pkg.tar.gz"
+   md5sum "94bbb6fec21d618a073e16b01b2f49fe"
+   size 149171
    provides ()
    requires ()
    type regular
@@ -1498,20 +1608,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (sounds-au
-  (standards-version 1.0
-   version "1.07"
-   author-version "21.0b64"
-   date "1999-02-02"
-   build-date "1999-03-05"
+  (standards-version 1.1
+   version "1.09"
+   author-version "21.2b35"
+   date "2000-05-23"
+   build-date "2000-09-26"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority high
    category "libs"
    dump nil
    description "XEmacs Sun sound files."
-   filename "sounds-au-1.07-pkg.tar.gz"
-   md5sum "4b5acd296b50102e50565650d9d7ec0b"
-   size 126184
+   filename "sounds-au-1.09-pkg.tar.gz"
+   md5sum "d24f2e390541b616c0efee2cc9b8d052"
+   size 126303
    provides ()
    requires ()
    type regular
@@ -1520,42 +1630,42 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (xemacs-devel
-  (standards-version 1.0
-   version "1.21"
-   author-version "21.0b62"
-   date "1998-10-20"
-   build-date "1999-02-02"
+  (standards-version 1.1
+   version "1.30"
+   author-version "21.2b36"
+   date "2000-10-25"
+   build-date "2000-10-28"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority medium
    category "libs"
    dump nil
    description "Emacs Lisp developer support."
-   filename "xemacs-devel-1.21-pkg.tar.gz"
-   md5sum "aa472f2d412382c2fdd3150105ca7d1c"
-   size 83543
+   filename "xemacs-devel-1.30-pkg.tar.gz"
+   md5sum "dac6a1d249a6a49f9f152d5d1e57848d"
+   size 131177
    provides (docref eldoc elp find-func hide-copyleft ielm regexp-opt trace)
-   requires (xemacs-base)
+   requires (xemacs-base ispell)
    type single
 ))
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
 (tooltalk
-  (standards-version 1.0
-   version "1.09"
-   author-version "21.0b62"
-   date "1998-07-25"
-   build-date "1999-02-02"
+  (standards-version 1.1
+   version "1.12"
+   author-version "21.2b36"
+   date "2000-10-05"
+   build-date "2000-10-23"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution contrib
+   distribution xemacs
    priority low
    category "libs"
    dump nil
    description "Support for building with Tooltalk."
-   filename "tooltalk-1.09-pkg.tar.gz"
-   md5sum "368d6407bf82711bee9a01fa6908b576"
-   size 9271
+   filename "tooltalk-1.12-pkg.tar.gz"
+   md5sum "52b75838536c169cac797a9430444f68"
+   size 9307
    provides ()
    requires ()
    type regular
@@ -1564,20 +1674,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (elib
-  (standards-version 1.0
-   version "1.04"
+  (standards-version 1.1
+   version "1.07"
    author-version "1.0"
-   date "1998-10-01"
-   build-date "1999-02-02"
+   date "2000-10-05"
+   build-date "2000-10-23"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution mule
+   distribution xemacs
    priority high
    category "libs"
    dump nil
    description "Portable Emacs Lisp utilities library."
-   filename "elib-1.04-pkg.tar.gz"
-   md5sum "d17596beb9b03292e322f8460c36eb81"
-   size 72834
+   filename "elib-1.07-pkg.tar.gz"
+   md5sum "65b3e955c312ebc40fe0c243aff8aea5"
+   size 73118
    provides (avltree bintree cookie dll elib-node queue-f queue-m read stack-f stack-m string)
    requires ()
    type single
@@ -1586,20 +1696,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (edebug
-  (standards-version 1.0
-   version "1.07"
-   author-version "21.0b62"
-   date "1998-03-12"
-   build-date "1999-02-02"
+  (standards-version 1.1
+   version "1.11"
+   author-version "21.2b36"
+   date "2000-10-05"
+   build-date "2000-10-23"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority low
    category "libs"
    dump nil
    description "An Emacs Lisp debugger."
-   filename "edebug-1.07-pkg.tar.gz"
-   md5sum "62d3e581feac2c3a73917ad0d81151b0"
-   size 112408
+   filename "edebug-1.11-pkg.tar.gz"
+   md5sum "e22b9a34725d47b67232ca1fcb77dafc"
+   size 112468
    provides (edebug cl-read cust-print eval-reg cl-specs)
    requires (xemacs-base)
    type regular
@@ -1608,20 +1718,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (Sun
-  (standards-version 1.0
-   version "1.10"
-   author-version "21.0b62"
+  (standards-version 1.1
+   version "1.12"
+   author-version "21.2b35"
    date "1998-07-25"
-   build-date "1999-02-02"
+   build-date "2000-09-26"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution sun
+   distribution xemacs
    priority low
    category "libs"
    dump nil
    description "Support for Sparcworks."
-   filename "Sun-1.10-pkg.tar.gz"
-   md5sum "54cce5cbb182d99de5562a586714e50c"
-   size 63693
+   filename "Sun-1.12-pkg.tar.gz"
+   md5sum "c6f7ccf491d03dcb265aed004262e980"
+   size 63902
    provides (sccs eos-browser eos-common eos-debugger eos-debugger eos-editor eos-init eos-load eos-menubar eos-toolbar sunpro)
    requires (cc-mode xemacs-base)
    type regular
@@ -1630,20 +1740,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (apel
-  (standards-version 1.0
-   version "1.11"
-   author-version "9.18"
-   date "1999-05-08"
-   build-date "1999-05-13"
+  (standards-version 1.1
+   version "1.19"
+   author-version "9.20"
+   date "2000-10-05"
+   build-date "2000-10-23"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution mule
+   distribution xemacs
    priority high
    category "libs"
    dump nil
    description "A Portable Emacs Library.  Used by XEmacs MIME support."
-   filename "apel-1.11-pkg.tar.gz"
-   md5sum "4c53047e1f0964b24626c29ee40a04c5"
-   size 73997
+   filename "apel-1.19-pkg.tar.gz"
+   md5sum "81ab147115a88f5ea62901898ee29897"
+   size 107806
    provides (atype emu-20 emu-e19 emu-x20 emu-xemacs emu file-detect filename install mule-caesar path-util richtext std11-parse std11 tinyrich)
    requires (fsf-compat xemacs-base)
    type regular
@@ -1653,41 +1763,41 @@
 (package-get-update-base-entry (quote
 (efs
   (standards-version 1.0
-   version "1.14"
-   author-version "1.18"
-   date "1999-01-03"
-   build-date "1999-02-02"
+   version "1.21"
+   author-version "1.19"
+   date "2000-10-15"
+   build-date "2000-10-23"
    maintainer "Mike Sperber <sperber@informatik.uni-tuebingen.de>"
    distribution stable
    priority medium
    category "libs"
    dump nil
    description "Treat files on remote systems the same as local files."
-   filename "efs-1.14-pkg.tar.gz"
-   md5sum "2b4128fec0dcb31834f404ef962f10ab"
-   size 369742
+   filename "efs-1.21-pkg.tar.gz"
+   md5sum "a933c742941ff4f0d73acbd392cb6ab5"
+   size 367564
    provides (efs)
-   requires (xemacs-base vm dired)
+   requires (xemacs-base dired)
    type regular
 ))
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
 (dired
-  (standards-version 1.0
-   version "1.05"
+  (standards-version 1.1
+   version "1.08"
    author-version "7.9"
    date "1998-12-09"
-   build-date "1999-02-02"
+   build-date "2000-10-23"
    maintainer "Mike Sperber <sperber@informatik.uni-tuebingen.de>"
-   distribution stable
+   distribution xemacs
    priority medium
    category "libs"
    dump nil
    description "Manage file systems."
-   filename "dired-1.05-pkg.tar.gz"
-   md5sum "392440b1472a2415b0b9b6779df93619"
-   size 187654
+   filename "dired-1.08-pkg.tar.gz"
+   md5sum "42f7e3e82d281da0246d696a9059d047"
+   size 187745
    provides (diff dired)
    requires (xemacs-base)
    type regular
@@ -1696,42 +1806,42 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (mail-lib
-  (standards-version 1.0
-   version "1.23"
-   author-version "21.0"
-   date "1999-04-13"
-   build-date "1999-05-13"
+  (standards-version 1.1
+   version "1.33"
+   author-version "21.2b36"
+   date "2000-10-26"
+   build-date "2000-11-01"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution stable
+   distribution xemacs
    priority medium
    category "libs"
    dump nil
    description "Fundamental lisp files for providing email support."
-   filename "mail-lib-1.23-pkg.tar.gz"
-   md5sum "4293acbed286a63581f55b7a16e4a489"
-   size 131968
+   filename "mail-lib-1.33-pkg.tar.gz"
+   md5sum "06fb329e488d8e3b8ff28155687f21b2"
+   size 150153
    provides (browse-url highlight-headers mail-abbrevs mail-extr mail-utils reporter rfc822 rmail-mini rmailout sendmail smtpmail)
-   requires (xemacs-base)
+   requires (eterm xemacs-base)
    type regular
 ))
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
 (fsf-compat
-  (standards-version 1.0
-   version "1.05"
-   author-version "21.0b62"
-   date "1998-09-12"
-   build-date "1999-02-02"
+  (standards-version 1.1
+   version "1.07"
+   author-version "21.2b35"
+   date "1999-11-14"
+   build-date "2000-09-26"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution mule
+   distribution xemacs
    priority high
    category "libs"
    dump nil
    description "FSF Emacs compatibility files."
-   filename "fsf-compat-1.05-pkg.tar.gz"
-   md5sum "64cb1984a71974f3f40c0be1a971f441"
-   size 17347
+   filename "fsf-compat-1.07-pkg.tar.gz"
+   md5sum "6adc8e4b0aba74d979c7a457f879e707"
+   size 17542
    provides (overlay thingatpt timer x-popup-menu)
    requires ()
    type single
@@ -1740,20 +1850,20 @@
 ;;;@@@
 (package-get-update-base-entry (quote
 (xemacs-base
-  (standards-version 1.0
-   version "1.30"
-   author-version "21.0"
-   date "1998-11-30"
-   build-date "1999-05-13"
+  (standards-version 1.1
+   version "1.46"
+   author-version "21.2b36"
+   date "2000-10-15"
+   build-date "2000-10-28"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution mule
+   distribution xemacs
    priority high
    category "libs"
    dump nil
    description "Fundamental XEmacs support, you almost certainly need this."
-   filename "xemacs-base-1.30-pkg.tar.gz"
-   md5sum "d9e95850fe8e13a04166d59d62fb38ab"
-   size 430640
+   filename "xemacs-base-1.46-pkg.tar.gz"
+   md5sum "3cf54cdd4c564736f0a4cc9d2f7f31ce"
+   size 450150
    provides (add-log advice annotations assoc case-table chistory comint-xemacs comint compile debug ebuff-menu echistory edmacro ehelp electric enriched env facemenu ffap helper imenu iso-syntax macros novice outline overlay passwd pp regi ring shell skeleton sort thing time-stamp timezone xbm-button xpm-button)
    requires ()
    type regular
--- a/lib-src/ChangeLog	Mon Aug 13 11:01:11 2007 +0200
+++ b/lib-src/ChangeLog	Mon Aug 13 11:01:51 2007 +0200
@@ -1,3 +1,16 @@
+2001-01-27  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.1.14 is released
+
+2001-01-23  Jan Vroonhof  <jan@xemacs.org>
+
+	* gnuserv.c: Add version number to object file.
+
+2001-01-20  Klaus Frank <klausf@i3.informatik.rwth-aachen.de>
+
+	* gnuserv.c (permitted): Completed the checks of the authentication
+	data length, replaced memcmp() by constant-time comparision.
+
 2001-01-07  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.1.13 is released
--- a/lib-src/gnuclient.c	Mon Aug 13 11:01:11 2007 +0200
+++ b/lib-src/gnuclient.c	Mon Aug 13 11:01:51 2007 +0200
@@ -37,12 +37,10 @@
  * ../etc/gnuserv.README relative to the directory containing this file)
  */
 
-#if 0
-/* Hand-munged RCS header */
-static char rcsid [] = "!Header: gnuclient.c,v 2.2 95/12/12 01:39:21 wing nene !";
-#endif
+#include "gnuserv.h"
 
-#include "gnuserv.h"
+char gnuserv_version[] = "gnuclient version " GNUSERV_VERSION;
+
 #include "getopt.h"
 
 #include <stdio.h>
--- a/lib-src/gnuserv.c	Mon Aug 13 11:01:11 2007 +0200
+++ b/lib-src/gnuserv.c	Mon Aug 13 11:01:51 2007 +0200
@@ -29,11 +29,10 @@
  * ../etc/gnuserv.README relative to the directory containing this file)
  */
 
-#if 0
-static char rcsid [] = "!Header: gnuserv.c,v 2.1 95/02/16 11:58:27 arup alpha !";
-#endif
+#include "gnuserv.h"
 
-#include "gnuserv.h"
+char gnuserv_version[] = "gnuserv version" GNUSERV_VERSION;
+
 
 #ifdef USE_LITOUT
 #ifdef linux
@@ -459,6 +458,8 @@
   char auth_protocol[128]; 
   char buf[1024];
   int  auth_data_len;
+  int  auth_data_pos;
+  int  auth_mismatches;
 
   if (fd > 0)
     {
@@ -491,15 +492,34 @@
 
 	  auth_data_len = atoi(buf);
 
+	  if (auth_data_len <= 0 || auth_data_len > sizeof(buf))
+	      {
+		return FALSE;
+	      }
+
 	  if (timed_read(fd, buf, auth_data_len, AUTH_TIMEOUT, 0) != auth_data_len)
 	    return FALSE;
       
 #ifdef AUTH_MAGIC_COOKIE
-	  if (server_xauth && server_xauth->data &&
-	      !memcmp(buf, server_xauth->data, auth_data_len))
-	    {
-	      return TRUE;
-	    }
+	  if (server_xauth && server_xauth->data)
+	  {
+	    /* Do a compare without comprising info about
+	       the size of the cookie */
+	    auth_mismatches =
+	      ( auth_data_len ^
+		server_xauth->data_length );
+
+	    for(auth_data_pos=0; auth_data_pos < auth_data_len; ++auth_data_pos)
+	      auth_mismatches |=
+		( buf[auth_data_pos] ^
+		  server_xauth->data[auth_data_pos % server_xauth->data_length]);
+
+	    if (auth_mismatches == 0)
+ 	      return TRUE;
+	    
+	    for(;rand() % 1000;);
+	  }
+
 #else 
 	  printf ("client tried Xauth, but server is not compiled with Xauth\n");
 #endif
--- a/lib-src/gnuserv.h	Mon Aug 13 11:01:11 2007 +0200
+++ b/lib-src/gnuserv.h	Mon Aug 13 11:01:51 2007 +0200
@@ -30,9 +30,7 @@
  * ../etc/gnuserv.README relative to the directory containing this file)
  */
 
-#if 0
-static char header_rcsid [] = "!Header: gnuserv.h,v 2.4 95/02/16 11:58:11 arup alpha !";
-#endif
+#define GNUSERV_VERSION "3.12"
 
 #define USE_TMPDIR
 
--- a/lisp/ChangeLog	Mon Aug 13 11:01:11 2007 +0200
+++ b/lisp/ChangeLog	Mon Aug 13 11:01:51 2007 +0200
@@ -1,3 +1,39 @@
+2001-01-27  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.1.14 is released
+
+2001-01-20  Klaus Frank <klausf@i3.informatik.rwth-aachen.de>
+
+	* gnuserv.el (gnuserv-process-filter): Robuster handling of error
+	messages from gnuserv.
+
+2001-01-15  Didier Verna  <didier@xemacs.org>
+
+	* about.el (xemacs-hackers): update my entry.
+	* about.el (about-url-alist): ditto.
+	* about.el (about-maintainer-info): ditto.
+	* about.el (about-hackers): ditto.
+
+2001-01-13  Steve Youngs  <youngs@xemacs.org>
+
+	* package-get.el (package-get-download-sites): Add a pre-release
+	site for experimental packages.
+
+	* auto-autoloads.el: Regenerated.
+
+2000-12-28  Andreas Jaeger  <aj@suse.de>
+
+	* about.el (about-hackers): Update my entry.
+
+2000-12-11  Matt Tucker  <tuck@whistlingfish.net>
+
+        * packages.el (locate-library): Add support for bzip2
+          compressed .el files
+
+2000-10-25  Yoshiki Hayashi  <yoshiki@xemacs.org>
+
+	* files.el (auto-mode-alist): Update to 21.2 version.
+
 2001-01-07  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.1.13 is released
--- a/lisp/about.el	Mon Aug 13 11:01:11 2007 +0200
+++ b/lisp/about.el	Mon Aug 13 11:01:51 2007 +0200
@@ -63,7 +63,7 @@
     (cthomp   "Chuck Thompson"    "cthomp@xemacs.org")
     (dmoore   "David Moore"       "dmoore@ucsd.edu")
     (dkindred "Darrell Kindred"	  "dkindred@cmu.edu")
-    (dv       "Didier Verna"      "verna@inf.enst.fr")
+    (dv       "Didier Verna"      "didier@xemacs.org")
     (hniksic  "Hrvoje Niksic"     "hniksic@srce.hr")
     (jareth   "Jareth Hein"       "jareth@camelot.co.jp")
     (jason    "Jason Mastaler"	  "jason@xemacs.org")
@@ -108,6 +108,7 @@
     (chr       . "http://www.xemacs.org/faq/")
     (dkindred  . "http://www.cs.cmu.edu/People/dkindred/me.html")
     (dmoore    . "http://oj.egbt.org/dmoore/")
+    (dv        . "http://www.lrde.epita.fr/~didier/")
     (jason     . "http://www.mastaler.com/")
     (juhp      . "http://www.kurims.kyoto-u.ac.jp/~petersen/")
     (jwz       . "http://people.netscape.com/jwz/")
@@ -901,14 +902,23 @@
      (widget-insert ".\n"))
     (dv
      (widget-insert "\
-I'm currently working (Ph.D.) on the cognitive aspects of
-Human-Machine Interaction in Virtual Environments, and especialy on
-the possibility of adding (artificial) intelligence between the system
-and the operator, in order to detect the intentions of the latter.
+I gratuated at ENST (an engineering school in Paris) and have a Ph.D.
+in computer science. I'm currently a teacher at EPITA (another
+engineering school, still in Paris) and a researcher at LRDE (EPITA's
+research and development laboratory). Our research topics include
+generic programming and distributed virtual reality.
 
-Otherwise, I'm, say, 35.82% professional Jazz guitar player,
-which means that's not the way I earn my crust, but things may very
-well reverse in the future ...\n"))
+Appart from XEmacs, I'm also involved in other free software projects,
+including Gnus, BBDB, and the GNU \"autotools\". I also wrote some
+LaTeX packages (ugh :-).
+
+All of this, actually, is only 60% true. Two days per week, I'm also a
+semi-professional Jazz guitar player (and singer), which means that it
+is not the way I earn my crust, but things may very well reverse in
+the future ...\n\n")
+     (widget-insert "Visit Didier's home page: ")
+     (about-url-link 'dv "Visit Didier's home page")
+     (widget-insert "\n"))
     (rossini
      (widget-insert "\
 Author of the first XEmacs FAQ, as well as minor priest in the
@@ -1168,14 +1178,16 @@
 Carnegie Mellon University, but he's trying hard to kick that
 habit.\n")
     (about-show-linked-info 'dv "\
-I'm currently working (Ph.D.) on the cognitive aspects of
-Human-Machine Interaction in Virtual Environments, and especialy on
-the possibility of adding (artificial) intelligence between the system
-and the operator, in order to detect the intentions of the latter.
+I joined the development of XEmacs in 1996, and have been one of the
+core maintainers since 1998. Although I'm mostly interested in the
+GUI, ergonomics, redisplay and autoconf issues, it's probably simpler
+to describe what I'm *not* involved in: I've never touched the Lisp
+implementation, and I probably never will...
 
-Otherwise, I'm, say, 35.82% professional Jazz guitar player,
-which means that's not the way I earn my crust, but things may very
-well reverse in the future ...\n")
+I'm the author of the multicast support, I wrote and maintain some
+external Emacs Lisp packages (including mchat) and I'm also
+responsible for some of the core Lisp code (including the rectangle
+library which I rewrote for both XEmacs and GNU Emacs).\n")
     (about-show-linked-info 'marcpa "\
 I work for Positron Industries Inc., Public Safety Division.\n")
     (about-show-linked-info 'pez "\
@@ -1209,7 +1221,7 @@
     (about-show-linked-info 'chr "\
 Maintainer of the XEmacs FAQ and proud author of `zap-up-to-char'.\n")
     (about-show-linked-info 'aj "\
-`Package Patch Tender', beta tester and GNU libc developer.\n")
+Former `Package Patch Tender', beta tester and GNU libc developer.\n")
 
     (flet ((print-short (name addr &optional shortinfo)
 	     (concat (about-with-face name 'italic)
--- a/lisp/auto-autoloads.el	Mon Aug 13 11:01:11 2007 +0200
+++ b/lisp/auto-autoloads.el	Mon Aug 13 11:01:51 2007 +0200
@@ -1036,10 +1036,10 @@
 See the variable `font-lock-keywords' for customization." t nil)
 
 (autoload 'turn-on-font-lock "font-lock" "\
-Unconditionally turn on Font Lock mode." nil nil)
+Unconditionally turn on Font Lock mode." t nil)
 
 (autoload 'turn-off-font-lock "font-lock" "\
-Unconditionally turn off Font Lock mode." nil nil)
+Unconditionally turn off Font Lock mode." t nil)
 
 (autoload 'font-lock-fontify-buffer "font-lock" "\
 Fontify the current buffer the way `font-lock-mode' would.
@@ -1173,11 +1173,12 @@
 Enter Info, the documentation browser.  Prompt for name of Info file." t nil)
 
 (autoload 'Info-batch-rebuild-dir "info" "\
-(Re)build info `dir' files in the directories remaining on the command line.
-Use this from the command line, with `-batch';
-it won't work in an interactive Emacs.
-Each file is processed even if an error occurred previously.
-For example, invoke \"xemacs -batch -f Info-batch-rebuild-dir /usr/local/info\"" nil nil)
+(Re)build `dir' files in the directories remaining on the command line.
+Use this from the command line, with `-batch', it won't work in an
+interactive XEmacs.
+
+Each file is processed even if an error occurred previously. For example,
+invoke \"xemacs -batch -f Info-batch-rebuild-dir /usr/local/info\"" nil nil)
 
 (autoload 'Info-goto-node "info" "\
 Go to info node named NAME.  Give just NODENAME or (FILENAME)NODENAME.
@@ -1233,7 +1234,7 @@
 ;;;### (autoloads (mwheel-install) "mwheel" "lisp/mwheel.el")
 
 (autoload 'mwheel-install "mwheel" "\
-Enable mouse wheel support." nil nil)
+Enable mouse wheel support." t nil)
 
 ;;;***
 
@@ -1299,7 +1300,7 @@
 be lexically ordered.  It is debatable if it makes sense to have more than
 one version of a package available.")
 
-(defcustom package-get-download-sites '(("xemacs.org" "ftp.xemacs.org" "pub/xemacs/packages") ("crc.ca (Canada)" "ftp.crc.ca" "pub/packages/editors/xemacs/packages") ("ualberta.ca (Canada)" "sunsite.ualberta.ca" "pub/Mirror/xemacs/packages") ("uiuc.edu (United States)" "uiarchive.uiuc.edu" "pub/packages/xemacs/packages") ("unc.edu (United States)" "metalab.unc.edu" "pub/packages/editors/xemacs/packages") ("utk.edu (United States)" "ftp.sunsite.utk.edu" "pub/xemacs/packages") ("unicamp.br (Brazil)" "ftp.unicamp.br" "pub/xemacs/packages") ("tuwien.ac.at (Austria)" "gd.tuwien.ac.at" "editors/xemacs/packages") ("auc.dk (Denmark)" "sunsite.auc.dk" "pub/emacs/xemacs/packages") ("doc.ic.ac.uk (England)" "sunsite.doc.ic.ac.uk" "packages/xemacs/packages") ("mirror.ac.uk (England)" "ftp.mirror.ac.uk" "sites/ftp.xemacs.org/pub/xemacs/packages") ("funet.fi (Finland)" "ftp.funet.fi" "pub/mirrors/ftp.xemacs.org/pub/tux/xemacs/packages") ("pasteur.fr (France)" "ftp.pasteur.fr" "pub/computing/xemacs/packages") ("tls.cena.fr (France)" "ftp.tls.cena.fr" "Emacs/xemacs/packages") ("freenet.de (Germany)" "ftp.freenet.de" "pub/ftp.xemacs.org/tux/xemacs/packages") ("tu-darmstadt.de (Germany)" "ftp.tu-darmstadt.de" "pub/editors/xemacs/packages") ("kfki.hu (Hungary)" "ftp.kfki.hu" "pub/packages/xemacs/packages") ("eunet.ie (Ireland)" "ftp.eunet.ie" "mirrors/ftp.xemacs.org/pub/xemacs/packages") ("uniroma2.it (Italy)" "ftp.uniroma2.it" "unix/misc/dist/XEMACS/packages") ("uio.no (Norway)" "sunsite.uio.no" "pub/xemacs/packages") ("icm.edu.pl (Poland)" "ftp.icm.edu.pl" "pub/unix/editors/xemacs/packages") ("srcc.msu.su (Russia)" "ftp.srcc.msu.su" "mirror/ftp.xemacs.org/packages") ("sunet.se (Sweden)" "ftp.sunet.se" "pub/gnu/xemacs/packages") ("cnlab-switch.ch (Switzerland)" "sunsite.cnlab-switch.ch" "mirror/xemacs/packages") ("aist.go.jp (Japan)" "ring.aist.go.jp" "pub/text/xemacs/packages") ("asahi-net.or.jp (Japan)" "ring.asahi-net.or.jp" "pub/text/xemacs/packages") ("dti.ad.jp (Japan)" "ftp.dti.ad.jp" "pub/unix/editor/xemacs/packages") ("jaist.ac.jp (Japan)" "ftp.jaist.ac.jp" "pub/GNU/xemacs/packages") ("nucba.ac.jp (Japan)" "mirror.nucba.ac.jp" "mirror/xemacs/packages") ("sut.ac.jp (Japan)" "sunsite.sut.ac.jp" "pub/archives/packages/xemacs/packages") ("tsukuba.ac.jp (Japan)" "ftp.netlab.is.tsukuba.ac.jp" "pub/GNU/xemacs/packages") ("kreonet.re.kr (Korea)" "ftp.kreonet.re.kr" "pub/tools/emacs/xemacs/packages") ("nctu.edu.tw (Taiwan)" "coda.nctu.edu.tw" "Editors/xemacs/packages") ("sun.ac.za (South Africa)" "ftp.sun.ac.za" "xemacs/packages") ("isu.net.sa (Saudi Arabia)" "ftp.isu.net.sa" "pub/mirrors/ftp.xemacs.org/packages") ("aarnet.edu.au (Australia)" "mirror.aarnet.edu.au" "pub/xemacs/packages")) "*List of remote sites available for downloading packages.\nList format is '(site-description site-name directory-on-site).\nSITE-DESCRIPTION is a textual description of the site.  SITE-NAME\nis the internet address of the download site.  DIRECTORY-ON-SITE\nis the directory on the site in which packages may be found.\nThis variable is used to initialize `package-get-remote', the\nvariable actually used to specify package download sites." :tag "Package download sites" :type '(repeat (list (string :tag "Name") host-name directory)) :group 'package-get)
+(defcustom package-get-download-sites '(("Pre-Releases" "ftp.xemacs.org" "pub/xemacs/beta/experimental/packages") ("xemacs.org" "ftp.xemacs.org" "pub/xemacs/packages") ("crc.ca (Canada)" "ftp.crc.ca" "pub/packages/editors/xemacs/packages") ("ualberta.ca (Canada)" "sunsite.ualberta.ca" "pub/Mirror/xemacs/packages") ("uiuc.edu (United States)" "uiarchive.uiuc.edu" "pub/packages/xemacs/packages") ("unc.edu (United States)" "metalab.unc.edu" "pub/packages/editors/xemacs/packages") ("utk.edu (United States)" "ftp.sunsite.utk.edu" "pub/xemacs/packages") ("unicamp.br (Brazil)" "ftp.unicamp.br" "pub/xemacs/packages") ("tuwien.ac.at (Austria)" "gd.tuwien.ac.at" "editors/xemacs/packages") ("auc.dk (Denmark)" "sunsite.auc.dk" "pub/emacs/xemacs/packages") ("doc.ic.ac.uk (England)" "sunsite.doc.ic.ac.uk" "packages/xemacs/packages") ("mirror.ac.uk (England)" "ftp.mirror.ac.uk" "sites/ftp.xemacs.org/pub/xemacs/packages") ("funet.fi (Finland)" "ftp.funet.fi" "pub/mirrors/ftp.xemacs.org/pub/tux/xemacs/packages") ("pasteur.fr (France)" "ftp.pasteur.fr" "pub/computing/xemacs/packages") ("tls.cena.fr (France)" "ftp.tls.cena.fr" "Emacs/xemacs/packages") ("freenet.de (Germany)" "ftp.freenet.de" "pub/ftp.xemacs.org/tux/xemacs/packages") ("tu-darmstadt.de (Germany)" "ftp.tu-darmstadt.de" "pub/editors/xemacs/packages") ("kfki.hu (Hungary)" "ftp.kfki.hu" "pub/packages/xemacs/packages") ("eunet.ie (Ireland)" "ftp.eunet.ie" "mirrors/ftp.xemacs.org/pub/xemacs/packages") ("uniroma2.it (Italy)" "ftp.uniroma2.it" "unix/misc/dist/XEMACS/packages") ("uio.no (Norway)" "sunsite.uio.no" "pub/xemacs/packages") ("icm.edu.pl (Poland)" "ftp.icm.edu.pl" "pub/unix/editors/xemacs/packages") ("srcc.msu.su (Russia)" "ftp.srcc.msu.su" "mirror/ftp.xemacs.org/packages") ("sunet.se (Sweden)" "ftp.sunet.se" "pub/gnu/xemacs/packages") ("cnlab-switch.ch (Switzerland)" "sunsite.cnlab-switch.ch" "mirror/xemacs/packages") ("aist.go.jp (Japan)" "ring.aist.go.jp" "pub/text/xemacs/packages") ("asahi-net.or.jp (Japan)" "ring.asahi-net.or.jp" "pub/text/xemacs/packages") ("dti.ad.jp (Japan)" "ftp.dti.ad.jp" "pub/unix/editor/xemacs/packages") ("jaist.ac.jp (Japan)" "ftp.jaist.ac.jp" "pub/GNU/xemacs/packages") ("nucba.ac.jp (Japan)" "mirror.nucba.ac.jp" "mirror/xemacs/packages") ("sut.ac.jp (Japan)" "sunsite.sut.ac.jp" "pub/archives/packages/xemacs/packages") ("tsukuba.ac.jp (Japan)" "ftp.netlab.is.tsukuba.ac.jp" "pub/GNU/xemacs/packages") ("kreonet.re.kr (Korea)" "ftp.kreonet.re.kr" "pub/tools/emacs/xemacs/packages") ("nctu.edu.tw (Taiwan)" "coda.nctu.edu.tw" "Editors/xemacs/packages") ("sun.ac.za (South Africa)" "ftp.sun.ac.za" "xemacs/packages") ("isu.net.sa (Saudi Arabia)" "ftp.isu.net.sa" "pub/mirrors/ftp.xemacs.org/packages") ("aarnet.edu.au (Australia)" "mirror.aarnet.edu.au" "pub/xemacs/packages")) "*List of remote sites available for downloading packages.\nList format is '(site-description site-name directory-on-site).\nSITE-DESCRIPTION is a textual description of the site.  SITE-NAME\nis the internet address of the download site.  DIRECTORY-ON-SITE\nis the directory on the site in which packages may be found.\nThis variable is used to initialize `package-get-remote', the\nvariable actually used to specify package download sites." :tag "Package download sites" :type '(repeat (list (string :tag "Name") host-name directory)) :group 'package-get)
 
 (autoload 'package-get-download-menu "package-get" "\
 Build the `Add Download Site' menu." nil nil)
--- a/lisp/files.el	Mon Aug 13 11:01:11 2007 +0200
+++ b/lisp/files.el	Mon Aug 13 11:01:51 2007 +0200
@@ -1159,51 +1159,53 @@
 
 (defvar auto-mode-alist
   '(("\\.te?xt\\'" . text-mode)
-    ("\\.[ch]\\'" . c-mode)
+    ("\\.[chi]\\'" . c-mode)
     ("\\.el\\'" . emacs-lisp-mode)
-    ("\\.\\([CH]\\|cc\\|hh\\)\\'" . c++-mode)
+    ("\\.\\(?:[CH]\\|cc\\|hh\\)\\'" . c++-mode)
     ("\\.[ch]\\(pp\\|xx\\|\\+\\+\\)\\'" . c++-mode)
     ("\\.java\\'" . java-mode)
     ("\\.idl\\'" . idl-mode)
-    ("\\.f\\(or\\)?\\'" . fortran-mode)
-    ("\\.F\\(OR\\)?\\'" . fortran-mode)
+    ("\\.f\\(?:or\\)?\\'" . fortran-mode)
+    ("\\.F\\(?:OR\\)?\\'" . fortran-mode)
     ("\\.[fF]90\\'" . f90-mode)
 ;;; Less common extensions come here
 ;;; so more common ones above are found faster.
     ("\\.\\([pP][Llm]\\|al\\)\\'" . perl-mode)
     ("\\.py\\'" . python-mode)
-    ("\\.texi\\(nfo\\)?\\'" . texinfo-mode)
+    ("\\.texi\\(?:nfo\\)?\\'" . texinfo-mode)
     ("\\.ad[abs]\\'" . ada-mode)
-    ("\\.c?l\\(i?sp\\)?\\'" . lisp-mode)
-    ("\\.p\\(as\\)?\\'" . pascal-mode)
+    ("\\.c?l\\(?:i?sp\\)?\\'" . lisp-mode)
+    ("\\.p\\(?:as\\)?\\'" . pascal-mode)
     ("\\.ltx\\'" . latex-mode)
     ("\\.[sS]\\'" . asm-mode)
-    ("[Cc]hange.?[Ll]og?\\(.[0-9]+\\)?\\'" . change-log-mode)
+    ("[Cc]hange.?[Ll]og?\\(?:.[0-9]+\\)?\\'" . change-log-mode)
     ("\\$CHANGE_LOG\\$\\.TXT" . change-log-mode)
     ("\\.scm?\\(?:\\.[0-9]*\\)?\\'" . scheme-mode)
     ("\\.e\\'" . eiffel-mode)
     ("\\.mss\\'" . scribe-mode)
-    ("\\.m\\([mes]\\|an\\)\\'" . nroff-mode)
+    ("\\.m\\(?:[mes]\\|an\\)\\'" . nroff-mode)
     ("\\.icn\\'" . icon-mode)
-    ("\\.\\([ckz]?sh\\|shar\\)\\'" . sh-mode)
+    ("\\.\\(?:[ckz]?sh\\|shar\\)\\'" . sh-mode)
+    ("\\.[Pp][Rr][Oo]\\'" . idlwave-mode)
     ;; #### Unix-specific!
-    ("/\\.\\(bash_\\|z\\)?\\(profile\\|login\\|logout\\)\\'" . sh-mode)
-    ("/\\.\\([ckz]sh\\|bash\\|tcsh\\|es\\|xinit\\|startx\\)rc\\'" . sh-mode)
-    ("/\\.\\([kz]shenv\\|xsession\\)\\'" . sh-mode)
+    ("/\\.\\(?:bash_\\|z\\)?\\(profile\\|login\\|logout\\)\\'" . sh-mode)
+    ("/\\.\\(?:[ckz]sh\\|bash\\|tcsh\\|es\\|xinit\\|startx\\)rc\\'" . sh-mode)
+    ("/\\.\\(?:[kz]shenv\\|xsession\\)\\'" . sh-mode)
+    ("\\.m?spec$" .sh-mode)
     ;; The following come after the ChangeLog pattern for the sake of
     ;; ChangeLog.1, etc. and after the .scm.[0-9] pattern too.
     ("\\.[12345678]\\'" . nroff-mode)
     ("\\.[tT]e[xX]\\'" . tex-mode)
-    ("\\.\\(sty\\|cls\\|bbl\\)\\'" . latex-mode)
+    ("\\.\\(?:sty\\|cls\\|bbl\\)\\'" . latex-mode)
     ("\\.bib\\'" . bibtex-mode)
     ("\\.article\\'" . text-mode)
     ("\\.letter\\'" . text-mode)
-    ("\\.\\(tcl\\|exp\\)\\'" . tcl-mode)
+    ("\\.\\(?:tcl\\|exp\\)\\'" . tcl-mode)
     ("\\.wrl\\'" . vrml-mode)
     ("\\.awk\\'" . awk-mode)
     ("\\.prolog\\'" . prolog-mode)
     ("\\.tar\\'" . tar-mode)
-    ("\\.\\(arc\\|zip\\|lzh\\|zoo\\)\\'" . archive-mode)
+    ("\\.\\(?:arc\\|zip\\|lzh\\|zoo\\)\\'" . archive-mode)
     ;; Mailer puts message to be edited in /tmp/Re.... or Message
     ;; #### Unix-specific!
     ("\\`/tmp/Re" . text-mode)
@@ -1215,9 +1217,10 @@
     ("\\.lex\\'" . c-mode)
     ("\\.m\\'" . objc-mode)
     ("\\.oak\\'" . scheme-mode)
-    ("\\.s?html?\\'" . html-mode)
-    ("\\.htm?l?3\\'" . html3-mode)
-    ("\\.\\(sgml?\\|dtd\\)\\'" . sgml-mode)
+    ("\\.[sj]?html?\\'" . html-mode)
+    ("\\.jsp\\'" . html-mode)
+    ("\\.xml\\'" . xml-mode)
+    ("\\.\\(?:sgml?\\|dtd\\)\\'" . sgml-mode)
     ("\\.c?ps\\'" . postscript-mode)
     ;; .emacs following a directory delimiter in either Unix or
     ;; Windows syntax.
@@ -1225,16 +1228,16 @@
     ("\\.m4\\'" . autoconf-mode)
     ("configure\\.in\\'" . autoconf-mode)
     ("\\.ml\\'" . lisp-mode)
-    ("\\.ma?k\\'" . makefile-mode)
+    ("\\.ma?ke?\\'" . makefile-mode)
     ("[Mm]akefile\\(\\.\\|\\'\\)" . makefile-mode)
     ("\\.X\\(defaults\\|environment\\|resources\\|modmap\\)\\'" . xrdb-mode)
     ;; #### The following three are Unix-specific (but do we care?)
     ("/app-defaults/" . xrdb-mode)
-    ("\\.[^/]*wm\\'" . winmgr-mode)
-    ("\\.[^/]*wm2?rc" . winmgr-mode)
+    ("\\.[^/]*wm2?\\(?:rc\\)?\\'" . winmgr-mode)
     ("\\.[Jj][Pp][Ee]?[Gg]\\'" . image-mode)
     ("\\.[Pp][Nn][Gg]\\'" . image-mode)
     ("\\.[Gg][Ii][Ff]\\'" . image-mode)
+    ("\\.[Tt][Ii][Ff][Ff]?\\'" . image-mode)
     )
 "Alist of filename patterns vs. corresponding major mode functions.
 Each element looks like (REGEXP . FUNCTION) or (REGEXP FUNCTION NON-NIL).
--- a/lisp/gnuserv.el	Mon Aug 13 11:01:11 2007 +0200
+++ b/lisp/gnuserv.el	Mon Aug 13 11:01:51 2007 +0200
@@ -1,7 +1,7 @@
 ;;; gnuserv.el --- Lisp interface code between Emacs and gnuserv
 ;; Copyright (C) 1989-1997 Free Software Foundation, Inc.
 
-;; Version: 3.11
+;; Version: 3.12
 ;; Author: Andy Norman (ange@hplb.hpl.hp.com), originally based on server.el
 ;;         Hrvoje Niksic <hniksic@srce.hr>
 ;; Maintainer: Jan Vroonhof <vroonhof@math.ethz.ch>,
@@ -337,8 +337,8 @@
   "Process gnuserv client requests to execute Emacs commands."
   (setq gnuserv-string (concat gnuserv-string string))
   ;; C-d means end of request.
-  (when (string-match "\C-d\\'" gnuserv-string)
-    (cond ((string-match "^[0-9]+" gnuserv-string) ; client request id
+  (when (string-match "\C-d\n?\\'" gnuserv-string)
+    (cond ((string-match "\\`[0-9]+" gnuserv-string) ; client request id
 	   (let ((header (read-from-string gnuserv-string)))
 	     ;; Set the client we are talking to.
 	     (setq gnuserv-current-client (car header))
@@ -359,8 +359,9 @@
 		     (signal 'quit nil)))
 	     (setq gnuserv-string "")))
 	  (t
-	   (error "%s: invalid response from gnuserv" gnuserv-string)
-	   (setq gnuserv-string "")))))
+	   (let ((response (car (split-string gnuserv-string "\C-d"))))
+	     (setq gnuserv-string "")
+	     (error "%s: invalid response from gnuserv" response))))))
 
 ;; This function is somewhat of a misnomer.  Actually, we write to the
 ;; server (using `process-send-string' to gnuserv-process), which
--- a/lisp/help.el	Mon Aug 13 11:01:11 2007 +0200
+++ b/lisp/help.el	Mon Aug 13 11:01:51 2007 +0200
@@ -256,7 +256,7 @@
 
 ;; This is a grody hack of the same genotype as `advertised-undo'; if the
 ;; bindings of Backspace and C-h are the same, we want the menubar to claim
-;; that `info' in invoked with `C-h i', not `BS i'.
+;; that `info' is invoked with `C-h i', not `BS i'.
 
 (defun deprecated-help-command ()
   (interactive)
--- a/lisp/lisp-mnt.el	Mon Aug 13 11:01:11 2007 +0200
+++ b/lisp/lisp-mnt.el	Mon Aug 13 11:01:51 2007 +0200
@@ -343,7 +343,7 @@
 
 (defun lm-version (&optional file)
   "Return the version listed in file FILE, or current buffer if FILE is nil.
-This can befound in an RCS or SCCS header to crack it out of."
+This can be found in an RCS or SCCS header to crack it out of."
   (save-excursion 
     (if file
 	(find-file file))
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lisp/mule/auto-autoloads.el	Mon Aug 13 11:01:51 2007 +0200
@@ -0,0 +1,32 @@
+;;; DO NOT MODIFY THIS FILE
+(if (featurep 'mule-autoloads) (error "Already loaded"))
+
+;;;### (autoloads (ccl-execute-with-args define-ccl-program declare-ccl-program ccl-dump ccl-compile ccl-program-p) "mule-ccl" "mule/mule-ccl.el")
+
+(autoload 'ccl-program-p "mule-ccl" "\
+T if OBJECT is a valid CCL compiled code." nil nil)
+
+(autoload 'ccl-compile "mule-ccl" "\
+Return a compiled code of CCL-PROGRAM as a vector of integer." nil nil)
+
+(autoload 'ccl-dump "mule-ccl" "\
+Disassemble compiled CCL-CODE." nil nil)
+
+(autoload 'declare-ccl-program "mule-ccl" "\
+Declare NAME as a name of CCL program.
+
+To compile a CCL program which calls another CCL program not yet
+defined, it must be declared as a CCL program in advance." nil 'macro)
+
+(autoload 'define-ccl-program "mule-ccl" "\
+Set NAME the compiled code of CCL-PROGRAM.
+CCL-PROGRAM is `eval'ed before being handed to the CCL compiler `ccl-compile'.
+The compiled code is a vector of integers." nil 'macro)
+
+(autoload 'ccl-execute-with-args "mule-ccl" "\
+Execute CCL-PROGRAM with registers initialized by the remaining args.
+The return value is a vector of resulting CCL registeres." nil nil)
+
+;;;***
+
+(provide 'mule-autoloads)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lisp/mule/custom-load.el	Mon Aug 13 11:01:51 2007 +0200
@@ -0,0 +1,7 @@
+;;; custom-load.el --- automatically extracted custom dependencies
+
+;;; Code:
+
+(custom-add-loads 'mule '("mule-cmds"))
+
+;;; custom-load.el ends here
--- a/lisp/package-get.el	Mon Aug 13 11:01:11 2007 +0200
+++ b/lisp/package-get.el	Mon Aug 13 11:01:51 2007 +0200
@@ -184,6 +184,7 @@
 (defcustom package-get-download-sites
   '(
     ;; North America
+    ("Pre-Releases" "ftp.xemacs.org" "pub/xemacs/beta/experimental/packages")
     ("xemacs.org" "ftp.xemacs.org" "pub/xemacs/packages")
     ("crc.ca (Canada)" "ftp.crc.ca" "pub/packages/editors/xemacs/packages")
     ("ualberta.ca (Canada)" "sunsite.ualberta.ca" "pub/Mirror/xemacs/packages")
--- a/lisp/packages.el	Mon Aug 13 11:01:11 2007 +0200
+++ b/lisp/packages.el	Mon Aug 13 11:01:51 2007 +0200
@@ -203,8 +203,8 @@
 			  (member 'crypt-find-file-hook find-file-hooks)))
 		 ;; Compression involved.
 		 (if nosuffix
-		     ":.gz:.Z"
-		   ".elc:.elc.gz:elc.Z:.el:.el.gz:.el.Z::.gz:.Z"))
+		     ":.gz:.bz2:.Z"
+		   ".elc:.elc.gz:.elc.bz2:.elc.Z:.el:.el.gz:.el.bz2:.el.Z::.gz:.bz2:.Z"))
 		(t
 		 ;; No compression.
 		 (if nosuffix
--- a/lisp/replace.el	Mon Aug 13 11:01:11 2007 +0200
+++ b/lisp/replace.el	Mon Aug 13 11:01:51 2007 +0200
@@ -377,8 +377,8 @@
 
 If a match spreads across multiple lines, all those lines are shown.
 
-If variable `list-matching-lines-whole-buffer' is non-nil, the entire buffer is
-searched, otherwise search begins at point.
+If variable `list-matching-lines-whole-buffer' is non-nil, the entire
+buffer is searched, otherwise search begins at point.
 
 Each line is displayed with NLINES lines before and after, or -NLINES
 before if NLINES is negative.
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/lisp/xpm-button.el	Mon Aug 13 11:01:51 2007 +0200
@@ -0,0 +1,415 @@
+;;; xpm-button.el --- create XPM buttons
+
+;; Copyright (C) 1997 Free Software Foundation, Inc.
+;; Copyright (C) 1995 Kyle E. Jones
+
+;; Author: Kyle Jones
+;; Maintainer: XEmacs Development Team
+;; Keywords: frames, internal
+
+;; This file is part of XEmacs.
+
+;; XEmacs 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 1, or (at your option)
+;; any later version.
+
+;; XEmacs 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.
+
+;;; Synched up with: Not in FSF.
+
+;;; Commentary:
+
+;; Create XPM text buttons under XEmacs (requires 19.12 or beyond)
+
+;; Send bug reports to kyle@wonderworks.com
+
+;; Sample use of this package.
+;;(progn
+;;  (setq b (xpm-button-create "Test button" 2 "yellow" "#a0a0d0"))
+;;  (setq e (make-extent (point-max) (point-max)))
+;;  (setq g (make-glyph (nth 0 b)))
+;;  (set-extent-begin-glyph e g)
+;;  (setq g2 (make-glyph (nth 1 b)))
+;;  (setq k (make-sparse-keymap))
+;;  (define-key k 'button1 '(lambda (ev)
+;;                          (interactive "e")
+;;                          (set-extent-begin-glyph e g2)))
+;;  (define-key k 'button1up '(lambda (ev)
+;;                            (interactive "e")
+;;                            (set-extent-begin-glyph e g)))
+;;  (set-extent-property e 'keymap k))
+
+;; The sole interface function is xpm-button-create.
+
+;;; Code:
+
+(provide 'xpm-button)
+
+(defvar xpm-button-version "1.02"
+  "Version string for xpm-button.")
+
+(defvar xpm-button-vertical-padding 3
+  "Number of pixels between the text and the top/bottom of the button.")
+
+(defvar xpm-button-horizontal-padding 3
+  "Number of pixels between the text and the left/right edges of the button.")
+
+(defvar xpm-button-font-pixel-lines
+  '(
+"    xx     xxxxxx     xxxx x xxxxxxx   xxxxxxxx xxxxxxxx   xxxx x  xxxx  xxxx xxxx    xxxx xxxx xxxx xxxx     xxxx   xxxx xxx    xxx   xxxxx   xxxxxxx    xxxxx    xxxxxxx    xxxx x xxxxxxxx xxxx  xxx xxxx   xxx xxxx xxxx xxx xxxx xxxx xxxx xxx xxxxxxxx         xxx                 xxx           xxx         xxx       xx   xx xxx      xxx                                                                 x                                                            xx     x   xxxx   xxxx    xxx   xxxxx   xxx  xxxxxx  xxxx   xxxx   x        xx     xxxx      x x   xxxx    xx   x       x      xxx       x      x x                                  xxxx   xx xxxx xx         xx x x                       x  xxxx  x     x                                                                                         "
+"    xx      xx  xx   xx   xx  xx   xx   xx   xx  xx   xx  xx   xx   xx    xx   xx      xx   xx   x    xx       xxx   xxx   xxx    x   xx   xx   xx   xx  xx   xx    xx   xx  xx   xx xx xx xx  xx    x   xx     x   xx   xx   x   xx   x    xx   x  xx   xxx          xx                  xx          xx x          xx       xx   xx  xx       xx                                                                xx                                                           x  x  xxx  xx  xx xx  xx   xxx   xxxx   x  xx xxxxxx xx  xx xx  xx x         xx   xx    x     x x  xx xxx  xx xxxx       x     xx  x    x x x   x   x                                 xx    xx    xx  xx        xx x x                       x xx  xx xx    x                                                                                         "
+"   x xx     xx  xx  xx     x  xx    xx  xx    x  xx    x xx     x   xx    xx   xx      xx   xx  x     xx       xxx   xxx   xxxx   x  xx     xx  xx   xx xx     xx   xx   xx  xx    x x  xx  x  xx    x   xx     x   xx   xx   x   xxx x     xx   x  x   xxx           xx                  xx          xx       xx   xx                xx       xx                                                                xx                                                          xx  xx  xx  xx  xx xx  xx  x xx   x     xx  xx x   x  xx   x xx  xx xx        xx  x  xxxx x  xxxxxx x  x   xx  x x       xxx    xx x      xxx   xx   xx                           x    xx    xx    xx  xx         x x x                       x xx  xx  x    x                                                                                         "
+"   x xx     xx  xx  xx     x  xx    xx  xx  x    xx  x x xx     x   xx    xx   xx      xx   xx x      xx       x xx x xx   x xxx  x  xx     xx  xx   xx xx     xx   xx   xx  xxxx    x  xx  x  xx    x    xx   x     xx x xx x     xxxx      xx x      xxx    xxxx    xx xx     xxx    xx xx    xxx  xxxxx  xxxx    xx xx   xxx  xxx  xx xxx   xx  xxx xx  xx   xxx xx     xxx   xxx xx     xx xx  xxx xx  xxxx xxxxx xxx xxx  xxxx xxx xxx xxxx xxx xxx xxx xxxx xxx xxxxxx xx  xx  xx      xx     xx  x xx   xxxx  xx        xx   xx x  xx  xx xx        xx  x x  xx x   x x   xx x   xx  x x  xx   x x     xx  xxx x x x  x     x                           x    xx    xx    xx  xx  xx xx x             xx    xx      xx     xx  xx   x                                                                                         "
+"  x   xx    xxxxx   xx        xx    xx  xxxxx    xxxxx   xx         xxxxxxxx   xx      xx   xxxxx     xx       x xx x xx   x  xxx x  xx     xx  xx  xx  xx     xx   xxxxx     xxxxx     xx     xx    x    xx   x     xx x xx x      xxx      xx x      xx     x  xx   xxx xxx xxx xx xxx xxx  xxx xx  xx   xx  xx   xxx xx   xx   xx  xx xx    xx   xxx xxx xx   xxx xx  xxx xxx  xxx xxx xxx xxx   xxxxx x   x  xx    xx  xx   xx   x   xx  xx   x   xx  x   xx   x  x  xxx xx  xx  xx     xx    xx   x  xx   x  xx xxxxx     xx   xxxx   xxxxx     xx  x xx x xx xx  x   x x    xxxx  xx x x  xx x xx xx   xxxx  x    x   xx     xx                xxxxxx    x    xx    x     xx   x  xx xx             xxx      xxx    x     xx    x   x                                                                                         "
+"  xxxxxx    xx   xx xx        xx    xx  xx  x    xx  x   xx   xxxx  xx    xx   xx      xx   xx xxx    xx       x xx x xx   x   xxxx  xx     xx  xxxxx   xx xx  xx   xx  xx      xxxx    xx     xx    x     xx x      xx x xx x     x xxx      xx      xxx      xxxx   xx   xx xx     xx   xx  xxxxxx  xx   xx  xx   xx  xx   xx   xx  xxxx     xx   xx  xx  xx   xx  xx  xx   xx  xx   xx xx   xx   xx    xxxx   xx    xx  xx    xx x     xx xxx x     xxx     xx x     xxx  xx  xx  xx    xx       xx x  xx      xx xx  xx   xx    x xxx     xx    xxxxxx xx x xx xx x  xxxxxx     xxx  xx  x xx  x x   x  x  xxxx         xx     xx xxxxxx                xxxxxxx xx   x      xx    x                 xxx          xxx xx    x      xx  x                                                                                         "
+" x     xx   xx   xx xx     x  xx    xx  xx    x  xx      xx    xx   xx    xx   xx  xx  xx   xx  xx    xx    x  x  xx  xx   x    xxx  xx     xx  xx      xxx  x xx   xx  xx   x    xx    xx     xx    x     xx x       xx   xx      x  xxx     xx     xxx   x xx  xx   xx   xx xx     xx   xx  xx      xx    xxxx    xx  xx   xx   xx  xx xx    xx   xx  xx  xx   xx  xx  xx   xx  xx   xx xx   xx   xx     xxxx  xx    xx  xx    xx x     xx xxx x     xxx     xx x    xxx   xx  xx  xx   x   x xx  xx xxxxxx xx  xx xx  xx   xx   x   xx xx  xx    x  xx     x  xx xx    x x    xx x x     x  xx  x       xx   xxx         xx     xx                xxxxxx    x    xx    x     xx   x                    xxx      xxx   x             x  x                                                                                         "
+" x     xx   xx   xx  xx   xx  xx   xx   xx   xx  xx       xx   xx   xx    xx   xx  xx  xx   xx  xxx   xx   xx  x  xx  xx   x     xx   xx   xx   xx       xx  xxx    xx   xxx xx   xx    xx     xxx  xx      xx        xx   xx     x    xx     xx    xxx   xx xx xxx   xx  xxx xxx xx xxx xxx  xxx xx  xx   x        xx  xx   xx   xx  xx  xx   xx   xx  xx  xx   xx  xx  xxx xxx  xxx xxx xxx xxx   xx    x   x  xx    xx xxx     xx       xx  xx     x  xx     xx    xxx  x  x  x   xx  xxxxxx xx  xx    xx  xx  xx xx  xx   xx   xx  xx xx  x            xx  x      x   x x    xx x x     x  xx x        xxx  xxxxx        x     x                           x    xx    xx    xx  xx  xx xx        xx     xx xx xx     x     xx      xx x                                                                                         "
+"xxx   xxxx xxxxxxx    xxxxx  xxxxxxx   xxxxxxxx xxxx       xxxx x  xxxx  xxxx xxxx  xxx    xxxx  xxx xxxxxxxx xxx xx xxxx xxx     x    xxxxx   xxxx       xxxxx    xxxx  xx  x xxxx    xxxx     xxxxx       xx        xx   xx    xxx  xxxx   xxxx   xxxxxxxx  xx xxx  x xxx     xxx    xx xxx   xxx  xxxx  xxxxxx  xxxx xxx xxxx  xx xxxx xxx xxxx xxxx xxx xxx xxxx xxx   xxx    xx xx     xx xx  xxxx   xxxx    xx    xx xxx    xx       xx  xx    xxx xxx    xx    xxxxxx   xx   xxxx xxxxxx  xxxx    xxxx  xxxx   xxxx    xx    xxxx   xxx             xx   xxxxxx    x x     xxxx     x    xx          xxxx  xx         xx   xx                           x    xx    xx    xx  xx  xx xx        xx        xx        x     xx       x x                                                                                         "
+"                                                                                                                                                              xxxx                                                                                                                                          xxxxxx                xx                                              xx           xx                                                               x                                                                                                                   x                                         x   x                                 xx    xx    xx  xx   x            x                                                                                                                             "
+"                                                                                                                                                               xx                                                                                                                                          x    xx                xx                                              xx           xx                                                            xxx                                                                                                                                                               x x           xxxxxxx                xxxx   xx xxxx xx   x            x                                                                                                                              "
+"                                                                                                                                                                                                                                                                                                            xxxxx                xx                                              xxxx         xxxx                                                           xx                                                                                                                                                                                                                                                                                                                                                                     "
+   )
+  "List of strings representing pixel lines for the button font.")
+
+(defvar xpm-button-font-line-indices
+  '(("A" 0 10)
+    ("B" 11 19)
+    ("C" 20 28)
+    ("D" 29 38)
+    ("E" 39 47)
+    ("F" 48 56)
+    ("G" 57 66)
+    ("H" 67 77)
+    ("I" 78 82)
+    ("J" 83 90)
+    ("K" 91 100)
+    ("L" 101 109)
+    ("M" 110 121)
+    ("N" 122 132)
+    ("O" 133 142)
+    ("P" 143 151)
+    ("Q" 152 162)
+    ("R" 163 172)
+    ("S" 173 180)
+    ("T" 181 189)
+    ("U" 190 199)
+    ("V" 200 210)
+    ("W" 211 224)
+    ("X" 225 234)
+    ("Y" 235 243)
+    ("Z" 244 252)
+    ("a" 253 260)
+    ("b" 261 269)
+    ("c" 270 276)
+    ("d" 277 285)
+    ("e" 286 292)
+    ("f" 293 298)
+    ("g" 299 306)
+    ("h" 307 315)
+    ("i" 316 320)
+    ("j" 321 324)
+    ("k" 325 333)
+    ("l" 334 338)
+    ("m" 339 351)
+    ("n" 352 360)
+    ("o" 361 368)
+    ("p" 369 377)
+    ("q" 378 386)
+    ("r" 387 393)
+    ("s" 394 399)
+    ("t" 400 405)
+    ("u" 406 414)
+    ("v" 415 423)
+    ("w" 424 436)
+    ("x" 437 444)
+    ("y" 445 453)
+    ("z" 454 460)
+    ("0" 461 467)
+    ("1" 468 472)
+    ("2" 473 479)
+    ("3" 480 486)
+    ("4" 487 493)
+    ("5" 494 500)
+    ("6" 501 507)
+    ("7" 508 514)
+    ("8" 515 521)
+    ("9" 522 528)
+    ("`" 529 531)
+    ("~" 532 538)
+    ("!" 539 541)
+    ("@" 542 552)
+    ("#" 553 560)
+    ("$" 561 567)
+    ("%" 568 580)
+    ("^" 581 586)
+    ("&" 587 597)
+    ("*" 598 603)
+    ("(" 604 608)
+    (")" 609 613)
+    ("-" 614 620)
+    ("_" 621 628)
+    ("=" 629 635)
+    ("+" 636 643)
+    ("[" 644 648)
+    ("{" 649 653)
+    ("]" 654 658)
+    ("}" 659 663)
+    (";" 664 666)
+    (":" 667 669)
+    ("'" 670 672)
+    ("\"" 673 676)
+    ("," 677 679)
+    ("<" 680 686)
+    ("." 687 689)
+    (">" 690 696)
+    ("/" 697 700)
+    ("?" 701 707)
+    ("\\" 708 713)
+    ("|" 714 715)
+    (" " 716 719))
+  "Indices into the xpm-button-font-pixel-lines strings for each character.
+Format is
+  (STR START END)
+STR contains the character.
+START is where the character's pixels start in each string of
+   xpm-button-font-pixel-lines (0 is the index of the first pixel).
+END is the index of the position after the last pixel of the character.")
+
+(defun xpm-button-color-rgb-components (color)
+  "Return the RGB components of COLOR as a list of integers (R G B).
+16-bit values are always returned.
+#FEFEFE and rgb:fe/fe/fe style color specifications are parsed directly
+into their components."
+  (color-instance-rgb-components (make-color-instance color)))
+
+(defun xpm-button-compute-contrast-color (color)
+  "Compute a contrasting color for COLOR.
+The new color is created by xor-ing the RGB values of COLOR with all ones."
+  (let* ((rgb (xpm-button-color-rgb-components color))
+	 (r (logxor (nth 0 rgb) 65535))
+	 (g (logxor (nth 1 rgb) 65535))
+	 (b (logxor (nth 2 rgb) 65535)))
+    (format "rgb:%04x/%04x/%04x" r g b)))
+
+(defun xpm-button-compute-shadow-colors (color)
+  "Compute shadow colors for COLOR.
+COLOR should be a string naming a color.
+Returns (COLOR1 . COLOR2) where COLOR1 is the brighter shadow color
+and COLOR2 is the dimmer color."
+  (let* ((rgb (xpm-button-color-rgb-components color))
+	 (r (nth 0 rgb))
+	 (g (nth 1 rgb))
+	 (b (nth 2 rgb))
+	 (bright-r (/ (* r 12) 10))
+	 (bright-g (/ (* g 12) 10))
+	 (bright-b (/ (* b 12) 10))
+	 (dim-r (/ (* r 8) 10))
+	 (dim-g (/ (* g 8) 10))
+	 (dim-b (/ (* b 8) 10)))
+    (if (> bright-r 65535)
+	(setq bright-r 65535))
+    (if (> bright-g 65535)
+	(setq bright-g 65535))
+    (if (> bright-b 65535)
+	(setq bright-b 65535))
+    (cons (format "rgb:%04x/%04x/%04x" bright-r bright-g bright-b)
+	  (format "rgb:%04x/%04x/%04x" dim-r dim-g dim-b))))
+
+;;;###autoload
+(defun xpm-button-create (text shadow-thickness fg-color bg-color)
+  "Returns a list of XPM image instantiators for a button displaying TEXT.
+The list is of the form
+   (UP DOWN DISABLED)
+where UP, DOWN, and DISABLED are the up, down and disabled image
+instantiators for the button.
+
+SHADOW-THICKNESS specifies how many pixels should be used for the
+shadows on the edges of the buttons.  It should be a positive integer,
+or 0 to mean no shadows on the edges.
+FG-COLOR is the color used to display the text.  It should be a string.
+BG-COLOR is the background color the text will be displayed upon.
+It should be a string."
+  (save-excursion
+    (set-buffer (get-buffer-create " xpm-button"))
+    (erase-buffer)
+    ;; create the correct number of lines for the pixels for the
+    ;; characters.
+    (insert-char ?\n (length xpm-button-font-pixel-lines))
+    (let ((i 0)
+	  (str (make-string 1 0))
+	  (lim (length text))
+	  (bg-char ? )
+	  font-pixel-lines q)
+      ;; loop through text, adding the character pixels
+      (while (< i lim)
+	(aset str 0 (aref text i))
+	(if (null (setq q (assoc str xpm-button-font-line-indices)))
+	    nil ; no pixel data for this character
+	  (goto-char (point-min))
+	  (setq font-pixel-lines xpm-button-font-pixel-lines)
+	  (while font-pixel-lines
+	    (end-of-line)
+	    (if (not (bolp))
+		;; Insert space before some of the characters.
+		;; This isn't really correct for this font
+		;; but doing it right is too hard.
+		;; This isn't TeX after all.
+		(if (memq (aref str 0) '(?, ?. ?\" ?! ?| ?\' ?\`))
+		    (insert-char bg-char 1))
+	      ;; offset the start a bit from the left edge of the button
+	      (insert-char bg-char xpm-button-horizontal-padding))
+	    ;; insert the character pixels.
+	    (insert (substring (car font-pixel-lines) (nth 1 q) (nth 2 q)))
+	    (forward-line)
+	    (setq font-pixel-lines (cdr font-pixel-lines))))
+	(setq i (1+ i)))
+      ;; now offset the text from the right edge of the button.
+      (goto-char (point-min))
+      (while (not (eobp))
+	(end-of-line)
+	(insert-char bg-char xpm-button-horizontal-padding)
+	(forward-line)))
+    (let ((bright-char ?b)
+	  (dim-char ?d)
+	  (fg-char ?x)
+	  (bg-char ? )
+	  (shadow-colors (xpm-button-compute-shadow-colors bg-color))
+	  i len up-string down-string disabled-string)
+      ;; find the length of a pixel line.
+      (goto-char (point-min))
+      (end-of-line)
+      (setq len (- (point) (point-min)))
+      ;; offset text from the top of the button
+      (goto-char (point-min))
+      (setq i xpm-button-vertical-padding)
+      (while (> i 0)
+	(insert-char bg-char len)
+	(insert ?\n)
+	(setq i (1- i)))
+      ;; offset text from the bottom of the button
+      (goto-char (point-max))
+      (setq i xpm-button-vertical-padding)
+      (while (> i 0)
+	(insert-char bg-char len)
+	(insert ?\n)
+	(setq i (1- i)))
+      ;; add shadows to the pixel lines
+      (goto-char (point-min))
+      (while (not (eobp))
+	(insert-char bright-char shadow-thickness)
+	(end-of-line)
+	(insert-char dim-char shadow-thickness)
+	(forward-line))
+      ;; add top and bottom shadow lines
+      (setq i shadow-thickness)
+      (goto-char (point-min))
+      (while (> i 0)
+	(insert-char bright-char (+ len shadow-thickness i))
+	(insert-char dim-char (- shadow-thickness i))
+	(insert ?\n)
+	(setq i (1- i)))
+      (setq i shadow-thickness)
+      (goto-char (point-max))
+      (while (> i 0)
+	(insert-char bright-char i)
+	(insert-char dim-char (+ len (* 2 shadow-thickness) (- i)))
+	(insert ?\n)
+	(setq i (1- i)))
+      ;; add doublequotes, commas and XPM header goop.
+      (goto-char (point-min))
+      (while (not (eobp))
+	(insert "\"")
+	(end-of-line)
+	(insert "\",")
+	(forward-line))
+      (insert "};\n")
+      (goto-char (point-min))
+      ;; color map for the UP button
+      (insert (format
+	       "/* XPM */
+static char * button_xpm[] = {
+\"%d %d 4 1\",
+\"%c   c %s\",
+\"%c   c %s\",
+\"%c   c %s\",
+\"%c   c %s\",
+"
+	       (+ len (* shadow-thickness 2))
+	       (+ (* xpm-button-vertical-padding 2)
+		  (* shadow-thickness 2)
+		  (length xpm-button-font-pixel-lines))
+	       fg-char fg-color
+	       bg-char bg-color
+	       bright-char (car shadow-colors)
+	       dim-char (cdr shadow-colors)))
+      (setq up-string (buffer-string))
+      (delete-region (point-min) (point))
+      ;; color map for the DOWN button
+      (insert (format
+	       "/* XPM */
+static char * button_xpm[] = {
+\"%d %d 4 1\",
+\"%c   c %s\",
+\"%c   c %s\",
+\"%c   c %s\",
+\"%c   c %s\",
+"
+	       (+ len (* shadow-thickness 2))
+	       (+ (* xpm-button-vertical-padding 2)
+		  (* shadow-thickness 2)
+		  (length xpm-button-font-pixel-lines))
+	       fg-char (xpm-button-compute-contrast-color fg-color)
+	       bg-char bg-color
+	       bright-char (cdr shadow-colors)
+	       dim-char (car shadow-colors)))
+      (setq down-string (buffer-string))
+      (delete-region (point-min) (point))
+      ;; color map for the DISABLED button
+      (insert (format
+	       "/* XPM */
+static char * button_xpm[] = {
+\"%d %d 4 1\",
+\"%c   c %s\",
+\"%c   c %s\",
+\"%c   c %s\",
+\"%c   c %s\",
+"
+	       (+ len (* shadow-thickness 2))
+	       (+ (* xpm-button-vertical-padding 2)
+		  (* shadow-thickness 2)
+		  (length xpm-button-font-pixel-lines))
+	       fg-char fg-color
+	       bg-char bg-color
+	       bright-char (car shadow-colors)
+	       dim-char (cdr shadow-colors)))
+      ;; stipple the foreground pixels
+      (let ((str (make-string 1 0))
+	    (bit 0)
+	    lim line-start)
+	(aset str 0 fg-char)
+	(while (not (eobp))
+	  (setq lim (save-excursion (end-of-line) (point))
+		line-start (point))
+	  (while (search-forward str lim t)
+	    (if (= (% (- (point) line-start) 2) bit)
+		(subst-char-in-region (1- (point)) (point) fg-char bg-char t)))
+	  (if (zerop bit)
+	      (setq bit 1)
+	    (setq bit 0))
+	  (forward-line)))
+      (setq disabled-string (buffer-string))
+
+      (list (vector 'xpm ':data up-string)
+	    (vector 'xpm ':data down-string)
+	    (vector 'xpm ':data disabled-string)) )))
+
+;;; xpm-button.el ends here
--- a/lwlib/ChangeLog	Mon Aug 13 11:01:11 2007 +0200
+++ b/lwlib/ChangeLog	Mon Aug 13 11:01:51 2007 +0200
@@ -1,3 +1,7 @@
+2001-01-27  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.1.14 is released
+
 2001-01-07  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.1.13 is released
--- a/man/ChangeLog	Mon Aug 13 11:01:11 2007 +0200
+++ b/man/ChangeLog	Mon Aug 13 11:01:51 2007 +0200
@@ -1,3 +1,12 @@
+2001-01-27  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.1.14 is released
+
+2001-01-27  Martin Buchholz  <martin@xemacs.org>
+
+	* lispref/variables.texi (max-specpdl-size): Correct default value.
+	* lispref/eval.texi (max-lisp-eval-depth): Correct default value.
+
 2001-01-07  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.1.13 is released
--- a/man/lispref/eval.texi	Mon Aug 13 11:01:11 2007 +0200
+++ b/man/lispref/eval.texi	Mon Aug 13 11:01:51 2007 +0200
@@ -182,7 +182,7 @@
 that Lisp avoids infinite recursion on an ill-defined function.
 @cindex Lisp nesting error
 
-The default value of this variable is 500.  If you set it to a value
+The default value of this variable is 1000.  If you set it to a value
 less than 100, Lisp will reset it to 100 if the given value is reached.
 
 @code{max-specpdl-size} provides another limit on nesting.
--- a/man/lispref/extents.texi	Mon Aug 13 11:01:11 2007 +0200
+++ b/man/lispref/extents.texi	Mon Aug 13 11:01:51 2007 +0200
@@ -823,7 +823,7 @@
 When a string is created using @code{buffer-substring} or
 @code{buffer-string}, any duplicable extents in the region corresponding
 to the string will be copied into the string (@pxref{Buffer
-Contents}).  When the string in inserted into a buffer using
+Contents}).  When the string is inserted into a buffer using
 @code{insert}, @code{insert-before-markers}, @code{insert-buffer} or
 @code{insert-buffer-substring}, the extents in the string will be copied
 back into the buffer (@pxref{Insertion}).  The extents in a string can,
--- a/man/lispref/variables.texi	Mon Aug 13 11:01:11 2007 +0200
+++ b/man/lispref/variables.texi	Mon Aug 13 11:01:51 2007 +0200
@@ -251,7 +251,7 @@
   This limit, with the associated error when it is exceeded, is one way
 that Lisp avoids infinite recursion on an ill-defined function.
 
-  The default value is 600.
+  The default value is 3000.
 
   @code{max-lisp-eval-depth} provides another limit on depth of nesting.
 @xref{Eval}.
--- a/man/xemacs-faq.texi	Mon Aug 13 11:01:11 2007 +0200
+++ b/man/xemacs-faq.texi	Mon Aug 13 11:01:51 2007 +0200
@@ -7,7 +7,7 @@
 @finalout
 @titlepage
 @title XEmacs FAQ
-@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2000/12/17 02:08:31 $
+@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2001/01/20 20:49:32 $
 @sp 1
 @author Tony Rossini <rossini@@biostat.washington.edu>
 @author Ben Wing <ben@@xemacs.org>
@@ -231,6 +231,7 @@
 * Q3.5.9::      How do I make the Delete key delete forward?
 * Q3.5.10::     Can I turn on @dfn{sticky} modifier keys?
 * Q3.5.11::     How do I map the arrow keys?
+* Q3.5.12::     XEmacs complains about my xmodmap (I hate the default X keymap).
 
 The Cursor:
 * Q3.6.1::      Is there a way to make the bar cursor thicker?
@@ -698,7 +699,7 @@
 
 Yes, there is a port of XEmacs 19.14, tested on MacOS 7.6.1 and MacOS
 8.5.1 by @email{pjarvis@@ispchannel.com, Pitts Jarvis}.  It's available
-at @uref{http://my.ispchannel.com/~pjarvis/xemacs.html}.
+at @uref{http://homepage.mac.com/pjarvis/xemacs.html}.
 
 @node Q1.0.12, Q1.0.13, Q1.0.11, Introduction
 @unnumberedsubsec Q1.0.12: Is there a port of XEmacs to NextStep?
@@ -2393,6 +2394,7 @@
 * Q3.5.9::      How do I make the Delete key delete forward?
 * Q3.5.10::     Can I turn on @dfn{sticky} modifier keys?
 * Q3.5.11::     How do I map the arrow keys?
+* Q3.5.12::     XEmacs complains about my xmodmap (I hate the default X keymap).
 
 The Cursor:
 * Q3.6.1::      Is there a way to make the bar cursor thicker?
@@ -3205,6 +3207,7 @@
 xmodmap, e.g.
 @c hey, show some respect, willya -- there's xkeycaps, isn't there? --
 @c chr ;)
+@c Fixed.  sjt ;)
 @example
         xmodmap -e 'keycode 0xff20 = Multi_key'
 @end example
@@ -3236,6 +3239,10 @@
 Running @samp{xmodmap -pk} will list all of the defined keysyms.
 @end quotation
 
+Actually, the simplest way to define keys on the X server is to use
+XKeyCaps (@pxref{Q3.5.12}), which provides an efficient GUI interface
+and will write correct @samp{xmodmap} scripts for you.
+
 @node Q3.5.8, Q3.5.9, Q3.5.7, Customization
 @unnumberedsubsec Q3.5.8: Why does @code{(global-set-key [delete-forward] 'delete-char)} complain?
 
@@ -3296,7 +3303,7 @@
 of the frame and back in, it cancels all currently ``stuck'' modifiers.
 @end quotation
 
-@node Q3.5.11, Q3.6.1, Q3.5.10, Customization
+@node Q3.5.11, Q3.5.12, Q3.5.10, Customization
 @unnumberedsubsec Q3.5.11: How do I map the arrow keys?
 @c New
 Say you want to map @kbd{C-@key{right}} to forward-word:
@@ -3320,9 +3327,27 @@
 @end lisp
 @end quotation
 
-
-
-@node Q3.6.1, Q3.6.2, Q3.5.11, Customization
+@node Q3.5.12, Q3.6.1, Q3.5.11, Customization
+@unnumberedsubsec Q3.5.12: XEmacs complains about my xmodmap (I hate the default X keymap).
+@c New
+
+Get XKeyCaps from @uref{http://www.jwz.org/xkeycaps/}.  It knows more
+than 200 keyboards by name, and provides nice pictures so you can tell
+if yours is a lookalike OEM version.  It sports an efficient GUI
+interface for remapping, and it knows how to write correct
+@samp{xmodmap} scripts.
+
+Most Linux and BSD distributions provide packages or ports.
+
+If you haven't tried XKeyCaps for your X11 keymapping problems, then
+you're wasting your time.  It is highly unlikely that a human being will
+be able to give you as good advice as XKeyCaps will for most problems.
+Even XKeyCaps's author has forgotten the details of the X11 keyboard
+mechanism.  There are a few problems it can't handle, but try it first.
+
+
+
+@node Q3.6.1, Q3.6.2, Q3.5.12, Customization
 @unnumberedsec 3.6: The Cursor
 @unnumberedsubsec Q3.6.1: Is there a way to make the bar cursor thicker?
 
--- a/nt/ChangeLog	Mon Aug 13 11:01:11 2007 +0200
+++ b/nt/ChangeLog	Mon Aug 13 11:01:51 2007 +0200
@@ -1,3 +1,7 @@
+2001-01-27  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.1.14 is released
+
 2001-01-07  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.1.13 is released
--- a/src/ChangeLog	Mon Aug 13 11:01:11 2007 +0200
+++ b/src/ChangeLog	Mon Aug 13 11:01:51 2007 +0200
@@ -1,3 +1,61 @@
+2001-01-27  XEmacs Build Bot <builds@cvs.xemacs.org>
+
+	* XEmacs 21.1.14 is released
+
+2001-01-18  Martin Buchholz  <martin@xemacs.org>
+
+	* alloc.c (INVALID_POINTER_VALUE): Use SIZEOF_LONG, not SIZEOF_INT.
+	Fixes crashes on 64-bit systems.  
+	Delete "support" for 48-bit systems.
+
+2001-01-13  Martin Buchholz  <martin@xemacs.org>
+
+	Port XEmacs to AIX xlC -O3 -qansialias.
+	* alloc.c (ALIASING_VOIDPP_DEREFERENCE): New.  From 21.2.
+	(FREE_STRUCT_P): Make aliasing-optimization-resistant.
+	(MARK_STRUCT_AS_FREE): Make aliasing-optimization-resistant.
+	(MARK_STRUCT_AS_NOT_FREE): Make aliasing-optimization-resistant.
+
+2000-11-06  Yoshiki Hayashi  <yoshiki@xemacs.org>
+
+	* cmdloop.c (Fcommand_loop_1): Just add C-g to event queue.
+
+2000-10-30  Yoshiki Hayashi  <yoshiki@xemacs.org>
+
+	* console.c (Fset_input_method): Trigger redisplay on tty.
+
+2001-01-12  Martin Buchholz  <martin@xemacs.org>
+
+	Pty fixes for HP-UX and AIX and BSD and SunOS4 backported from 21.2.
+	Makes ``M-x shell; sleep 1000; Signals->Send KILL'' work.
+
+	* ../configure.in: Detect killpg.
+	* config.h.in: Define HAVE_KILLPG.
+	* syssignal.h (EMACS_KILLPG): Autoconfiscate using HAVE_KILLPG.
+	Needed to have EMACS_KILLPG work on SunOS4.  An ancient bug.
+
+	* process-unix.c (try_to_initialize_subtty): New, from 21.2.
+	* process-unix.c (unix_kill_child_process):  Backported from 21.2.
+
+	* sysproc.h: Include <stropts.h> and <strtio.h>.
+	* config.h.in: Define HAVE_STROPTS_H and STRTIO_H
+	* ../configure.in: Detect <stropts.h> and <strtio.h>.
+	So that TIOCSIGNAL is defined on HP-UX.
+
+2001-01-09  Martin Buchholz  <martin@xemacs.org>
+
+	* process-unix.c (unix_create_process): 
+	Always disconnect_controlling_terminal() for subprocesses, whether
+	using ptys or not.
+	Fixes failure to create useful shell buffer via
+	(let ((process-connection-type nil)) (shell))
+
+2001-01-08  Martin Buchholz  <martin@xemacs.org>
+
+	Port to Netbsd 1.5.
+	* unexelf.c: Remove (never used) bogus Netbsd-specific cruft.
+	* s/netbsd.c: Use unexelf.o if __ELF__ is defined.
+
 2001-01-07  XEmacs Build Bot <builds@cvs.xemacs.org>
 
 	* XEmacs 21.1.13 is released
--- a/src/alloc.c	Mon Aug 13 11:01:11 2007 +0200
+++ b/src/alloc.c	Mon Aug 13 11:01:51 2007 +0200
@@ -1022,22 +1022,28 @@
    byte-aligned pointers, this pointer is at the very top of the address
    space and so it's almost inconceivable that it could ever be valid. */
 
-#if INTBITS == 32
-# define INVALID_POINTER_VALUE 0xFFFFFFFF
-#elif INTBITS == 48
-# define INVALID_POINTER_VALUE 0xFFFFFFFFFFFF
-#elif INTBITS == 64
-# define INVALID_POINTER_VALUE 0xFFFFFFFFFFFFFFFF
+#if SIZEOF_LONG == 4
+# define INVALID_POINTER_VALUE 0xFFFFFFFFUL
+#elif SIZEOF_LONG == 8
+# define INVALID_POINTER_VALUE 0xFFFFFFFFFFFFFFFFUL
 #else
 You have some weird system and need to supply a reasonable value here.
 #endif
 
+/* The construct (* (void **) (ptr)) would cause aliasing problems
+   with modern optimizing compilers like `gcc -O3 -fstrict-aliasing'.
+   But `char *' can legally alias any pointer.  Hence this union trick...
+
+   It turned out that the union trick was not good enough for xlC -O3;
+   and it is questionable whether it really complies with the C standard.
+   so we use memset instead, which should be safe from optimizations. */
+typedef union { char c; void *p; } *aliasing_voidpp;
+#define ALIASING_VOIDPP_DEREFERENCE(ptr) \
+  (((aliasing_voidpp) (ptr))->p)
 #define FREE_STRUCT_P(ptr) \
-  (* (void **) ptr == (void *) INVALID_POINTER_VALUE)
-#define MARK_STRUCT_AS_FREE(ptr) \
-  (* (void **) ptr = (void *) INVALID_POINTER_VALUE)
-#define MARK_STRUCT_AS_NOT_FREE(ptr) \
-  (* (void **) ptr = 0)
+  (ALIASING_VOIDPP_DEREFERENCE (ptr) == (void *) INVALID_POINTER_VALUE)
+#define MARK_STRUCT_AS_FREE(ptr) memset (ptr, 0xff, sizeof (void *))
+#define MARK_STRUCT_AS_NOT_FREE(ptr) memset (ptr, 0x00, sizeof (void *))
 
 #ifdef ERROR_CHECK_GC
 
--- a/src/config.h.in	Mon Aug 13 11:01:11 2007 +0200
+++ b/src/config.h.in	Mon Aug 13 11:01:51 2007 +0200
@@ -309,6 +309,9 @@
 #undef HAVE_UNLOCKPT
 #undef HAVE_GETPT
 #undef HAVE_PTSNAME
+#undef HAVE_KILLPG
+#undef HAVE_STROPTS_H	/* SysV streams */
+#undef HAVE_STRTIO_H	/* SysV streams TIOCSIGNAL */
 
 #undef HAVE_SOCKETS
 #undef HAVE_SOCKADDR_SUN_LEN
--- a/src/console.c	Mon Aug 13 11:01:11 2007 +0200
+++ b/src/console.c	Mon Aug 13 11:01:51 2007 +0200
@@ -1011,6 +1011,7 @@
       TTY_FLAGS (con).flow_control = !NILP (flow);
       TTY_FLAGS (con).meta_key = meta_key;
       init_one_console (con);
+      MARK_FRAME_CHANGED (XFRAME (CONSOLE_SELECTED_FRAME (con)));
     }
 #endif
 
--- a/src/data.c	Mon Aug 13 11:01:11 2007 +0200
+++ b/src/data.c	Mon Aug 13 11:01:51 2007 +0200
@@ -1969,7 +1969,7 @@
 Return a new weak list object of type TYPE.
 A weak list object is an object that contains a list.  This list behaves
 like any other list except that its elements do not count towards
-garbage collection -- if the only pointer to an object in inside a weak
+garbage collection -- if the only pointer to an object is inside a weak
 list (other than pointers in similar objects such as weak hash tables),
 the object is garbage collected and automatically removed from the list.
 This is used internally, for example, to manage the list holding the
--- a/src/depend	Mon Aug 13 11:01:11 2007 +0200
+++ b/src/depend	Mon Aug 13 11:01:51 2007 +0200
@@ -1,4 +1,4 @@
-## This file automatically generated by make-src-depend.  Do not modify.
+## This file is automatically generated by `make-src-depend'.  Do not modify.
 
 #ifdef USE_UNION_TYPE
 LISP_UNION_H=lisp-union.h
@@ -195,7 +195,7 @@
 unexcw.o: config.h sysfile.h
 unexec.o: $(LISP_H) getpagesize.h lisp-disunion.h lisp-union.h lrecord.h symeval.h symsinit.h
 unexelf.o: config.h
-unexelfsgi.o: $(LISP_H) lisp-disunion.h lisp-union.h lrecord.h symeval.h symsinit.h
+unexelfsgi.o: config.h
 unexenix.o: config.h
 unexfreebsd.o: config.h
 unexhp9k3.o: config.h sysdep.h
--- a/src/process-unix.c	Mon Aug 13 11:01:11 2007 +0200
+++ b/src/process-unix.c	Mon Aug 13 11:01:51 2007 +0200
@@ -817,17 +817,15 @@
 	int xforkin = forkin;
 	int xforkout = forkout;
 
-	if (!pty_flag)
-	  EMACS_SEPARATE_PROCESS_GROUP ();
-#ifdef HAVE_PTYS
-	else
-	  {
 	    /* Disconnect the current controlling terminal, pursuant to
 	       making the pty be the controlling terminal of the process.
 	       Also put us in our own process group. */
 
 	    disconnect_controlling_terminal ();
 
+#ifdef HAVE_PTYS
+	if (pty_flag)
+	  {
 	    /* Open the pty connection and make the pty's terminal
 	       our controlling terminal.
 
@@ -1289,7 +1287,17 @@
   return usid;
 }
 
-/* send a signal number SIGNO to PROCESS.
+/* If the subtty field of the process data is not filled in, do so now. */
+static void
+try_to_initialize_subtty (struct unix_process_data *upd)
+{
+  if (upd->pty_flag
+      && (upd->subtty == -1 || ! isatty (upd->subtty))
+      && STRINGP (upd->tty_name))
+    upd->subtty = open ((char *) XSTRING_DATA (upd->tty_name), O_RDWR, 0);
+}
+
+/* Send signal number SIGNO to PROCESS.
    CURRENT_GROUP means send to the process group that currently owns
    the terminal being used to communicate with PROCESS.
    This is used for various commands in shell mode.
@@ -1298,70 +1306,18 @@
 
    If we can, we try to signal PROCESS by sending control characters
    down the pty.  This allows us to signal inferiors who have changed
-   their uid, for which killpg would return an EPERM error.
+   their uid, for which killpg would return an EPERM error,
+   or processes running on other machines via remote login.
 
-   The method signals an error if the given SIGNO is not valid
-*/
+   The method signals an error if the given SIGNO is not valid. */
 
 static void
 unix_kill_child_process (Lisp_Object proc, int signo,
 			 int current_group, int nomsg)
 {
-  int gid;
-  int no_pgrp = 0;
-  int kill_retval;
+  pid_t pgid = -1;
   struct Lisp_Process *p = XPROCESS (proc);
-
-  if (!UNIX_DATA(p)->pty_flag)
-    current_group = 0;
-
-  /* If we are using pgrps, get a pgrp number and make it negative.  */
-  if (current_group)
-    {
-#ifdef SIGNALS_VIA_CHARACTERS
-      /* If possible, send signals to the entire pgrp
-	 by sending an input character to it.  */
-      {
-        char sigchar = process_signal_char(UNIX_DATA(p)->subtty, signo);
-        if (sigchar) {
-          send_process (proc, Qnil, (Bufbyte *) &sigchar, 0, 1);
-          return;
-        }
-      }
-#endif /* ! defined (SIGNALS_VIA_CHARACTERS) */
-
-#ifdef TIOCGPGRP
-      /* Get the pgrp using the tty itself, if we have that.
-	 Otherwise, use the pty to get the pgrp.
-	 On pfa systems, saka@pfu.fujitsu.co.JP writes:
-	 "TIOCGPGRP symbol defined in sys/ioctl.h at E50.
-	 But, TIOCGPGRP does not work on E50 ;-P works fine on E60"
-	 His patch indicates that if TIOCGPGRP returns an error, then
-	 we should just assume that p->pid is also the process group id.  */
-      {
-	int err;
-
-        err = ioctl ( (UNIX_DATA(p)->subtty != -1
-		       ? UNIX_DATA(p)->subtty
-		       : UNIX_DATA(p)->infd), TIOCGPGRP, &gid);
-
-#ifdef pfa
-	if (err == -1)
-	  gid = - XINT (p->pid);
-#endif /* ! defined (pfa) */
-      }
-      if (gid == -1)
-	no_pgrp = 1;
-      else
-	gid = - gid;
-#else /* ! defined (TIOCGPGRP ) */
-      /* Can't select pgrps on this system, so we know that
-	 the child itself heads the pgrp.  */
-      gid = - XINT (p->pid);
-#endif /* ! defined (TIOCGPGRP ) */
-    }
-  else
-    gid = - XINT (p->pid);
+  struct unix_process_data *d = UNIX_DATA (p);
 
   switch (signo)
     {
@@ -1378,38 +1334,100 @@
     case SIGINT:
     case SIGQUIT:
     case SIGKILL:
-      flush_pending_output (UNIX_DATA(p)->infd);
+      flush_pending_output (d->infd);
       break;
     }
 
-  /* If we don't have process groups, send the signal to the immediate
-     subprocess.  That isn't really right, but it's better than any
-     obvious alternative.  */
-  if (no_pgrp)
+  if (! d->pty_flag)
+    current_group = 0;
+
+  /* If current_group is true, we want to send a signal to the
+     foreground process group of the terminal our child process is
+     running on.  You would think that would be easy.
+
+     The BSD people invented the TIOCPGRP ioctl to get the foreground
+     process group of a tty.  That, combined with killpg, gives us
+     what we want.
+
+     However, the POSIX standards people, in their infinite wisdom,
+     have seen fit to only allow this for processes which have the
+     terminal as controlling terminal, which doesn't apply to us.
+
+     Sooo..., we have to do something non-standard.  The ioctls
+     TIOCSIGNAL, TIOCSIG, and TIOCSIGSEND send the signal directly on
+     many systems.  POSIX tcgetpgrp(), since it is *documented* as not
+     doing what we want, is actually less likely to work than the BSD
+     ioctl TIOCGPGRP it is supposed to obsolete.  Sometimes we have to
+     use TIOCGPGRP on the master end, sometimes the slave end
+     (probably an AIX bug).  So we better get a fd for the slave if we
+     haven't got it yet.
+
+     Anal operating systems like SGI Irix and Compaq Tru64 adhere
+     strictly to the letter of the law, so our hack doesn't work.
+     The following fragment from an Irix header file is suggestive:
+
+     #ifdef __notdef__
+     // this is not currently supported
+     #define TIOCSIGNAL      (tIOC|31)       // pty: send signal to slave
+     #endif
+
+     On those systems where none of our tricks work, we just fall back
+     to the non-current_group behavior and kill the process group of
+     the child.
+  */
+  if (current_group)
     {
-      kill_retval = kill (XINT (p->pid), signo) ? errno : 0;
-    }
-  else
+      try_to_initialize_subtty (d);
+
+#ifdef SIGNALS_VIA_CHARACTERS
+      /* If possible, send signals to the entire pgrp
+	 by sending an input character to it.  */
     {
-      /* gid may be a pid, or minus a pgrp's number */
-#if defined (TIOCSIGNAL) || defined (TIOCSIGSEND)
-      if (current_group)
+        char sigchar = process_signal_char (d->subtty, signo);
+        if (sigchar)
 	{
-#ifdef TIOCSIGNAL
-	  kill_retval = ioctl (UNIX_DATA(p)->infd, TIOCSIGNAL, signo);
-#else /* ! defined (TIOCSIGNAL) */
-	  kill_retval = ioctl (UNIX_DATA(p)->infd, TIOCSIGSEND, signo);
-#endif /* ! defined (TIOCSIGNAL) */
+	    send_process (proc, Qnil, (Bufbyte *) &sigchar, 0, 1);
+	    return;
 	}
-      else
-	kill_retval = kill (- XINT (p->pid), signo) ? errno : 0;
-#else /* ! (defined (TIOCSIGNAL) || defined (TIOCSIGSEND)) */
-      kill_retval = EMACS_KILLPG (-gid, signo) ? errno : 0;
-#endif /* ! (defined (TIOCSIGNAL) || defined (TIOCSIGSEND)) */
     }
+#endif /* SIGNALS_VIA_CHARACTERS */
 
-  if (kill_retval < 0 && errno == EINVAL)
-    error ("Signal number %d is invalid for this system", signo);
+#ifdef TIOCGPGRP
+      if (pgid == -1)
+	ioctl (d->infd, TIOCGPGRP, &pgid); /* BSD */
+      if (pgid == -1 && d->subtty != -1)
+	ioctl (d->subtty, TIOCGPGRP, &pgid); /* Only this works on AIX! */
+#endif /* TIOCGPGRP */
+
+      if (pgid == -1)
+	{
+	  /* Many systems provide an ioctl to send a signal directly */
+#ifdef TIOCSIGNAL /* Solaris, HP-UX */
+	  if (ioctl (d->infd, TIOCSIGNAL, signo) != -1)
+	    return;
+#endif /* TIOCSIGNAL */
+
+#ifdef TIOCSIG /* BSD */
+	  if (ioctl (d->infd, TIOCSIG, signo) != -1)
+	    return;
+#endif /* TIOCSIG */
+	}
+    } /* current_group */
+
+  if (pgid == -1)
+    /* Either current_group is 0, or we failed to get the foreground
+       process group using the trickery above.  So we fall back to
+       sending the signal to the process group of our child process.
+       Since this is often a shell that ignores signals like SIGINT,
+       the shell's subprocess is killed, which is the desired effect.
+       The process group of p->pid is always p->pid, since it was
+       created as a process group leader. */
+    pgid = XINT (p->pid);
+
+  /* Finally send the signal. */
+  if (EMACS_KILLPG (pgid, signo) == -1)
+    error ("kill (%ld, %ld) failed: %s",
+	   (long) pgid, (long) signo, strerror (errno));
 }
 
 /*
--- a/src/s/netbsd.h	Mon Aug 13 11:01:11 2007 +0200
+++ b/src/s/netbsd.h	Mon Aug 13 11:01:51 2007 +0200
@@ -54,7 +54,15 @@
 
 #define HAVE_TEXT_START		/* No need to define `start_of_text'.  */
 #define ORDINARY_LINK
+
+/* As of this writing (Netbsd 1.5 was just released), Netbsd is
+   converting from a.out to elf - x86 and Sparc are using ELF.
+   But we're clever and let the compiler tell us which one to use.  */
+#ifdef __ELF__
+#define UNEXEC "unexelf.o"
+#else
 #define UNEXEC "unexfreebsd.o"  /* ironic, considering history of unexfreebsd */
+#endif
 
 #if 0
 /* Try to make this work for both 0.9 and >0.9.  */
--- a/src/sysproc.h	Mon Aug 13 11:01:11 2007 +0200
+++ b/src/sysproc.h	Mon Aug 13 11:01:51 2007 +0200
@@ -71,6 +71,14 @@
 #include <sys/select.h>
 #endif
 
+#ifdef HAVE_STROPTS_H
+#include <stropts.h>		/* isastream(), I_PUSH */
+#endif
+
+#ifdef HAVE_STRTIO_H
+#include <strtio.h>		/* TIOCSIGNAL */
+#endif
+
 #ifdef FD_SET
 
 /* We could get this from param.h, but better not to depend on finding that.
--- a/src/syssignal.h	Mon Aug 13 11:01:11 2007 +0200
+++ b/src/syssignal.h	Mon Aug 13 11:01:51 2007 +0200
@@ -209,7 +209,7 @@
 
 /* On bsd, [man says] kill does not accept a negative number to kill a pgrp.
    Must do that using the killpg call.  */
-#ifdef BSD
+#ifdef HAVE_KILLPG
 #define EMACS_KILLPG(gid, signo) killpg (gid, signo)
 #else
 #ifdef WINDOWSNT
--- a/src/unexelf.c	Mon Aug 13 11:01:11 2007 +0200
+++ b/src/unexelf.c	Mon Aug 13 11:01:51 2007 +0200
@@ -424,7 +424,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <fcntl.h>
-#if !defined (__NetBSD__) && !defined (__OpenBSD__)
+#if !defined (__OpenBSD__)
 #include <elf.h>
 #endif
 #include <sys/mman.h>
@@ -471,36 +471,6 @@
 #define hdrNil ((pHDRR)0)
 #endif
 
-#ifdef __NetBSD__
-/*
- * NetBSD does not have normal-looking user-land ELF support.
- */
-# ifdef __alpha__
-#  define ELFSIZE	64
-# else
-#  define ELFSIZE	32
-# endif
-# include <sys/exec_elf.h>
-
-# define PT_LOAD	Elf_pt_load
-# define SHT_SYMTAB	Elf_sht_symtab
-# define SHT_DYNSYM	Elf_sht_dynsym
-# define SHT_NULL	Elf_sht_null
-# define SHT_NOBITS	Elf_sht_nobits
-# define SHT_REL	Elf_sht_rel
-# define SHT_RELA	Elf_sht_rela
-
-# define SHN_UNDEF	Elf_eshn_undefined
-# define SHN_ABS	Elf_eshn_absolute
-# define SHN_COMMON	Elf_eshn_common
-
-# ifdef __alpha__
-#  include <sys/exec_ecoff.h>
-#  define HDRR		struct ecoff_symhdr
-#  define pHDRR		HDRR *
-# endif
-#endif /* __NetBSD__ */
-
 #ifdef __OpenBSD__
 # include <sys/exec_elf.h>
 #endif
--- a/version.sh	Mon Aug 13 11:01:11 2007 +0200
+++ b/version.sh	Mon Aug 13 11:01:51 2007 +0200
@@ -1,8 +1,8 @@
 #!/bin/sh
 emacs_major_version=21
 emacs_minor_version=1
-emacs_beta_version=13
-xemacs_codename="Crater Lake"
+emacs_beta_version=14
+xemacs_codename="Cuyahoga Valley"
 infodock_major_version=4
 infodock_minor_version=0
 infodock_build_version=7