# This is a patch for xemacs-21.4.6 to update it to xemacs-21.4.7
# 
# To apply this patch:
# STEP 1: Chdir to the source directory.
# STEP 2: Run the 'applypatch' program with this patch file as input.
#
# If you do not have 'applypatch', it is part of the 'makepatch' package
# that you can fetch from the Comprehensive Perl Archive Network:
# http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz
# In the above URL, 'x' should be 2 or higher.
#
# To apply this patch without the use of 'applypatch':
# STEP 1: Chdir to the source directory.
# If you have a decent Bourne-type shell:
# STEP 2: Run the shell with this file as input.
# If you don't have such a shell, you may need to manually create
# the files as shown below.
# STEP 3: Run the 'patch' program with this file as input.
#
# These are the commands needed to create/delete files/directories:
#
touch './CHANGES-msw'
chmod 0644 './CHANGES-msw'
touch './build-msw-release.sh'
chmod 0755 './build-msw-release.sh'
touch './etc/TUTORIAL.se'
chmod 0644 './etc/TUTORIAL.se'
touch './src/s/darwin.h'
chmod 0644 './src/s/darwin.h'
#
# This command terminates the shell and need not be executed manually.
exit
#
#### End of Preamble ####

#### Patch data follows ####
diff --text -u /dev/null 'xemacs-21.4.7/CHANGES-msw'
Index: ././CHANGES-msw
*** ././CHANGES-msw	Thu Jan  1 09:00:00 1970
--- ././CHANGES-msw	Wed May  1 01:03:42 2002
***************
*** 0 ****
--- 1,23 ----
+ CHANGES-msw
+ 
+ This file briefly describes all mswindows-specific changes to XEmacs
+ in the OXYMORON series of releases. The mswindows release branch
+ contains additional changes on top of the mainline XEmacs
+ release. These changes are deemed necessary for XEmacs to be fully
+ functional under mswindows. It is not intended that these changes
+ cause problems on UNIX systems, but they have not been tested on UNIX
+ platforms. Caveat Emptor.
+ 
+ See the file 'CHANGES-release' for a full list of mainline changes.
+ 
+ to XEmacs 21.4.5 "Civil Service (Windows)"
+ 
+   - Fixed a scrollbar problem when selecting the frame with focus.
+   - Fixed `mswindows-shell-execute' under cygwin.
+   - Added a new function `mswindows-cygwin-to-win32-path' for JDE.
+   - Added support for dialog-based directory selection.
+   - The installer version has been updated to the 21.5 netinstaller. The 21.5
+     installer now does proper dde file association and adds uninstall
+     capability.
+   - Handle leak fix from Mike Alexander.
+   - New release build script.
diff --text -u 'xemacs-21.4.6/CHANGES-release' 'xemacs-21.4.7/CHANGES-release'
Index: ././CHANGES-release
--- ././CHANGES-release	Mon Dec 17 15:27:04 2001
+++ ././CHANGES-release	Wed May  1 01:03:42 2002
@@ -22,6 +22,55 @@
 For more details, including developers involved and dates, see the
 ChangeLogs, or use CVS diff to view the patches.
 
+to XEmacs 21.4.7 "Economic Science"
+
+  - Fix: prevent migration code from trashing .emacs -- Stephen J. Turnbull
+  - Fix: XmProcessTraversal crash -- Stephen J. Turnbull
+  - Fix: crash in GTK popup menu -- William M. Perry
+  - Fix: dll_load to avoid incorrect symbol binding -- Andrew Begel
+  - Fix: emodules_load to avoid multiple loading of same module -- Jerry James
+  - Fix: recover gracefully from XOpenDevice failure -- Mike Sperber
+
+  - (**) Fix: write-region-pre-hook obeys coding-system argument -- Stephen J.
+    Turnbull
+  - (**) Improve: GTK selection handling -- Eric Gillespie, Jr.
+  - (**) New: auto-modes: .siv, .sieve, GNUmakefile, Xdefaults -- Ville Skyttä,
+    Simon Josefsson
+  - Fix: default Info-auto-generate-directory to 'if-outdated. -- Adrian
+    Aichner
+  - Fix: generic-print-region passes correct arguments Nevin Kapur, Björn
+    Torkelsson, Adrian Aichner
+  - Fix: regenerate info dir when missing -- Mike Sperber
+  - Fix: truncate menu item to width -- Adrian Aichner
+  - Update: GNU synchs: assq-delete-all, function-interactive, describe-mode
+    -- John Paul Wallington
+
+  - Fix: "--with-widgets" means "=yes", and autodetect athena. -- Jan Vroonhof
+  - Fix: add -Wno-shadow for GTK -- William M. Perry
+  - Fix: make moduledir option work -- Mike Fabian
+  - Fix: native Windows build dependencies with pdump -- Adrian Aichner
+  - Fix: clean up name space after automated tests -- Stephen J. Turnbull
+  - Improve: native Windows build -- Jonathan Harris
+  - Fix: typo in macro definition -- Martin Buchholz
+
+  - Fix: typos -- Adrian Aichner, Steve Youngs, Charles Waldman
+  - Improve: Packages node -- Stephen J. Turnbull
+  - Improve: comments and docstrings -- Stephen J. Turnbull, Christoph Wedler,
+    Valdis Kletnieks, John H. Palmieri
+  - Improve: etc/BETA -- Stephen J. Turnbull, Jarl Friis
+  - New: External Client Widget Internals node -- Stephen J. Turnbull
+  - New: FAQ: Unicode support via Mule-UCS. -- Stephen J. Turnbull
+  - New: FAQ: remote files -- Stephen J. Turnbull
+  - New: Glyph, graphics examples node -- Darryl Okahata
+  - New: TUTORIAL.se -- Mats Lidell
+  - New: The User's View [of packages] node -- Stephen J. Turnbull
+  - New: autoconfiscate MacOS/X "Darwin" -- Greg Parker, Martin Buchholz
+  - New: s/linux.h for 64-bit libs -- Andreas Jaeger
+  - Update: photos -- Hrvoje Niksic
+  - Update: Files node: remote file editing, EFS, TRAMP -- Stephen J. Turnbull
+  - Update: URLs in FAQ -- Adrian Aichner, Stephen J. Turnbull
+  - Update: package-index.LATEST.pgp -- Steve Youngs
+
 to XEmacs 21.4.6 "Common Lisp"
 
   - Changing coding system marks buffer as modified.
diff --text -u 'xemacs-21.4.6/ChangeLog' 'xemacs-21.4.7/ChangeLog'
Index: ././ChangeLog
--- ././ChangeLog	Mon Dec 17 18:33:19 2001
+++ ././ChangeLog	Sat May  4 21:34:19 2002
@@ -1,6 +1,62 @@
-2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
+2002-05-04  Stephen J. Turnbull  <stephen@xemacs.org>
 
-	* XEmacs 21.4.6 "Common Lisp" is released.
+	* XEmacs 21.4.7 "Economic Science" is released.
+
+2002-05-04  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* etc/sample.init.el: Fix comment typo about resize-minibuffer.
+
+	* etc/sample.init.el: Add description of initialization process,
+	the custom.el file, and code to load custom.el early instead of
+	late.
+
+2002-05-04  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* PROBLEMS (General): Decribe failed AUTH with EFS.
+
+2002-04-22  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* etc/photos/hniksic.png, etc/photos/hniksic.png: Update.
+
+2002-04-25  Mike Fabian  <mfabian@suse.de>
+
+	* configure.in: add option moduledir as mentioned
+        in ./configure --help
+
+2001-04-21  Martin Buchholz  <martin@xemacs.org>
+
+	* configure.in: Detect MacOS/X "Darwin".
+	Thanks to Greg Parker <gparker@cs.stanford.edu>.
+	
+2002-03-30  Steve Youngs  <youngs@xemacs.org>
+
+	* etc/package-index.LATEST.pgp: Update to current reality.
+
+2002-02-28  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* etc/TUTORIAL.se: New from Mats Lidell.
+
+2002-01-07  Jan Vroonhof  <jan@xemacs.org>
+
+	* configure.in: Make explicit "--with-widgets" mean "=yes".
+	If "--with-widgets=yes" autodetect athena.
+
+2001-12-29  Steve Youngs  <youngs@xemacs.org>
+
+	* etc/package-index.LATEST.pgp: Update.
+
+2001-12-13  William M. Perry  <wmperry@gnu.org>
+
+	* configure.in (GTK): add -Wno-shadow.
+	
+2002-02-04  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* etc/BETA: Synch to 21.5.
+
+2002-01-23  Jarl Friis  <jarl@diku.dk>
+
+	* etc/BETA (http): Informing of xemacs-patches mailing list. Added
+	note on patch etiquette.
 
 2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
 
diff --text -u 'xemacs-21.4.6/PROBLEMS' 'xemacs-21.4.7/PROBLEMS'
Index: ././PROBLEMS
--- ././PROBLEMS	Mon Dec 17 15:27:04 2001
+++ ././PROBLEMS	Sat May  4 17:35:31 2002
@@ -656,6 +656,18 @@
 * Problems with running XEmacs
 ==============================
 ** General
+*** Whenever I try to retrieve a remote file, I have problems.
+
+A typical error: FTP Error: USER request failed; 500 AUTH not understood.
+Thanks to giacomo boffi <giacomo.boffi@polimi.it> on comp.emacs.xemacs:
+
+   tell your ftp client to not attempt AUTH authentication (or do not
+   use FTP servers that don't understand AUTH)
+
+and notes that you need to add an element (often "-u") to
+`efs-ftp-program-args'.  Use M-x customize-variable, and verify the
+needed flag with `man ftp' or other local documentation.
+
 *** gnuserv is running, some clients can connect, but others cannot.
 
 The code in gnuslib.c respects the value of TMPDIR.  If the server and
diff --text -u /dev/null 'xemacs-21.4.7/build-msw-release.sh'
Index: ././build-msw-release.sh
--- ././build-msw-release.sh	Thu Jan  1 09:00:00 1970
+++ ././build-msw-release.sh	Wed May  1 01:03:44 2002
@@ -0,0 +1,120 @@
+#!/bin/sh
+
+# This file builds the release kits for both cygwin and win32. You
+# must have both environments configured for it to work properly. In
+# particular you must provide a suitable value for NATIVE_ZLIB_DIR.
+
+# configuration
+NATIVE_ZLIB_DIR=/usr/local/mingw/lib
+PROGRAM_FILES='c:/Program Files/XEmacs'
+# no configuration past this point
+
+INSTALL=
+FILES=
+BUILD=1
+
+for OPT in $*
+do
+    case $OPT in
+    --install) INSTALL=1;;
+    --installonly) INSTALL=1; BUILD='';;
+    --help) echo "usage: build-msw-release.sh [--install]" && exit;;
+    --*) ;;
+    *) FILES="$FILES $OPT";;
+    esac
+done
+
+# pick up version info
+. version.sh
+
+# decide on names
+emacs_ver=${emacs_major_version}.${emacs_minor_version}.${emacs_beta_version}
+cygwin_tarball=xemacs-i686-pc-cygwin-${emacs_ver}.tar.gz
+win32_tarball=xemacs-i586-pc-win32-${emacs_ver}.tar.gz
+
+# create a dist directory 
+mkdir -p windows/cygwin32
+mkdir -p windows/win32
+mkdir -p /usr/local
+DISTDIR=`pwd`/windows
+
+# check to see if we should build
+if test "$BUILD" = "1"
+then
+
+echo "Building the mswindows ${emacs_ver} release"
+
+# cleanup everything first
+if [ -f Makefile ] ; then
+    make distclean
+fi
+
+# first build win32
+(cd nt;
+  nmake -f xemacs.mak)
+(cd "${PROGRAM_FILES}";
+    rm -rf ./XEmacs-${emacs_ver})
+(cd nt;
+  nmake -f xemacs.mak install;
+  nmake -f xemacs.mak clean)
+
+# now build cygwin
+./configure --with-dragndrop --with-postgresql=no --with-x=no \
+    --bindir=/usr/local/bin/i686-pc-cygwin --with-site-lisp=yes \
+    --with-ipv6-cname=no --with-netinstall
+make CFLAGS=-O3 MINGW_ZLIB_DIR=${NATIVE_ZLIB_DIR} beta
+
+# deal with the netinstaller
+(cd netinstall;
+    strip setup.exe)
+cp netinstall/setup.exe windows
+
+# the win32 tar ball needs setup.exe
+cp netinstall/setup.exe \
+    "${PROGRAM_FILES}"/XEmacs-${emacs_ver}/i586-pc-win32
+
+# make the win32 tarball
+(cd "${PROGRAM_FILES}";
+    tar czvf ${DISTDIR}/win32/${win32_tarball} \
+	./XEmacs-${emacs_ver})
+
+# make the tarball
+make install
+(cd /usr/local;
+    tar czvf ${DISTDIR}/cygwin32/${cygwin_tarball} \
+    ./bin/i686-pc-cygwin \
+    ./lib/xemacs-${emacs_ver} \
+    ./lib/xemacs/lock \
+    ./man/man1/ctags.1 \
+    ./man/man1/etags.1 \
+    ./man/man1/gnuattach.1 \
+    ./man/man1/gnuclient.1 \
+    ./man/man1/gnudoit.1 \
+    ./man/man1/gnuserv.1 \
+    ./man/man1/xemacs.1)
+
+# figure out the ini file.
+cygwin_tarball_size=`ls -l windows/cygwin32/${cygwin_tarball} | awk '{ print $5; }'`
+win32_tarball_size=`ls -l windows/win32/${win32_tarball} | awk '{ print $5; }'`
+
+(cd netinstall;
+    make CYGWIN_SIZE=${cygwin_tarball_size} \
+	WIN32_SIZE=${win32_tarball_size} setup-bin.ini )
+cp netinstall/setup-bin.ini windows
+
+# tidy up
+make distclean
+
+fi
+# end of build
+
+# optionally install to the ftp site
+if test "$INSTALL" != ""
+then
+    echo "Installing the mswindows ${emacs_ver} release"
+    scp -r -oUser=slb -oProtocol=1 windows/* \
+	ftp.xemacs.org:/pub/xemacs/windows
+    # update setup.ini
+    ssh -1 -l slb ftp.xemacs.org 'cd /pub/xemacs/windows; sh makeini.sh'
+fi
+
diff --text -u 'xemacs-21.4.6/configure' 'xemacs-21.4.7/configure'
Index: ././configure
--- ././configure	Mon Dec 17 18:22:18 2001
+++ ././configure	Sat May  4 21:34:03 2002
@@ -584,7 +584,7 @@
 				
 		prefix | exec_prefix | bindir | datadir | statedir | libdir | \
 	mandir | infodir | infopath | lispdir | etcdir | pkgdir | \
-	archlibdir | docdir | package_path )
+	archlibdir | docdir | package_path | moduledir )
 	   	   if test "$valomitted" = "yes"; then
 	     if test "$#" = 0; then
 		 (echo "$progname: Usage error:"
@@ -742,6 +742,7 @@
 	    a | at | ath | athe | athen | athena )	val=athena ;;
 	    n | no | non | none )			val=no     ;;
 	    y | ye | yes )				val=yes    ;;
+	                "")						val=yes    ;;
 	    g | gt | gtk )				val=gtk    ;;
 	    ms | msw )					val=msw    ;;
 	    * ) (echo "$progname: Usage error:"
@@ -848,7 +849,7 @@
 fi
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:852: checking whether ln -s works" >&5
+echo "configure:853: checking whether ln -s works" >&5
 
 rm -f conftestdata
 if ln -s X conftestdata 2>/dev/null
@@ -1113,7 +1114,7 @@
 
 
 echo $ac_n "checking "host system type"""... $ac_c" 1>&6
-echo "configure:1117: checking "host system type"" >&5
+echo "configure:1118: checking "host system type"" >&5
 internal_configuration=`echo $configuration | sed 's/-\(workshop\)//'`
 canonical=`${CONFIG_SHELL-/bin/sh} $srcdir/config.sub "$internal_configuration"`
 configuration=`echo "$configuration" | sed 's/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/'`
@@ -1243,6 +1244,10 @@
 
     i[3-9]86-cubix-sysv* ) machine=intel386 opsys=usg5-3 ;;
 
+    *-*-darwin*)
+    opsys=darwin
+    RANLIB="ranlib -c"     pdump=yes              ;;
+
     i586-dg-dgux*R4*   | i586-dg-dgux5.4.4* ) machine=aviion opsys=dgux5-4r4 ;;
   m88k-dg-dgux5.4R3* | m88k-dg-dgux5.4.3* ) opsys=dgux5-4r3 ;;
   m88k-dg-dgux5.4R2* | m88k-dg-dgux5.4.2* ) opsys=dgux5-4r2 ;;
@@ -1628,7 +1633,7 @@
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1632: checking for $ac_word" >&5
+echo "configure:1637: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1655,7 +1660,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1659: checking for $ac_word" >&5
+echo "configure:1664: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1703,7 +1708,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1707: checking for $ac_word" >&5
+echo "configure:1712: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1732,7 +1737,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1736: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1741: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
@@ -1745,12 +1750,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 1749 "configure"
+#line 1754 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1778,19 +1783,19 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1782: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1787: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1787: checking whether we are using GNU C" >&5
+echo "configure:1792: checking whether we are using GNU C" >&5
 
 cat > conftest.c <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1794: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1799: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1808,7 +1813,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1812: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1817: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -1841,7 +1846,7 @@
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1845: checking for $ac_word" >&5
+echo "configure:1850: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1868,7 +1873,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1872: checking for $ac_word" >&5
+echo "configure:1877: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1916,7 +1921,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1920: checking for $ac_word" >&5
+echo "configure:1925: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1945,7 +1950,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1949: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1954: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
@@ -1958,12 +1963,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 1962 "configure"
+#line 1967 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1967: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1991,19 +1996,19 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1995: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2000: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2000: checking whether we are using GNU C" >&5
+echo "configure:2005: checking whether we are using GNU C" >&5
 
 cat > conftest.c <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2012: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -2021,7 +2026,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2025: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2030: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -2054,7 +2059,7 @@
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2058: checking for $ac_word" >&5
+echo "configure:2063: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2081,7 +2086,7 @@
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2085: checking for $ac_word" >&5
+echo "configure:2090: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2129,7 +2134,7 @@
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2133: checking for $ac_word" >&5
+echo "configure:2138: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2158,7 +2163,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2162: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2167: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
@@ -2171,12 +2176,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 2175 "configure"
+#line 2180 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:2180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -2204,19 +2209,19 @@
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2208: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2213: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2213: checking whether we are using GNU C" >&5
+echo "configure:2218: checking whether we are using GNU C" >&5
 
 cat > conftest.c <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2220: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -2234,7 +2239,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2238: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2243: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -2271,7 +2276,7 @@
 test -n "$NON_GNU_CPP" -a "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP"
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2275: checking how to run the C preprocessor" >&5
+echo "configure:2280: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -2284,13 +2289,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 2288 "configure"
+#line 2293 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2299: \"$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
   :
@@ -2301,13 +2306,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 2305 "configure"
+#line 2310 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2311: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2316: \"$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
   :
@@ -2318,13 +2323,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 2322 "configure"
+#line 2327 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2328: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2333: \"$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
   :
@@ -2350,9 +2355,9 @@
 
 
 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:2354: checking for AIX" >&5
+echo "configure:2359: checking for AIX" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2356 "configure"
+#line 2361 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -2379,9 +2384,9 @@
  
 
 echo $ac_n "checking for GNU libc""... $ac_c" 1>&6
-echo "configure:2383: checking for GNU libc" >&5
+echo "configure:2388: checking for GNU libc" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2385 "configure"
+#line 2390 "configure"
 #include "confdefs.h"
 #include <features.h>
 int main() {
@@ -2393,7 +2398,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2402: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   have_glibc=yes
 else
@@ -2470,7 +2475,7 @@
 esac
 
 cat > conftest.$ac_ext <<EOF
-#line 2474 "configure"
+#line 2479 "configure"
 #include "confdefs.h"
 int main () {
 #if defined __SUNPRO_C
@@ -2484,7 +2489,7 @@
 #endif
 }
 EOF
-if { (eval echo configure:2488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:2493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -2718,17 +2723,17 @@
 
 if test "$__USLC__" = yes; then
   echo $ac_n "checking for whether the -Kalloca compiler flag is needed""... $ac_c" 1>&6
-echo "configure:2722: checking for whether the -Kalloca compiler flag is needed" >&5
+echo "configure:2727: checking for whether the -Kalloca compiler flag is needed" >&5
   need_kalloca=no
   cat > conftest.$ac_ext <<EOF
-#line 2725 "configure"
+#line 2730 "configure"
 #include "confdefs.h"
 
 int main() {
 void *x = alloca(4);
 ; return 0; }
 EOF
-if { (eval echo configure:2732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   :
 else
@@ -2739,14 +2744,14 @@
     xe_save_c_switch_system="$c_switch_system"
     c_switch_system="$c_switch_system -Kalloca"
     cat > conftest.$ac_ext <<EOF
-#line 2743 "configure"
+#line 2748 "configure"
 #include "confdefs.h"
 
 int main() {
 void *x = alloca(4);
 ; return 0; }
 EOF
-if { (eval echo configure:2750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    need_kalloca=yes 
 else
@@ -2784,7 +2789,7 @@
 
 if test "$GCC" = "yes"; then
 echo $ac_n "checking for buggy gcc versions""... $ac_c" 1>&6
-echo "configure:2788: checking for buggy gcc versions" >&5
+echo "configure:2793: checking for buggy gcc versions" >&5
 GCC_VERSION=`$CC --version`
 case `uname -s`:`uname -m`:$GCC_VERSION in
 		    *:sun4*:2.8.1|*:sun4*:egcs-2.90.*)
@@ -2907,7 +2912,7 @@
  fi
 
 echo $ac_n "checking for dynodump""... $ac_c" 1>&6
-echo "configure:2911: checking for dynodump" >&5
+echo "configure:2916: checking for dynodump" >&5
 if test "$unexec" != "unexsol2.o"; then
   echo "$ac_t""no" 1>&6
 else
@@ -2945,12 +2950,12 @@
   done
   
 echo $ac_n "checking for terminateAndUnload in -lC""... $ac_c" 1>&6
-echo "configure:2949: checking for terminateAndUnload in -lC" >&5
+echo "configure:2954: checking for terminateAndUnload in -lC" >&5
 ac_lib_var=`echo C'_'terminateAndUnload | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lC "
 cat > conftest.$ac_ext <<EOF
-#line 2954 "configure"
+#line 2959 "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
@@ -2961,7 +2966,7 @@
 terminateAndUnload()
 ; return 0; }
 EOF
-if { (eval echo configure:2965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2970: \"$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
@@ -3069,7 +3074,7 @@
 
 if test "$add_runtime_path" = "yes"; then
       echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6
-echo "configure:3073: checking "for runtime libraries flag"" >&5
+echo "configure:3078: checking "for runtime libraries flag"" >&5
   case "$opsys" in
     sol2 ) dash_r="-R" ;;
     decosf* | linux* | irix*) dash_r="-rpath " ;;
@@ -3091,14 +3096,14 @@
   done
 fi
         cat > conftest.$ac_ext <<EOF
-#line 3095 "configure"
+#line 3100 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   dash_r="$try_dash_r"
 else
@@ -3199,10 +3204,10 @@
 fi
 after_morecore_hook_exists=yes
 echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6
-echo "configure:3203: checking for malloc_set_state" >&5
+echo "configure:3208: checking for malloc_set_state" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3206 "configure"
+#line 3211 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char malloc_set_state(); below.  */
@@ -3225,7 +3230,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_malloc_set_state=yes"
 else
@@ -3245,16 +3250,16 @@
 fi
 
 echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6
-echo "configure:3249: checking whether __after_morecore_hook exists" >&5
+echo "configure:3254: checking whether __after_morecore_hook exists" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3251 "configure"
+#line 3256 "configure"
 #include "confdefs.h"
 extern void (* __after_morecore_hook)();
 int main() {
 __after_morecore_hook = 0
 ; return 0; }
 EOF
-if { (eval echo configure:3258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -3310,7 +3315,7 @@
 # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3314: checking for $ac_word" >&5
+echo "configure:3319: checking for $ac_word" >&5
 
 if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -3365,7 +3370,7 @@
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:3369: checking for a BSD compatible install" >&5
+echo "configure:3374: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 
   IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
@@ -3419,7 +3424,7 @@
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3423: checking for $ac_word" >&5
+echo "configure:3428: checking for $ac_word" >&5
 
 if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
@@ -3451,15 +3456,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3455: checking for $ac_hdr" >&5
+echo "configure:3460: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3458 "configure"
+#line 3463 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3468: \"$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*
@@ -3489,10 +3494,10 @@
 done
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3493: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:3498: checking for sys/wait.h that is POSIX.1 compatible" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3496 "configure"
+#line 3501 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -3508,7 +3513,7 @@
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:3512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3517: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -3532,10 +3537,10 @@
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3536: checking for ANSI C header files" >&5
+echo "configure:3541: checking for ANSI C header files" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3539 "configure"
+#line 3544 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3543,7 +3548,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3552: \"$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*
@@ -3560,7 +3565,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 3564 "configure"
+#line 3569 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -3578,7 +3583,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
 cat > conftest.$ac_ext <<EOF
-#line 3582 "configure"
+#line 3587 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3596,7 +3601,7 @@
 if test $ac_cv_header_stdc = yes; then
   # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
 cat > conftest.$ac_ext <<EOF
-#line 3600 "configure"
+#line 3605 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3607,7 +3612,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:3611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:3616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -3633,10 +3638,10 @@
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3637: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3642: checking whether time.h and sys/time.h may both be included" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3640 "configure"
+#line 3645 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -3645,7 +3650,7 @@
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:3649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3654: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -3669,10 +3674,10 @@
 fi
 
 echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:3673: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+echo "configure:3678: checking for sys_siglist declaration in signal.h or unistd.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3676 "configure"
+#line 3681 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3684,7 +3689,7 @@
 char *msg = *(sys_siglist + 1);
 ; return 0; }
 EOF
-if { (eval echo configure:3688: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3693: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_decl_sys_siglist=yes
 else
@@ -3710,9 +3715,9 @@
 
 
 echo $ac_n "checking for utime""... $ac_c" 1>&6
-echo "configure:3714: checking for utime" >&5
+echo "configure:3719: checking for utime" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3716 "configure"
+#line 3721 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <utime.h>
@@ -3720,7 +3725,7 @@
 struct utimbuf x; x.actime = x.modtime = 0; utime ("/", &x);
 ; return 0; }
 EOF
-if { (eval echo configure:3724: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3729: \"$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
@@ -3739,10 +3744,10 @@
       for ac_func in utimes
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3743: checking for $ac_func" >&5
+echo "configure:3748: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3746 "configure"
+#line 3751 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3765,7 +3770,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3774: \"$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
@@ -3797,10 +3802,10 @@
 
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3801: checking return type of signal handlers" >&5
+echo "configure:3806: checking return type of signal handlers" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3804 "configure"
+#line 3809 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3817,7 +3822,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:3821: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3826: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -3839,10 +3844,10 @@
 
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3843: checking for size_t" >&5
+echo "configure:3848: checking for size_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3846 "configure"
+#line 3851 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3873,10 +3878,10 @@
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:3877: checking for pid_t" >&5
+echo "configure:3882: checking for pid_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3880 "configure"
+#line 3885 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3907,10 +3912,10 @@
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:3911: checking for uid_t in sys/types.h" >&5
+echo "configure:3916: checking for uid_t in sys/types.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3914 "configure"
+#line 3919 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -3946,10 +3951,10 @@
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:3950: checking for mode_t" >&5
+echo "configure:3955: checking for mode_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3953 "configure"
+#line 3958 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3980,10 +3985,10 @@
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:3984: checking for off_t" >&5
+echo "configure:3989: checking for off_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3987 "configure"
+#line 3992 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4014,10 +4019,10 @@
 fi
 
 echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
-echo "configure:4018: checking for ssize_t" >&5
+echo "configure:4023: checking for ssize_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4021 "configure"
+#line 4026 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4049,9 +4054,9 @@
 
 
 echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
-echo "configure:4053: checking for socklen_t" >&5
+echo "configure:4058: checking for socklen_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4055 "configure"
+#line 4060 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 socklen_t x;
@@ -4060,7 +4065,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4064: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4069: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -4069,7 +4074,7 @@
   rm -rf conftest*
   
 cat > conftest.$ac_ext <<EOF
-#line 4073 "configure"
+#line 4078 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 int accept (int, struct sockaddr *, size_t *);
@@ -4078,7 +4083,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4082: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 echo "$ac_t""size_t" 1>&6
@@ -4110,9 +4115,9 @@
 rm -f conftest*
 
 echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
-echo "configure:4114: checking for struct timeval" >&5
+echo "configure:4119: checking for struct timeval" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4116 "configure"
+#line 4121 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -4128,7 +4133,7 @@
 static struct timeval x; x.tv_sec = x.tv_usec;
 ; return 0; }
 EOF
-if { (eval echo configure:4132: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4137: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
   HAVE_TIMEVAL=yes
@@ -4150,10 +4155,10 @@
 rm -f conftest*
 
 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:4154: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:4159: checking whether struct tm is in sys/time.h or time.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4157 "configure"
+#line 4162 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -4161,7 +4166,7 @@
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:4165: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
 else
@@ -4185,10 +4190,10 @@
 fi
 
 echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:4189: checking for tm_zone in struct tm" >&5
+echo "configure:4194: checking for tm_zone in struct tm" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4192 "configure"
+#line 4197 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
@@ -4196,7 +4201,7 @@
 struct tm tm; tm.tm_zone;
 ; return 0; }
 EOF
-if { (eval echo configure:4200: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm_zone=yes
 else
@@ -4219,10 +4224,10 @@
 
 else
   echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:4223: checking for tzname" >&5
+echo "configure:4228: checking for tzname" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4226 "configure"
+#line 4231 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
@@ -4232,7 +4237,7 @@
 atoi(*tzname);
 ; return 0; }
 EOF
-if { (eval echo configure:4236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_var_tzname=yes
 else
@@ -4258,10 +4263,10 @@
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:4262: checking for working const" >&5
+echo "configure:4267: checking for working const" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4265 "configure"
+#line 4270 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -4310,7 +4315,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4314: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -4335,7 +4340,7 @@
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:4339: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:4344: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 
 cat > conftestmake <<\EOF
@@ -4360,12 +4365,12 @@
 
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:4364: checking whether byte ordering is bigendian" >&5
+echo "configure:4369: checking whether byte ordering is bigendian" >&5
 
 ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat > conftest.$ac_ext <<EOF
-#line 4369 "configure"
+#line 4374 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -4376,11 +4381,11 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat > conftest.$ac_ext <<EOF
-#line 4384 "configure"
+#line 4389 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -4391,7 +4396,7 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4400: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -4408,7 +4413,7 @@
 rm -f conftest*
 if test $ac_cv_c_bigendian = unknown; then
 cat > conftest.$ac_ext <<EOF
-#line 4412 "configure"
+#line 4417 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -4421,7 +4426,7 @@
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:4425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_c_bigendian=no
 else
@@ -4448,10 +4453,10 @@
 
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:4452: checking size of short" >&5
+echo "configure:4457: checking size of short" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4455 "configure"
+#line 4460 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -4463,7 +4468,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -4491,10 +4496,10 @@
   exit 1
 fi
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:4495: checking size of int" >&5
+echo "configure:4500: checking size of int" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4498 "configure"
+#line 4503 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -4506,7 +4511,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -4528,10 +4533,10 @@
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:4532: checking size of long" >&5
+echo "configure:4537: checking size of long" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4535 "configure"
+#line 4540 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -4543,7 +4548,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -4565,10 +4570,10 @@
 
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:4569: checking size of long long" >&5
+echo "configure:4574: checking size of long long" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4572 "configure"
+#line 4577 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -4580,7 +4585,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_long_long=`cat conftestval`
 else
@@ -4602,10 +4607,10 @@
 
 
 echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:4606: checking size of void *" >&5
+echo "configure:4611: checking size of void *" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4609 "configure"
+#line 4614 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -4617,7 +4622,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_void_p=`cat conftestval`
 else
@@ -4640,7 +4645,7 @@
 
 
 echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:4644: checking for long file names" >&5
+echo "configure:4649: checking for long file names" >&5
 
 ac_cv_sys_long_file_names=yes
 # Test for long file names in all the places we know might matter:
@@ -4686,10 +4691,10 @@
 
 
 echo $ac_n "checking for sin""... $ac_c" 1>&6
-echo "configure:4690: checking for sin" >&5
+echo "configure:4695: checking for sin" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4693 "configure"
+#line 4698 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char sin(); below.  */
@@ -4712,7 +4717,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_sin=yes"
 else
@@ -4730,12 +4735,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:4734: checking for sin in -lm" >&5
+echo "configure:4739: checking for sin in -lm" >&5
 ac_lib_var=`echo m'_'sin | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lm "
 cat > conftest.$ac_ext <<EOF
-#line 4739 "configure"
+#line 4744 "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
@@ -4746,7 +4751,7 @@
 sin()
 ; return 0; }
 EOF
-if { (eval echo configure:4750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4755: \"$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
@@ -4790,14 +4795,14 @@
 
 
 cat > conftest.$ac_ext <<EOF
-#line 4794 "configure"
+#line 4799 "configure"
 #include "confdefs.h"
 #include <math.h>
 int main() {
 return atanh(1.0) + asinh(1.0) + acosh(1.0); 
 ; return 0; }
 EOF
-if { (eval echo configure:4801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_INVERSE_HYPERBOLIC
@@ -4814,14 +4819,14 @@
 rm -f conftest*
 
 echo "checking type of mail spool file locking" 1>&6
-echo "configure:4818: checking type of mail spool file locking" >&5
+echo "configure:4823: checking type of mail spool file locking" >&5
 for ac_func in lockf flock
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4822: checking for $ac_func" >&5
+echo "configure:4827: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4825 "configure"
+#line 4830 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4844,7 +4849,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4853: \"$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
@@ -4926,12 +4931,12 @@
 case "$opsys" in decosf*)
   
 echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
-echo "configure:4930: checking for cma_open in -lpthreads" >&5
+echo "configure:4935: checking for cma_open in -lpthreads" >&5
 ac_lib_var=`echo pthreads'_'cma_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lpthreads "
 cat > conftest.$ac_ext <<EOF
-#line 4935 "configure"
+#line 4940 "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
@@ -4942,7 +4947,7 @@
 cma_open()
 ; return 0; }
 EOF
-if { (eval echo configure:4946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4951: \"$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
@@ -4979,7 +4984,7 @@
 
 
 echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
-echo "configure:4983: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:4988: checking whether the -xildoff compiler flag is required" >&5
 if   ${CC-cc} '-###' -xildon  no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ; then
   if ${CC-cc} '-###' -xildoff no_such_file.c 2>&1 | grep '^[^ ]*/ild ' > /dev/null ;
     then echo "$ac_t""no" 1>&6;
@@ -4991,7 +4996,7 @@
 if test "$opsys" = "sol2"; then
   if test "$os_release" -ge 56; then
     echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6
-echo "configure:4995: checking for \"-z ignore\" linker flag" >&5
+echo "configure:5000: checking for \"-z ignore\" linker flag" >&5
     case "`ld -h 2>&1`" in
       *-z\ ignore\|record* ) echo "$ac_t""yes" 1>&6
         ld_switch_site="-z ignore $ld_switch_site" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-z ignore\" to \$ld_switch_site"; fi ;;
@@ -5002,7 +5007,7 @@
 
 if test "$pdump" != "yes"; then
   echo $ac_n "checking for \"-z nocombreloc\" linker flag""... $ac_c" 1>&6
-echo "configure:5006: checking for \"-z nocombreloc\" linker flag" >&5
+echo "configure:5011: checking for \"-z nocombreloc\" linker flag" >&5
   case "`ld --help 2>&1`" in
     *-z\ nocombreloc* ) echo "$ac_t""yes" 1>&6
       ld_switch_site="-z nocombreloc $ld_switch_site" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-z nocombreloc\" to \$ld_switch_site"; fi ;;
@@ -5012,7 +5017,7 @@
 
 
 echo "checking "for specified window system"" 1>&6
-echo "configure:5016: checking "for specified window system"" >&5
+echo "configure:5021: checking "for specified window system"" >&5
 
 
 GNOME_CONFIG=no
@@ -5020,7 +5025,7 @@
 
 if test "$with_gnome" != "no"; then
    echo $ac_n "checking for GNOME configuration script""... $ac_c" 1>&6
-echo "configure:5024: checking for GNOME configuration script" >&5
+echo "configure:5029: checking for GNOME configuration script" >&5
    for possible in gnome-config
    do
       possible_version=`${possible} --version 2> /dev/null`
@@ -5051,7 +5056,7 @@
 
 if test "$with_gtk" != "no";then
    echo $ac_n "checking for GTK configuration script""... $ac_c" 1>&6
-echo "configure:5055: checking for GTK configuration script" >&5
+echo "configure:5060: checking for GTK configuration script" >&5
    for possible in gtk12-config gtk14-config gtk-config
    do
       possible_version=`${possible} --version 2> /dev/null`
@@ -5073,37 +5078,40 @@
 
 if test "${GTK_CONFIG}" != "no"; then
       echo $ac_n "checking gtk version""... $ac_c" 1>&6
-echo "configure:5077: checking gtk version" >&5
+echo "configure:5082: checking gtk version" >&5
       GTK_VERSION=`${GTK_CONFIG} --version`
       echo "$ac_t""${GTK_VERSION}" 1>&6
 
       echo $ac_n "checking gtk libs""... $ac_c" 1>&6
-echo "configure:5082: checking gtk libs" >&5
+echo "configure:5087: checking gtk libs" >&5
       GTK_LIBS=`${GTK_CONFIG} --libs`
       libs_gtk="$libs_gtk ${GTK_LIBS}" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"${GTK_LIBS}\" to \$libs_gtk"; fi
       echo "$ac_t""${GTK_LIBS}" 1>&6
 
       echo $ac_n "checking gtk cflags""... $ac_c" 1>&6
-echo "configure:5088: checking gtk cflags" >&5
+echo "configure:5093: checking gtk cflags" >&5
       GTK_CFLAGS=`${GTK_CONFIG} --cflags`
+      if test "$GCC" = "yes"; then
+      	GTK_CFLAGS="${GTK_CFLAGS} -Wno-shadow"
+      fi
       c_switch_gtk="$c_switch_gtk ${GTK_CFLAGS}" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"${GTK_CFLAGS}\" to \$c_switch_gtk"; fi
       echo "$ac_t""${GTK_CFLAGS}" 1>&6
 
       
 echo $ac_n "checking for main in -lgdk_imlib""... $ac_c" 1>&6
-echo "configure:5095: checking for main in -lgdk_imlib" >&5
+echo "configure:5103: checking for main in -lgdk_imlib" >&5
 ac_lib_var=`echo gdk_imlib'_'main | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lgdk_imlib "
 cat > conftest.$ac_ext <<EOF
-#line 5100 "configure"
+#line 5108 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5115: \"$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
@@ -5125,12 +5133,12 @@
 
       
 echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6
-echo "configure:5129: checking for Imlib_init in -lImlib" >&5
+echo "configure:5137: checking for Imlib_init in -lImlib" >&5
 ac_lib_var=`echo Imlib'_'Imlib_init | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lImlib "
 cat > conftest.$ac_ext <<EOF
-#line 5134 "configure"
+#line 5142 "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
@@ -5141,7 +5149,7 @@
 Imlib_init()
 ; return 0; }
 EOF
-if { (eval echo configure:5145: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5153: \"$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
@@ -5164,10 +5172,10 @@
       for ac_func in gdk_imlib_init
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5168: checking for $ac_func" >&5
+echo "configure:5176: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5171 "configure"
+#line 5179 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5190,7 +5198,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5202: \"$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
@@ -5269,15 +5277,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5273: checking for $ac_hdr" >&5
+echo "configure:5281: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5276 "configure"
+#line 5284 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5281: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5289: \"$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*
@@ -5308,19 +5316,19 @@
 
       
 echo $ac_n "checking for main in -lxml""... $ac_c" 1>&6
-echo "configure:5312: checking for main in -lxml" >&5
+echo "configure:5320: checking for main in -lxml" >&5
 ac_lib_var=`echo xml'_'main | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lxml "
 cat > conftest.$ac_ext <<EOF
-#line 5317 "configure"
+#line 5325 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5332: \"$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
@@ -5342,19 +5350,19 @@
 
       
 echo $ac_n "checking for main in -lglade""... $ac_c" 1>&6
-echo "configure:5346: checking for main in -lglade" >&5
+echo "configure:5354: checking for main in -lglade" >&5
 ac_lib_var=`echo glade'_'main | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lglade "
 cat > conftest.$ac_ext <<EOF
-#line 5351 "configure"
+#line 5359 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5358: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5366: \"$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
@@ -5376,19 +5384,19 @@
 
       
 echo $ac_n "checking for main in -lglade-gnome""... $ac_c" 1>&6
-echo "configure:5380: checking for main in -lglade-gnome" >&5
+echo "configure:5388: checking for main in -lglade-gnome" >&5
 ac_lib_var=`echo glade-gnome'_'main | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lglade-gnome "
 cat > conftest.$ac_ext <<EOF
-#line 5385 "configure"
+#line 5393 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5400: \"$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
@@ -5409,7 +5417,7 @@
 
 
       cat > conftest.$ac_ext <<EOF
-#line 5413 "configure"
+#line 5421 "configure"
 #include "confdefs.h"
 #include <glade/glade-xml.h>
 EOF
@@ -5468,7 +5476,7 @@
 # Uses ac_ vars as temps to allow command line to override cache and checks.
 # --without-x overrides everything else, but does not touch the cache.
 echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:5472: checking for X" >&5
+echo "configure:5480: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -5528,12 +5536,12 @@
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 5532 "configure"
+#line 5540 "configure"
 #include "confdefs.h"
 #include <$x_direct_test_include>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5537: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5545: \"$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*
@@ -5602,14 +5610,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5606 "configure"
+#line 5614 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:5613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -5718,17 +5726,17 @@
     case "`(uname -sr) 2>/dev/null`" in
     "SunOS 5"*)
       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:5722: checking whether -R must be followed by a space" >&5
+echo "configure:5730: checking whether -R must be followed by a space" >&5
       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
       cat > conftest.$ac_ext <<EOF
-#line 5725 "configure"
+#line 5733 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -5744,14 +5752,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 5748 "configure"
+#line 5756 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5763: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -5787,12 +5795,12 @@
 else
 
 echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:5791: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:5799: checking for dnet_ntoa in -ldnet" >&5
 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldnet "
 cat > conftest.$ac_ext <<EOF
-#line 5796 "configure"
+#line 5804 "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
@@ -5803,7 +5811,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5815: \"$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
@@ -5827,12 +5835,12 @@
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
       
 echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:5831: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:5839: checking for dnet_ntoa in -ldnet_stub" >&5
 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldnet_stub "
 cat > conftest.$ac_ext <<EOF
-#line 5836 "configure"
+#line 5844 "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
@@ -5843,7 +5851,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5855: \"$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
@@ -5872,10 +5880,10 @@
     # The nsl library prevents programs from opening the X display
     # on Irix 5.2, according to dickey@clark.net.
     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:5876: checking for gethostbyname" >&5
+echo "configure:5884: checking for gethostbyname" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5879 "configure"
+#line 5887 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -5898,7 +5906,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -5919,12 +5927,12 @@
     if test $ac_cv_func_gethostbyname = no; then
       
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:5923: checking for gethostbyname in -lnsl" >&5
+echo "configure:5931: checking for gethostbyname in -lnsl" >&5
 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lnsl "
 cat > conftest.$ac_ext <<EOF
-#line 5928 "configure"
+#line 5936 "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
@@ -5935,7 +5943,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:5939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5947: \"$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
@@ -5965,10 +5973,10 @@
     # -lsocket must be given before -lnsl if both are needed.
     # We assume that if connect needs -lnsl, so does gethostbyname.
     echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:5969: checking for connect" >&5
+echo "configure:5977: checking for connect" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5972 "configure"
+#line 5980 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -5991,7 +5999,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -6014,12 +6022,12 @@
 xe_msg_checking="for connect in -lsocket"
 test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6018: checking "$xe_msg_checking"" >&5
+echo "configure:6026: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lsocket $X_EXTRA_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6023 "configure"
+#line 6031 "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
@@ -6030,7 +6038,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:6034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6042: \"$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
@@ -6054,10 +6062,10 @@
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:6058: checking for remove" >&5
+echo "configure:6066: checking for remove" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6061 "configure"
+#line 6069 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -6080,7 +6088,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -6101,12 +6109,12 @@
     if test $ac_cv_func_remove = no; then
       
 echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:6105: checking for remove in -lposix" >&5
+echo "configure:6113: checking for remove in -lposix" >&5
 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lposix "
 cat > conftest.$ac_ext <<EOF
-#line 6110 "configure"
+#line 6118 "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
@@ -6117,7 +6125,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:6121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6129: \"$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
@@ -6141,10 +6149,10 @@
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:6145: checking for shmat" >&5
+echo "configure:6153: checking for shmat" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6148 "configure"
+#line 6156 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -6167,7 +6175,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -6188,12 +6196,12 @@
     if test $ac_cv_func_shmat = no; then
       
 echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:6192: checking for shmat in -lipc" >&5
+echo "configure:6200: checking for shmat in -lipc" >&5
 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lipc "
 cat > conftest.$ac_ext <<EOF
-#line 6197 "configure"
+#line 6205 "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
@@ -6204,7 +6212,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:6208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6216: \"$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
@@ -6240,12 +6248,12 @@
 xe_msg_checking="for IceConnectionNumber in -lICE"
 test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6244: checking "$xe_msg_checking"" >&5
+echo "configure:6252: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lICE $X_EXTRA_LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 6249 "configure"
+#line 6257 "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
@@ -6256,7 +6264,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:6260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6268: \"$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
@@ -6423,7 +6431,7 @@
 
 
     echo "checking for X defines extracted by xmkmf" 1>&6
-echo "configure:6427: checking for X defines extracted by xmkmf" >&5
+echo "configure:6435: checking for X defines extracted by xmkmf" >&5
   rm -fr conftestdir
   if mkdir conftestdir; then
     cd conftestdir
@@ -6472,15 +6480,15 @@
 
     ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6
-echo "configure:6476: checking for X11/Intrinsic.h" >&5
+echo "configure:6484: checking for X11/Intrinsic.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6479 "configure"
+#line 6487 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6484: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6492: \"$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*
@@ -6504,12 +6512,12 @@
 
       
 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:6508: checking for XOpenDisplay in -lX11" >&5
+echo "configure:6516: checking for XOpenDisplay in -lX11" >&5
 ac_lib_var=`echo X11'_'XOpenDisplay | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lX11 "
 cat > conftest.$ac_ext <<EOF
-#line 6513 "configure"
+#line 6521 "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
@@ -6520,7 +6528,7 @@
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:6524: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6532: \"$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
@@ -6545,12 +6553,12 @@
 xe_msg_checking="for XGetFontProperty in -lX11"
 test -n "-b i486-linuxaout" && xe_msg_checking="$xe_msg_checking using extra libs -b i486-linuxaout"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6549: checking "$xe_msg_checking"" >&5
+echo "configure:6557: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo X11'_'XGetFontProperty | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lX11 -b i486-linuxaout"
 cat > conftest.$ac_ext <<EOF
-#line 6554 "configure"
+#line 6562 "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
@@ -6561,7 +6569,7 @@
 XGetFontProperty()
 ; return 0; }
 EOF
-if { (eval echo configure:6565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6573: \"$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
@@ -6588,12 +6596,12 @@
 
     
 echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6
-echo "configure:6592: checking for XShapeSelectInput in -lXext" >&5
+echo "configure:6600: checking for XShapeSelectInput in -lXext" >&5
 ac_lib_var=`echo Xext'_'XShapeSelectInput | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXext "
 cat > conftest.$ac_ext <<EOF
-#line 6597 "configure"
+#line 6605 "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
@@ -6604,7 +6612,7 @@
 XShapeSelectInput()
 ; return 0; }
 EOF
-if { (eval echo configure:6608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6616: \"$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
@@ -6627,12 +6635,12 @@
 
     
 echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6
-echo "configure:6631: checking for XtOpenDisplay in -lXt" >&5
+echo "configure:6639: checking for XtOpenDisplay in -lXt" >&5
 ac_lib_var=`echo Xt'_'XtOpenDisplay | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXt "
 cat > conftest.$ac_ext <<EOF
-#line 6636 "configure"
+#line 6644 "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
@@ -6643,7 +6651,7 @@
 XtOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:6647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6655: \"$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
@@ -6666,14 +6674,14 @@
 
 
   echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6
-echo "configure:6670: checking the version of X11 being used" >&5
+echo "configure:6678: checking the version of X11 being used" >&5
   cat > conftest.$ac_ext <<EOF
-#line 6672 "configure"
+#line 6680 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
     int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; }
 EOF
-if { (eval echo configure:6677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:6685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ./conftest foobar; x11_release=$?
 else
@@ -6704,10 +6712,10 @@
   for ac_func in XConvertCase
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6708: checking for $ac_func" >&5
+echo "configure:6716: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6711 "configure"
+#line 6719 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6730,7 +6738,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6734: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6742: \"$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
@@ -6762,15 +6770,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6766: checking for $ac_hdr" >&5
+echo "configure:6774: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6769 "configure"
+#line 6777 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6774: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6782: \"$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*
@@ -6803,10 +6811,10 @@
     for ac_func in XRegisterIMInstantiateCallback
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6807: checking for $ac_func" >&5
+echo "configure:6815: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6810 "configure"
+#line 6818 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6829,7 +6837,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6841: \"$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
@@ -6857,9 +6865,9 @@
 done
 
   echo $ac_n "checking for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6
-echo "configure:6861: checking for standard XRegisterIMInstantiateCallback prototype" >&5
+echo "configure:6869: checking for standard XRegisterIMInstantiateCallback prototype" >&5
   cat > conftest.$ac_ext <<EOF
-#line 6863 "configure"
+#line 6871 "configure"
 #include "confdefs.h"
 
 #define NeedFunctionPrototypes 1
@@ -6871,7 +6879,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6875: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6883: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -6892,12 +6900,12 @@
 
     test -z "$with_xmu" && { 
 echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6
-echo "configure:6896: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
+echo "configure:6904: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
 ac_lib_var=`echo Xmu'_'XmuReadBitmapDataFromFile | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXmu "
 cat > conftest.$ac_ext <<EOF
-#line 6901 "configure"
+#line 6909 "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
@@ -6908,7 +6916,7 @@
 XmuReadBitmapDataFromFile()
 ; return 0; }
 EOF
-if { (eval echo configure:6912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6920: \"$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
@@ -6947,19 +6955,19 @@
 
       
 echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:6951: checking for main in -lXbsd" >&5
+echo "configure:6959: checking for main in -lXbsd" >&5
 ac_lib_var=`echo Xbsd'_'main | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXbsd "
 cat > conftest.$ac_ext <<EOF
-#line 6956 "configure"
+#line 6964 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:6963: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6971: \"$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
@@ -6996,22 +7004,22 @@
 fi 
 if test "$with_msw" != "no"; then
   echo "checking for MS-Windows" 1>&6
-echo "configure:7000: checking for MS-Windows" >&5
+echo "configure:7008: checking for MS-Windows" >&5
   
 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6
-echo "configure:7003: checking for main in -lgdi32" >&5
+echo "configure:7011: checking for main in -lgdi32" >&5
 ac_lib_var=`echo gdi32'_'main | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lgdi32 "
 cat > conftest.$ac_ext <<EOF
-#line 7008 "configure"
+#line 7016 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:7015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7023: \"$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
@@ -7084,12 +7092,12 @@
  fi
     fi
         cat > conftest.$ac_ext <<EOF
-#line 7088 "configure"
+#line 7096 "configure"
 #include "confdefs.h"
 #include <fcntl.h>
     int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }
 EOF
-if { (eval echo configure:7093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   need_event_unixoid=yes; { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_MSG_SELECT
@@ -7153,15 +7161,15 @@
 if test "$with_x11" = "yes"; then
   ac_safe=`echo "X11/extensions/shape.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/extensions/shape.h""... $ac_c" 1>&6
-echo "configure:7157: checking for X11/extensions/shape.h" >&5
+echo "configure:7165: checking for X11/extensions/shape.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7160 "configure"
+#line 7168 "configure"
 #include "confdefs.h"
 #include <X11/extensions/shape.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7165: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7173: \"$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*
@@ -7213,7 +7221,7 @@
 esac
 
 echo "checking for WM_COMMAND option" 1>&6
-echo "configure:7217: checking for WM_COMMAND option" >&5;
+echo "configure:7225: checking for WM_COMMAND option" >&5;
 if test "$with_wmcommand" != "no"; then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_WMCOMMAND
@@ -7228,15 +7236,15 @@
 test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no
 test -z "$with_xauth" && { ac_safe=`echo "X11/Xauth.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xauth.h""... $ac_c" 1>&6
-echo "configure:7232: checking for X11/Xauth.h" >&5
+echo "configure:7240: checking for X11/Xauth.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7235 "configure"
+#line 7243 "configure"
 #include "confdefs.h"
 #include <X11/Xauth.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7248: \"$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*
@@ -7259,12 +7267,12 @@
  }
 test -z "$with_xauth" && { 
 echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6
-echo "configure:7263: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:7271: checking for XauGetAuthByAddr in -lXau" >&5
 ac_lib_var=`echo Xau'_'XauGetAuthByAddr | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXau "
 cat > conftest.$ac_ext <<EOF
-#line 7268 "configure"
+#line 7276 "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
@@ -7275,7 +7283,7 @@
 XauGetAuthByAddr()
 ; return 0; }
 EOF
-if { (eval echo configure:7279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7287: \"$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
@@ -7320,15 +7328,15 @@
       for dir in "" "Tt/" "desktop/" ; do
     ac_safe=`echo "${dir}tt_c.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ${dir}tt_c.h""... $ac_c" 1>&6
-echo "configure:7324: checking for ${dir}tt_c.h" >&5
+echo "configure:7332: checking for ${dir}tt_c.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7327 "configure"
+#line 7335 "configure"
 #include "confdefs.h"
 #include <${dir}tt_c.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7332: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7340: \"$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*
@@ -7364,12 +7372,12 @@
 xe_msg_checking="for tt_message_create in -ltt"
 test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7368: checking "$xe_msg_checking"" >&5
+echo "configure:7376: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo tt'_'tt_message_create | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ltt $extra_libs"
 cat > conftest.$ac_ext <<EOF
-#line 7373 "configure"
+#line 7381 "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
@@ -7380,7 +7388,7 @@
 tt_message_create()
 ; return 0; }
 EOF
-if { (eval echo configure:7384: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7392: \"$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
@@ -7437,15 +7445,15 @@
 
 test -z "$with_cde" && { ac_safe=`echo "Dt/Dt.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Dt/Dt.h""... $ac_c" 1>&6
-echo "configure:7441: checking for Dt/Dt.h" >&5
+echo "configure:7449: checking for Dt/Dt.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7444 "configure"
+#line 7452 "configure"
 #include "confdefs.h"
 #include <Dt/Dt.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7449: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7457: \"$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*
@@ -7468,12 +7476,12 @@
  }
 test -z "$with_cde" && { 
 echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6
-echo "configure:7472: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:7480: checking for DtDndDragStart in -lDtSvc" >&5
 ac_lib_var=`echo DtSvc'_'DtDndDragStart | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lDtSvc "
 cat > conftest.$ac_ext <<EOF
-#line 7477 "configure"
+#line 7485 "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
@@ -7484,7 +7492,7 @@
 DtDndDragStart()
 ; return 0; }
 EOF
-if { (eval echo configure:7488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7496: \"$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
@@ -7557,7 +7565,7 @@
 
 if test "$with_dragndrop" != "no" ; then
   echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6
-echo "configure:7561: checking if drag and drop API is needed" >&5
+echo "configure:7569: checking if drag and drop API is needed" >&5
   if test -n "$dragndrop_proto" ; then
     with_dragndrop=yes
     echo "$ac_t""yes (${dragndrop_proto} )" 1>&6
@@ -7577,18 +7585,18 @@
 fi
 
 echo "checking for LDAP" 1>&6
-echo "configure:7581: checking for LDAP" >&5
+echo "configure:7589: checking for LDAP" >&5
 test -z "$with_ldap" && { ac_safe=`echo "ldap.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ldap.h""... $ac_c" 1>&6
-echo "configure:7584: checking for ldap.h" >&5
+echo "configure:7592: checking for ldap.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7587 "configure"
+#line 7595 "configure"
 #include "confdefs.h"
 #include <ldap.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7592: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7600: \"$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*
@@ -7611,15 +7619,15 @@
  }
 test -z "$with_ldap" && { ac_safe=`echo "lber.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for lber.h""... $ac_c" 1>&6
-echo "configure:7615: checking for lber.h" >&5
+echo "configure:7623: checking for lber.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7618 "configure"
+#line 7626 "configure"
 #include "confdefs.h"
 #include <lber.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7623: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7631: \"$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*
@@ -7643,12 +7651,12 @@
 if test "$with_ldap" != "no"; then
   
 echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6
-echo "configure:7647: checking for ldap_search in -lldap" >&5
+echo "configure:7655: checking for ldap_search in -lldap" >&5
 ac_lib_var=`echo ldap'_'ldap_search | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap "
 cat > conftest.$ac_ext <<EOF
-#line 7652 "configure"
+#line 7660 "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
@@ -7659,7 +7667,7 @@
 ldap_search()
 ; return 0; }
 EOF
-if { (eval echo configure:7663: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7671: \"$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
@@ -7684,12 +7692,12 @@
 xe_msg_checking="for ldap_open in -lldap"
 test -n "-llber" && xe_msg_checking="$xe_msg_checking using extra libs -llber"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7688: checking "$xe_msg_checking"" >&5
+echo "configure:7696: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap -llber"
 cat > conftest.$ac_ext <<EOF
-#line 7693 "configure"
+#line 7701 "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
@@ -7700,7 +7708,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7712: \"$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
@@ -7725,12 +7733,12 @@
 xe_msg_checking="for ldap_open in -lldap"
 test -n "-llber -lkrb" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7729: checking "$xe_msg_checking"" >&5
+echo "configure:7737: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap -llber -lkrb"
 cat > conftest.$ac_ext <<EOF
-#line 7734 "configure"
+#line 7742 "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
@@ -7741,7 +7749,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7753: \"$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
@@ -7766,12 +7774,12 @@
 xe_msg_checking="for ldap_open in -lldap"
 test -n "-llber -lkrb -ldes" && xe_msg_checking="$xe_msg_checking using extra libs -llber -lkrb -ldes"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:7770: checking "$xe_msg_checking"" >&5
+echo "configure:7778: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo ldap'_'ldap_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lldap -llber -lkrb -ldes"
 cat > conftest.$ac_ext <<EOF
-#line 7775 "configure"
+#line 7783 "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
@@ -7782,7 +7790,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7794: \"$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
@@ -7833,10 +7841,10 @@
   for ac_func in ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7837: checking for $ac_func" >&5
+echo "configure:7845: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7840 "configure"
+#line 7848 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7859,7 +7867,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7871: \"$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
@@ -7890,20 +7898,20 @@
 
 if test "$with_postgresql" != "no"; then
   echo "checking for PostgreSQL" 1>&6
-echo "configure:7894: checking for PostgreSQL" >&5
+echo "configure:7902: checking for PostgreSQL" >&5
 
   for header_dir in "" "pgsql/" "postgresql/"; do
     ac_safe=`echo "${header_dir}libpq-fe.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ${header_dir}libpq-fe.h""... $ac_c" 1>&6
-echo "configure:7899: checking for ${header_dir}libpq-fe.h" >&5
+echo "configure:7907: checking for ${header_dir}libpq-fe.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7902 "configure"
+#line 7910 "configure"
 #include "confdefs.h"
 #include <${header_dir}libpq-fe.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7907: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7915: \"$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*
@@ -7927,12 +7935,12 @@
 
   test -n "$libpq_fe_h_file" && { 
 echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6
-echo "configure:7931: checking for PQconnectdb in -lpq" >&5
+echo "configure:7939: checking for PQconnectdb in -lpq" >&5
 ac_lib_var=`echo pq'_'PQconnectdb | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lpq "
 cat > conftest.$ac_ext <<EOF
-#line 7936 "configure"
+#line 7944 "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
@@ -7943,7 +7951,7 @@
 PQconnectdb()
 ; return 0; }
 EOF
-if { (eval echo configure:7947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7955: \"$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
@@ -7976,12 +7984,12 @@
 
     
 echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6
-echo "configure:7980: checking for PQconnectStart in -lpq" >&5
+echo "configure:7988: checking for PQconnectStart in -lpq" >&5
 ac_lib_var=`echo pq'_'PQconnectStart | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lpq "
 cat > conftest.$ac_ext <<EOF
-#line 7985 "configure"
+#line 7993 "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
@@ -7992,7 +8000,7 @@
 PQconnectStart()
 ; return 0; }
 EOF
-if { (eval echo configure:7996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8004: \"$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
@@ -8040,7 +8048,7 @@
 
 if test "$window_system" != "none"; then
   echo "checking for graphics libraries" 1>&6
-echo "configure:8044: checking for graphics libraries" >&5
+echo "configure:8052: checking for graphics libraries" >&5
 
       libpath_xpm=
   incpath_xpm=
@@ -8066,10 +8074,10 @@
     CFLAGS=""$incpath_xpm" $CFLAGS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
     LDFLAGS=""$libpath_xpm" $LDFLAGS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \""$libpath_xpm"\" to \$LDFLAGS"; fi
     echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6
-echo "configure:8070: checking for Xpm - no older than 3.4f" >&5
+echo "configure:8078: checking for Xpm - no older than 3.4f" >&5
     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF
-#line 8073 "configure"
+#line 8081 "configure"
 #include "confdefs.h"
 #define XPM_NUMBERS
 #include <X11/xpm.h>
@@ -8078,7 +8086,7 @@
       XpmIncludeVersion != XpmLibraryVersion() ? 1 :
       XpmIncludeVersion < 30406 ? 2 : 0 ;}
 EOF
-if { (eval echo configure:8082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:8090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ./conftest dummy_arg; xpm_status=$?;
       if test "$xpm_status" = "0"; then
@@ -8122,17 +8130,17 @@
     libs_x="-lXpm $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lXpm\" to \$libs_x"; fi
     CFLAGS=""$incpath_xpm" $CFLAGS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \""$incpath_xpm"\" to \$CFLAGS"; fi
     echo $ac_n "checking for \"FOR_MSW\" xpm""... $ac_c" 1>&6
-echo "configure:8126: checking for \"FOR_MSW\" xpm" >&5
+echo "configure:8134: checking for \"FOR_MSW\" xpm" >&5
     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF
-#line 8129 "configure"
+#line 8137 "configure"
 #include "confdefs.h"
 
 int main() {
 XpmCreatePixmapFromData()
 ; return 0; }
 EOF
-if { (eval echo configure:8136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   xpm_for_msw=no
 else
@@ -8158,15 +8166,15 @@
 
     test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for compface.h""... $ac_c" 1>&6
-echo "configure:8162: checking for compface.h" >&5
+echo "configure:8170: checking for compface.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8165 "configure"
+#line 8173 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8178: \"$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*
@@ -8189,12 +8197,12 @@
  }
   test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:8193: checking for UnGenFace in -lcompface" >&5
+echo "configure:8201: checking for UnGenFace in -lcompface" >&5
 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lcompface "
 cat > conftest.$ac_ext <<EOF
-#line 8198 "configure"
+#line 8206 "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
@@ -8205,7 +8213,7 @@
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:8209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8217: \"$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
@@ -8257,12 +8265,12 @@
       if test "$with_png $with_tiff" != "no no"; then
     
 echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6
-echo "configure:8261: checking for inflate in -lc" >&5
+echo "configure:8269: checking for inflate in -lc" >&5
 ac_lib_var=`echo c'_'inflate | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lc "
 cat > conftest.$ac_ext <<EOF
-#line 8266 "configure"
+#line 8274 "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
@@ -8273,7 +8281,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8277: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8285: \"$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
@@ -8292,12 +8300,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:8296: checking for inflate in -lz" >&5
+echo "configure:8304: checking for inflate in -lz" >&5
 ac_lib_var=`echo z'_'inflate | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lz "
 cat > conftest.$ac_ext <<EOF
-#line 8301 "configure"
+#line 8309 "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
@@ -8308,7 +8316,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8320: \"$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
@@ -8327,12 +8335,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6
-echo "configure:8331: checking for inflate in -lgz" >&5
+echo "configure:8339: checking for inflate in -lgz" >&5
 ac_lib_var=`echo gz'_'inflate | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lgz "
 cat > conftest.$ac_ext <<EOF
-#line 8336 "configure"
+#line 8344 "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
@@ -8343,7 +8351,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8355: \"$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
@@ -8373,15 +8381,15 @@
 
     test -z "$with_jpeg" && { ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
-echo "configure:8377: checking for jpeglib.h" >&5
+echo "configure:8385: checking for jpeglib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8380 "configure"
+#line 8388 "configure"
 #include "confdefs.h"
 #include <jpeglib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8385: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8393: \"$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*
@@ -8404,12 +8412,12 @@
  }
   test -z "$with_jpeg" && { 
 echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
-echo "configure:8408: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:8416: checking for jpeg_destroy_decompress in -ljpeg" >&5
 ac_lib_var=`echo jpeg'_'jpeg_destroy_decompress | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ljpeg "
 cat > conftest.$ac_ext <<EOF
-#line 8413 "configure"
+#line 8421 "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
@@ -8420,7 +8428,7 @@
 jpeg_destroy_decompress()
 ; return 0; }
 EOF
-if { (eval echo configure:8424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8432: \"$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
@@ -8456,10 +8464,10 @@
 
     png_problem=""
   test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
-echo "configure:8460: checking for pow" >&5
+echo "configure:8468: checking for pow" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8463 "configure"
+#line 8471 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pow(); below.  */
@@ -8482,7 +8490,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8486: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_pow=yes"
 else
@@ -8503,15 +8511,15 @@
  }
   test -z "$with_png" && { ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:8507: checking for png.h" >&5
+echo "configure:8515: checking for png.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8510 "configure"
+#line 8518 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8515: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8523: \"$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*
@@ -8534,12 +8542,12 @@
  }
   test -z "$with_png" && { 
 echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:8538: checking for png_read_image in -lpng" >&5
+echo "configure:8546: checking for png_read_image in -lpng" >&5
 ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lpng "
 cat > conftest.$ac_ext <<EOF
-#line 8543 "configure"
+#line 8551 "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
@@ -8550,7 +8558,7 @@
 png_read_image()
 ; return 0; }
 EOF
-if { (eval echo configure:8554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8562: \"$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
@@ -8573,10 +8581,10 @@
  }
   if test -z "$with_png"; then
     echo $ac_n "checking for workable png version information""... $ac_c" 1>&6
-echo "configure:8577: checking for workable png version information" >&5
+echo "configure:8585: checking for workable png version information" >&5
     xe_check_libs="-lpng -lz"
     cat > conftest.$ac_ext <<EOF
-#line 8580 "configure"
+#line 8588 "configure"
 #include "confdefs.h"
 #include <png.h>
     int main(int c, char **v) {
@@ -8584,7 +8592,7 @@
     if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1;
     return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;}
 EOF
-if { (eval echo configure:8588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:8596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ./conftest dummy_arg; png_status=$?;
       if test "$png_status" = "0"; then
@@ -8627,15 +8635,15 @@
 
     test -z "$with_tiff" && { ac_safe=`echo "tiffio.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for tiffio.h""... $ac_c" 1>&6
-echo "configure:8631: checking for tiffio.h" >&5
+echo "configure:8639: checking for tiffio.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8634 "configure"
+#line 8642 "configure"
 #include "confdefs.h"
 #include <tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8647: \"$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*
@@ -8658,12 +8666,12 @@
  }
   test -z "$with_tiff" && { 
 echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8662: checking for TIFFClientOpen in -ltiff" >&5
+echo "configure:8670: checking for TIFFClientOpen in -ltiff" >&5
 ac_lib_var=`echo tiff'_'TIFFClientOpen | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ltiff "
 cat > conftest.$ac_ext <<EOF
-#line 8667 "configure"
+#line 8675 "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
@@ -8674,7 +8682,7 @@
 TIFFClientOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:8678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8686: \"$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
@@ -8713,15 +8721,15 @@
 if test "$with_gtk" = "yes"; then
     test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for compface.h""... $ac_c" 1>&6
-echo "configure:8717: checking for compface.h" >&5
+echo "configure:8725: checking for compface.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8720 "configure"
+#line 8728 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8725: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8733: \"$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*
@@ -8744,12 +8752,12 @@
  }
   test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:8748: checking for UnGenFace in -lcompface" >&5
+echo "configure:8756: checking for UnGenFace in -lcompface" >&5
 ac_lib_var=`echo compface'_'UnGenFace | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lcompface "
 cat > conftest.$ac_ext <<EOF
-#line 8753 "configure"
+#line 8761 "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
@@ -8760,7 +8768,7 @@
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:8764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8772: \"$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
@@ -8799,12 +8807,17 @@
 
 if test "$with_x11" = "yes"; then
   echo "checking for X11 graphics libraries" 1>&6
-echo "configure:8803: checking for X11 graphics libraries" >&5
+echo "configure:8811: checking for X11 graphics libraries" >&5
 fi
 
-if test "$with_x11" = "yes" -a "$with_widgets" = "athena"; then
+case "$with_widgets" in
+  "yes" | "athena")		detect_athena=yes ;;
+   *)				detect_athena=no ;;
+esac
+
+if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then
   echo "checking for the Athena widgets" 1>&6
-echo "configure:8808: checking for the Athena widgets" >&5
+echo "configure:8821: checking for the Athena widgets" >&5
 
     case "$with_athena" in
         "xaw" | "")	athena_variant=Xaw	athena_3d=no  ;;
@@ -8818,12 +8831,12 @@
     if test "$athena_3d" = "no"; then
     
 echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:8822: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
+echo "configure:8835: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
 ac_lib_var=`echo $athena_variant'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$athena_variant "
 cat > conftest.$ac_ext <<EOF
-#line 8827 "configure"
+#line 8840 "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
@@ -8834,7 +8847,7 @@
 XawScrollbarSetThumb()
 ; return 0; }
 EOF
-if { (eval echo configure:8838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8851: \"$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
@@ -8850,12 +8863,12 @@
   echo "$ac_t""yes" 1>&6
           
 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:8854: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:8867: checking for threeDClassRec in -l$athena_variant" >&5
 ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$athena_variant "
 cat > conftest.$ac_ext <<EOF
-#line 8859 "configure"
+#line 8872 "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
@@ -8866,7 +8879,7 @@
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:8870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8883: \"$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
@@ -8897,12 +8910,12 @@
   else
         
 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:8901: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:8914: checking for threeDClassRec in -l$athena_variant" >&5
 ac_lib_var=`echo $athena_variant'_'threeDClassRec | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$athena_variant "
 cat > conftest.$ac_ext <<EOF
-#line 8906 "configure"
+#line 8919 "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
@@ -8913,7 +8926,7 @@
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:8917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8930: \"$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
@@ -8931,12 +8944,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for threeDClassRec in -lXaw""... $ac_c" 1>&6
-echo "configure:8935: checking for threeDClassRec in -lXaw" >&5
+echo "configure:8948: checking for threeDClassRec in -lXaw" >&5
 ac_lib_var=`echo Xaw'_'threeDClassRec | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXaw "
 cat > conftest.$ac_ext <<EOF
-#line 8940 "configure"
+#line 8953 "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
@@ -8947,7 +8960,7 @@
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:8951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8964: \"$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
@@ -8978,15 +8991,15 @@
     if test "$athena_3d" = "no"; then
     ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6
-echo "configure:8982: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:8995: checking for X11/Xaw/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8985 "configure"
+#line 8998 "configure"
 #include "confdefs.h"
 #include <X11/Xaw/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9003: \"$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*
@@ -9006,15 +9019,15 @@
   echo "$ac_t""no" 1>&6
 ac_safe=`echo "X11/Xaw/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw/XawInit.h""... $ac_c" 1>&6
-echo "configure:9010: checking for X11/Xaw/XawInit.h" >&5
+echo "configure:9023: checking for X11/Xaw/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9013 "configure"
+#line 9026 "configure"
 #include "confdefs.h"
 #include <X11/Xaw/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9018: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9031: \"$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*
@@ -9040,15 +9053,15 @@
   else
             ac_safe=`echo "X11/$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/$athena_variant/XawInit.h""... $ac_c" 1>&6
-echo "configure:9044: checking for X11/$athena_variant/XawInit.h" >&5
+echo "configure:9057: checking for X11/$athena_variant/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9047 "configure"
+#line 9060 "configure"
 #include "confdefs.h"
 #include <X11/$athena_variant/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9052: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9065: \"$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*
@@ -9065,15 +9078,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "X11/$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/$athena_variant/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9069: checking for X11/$athena_variant/ThreeD.h" >&5
+echo "configure:9082: checking for X11/$athena_variant/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9072 "configure"
+#line 9085 "configure"
 #include "confdefs.h"
 #include <X11/$athena_variant/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9077: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9090: \"$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*
@@ -9101,15 +9114,15 @@
         if test -z "$athena_h_path"; then
       ac_safe=`echo "$athena_variant/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $athena_variant/XawInit.h""... $ac_c" 1>&6
-echo "configure:9105: checking for $athena_variant/XawInit.h" >&5
+echo "configure:9118: checking for $athena_variant/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9108 "configure"
+#line 9121 "configure"
 #include "confdefs.h"
 #include <$athena_variant/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9126: \"$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*
@@ -9126,15 +9139,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "$athena_variant/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $athena_variant/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9130: checking for $athena_variant/ThreeD.h" >&5
+echo "configure:9143: checking for $athena_variant/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9133 "configure"
+#line 9146 "configure"
 #include "confdefs.h"
 #include <$athena_variant/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9138: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9151: \"$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*
@@ -9163,15 +9176,15 @@
         if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
       ac_safe=`echo "X11/Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw3d/XawInit.h""... $ac_c" 1>&6
-echo "configure:9167: checking for X11/Xaw3d/XawInit.h" >&5
+echo "configure:9180: checking for X11/Xaw3d/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9170 "configure"
+#line 9183 "configure"
 #include "confdefs.h"
 #include <X11/Xaw3d/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9175: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9188: \"$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*
@@ -9188,15 +9201,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "X11/Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw3d/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9192: checking for X11/Xaw3d/ThreeD.h" >&5
+echo "configure:9205: checking for X11/Xaw3d/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9195 "configure"
+#line 9208 "configure"
 #include "confdefs.h"
 #include <X11/Xaw3d/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9200: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9213: \"$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*
@@ -9228,15 +9241,15 @@
         if test -z "$athena_h_path" -a "$athena_variant" != "Xaw3d"; then
       ac_safe=`echo "Xaw3d/XawInit.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xaw3d/XawInit.h""... $ac_c" 1>&6
-echo "configure:9232: checking for Xaw3d/XawInit.h" >&5
+echo "configure:9245: checking for Xaw3d/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9235 "configure"
+#line 9248 "configure"
 #include "confdefs.h"
 #include <Xaw3d/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9253: \"$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*
@@ -9253,15 +9266,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "Xaw3d/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xaw3d/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9257: checking for Xaw3d/ThreeD.h" >&5
+echo "configure:9270: checking for Xaw3d/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9260 "configure"
+#line 9273 "configure"
 #include "confdefs.h"
 #include <Xaw3d/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9265: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9278: \"$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*
@@ -9293,15 +9306,15 @@
             if test -z "$athena_h_path"; then
       ac_safe=`echo "X11/Xaw/ThreeD.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xaw/ThreeD.h""... $ac_c" 1>&6
-echo "configure:9297: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:9310: checking for X11/Xaw/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9300 "configure"
+#line 9313 "configure"
 #include "confdefs.h"
 #include <X11/Xaw/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9305: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9318: \"$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*
@@ -9340,15 +9353,15 @@
 if test "$with_x11" = "yes"; then
     ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
-echo "configure:9344: checking for Xm/Xm.h" >&5
+echo "configure:9357: checking for Xm/Xm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9347 "configure"
+#line 9360 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9352: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9365: \"$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*
@@ -9365,12 +9378,12 @@
   echo "$ac_t""yes" 1>&6
   
 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
-echo "configure:9369: checking for XmStringFree in -lXm" >&5
+echo "configure:9382: checking for XmStringFree in -lXm" >&5
 ac_lib_var=`echo Xm'_'XmStringFree | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXm "
 cat > conftest.$ac_ext <<EOF
-#line 9374 "configure"
+#line 9387 "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
@@ -9381,7 +9394,7 @@
 XmStringFree()
 ; return 0; }
 EOF
-if { (eval echo configure:9385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9398: \"$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
@@ -9410,9 +9423,9 @@
 
   if test "$have_motif" = "yes"; then
         echo $ac_n "checking for Lesstif""... $ac_c" 1>&6
-echo "configure:9414: checking for Lesstif" >&5
+echo "configure:9427: checking for Lesstif" >&5
     cat > conftest.$ac_ext <<EOF
-#line 9416 "configure"
+#line 9429 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 #ifdef LESSTIF_VERSION
@@ -9836,7 +9849,7 @@
 
 if test "$with_mule" = "yes" ; then
   echo "checking for Mule-related features" 1>&6
-echo "configure:9840: checking for Mule-related features" >&5
+echo "configure:9853: checking for Mule-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining MULE
 EOF
@@ -9861,15 +9874,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9865: checking for $ac_hdr" >&5
+echo "configure:9878: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9868 "configure"
+#line 9881 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9873: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9886: \"$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*
@@ -9900,12 +9913,12 @@
 
   
 echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
-echo "configure:9904: checking for strerror in -lintl" >&5
+echo "configure:9917: checking for strerror in -lintl" >&5
 ac_lib_var=`echo intl'_'strerror | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lintl "
 cat > conftest.$ac_ext <<EOF
-#line 9909 "configure"
+#line 9922 "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
@@ -9916,7 +9929,7 @@
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:9920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9933: \"$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
@@ -9949,18 +9962,18 @@
 
 
   echo "checking for Mule input methods" 1>&6
-echo "configure:9953: checking for Mule input methods" >&5
+echo "configure:9966: checking for Mule input methods" >&5
         case "$with_xim" in "" | "yes" )
     echo "checking for XIM" 1>&6
-echo "configure:9956: checking for XIM" >&5
+echo "configure:9969: checking for XIM" >&5
     
 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6
-echo "configure:9959: checking for XOpenIM in -lX11" >&5
+echo "configure:9972: checking for XOpenIM in -lX11" >&5
 ac_lib_var=`echo X11'_'XOpenIM | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lX11 "
 cat > conftest.$ac_ext <<EOF
-#line 9964 "configure"
+#line 9977 "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
@@ -9971,7 +9984,7 @@
 XOpenIM()
 ; return 0; }
 EOF
-if { (eval echo configure:9975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9988: \"$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
@@ -9995,12 +10008,12 @@
         if test "$have_motif $have_lesstif" = "yes no"; then
       
 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:9999: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:10012: checking for XmImMbLookupString in -lXm" >&5
 ac_lib_var=`echo Xm'_'XmImMbLookupString | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXm "
 cat > conftest.$ac_ext <<EOF
-#line 10004 "configure"
+#line 10017 "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
@@ -10011,7 +10024,7 @@
 XmImMbLookupString()
 ; return 0; }
 EOF
-if { (eval echo configure:10015: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10028: \"$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
@@ -10076,15 +10089,15 @@
 
     if test "$with_xfs" = "yes" ; then
     echo "checking for XFontSet" 1>&6
-echo "configure:10080: checking for XFontSet" >&5
+echo "configure:10093: checking for XFontSet" >&5
     
 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6
-echo "configure:10083: checking for XmbDrawString in -lX11" >&5
+echo "configure:10096: checking for XmbDrawString in -lX11" >&5
 ac_lib_var=`echo X11'_'XmbDrawString | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lX11 "
 cat > conftest.$ac_ext <<EOF
-#line 10088 "configure"
+#line 10101 "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
@@ -10095,7 +10108,7 @@
 XmbDrawString()
 ; return 0; }
 EOF
-if { (eval echo configure:10099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10112: \"$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
@@ -10135,15 +10148,15 @@
     test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support
   test -z "$with_wnn" && { ac_safe=`echo "wnn/jllib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for wnn/jllib.h""... $ac_c" 1>&6
-echo "configure:10139: checking for wnn/jllib.h" >&5
+echo "configure:10152: checking for wnn/jllib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10142 "configure"
+#line 10155 "configure"
 #include "confdefs.h"
 #include <wnn/jllib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10147: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10160: \"$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*
@@ -10166,15 +10179,15 @@
  }
     test -z "$with_wnn" && { ac_safe=`echo "wnn/commonhd.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for wnn/commonhd.h""... $ac_c" 1>&6
-echo "configure:10170: checking for wnn/commonhd.h" >&5
+echo "configure:10183: checking for wnn/commonhd.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10173 "configure"
+#line 10186 "configure"
 #include "confdefs.h"
 #include <wnn/commonhd.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10191: \"$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*
@@ -10199,10 +10212,10 @@
     for ac_func in crypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10203: checking for $ac_func" >&5
+echo "configure:10216: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10206 "configure"
+#line 10219 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10225,7 +10238,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10242: \"$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
@@ -10254,12 +10267,12 @@
 
     test "$ac_cv_func_crypt" != "yes" && { 
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:10258: checking for crypt in -lcrypt" >&5
+echo "configure:10271: checking for crypt in -lcrypt" >&5
 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lcrypt "
 cat > conftest.$ac_ext <<EOF
-#line 10263 "configure"
+#line 10276 "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
@@ -10270,7 +10283,7 @@
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:10274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10287: \"$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
@@ -10305,12 +10318,12 @@
     if test -z "$with_wnn" -o "$with_wnn" = "yes"; then
     
 echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6
-echo "configure:10309: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:10322: checking for jl_dic_list_e in -lwnn" >&5
 ac_lib_var=`echo wnn'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lwnn "
 cat > conftest.$ac_ext <<EOF
-#line 10314 "configure"
+#line 10327 "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
@@ -10321,7 +10334,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10325: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10338: \"$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
@@ -10339,12 +10352,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for jl_dic_list_e in -lwnn4""... $ac_c" 1>&6
-echo "configure:10343: checking for jl_dic_list_e in -lwnn4" >&5
+echo "configure:10356: checking for jl_dic_list_e in -lwnn4" >&5
 ac_lib_var=`echo wnn4'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lwnn4 "
 cat > conftest.$ac_ext <<EOF
-#line 10348 "configure"
+#line 10361 "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
@@ -10355,7 +10368,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10359: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10372: \"$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
@@ -10373,12 +10386,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for jl_dic_list_e in -lwnn6""... $ac_c" 1>&6
-echo "configure:10377: checking for jl_dic_list_e in -lwnn6" >&5
+echo "configure:10390: checking for jl_dic_list_e in -lwnn6" >&5
 ac_lib_var=`echo wnn6'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lwnn6 "
 cat > conftest.$ac_ext <<EOF
-#line 10382 "configure"
+#line 10395 "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
@@ -10389,7 +10402,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10393: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10406: \"$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
@@ -10407,12 +10420,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dic_list_e in -lwnn6_fromsrc""... $ac_c" 1>&6
-echo "configure:10411: checking for dic_list_e in -lwnn6_fromsrc" >&5
+echo "configure:10424: checking for dic_list_e in -lwnn6_fromsrc" >&5
 ac_lib_var=`echo wnn6_fromsrc'_'dic_list_e | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lwnn6_fromsrc "
 cat > conftest.$ac_ext <<EOF
-#line 10416 "configure"
+#line 10429 "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
@@ -10423,7 +10436,7 @@
 dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10440: \"$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
@@ -10471,12 +10484,12 @@
     if test "$with_wnn6" != "no"; then
       
 echo $ac_n "checking for jl_fi_dic_list in -l$libwnn""... $ac_c" 1>&6
-echo "configure:10475: checking for jl_fi_dic_list in -l$libwnn" >&5
+echo "configure:10488: checking for jl_fi_dic_list in -l$libwnn" >&5
 ac_lib_var=`echo $libwnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -l$libwnn "
 cat > conftest.$ac_ext <<EOF
-#line 10480 "configure"
+#line 10493 "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
@@ -10487,7 +10500,7 @@
 jl_fi_dic_list()
 ; return 0; }
 EOF
-if { (eval echo configure:10491: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10504: \"$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
@@ -10522,15 +10535,15 @@
   if test "$with_canna" != "no"; then
     ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6
-echo "configure:10526: checking for canna/jrkanji.h" >&5
+echo "configure:10539: checking for canna/jrkanji.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10529 "configure"
+#line 10542 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10547: \"$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*
@@ -10557,15 +10570,15 @@
     c_switch_site="$c_switch_site -I/usr/local/canna/include"
     ac_safe=`echo "canna/jrkanji.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for canna/jrkanji.h""... $ac_c" 1>&6
-echo "configure:10561: checking for canna/jrkanji.h" >&5
+echo "configure:10574: checking for canna/jrkanji.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10564 "configure"
+#line 10577 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10569: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10582: \"$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*
@@ -10593,15 +10606,15 @@
 
   test -z "$with_canna" && { ac_safe=`echo "canna/RK.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for canna/RK.h""... $ac_c" 1>&6
-echo "configure:10597: checking for canna/RK.h" >&5
+echo "configure:10610: checking for canna/RK.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10600 "configure"
+#line 10613 "configure"
 #include "confdefs.h"
 #include <canna/RK.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10618: \"$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*
@@ -10624,12 +10637,12 @@
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
-echo "configure:10628: checking for RkBgnBun in -lRKC" >&5
+echo "configure:10641: checking for RkBgnBun in -lRKC" >&5
 ac_lib_var=`echo RKC'_'RkBgnBun | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lRKC "
 cat > conftest.$ac_ext <<EOF
-#line 10633 "configure"
+#line 10646 "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
@@ -10640,7 +10653,7 @@
 RkBgnBun()
 ; return 0; }
 EOF
-if { (eval echo configure:10644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10657: \"$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
@@ -10663,12 +10676,12 @@
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
-echo "configure:10667: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:10680: checking for jrKanjiControl in -lcanna" >&5
 ac_lib_var=`echo canna'_'jrKanjiControl | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lcanna "
 cat > conftest.$ac_ext <<EOF
-#line 10672 "configure"
+#line 10685 "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
@@ -10679,7 +10692,7 @@
 jrKanjiControl()
 ; return 0; }
 EOF
-if { (eval echo configure:10683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10696: \"$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
@@ -10728,12 +10741,12 @@
   libs_x="-lXm $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lXm\" to \$libs_x"; fi
     
 echo $ac_n "checking for layout_object_getvalue in -li18n""... $ac_c" 1>&6
-echo "configure:10732: checking for layout_object_getvalue in -li18n" >&5
+echo "configure:10745: checking for layout_object_getvalue in -li18n" >&5
 ac_lib_var=`echo i18n'_'layout_object_getvalue | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -li18n "
 cat > conftest.$ac_ext <<EOF
-#line 10737 "configure"
+#line 10750 "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
@@ -10744,7 +10757,7 @@
 layout_object_getvalue()
 ; return 0; }
 EOF
-if { (eval echo configure:10748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10761: \"$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
@@ -10830,10 +10843,10 @@
 for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10834: checking for $ac_func" >&5
+echo "configure:10847: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10837 "configure"
+#line 10850 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10856,7 +10869,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10873: \"$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
@@ -10888,10 +10901,10 @@
 for ac_func in getpt _getpty grantpt unlockpt ptsname killpg tcgetpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10892: checking for $ac_func" >&5
+echo "configure:10905: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10895 "configure"
+#line 10908 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10914,7 +10927,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10918: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10931: \"$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
@@ -10943,10 +10956,10 @@
 
 
 echo $ac_n "checking for openpty""... $ac_c" 1>&6
-echo "configure:10947: checking for openpty" >&5
+echo "configure:10960: checking for openpty" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10950 "configure"
+#line 10963 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char openpty(); below.  */
@@ -10969,7 +10982,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_openpty=yes"
 else
@@ -10988,12 +11001,12 @@
 
   
 echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:10992: checking for openpty in -lutil" >&5
+echo "configure:11005: checking for openpty in -lutil" >&5
 ac_lib_var=`echo util'_'openpty | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lutil "
 cat > conftest.$ac_ext <<EOF
-#line 10997 "configure"
+#line 11010 "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
@@ -11004,7 +11017,7 @@
 openpty()
 ; return 0; }
 EOF
-if { (eval echo configure:11008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11021: \"$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
@@ -11039,15 +11052,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11043: checking for $ac_hdr" >&5
+echo "configure:11056: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11046 "configure"
+#line 11059 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11051: \"$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*
@@ -11083,15 +11096,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11087: checking for $ac_hdr" >&5
+echo "configure:11100: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11090 "configure"
+#line 11103 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11095: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11108: \"$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*
@@ -11124,10 +11137,10 @@
   for ac_func in isastream
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11128: checking for $ac_func" >&5
+echo "configure:11141: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11131 "configure"
+#line 11144 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11150,7 +11163,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11167: \"$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
@@ -11181,15 +11194,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11185: checking for $ac_hdr" >&5
+echo "configure:11198: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11188 "configure"
+#line 11201 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11193: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11206: \"$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*
@@ -11226,10 +11239,10 @@
 for ac_func in getloadavg
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11230: checking for $ac_func" >&5
+echo "configure:11243: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11233 "configure"
+#line 11246 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11252,7 +11265,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11269: \"$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
@@ -11285,15 +11298,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11289: checking for $ac_hdr" >&5
+echo "configure:11302: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11292 "configure"
+#line 11305 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11297: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11310: \"$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*
@@ -11329,12 +11342,12 @@
 
     
 echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:11333: checking for kstat_open in -lkstat" >&5
+echo "configure:11346: checking for kstat_open in -lkstat" >&5
 ac_lib_var=`echo kstat'_'kstat_open | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lkstat "
 cat > conftest.$ac_ext <<EOF
-#line 11338 "configure"
+#line 11351 "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
@@ -11345,7 +11358,7 @@
 kstat_open()
 ; return 0; }
 EOF
-if { (eval echo configure:11349: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11362: \"$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
@@ -11380,15 +11393,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11384: checking for $ac_hdr" >&5
+echo "configure:11397: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11387 "configure"
+#line 11400 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11392: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11405: \"$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*
@@ -11420,12 +11433,12 @@
 
     
 echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:11424: checking for kvm_read in -lkvm" >&5
+echo "configure:11437: checking for kvm_read in -lkvm" >&5
 ac_lib_var=`echo kvm'_'kvm_read | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lkvm "
 cat > conftest.$ac_ext <<EOF
-#line 11429 "configure"
+#line 11442 "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
@@ -11436,7 +11449,7 @@
 kvm_read()
 ; return 0; }
 EOF
-if { (eval echo configure:11440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11453: \"$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
@@ -11470,16 +11483,16 @@
 fi
 
 echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:11474: checking whether netdb declares h_errno" >&5
+echo "configure:11487: checking whether netdb declares h_errno" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11476 "configure"
+#line 11489 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 return h_errno;
 ; return 0; }
 EOF
-if { (eval echo configure:11483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11496: \"$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
@@ -11499,16 +11512,16 @@
 rm -f conftest*
 
 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:11503: checking for sigsetjmp" >&5
+echo "configure:11516: checking for sigsetjmp" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11505 "configure"
+#line 11518 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigjmp_buf bar; sigsetjmp (bar, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:11512: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11525: \"$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
@@ -11528,11 +11541,11 @@
 rm -f conftest*
 
 echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
-echo "configure:11532: checking whether localtime caches TZ" >&5
+echo "configure:11545: checking whether localtime caches TZ" >&5
 
 if test "$ac_cv_func_tzset" = "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 11536 "configure"
+#line 11549 "configure"
 #include "confdefs.h"
 #include <time.h>
 #if STDC_HEADERS
@@ -11567,7 +11580,7 @@
   exit (0);
 }
 EOF
-if { (eval echo configure:11571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:11584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   emacs_cv_localtime_cache=no
 else
@@ -11597,9 +11610,9 @@
 
 if test "$HAVE_TIMEVAL" = "yes"; then
 echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6
-echo "configure:11601: checking whether gettimeofday accepts one or two arguments" >&5
+echo "configure:11614: checking whether gettimeofday accepts one or two arguments" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11603 "configure"
+#line 11616 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -11620,7 +11633,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11637: \"$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
@@ -11642,19 +11655,19 @@
 
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:11646: checking for inline" >&5
+echo "configure:11659: checking for inline" >&5
 
 ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 11651 "configure"
+#line 11664 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:11658: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11671: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -11695,17 +11708,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:11699: checking for working alloca.h" >&5
+echo "configure:11712: checking for working alloca.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11702 "configure"
+#line 11715 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:11709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11722: \"$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
@@ -11729,10 +11742,10 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:11733: checking for alloca" >&5
+echo "configure:11746: checking for alloca" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11736 "configure"
+#line 11749 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -11760,7 +11773,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:11764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11777: \"$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
@@ -11799,10 +11812,10 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:11803: checking whether alloca needs Cray hooks" >&5
+echo "configure:11816: checking whether alloca needs Cray hooks" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11806 "configure"
+#line 11819 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -11826,10 +11839,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:11830: checking for $ac_func" >&5
+echo "configure:11843: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11833 "configure"
+#line 11846 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11852,7 +11865,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11869: \"$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
@@ -11882,10 +11895,10 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:11886: checking stack direction for C alloca" >&5
+echo "configure:11899: checking stack direction for C alloca" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11889 "configure"
+#line 11902 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -11904,7 +11917,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:11908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:11921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_c_stack_direction=1
 else
@@ -11934,15 +11947,15 @@
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:11938: checking for vfork.h" >&5
+echo "configure:11951: checking for vfork.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11941 "configure"
+#line 11954 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11946: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11959: \"$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*
@@ -11970,10 +11983,10 @@
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:11974: checking for working vfork" >&5
+echo "configure:11987: checking for working vfork" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11977 "configure"
+#line 11990 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -12068,7 +12081,7 @@
   }
 }
 EOF
-if { (eval echo configure:12072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_vfork_works=yes
 else
@@ -12094,10 +12107,10 @@
 
 
 echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:12098: checking for working strcoll" >&5
+echo "configure:12111: checking for working strcoll" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12101 "configure"
+#line 12114 "configure"
 #include "confdefs.h"
 #include <string.h>
 main ()
@@ -12107,7 +12120,7 @@
 	strcoll ("123", "456") >= 0);
 }
 EOF
-if { (eval echo configure:12111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_strcoll_works=yes
 else
@@ -12135,10 +12148,10 @@
 for ac_func in getpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12139: checking for $ac_func" >&5
+echo "configure:12152: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12142 "configure"
+#line 12155 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -12161,7 +12174,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12178: \"$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
@@ -12189,10 +12202,10 @@
 done
 
 echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:12193: checking whether getpgrp takes no argument" >&5
+echo "configure:12206: checking whether getpgrp takes no argument" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12196 "configure"
+#line 12209 "configure"
 #include "confdefs.h"
 
 /*
@@ -12247,7 +12260,7 @@
 }
 
 EOF
-if { (eval echo configure:12251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_getpgrp_void=yes
 else
@@ -12274,10 +12287,10 @@
 
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:12278: checking for working mmap" >&5
+echo "configure:12291: checking for working mmap" >&5
 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 cat > conftest.$ac_ext <<EOF
-#line 12281 "configure"
+#line 12294 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <unistd.h>
@@ -12310,7 +12323,7 @@
   return 1;
 }
 EOF
-if { (eval echo configure:12314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   have_mmap=yes
 else
@@ -12339,9 +12352,9 @@
 if test "$rel_alloc $have_mmap" = "default yes"; then
   if test "$doug_lea_malloc" = "yes"; then
         echo $ac_n "checking for M_MMAP_THRESHOLD""... $ac_c" 1>&6
-echo "configure:12343: checking for M_MMAP_THRESHOLD" >&5
+echo "configure:12356: checking for M_MMAP_THRESHOLD" >&5
     cat > conftest.$ac_ext <<EOF
-#line 12345 "configure"
+#line 12358 "configure"
 #include "confdefs.h"
 #include <malloc.h>
 int main() {
@@ -12353,7 +12366,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12357: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   rel_alloc=no; echo "$ac_t""yes" 1>&6;
 else
@@ -12378,15 +12391,15 @@
 
 ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:12382: checking for termios.h" >&5
+echo "configure:12395: checking for termios.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12385 "configure"
+#line 12398 "configure"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12390: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12403: \"$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*
@@ -12429,15 +12442,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:12433: checking for termio.h" >&5
+echo "configure:12446: checking for termio.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12436 "configure"
+#line 12449 "configure"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12441: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12454: \"$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*
@@ -12469,10 +12482,10 @@
 
 
 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:12473: checking for socket" >&5
+echo "configure:12486: checking for socket" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12476 "configure"
+#line 12489 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -12495,7 +12508,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12512: \"$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
@@ -12510,15 +12523,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:12514: checking for netinet/in.h" >&5
+echo "configure:12527: checking for netinet/in.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12517 "configure"
+#line 12530 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12522: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12535: \"$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*
@@ -12535,15 +12548,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:12539: checking for arpa/inet.h" >&5
+echo "configure:12552: checking for arpa/inet.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12542 "configure"
+#line 12555 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12560: \"$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*
@@ -12568,9 +12581,9 @@
 }
 
       echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:12572: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:12585: checking "for sun_len member in struct sockaddr_un"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 12574 "configure"
+#line 12587 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12581,7 +12594,7 @@
 static struct sockaddr_un x; x.sun_len = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:12585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12598: \"$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
@@ -12599,9 +12612,9 @@
 fi
 rm -f conftest*
       echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6
-echo "configure:12603: checking "for ip_mreq struct in netinet/in.h"" >&5
+echo "configure:12616: checking "for ip_mreq struct in netinet/in.h"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 12605 "configure"
+#line 12618 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12611,7 +12624,7 @@
 static struct ip_mreq x;
 ; return 0; }
 EOF
-if { (eval echo configure:12615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12628: \"$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
@@ -12642,10 +12655,10 @@
 
 
 echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:12646: checking for msgget" >&5
+echo "configure:12659: checking for msgget" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12649 "configure"
+#line 12662 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char msgget(); below.  */
@@ -12668,7 +12681,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12685: \"$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
@@ -12683,15 +12696,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:12687: checking for sys/ipc.h" >&5
+echo "configure:12700: checking for sys/ipc.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12690 "configure"
+#line 12703 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12708: \"$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*
@@ -12708,15 +12721,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:12712: checking for sys/msg.h" >&5
+echo "configure:12725: checking for sys/msg.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12715 "configure"
+#line 12728 "configure"
 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12720: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12733: \"$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*
@@ -12754,15 +12767,15 @@
 
 ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:12758: checking for dirent.h" >&5
+echo "configure:12771: checking for dirent.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12761 "configure"
+#line 12774 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12766: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12779: \"$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*
@@ -12789,15 +12802,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:12793: checking for sys/dir.h" >&5
+echo "configure:12806: checking for sys/dir.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12796 "configure"
+#line 12809 "configure"
 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12801: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12814: \"$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*
@@ -12830,15 +12843,15 @@
 
 ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:12834: checking for nlist.h" >&5
+echo "configure:12847: checking for nlist.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12837 "configure"
+#line 12850 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12855: \"$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*
@@ -12868,22 +12881,22 @@
 
 
 echo "checking "for sound support"" 1>&6
-echo "configure:12872: checking "for sound support"" >&5
+echo "configure:12885: checking "for sound support"" >&5
 test -z "$with_native_sound" -a -n "$native_sound_lib" && with_native_sound=yes
 
 if test "$with_native_sound" != "no"; then
     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:12879: checking for multimedia/audio_device.h" >&5
+echo "configure:12892: checking for multimedia/audio_device.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12882 "configure"
+#line 12895 "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:12887: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12900: \"$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*
@@ -12931,12 +12944,12 @@
       if test -z "$native_sound_lib"; then
         
 echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:12935: checking for ALopenport in -laudio" >&5
+echo "configure:12948: 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 12940 "configure"
+#line 12953 "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
@@ -12947,7 +12960,7 @@
 ALopenport()
 ; return 0; }
 EOF
-if { (eval echo configure:12951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12964: \"$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
@@ -12978,12 +12991,12 @@
       if test -z "$native_sound_lib"; then
 	
 echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:12982: checking for AOpenAudio in -lAlib" >&5
+echo "configure:12995: 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 12987 "configure"
+#line 13000 "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
@@ -12994,7 +13007,7 @@
 AOpenAudio()
 ; return 0; }
 EOF
-if { (eval echo configure:12998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13011: \"$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
@@ -13039,15 +13052,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:13043: checking for ${dir}/soundcard.h" >&5
+echo "configure:13056: checking for ${dir}/soundcard.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13046 "configure"
+#line 13059 "configure"
 #include "confdefs.h"
 #include <${dir}/soundcard.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13051: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13064: \"$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*
@@ -13101,15 +13114,15 @@
 if test "$with_nas_sound" != "no"; then
   ac_safe=`echo "audio/audiolib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for audio/audiolib.h""... $ac_c" 1>&6
-echo "configure:13105: checking for audio/audiolib.h" >&5
+echo "configure:13118: checking for audio/audiolib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13108 "configure"
+#line 13121 "configure"
 #include "confdefs.h"
 #include <audio/audiolib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13113: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13126: \"$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*
@@ -13127,12 +13140,12 @@
   
     
 echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6
-echo "configure:13131: checking for AuOpenServer in -laudio" >&5
+echo "configure:13144: checking for AuOpenServer in -laudio" >&5
 ac_lib_var=`echo audio'_'AuOpenServer | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -laudio "
 cat > conftest.$ac_ext <<EOF
-#line 13136 "configure"
+#line 13149 "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
@@ -13143,7 +13156,7 @@
 AuOpenServer()
 ; return 0; }
 EOF
-if { (eval echo configure:13147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13160: \"$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
@@ -13182,7 +13195,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 13186 "configure"
+#line 13199 "configure"
 #include "confdefs.h"
 #include <audio/Xtutil.h>
 EOF
@@ -13213,7 +13226,7 @@
   # Extract the first word of "esd-config", so it can be a program name with args.
 set dummy esd-config; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:13217: checking for $ac_word" >&5
+echo "configure:13230: checking for $ac_word" >&5
 
 if test -n "$have_esd_config"; then
   ac_cv_prog_have_esd_config="$have_esd_config" # Let the user override the test.
@@ -13242,10 +13255,10 @@
     c_switch_site="$c_switch_site `esd-config --cflags`" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"`esd-config --cflags`\" to \$c_switch_site"; fi
     LIBS="`esd-config --libs` $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"`esd-config --libs`\" to \$LIBS"; fi
     echo $ac_n "checking for esd_play_stream""... $ac_c" 1>&6
-echo "configure:13246: checking for esd_play_stream" >&5
+echo "configure:13259: checking for esd_play_stream" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13249 "configure"
+#line 13262 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char esd_play_stream(); below.  */
@@ -13268,7 +13281,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_func_esd_play_stream=yes"
 else
@@ -13319,7 +13332,7 @@
 
 if test "$with_tty" = "yes"  ; then
   echo "checking for TTY-related features" 1>&6
-echo "configure:13323: checking for TTY-related features" >&5
+echo "configure:13336: checking for TTY-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_TTY
 EOF
@@ -13335,12 +13348,12 @@
     if test -z "$with_ncurses"; then
     
 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:13339: checking for tgetent in -lncurses" >&5
+echo "configure:13352: 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 13344 "configure"
+#line 13357 "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
@@ -13351,7 +13364,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13368: \"$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
@@ -13384,15 +13397,15 @@
 
     ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:13388: checking for ncurses/curses.h" >&5
+echo "configure:13401: checking for ncurses/curses.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13391 "configure"
+#line 13404 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13396: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13409: \"$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*
@@ -13414,15 +13427,15 @@
 
     ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
-echo "configure:13418: checking for ncurses/term.h" >&5
+echo "configure:13431: checking for ncurses/term.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13421 "configure"
+#line 13434 "configure"
 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13426: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13439: \"$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*
@@ -13452,15 +13465,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:13456: checking for ncurses/curses.h" >&5
+echo "configure:13469: checking for ncurses/curses.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13459 "configure"
+#line 13472 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13464: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13477: \"$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*
@@ -13495,12 +13508,12 @@
 	for lib in curses termlib termcap; do
 	  
 echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:13499: checking for tgetent in -l$lib" >&5
+echo "configure:13512: 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 13504 "configure"
+#line 13517 "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
@@ -13511,7 +13524,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13528: \"$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
@@ -13542,12 +13555,12 @@
       else
 	
 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:13546: checking for tgetent in -lcurses" >&5
+echo "configure:13559: 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 13551 "configure"
+#line 13564 "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
@@ -13558,7 +13571,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13575: \"$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
@@ -13576,12 +13589,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:13580: checking for tgetent in -ltermcap" >&5
+echo "configure:13593: 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 13585 "configure"
+#line 13598 "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
@@ -13592,7 +13605,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13609: \"$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
@@ -13640,15 +13653,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:13644: checking for gpm.h" >&5
+echo "configure:13657: checking for gpm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13647 "configure"
+#line 13660 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13665: \"$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*
@@ -13671,12 +13684,12 @@
  }
   test -z "$with_gpm" && { 
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:13675: checking for Gpm_Open in -lgpm" >&5
+echo "configure:13688: 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 13680 "configure"
+#line 13693 "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
@@ -13687,7 +13700,7 @@
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:13691: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13704: \"$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
@@ -13737,20 +13750,20 @@
 
 test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
   != "no no no" && echo "checking for database support" 1>&6
-echo "configure:13741: checking for database support" >&5
+echo "configure:13754: checking for database support" >&5
 
 if test "$with_database_gdbm $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:13746: checking for ndbm.h" >&5
+echo "configure:13759: checking for ndbm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13749 "configure"
+#line 13762 "configure"
 #include "confdefs.h"
 #include <ndbm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13767: \"$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*
@@ -13780,12 +13793,12 @@
 if test "$with_database_gdbm" != "no"; then
   
 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:13784: checking for dbm_open in -lgdbm" >&5
+echo "configure:13797: 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 13789 "configure"
+#line 13802 "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
@@ -13796,7 +13809,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:13800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13813: \"$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
@@ -13824,10 +13837,10 @@
 
 if test "$with_database_dbm" != "no"; then
   echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:13828: checking for dbm_open" >&5
+echo "configure:13841: checking for dbm_open" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13831 "configure"
+#line 13844 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */
@@ -13850,7 +13863,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13867: \"$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
@@ -13869,12 +13882,12 @@
 
     
 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:13873: checking for dbm_open in -ldbm" >&5
+echo "configure:13886: 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 13878 "configure"
+#line 13891 "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
@@ -13885,7 +13898,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:13889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13902: \"$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
@@ -13926,10 +13939,10 @@
 
 if test "$with_database_berkdb" != "no"; then
   echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
-echo "configure:13930: checking for Berkeley db.h" >&5
+echo "configure:13943: checking for Berkeley db.h" >&5
   for header in "db/db.h" "db.h"; do
     cat > conftest.$ac_ext <<EOF
-#line 13933 "configure"
+#line 13946 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13951,7 +13964,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13955: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13968: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   db_h_file="$header"; break
 else
@@ -13967,9 +13980,9 @@
 
   if test "$with_database_berkdb" != "no"; then
     echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6
-echo "configure:13971: checking for Berkeley DB version" >&5
+echo "configure:13984: checking for Berkeley DB version" >&5
     cat > conftest.$ac_ext <<EOF
-#line 13973 "configure"
+#line 13986 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 1
@@ -13981,7 +13994,7 @@
   egrep "yes" >/dev/null 2>&1; then
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 13985 "configure"
+#line 13998 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 2
@@ -14008,10 +14021,10 @@
 rm -f conftest*
 
     echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6
-echo "configure:14012: checking for $dbfunc" >&5
+echo "configure:14025: checking for $dbfunc" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14015 "configure"
+#line 14028 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $dbfunc(); below.  */
@@ -14034,7 +14047,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14051: \"$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
@@ -14053,12 +14066,12 @@
 
     
 echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
-echo "configure:14057: checking for $dbfunc in -ldb" >&5
+echo "configure:14070: 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 14062 "configure"
+#line 14075 "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
@@ -14069,7 +14082,7 @@
 $dbfunc()
 ; return 0; }
 EOF
-if { (eval echo configure:14073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14086: \"$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
@@ -14133,12 +14146,12 @@
 if test "$with_socks" = "yes"; then
   
 echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:14137: checking for SOCKSinit in -lsocks" >&5
+echo "configure:14150: 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 14142 "configure"
+#line 14155 "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
@@ -14149,7 +14162,7 @@
 SOCKSinit()
 ; return 0; }
 EOF
-if { (eval echo configure:14153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14166: \"$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
@@ -14204,22 +14217,22 @@
 
 if test "$with_modules" != "no"; then
   echo "checking for module support" 1>&6
-echo "configure:14208: checking for module support" >&5
+echo "configure:14221: checking for module support" >&5
 
     if test "$with_msw" = "yes"; then
     have_dl=yes;
   else
         ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6
-echo "configure:14215: checking for dlfcn.h" >&5
+echo "configure:14228: checking for dlfcn.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14218 "configure"
+#line 14231 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14223: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14236: \"$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*
@@ -14236,16 +14249,16 @@
   echo "$ac_t""yes" 1>&6
   
       echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6
-echo "configure:14240: checking for dlopen in -lc" >&5
+echo "configure:14253: checking for dlopen in -lc" >&5
       cat > conftest.$ac_ext <<EOF
-#line 14242 "configure"
+#line 14255 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int main() {
 	dlopen ("", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:14249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    have_dl=yes 
 else
@@ -14254,18 +14267,18 @@
   rm -rf conftest*
   
       echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:14258: checking for dlopen in -ldl" >&5
+echo "configure:14271: checking for dlopen in -ldl" >&5
       ac_save_LIBS="$LIBS"
       LIBS="-ldl $LIBS"
       cat > conftest.$ac_ext <<EOF
-#line 14262 "configure"
+#line 14275 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int main() {
 	dlopen ("", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:14269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    have_dl=yes 
 else
@@ -14294,12 +14307,12 @@
     else
       
 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:14298: checking for shl_load in -ldld" >&5
+echo "configure:14311: 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 14303 "configure"
+#line 14316 "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
@@ -14310,7 +14323,7 @@
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo configure:14314: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14327: \"$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
@@ -14337,12 +14350,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
-echo "configure:14341: checking for dld_init in -ldld" >&5
+echo "configure:14354: 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 14346 "configure"
+#line 14359 "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
@@ -14353,7 +14366,7 @@
 dld_init()
 ; return 0; }
 EOF
-if { (eval echo configure:14357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14370: \"$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
@@ -14398,7 +14411,7 @@
 xealias=$internal_configuration
 
 echo "checking how to build dynamic libraries for ${xehost}" 1>&6
-echo "configure:14402: checking how to build dynamic libraries for ${xehost}" >&5
+echo "configure:14415: checking how to build dynamic libraries for ${xehost}" >&5
 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
 case "$xehost" in
 *-*-linux-gnu*) ;;
@@ -14426,9 +14439,9 @@
   XEGCC=yes
 else
   echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:14430: checking checking whether we are using GNU C" >&5
+echo "configure:14443: checking checking whether we are using GNU C" >&5
   cat > conftest.$ac_ext <<EOF
-#line 14432 "configure"
+#line 14445 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -14450,7 +14463,7 @@
 fi
 
 echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6
-echo "configure:14454: checking how to produce PIC code" >&5
+echo "configure:14467: checking how to produce PIC code" >&5
 wl=
 
 can_build_shared=yes
@@ -14551,18 +14564,18 @@
 
   # Check to make sure the dll_cflags actually works.
   echo $ac_n "checking if PIC flag ${dll_cflags} really works""... $ac_c" 1>&6
-echo "configure:14555: checking if PIC flag ${dll_cflags} really works" >&5
+echo "configure:14568: checking if PIC flag ${dll_cflags} really works" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS $dll_cflags -DPIC"
   cat > conftest.$ac_ext <<EOF
-#line 14559 "configure"
+#line 14572 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:14566: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
     # On HP-UX, the stripped-down bundled CC doesn't accept +Z, but also
@@ -14593,7 +14606,7 @@
 xldf=
 xcldf=
 echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6
-echo "configure:14597: checking if C compiler can produce shared libraries" >&5
+echo "configure:14610: checking if C compiler can produce shared libraries" >&5
 if test "$XEGCC" = yes; then
   xcldf="-shared"
   xldf="-shared"
@@ -14644,14 +14657,14 @@
   xe_libs=
   ac_link='${CC-cc} -o conftest $CFLAGS '"$xe_cppflags $xe_ldflags"' conftest.$ac_ext '"$xe_libs"' 1>&5'
   cat > conftest.$ac_ext <<EOF
-#line 14648 "configure"
+#line 14661 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:14655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cc_produces_so=yes
 else
@@ -14676,7 +14689,7 @@
   if test "$XEGCC" = yes; then
     # Check if gcc -print-prog-name=ld gives a path.
     echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
-echo "configure:14680: checking for ld used by GCC" >&5
+echo "configure:14693: checking for ld used by GCC" >&5
     ac_prog=`($CC -print-prog-name=ld) 2>&5`
     case "$ac_prog" in
     # Accept absolute paths.
@@ -14702,7 +14715,7 @@
     esac
   else
     echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:14706: checking for GNU ld" >&5
+echo "configure:14719: checking for GNU ld" >&5
   fi
 
   if test -z "$LTLD"; then
@@ -14740,7 +14753,7 @@
 
 # Check to see if it really is or isn't GNU ld.
 echo $ac_n "checking if the linker is GNU ld""... $ac_c" 1>&6
-echo "configure:14744: checking if the linker is GNU ld" >&5
+echo "configure:14757: checking if the linker is GNU ld" >&5
 # I'd rather use --version here, but apparently some GNU ld's only accept -v.
 if $LTLD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
   xe_gnu_ld=yes
@@ -14768,7 +14781,7 @@
   # OK - only NOW do we futz about with ld.
   # See if the linker supports building shared libraries.
   echo $ac_n "checking whether the linker supports shared libraries""... $ac_c" 1>&6
-echo "configure:14772: checking whether the linker supports shared libraries" >&5
+echo "configure:14785: checking whether the linker supports shared libraries" >&5
   dll_ld=$CC
   dll_ldflags=$LDFLAGS
   ld_shlibs=yes
@@ -14979,10 +14992,10 @@
     for ac_func in dlerror _dlerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14983: checking for $ac_func" >&5
+echo "configure:14996: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14986 "configure"
+#line 14999 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -15005,7 +15018,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:15009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:15022: \"$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
@@ -15044,11 +15057,11 @@
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 15048 "configure"
+#line 15061 "configure"
 #include "confdefs.h"
 int main(int c,char *v[]){return 0;}
 EOF
-if { (eval echo configure:15052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:15065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
diff --text -u 'xemacs-21.4.6/configure.in' 'xemacs-21.4.7/configure.in'
Index: ././configure.in
--- ././configure.in	Mon Dec 17 15:27:02 2001
+++ ././configure.in	Wed May  1 01:05:05 2002
@@ -743,7 +743,7 @@
 	dnl Has the user specified one of the path options?
 	prefix | exec_prefix | bindir | datadir | statedir | libdir | \
 	mandir | infodir | infopath | lispdir | etcdir | pkgdir | \
-	archlibdir | docdir | package_path )
+	archlibdir | docdir | package_path | moduledir )
 	   dnl If the value was omitted, get it from the next argument.
 	   if test "$valomitted" = "yes"; then
 	     if test "$#" = 0; then
@@ -794,6 +794,8 @@
 	    a | at | ath | athe | athen | athena )	val=athena ;;
 	    n | no | non | none )			val=no     ;;
 	    y | ye | yes )				val=yes    ;;
+	    dnl Explicit --with-widgets on command line means yes.
+            "")						val=yes    ;;
 	    g | gt | gtk )				val=gtk    ;;
 	    ms | msw )					val=msw    ;;
 	    * ) USAGE_ERROR(["The \`--$optname' option must have one of these values:
@@ -1212,6 +1214,13 @@
   dnl Cubix QBx/386
   i[[3-9]]86-cubix-sysv* ) machine=intel386 opsys=usg5-3 ;;
 
+  dnl Darwin, a.k.a. MacOS X (based on Mach and Freebsd)
+  *-*-darwin*)
+    opsys=darwin
+    RANLIB="ranlib -c" dnl Avoids a link error with lwlib-config.c
+    pdump=yes          dnl No "native" working dumper available
+    ;;
+
   dnl Data General AViiON Machines
   i586-dg-dgux*R4*   | i586-dg-dgux5.4.4* ) machine=aviion opsys=dgux5-4r4 ;;
   m88k-dg-dgux5.4R3* | m88k-dg-dgux5.4.3* ) opsys=dgux5-4r3 ;;
@@ -2605,6 +2614,9 @@
 
       AC_MSG_CHECKING(gtk cflags)
       GTK_CFLAGS=`${GTK_CONFIG} --cflags`
+      if test "$GCC" = "yes"; then
+      	GTK_CFLAGS="${GTK_CFLAGS} -Wno-shadow"
+      fi
       XE_APPEND(${GTK_CFLAGS}, c_switch_gtk)
       AC_MSG_RESULT(${GTK_CFLAGS})
 
@@ -3385,7 +3397,15 @@
   AC_CHECKING(for X11 graphics libraries)
 fi
 
-if test "$with_x11" = "yes" -a "$with_widgets" = "athena"; then
+dnl We don't automatically trigger widgets if athena is present
+dnl because of stability concerns.
+dnl But if the user wants widgets, still offer him autodetections
+case "$with_widgets" in
+  "yes" | "athena")		detect_athena=yes ;;
+   *)				detect_athena=no ;;
+esac
+
+if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then
   AC_CHECKING(for the Athena widgets)
 
   dnl What in heck did the user actually want?
@@ -3484,7 +3504,7 @@
 
 else
   have_xaw=no
-fi dnl "$with_x11" = "yes" -a "$with_widgets" = "athena"
+fi dnl "$with_x11" = "yes" -a "detect_athena" = "yes"
 
 if test "$with_x11" = "yes"; then
   dnl autodetect Motif - but only add to libs_x later (if necessary)
diff --text -u 'xemacs-21.4.6/etc/BETA' 'xemacs-21.4.7/etc/BETA'
Index: ././etc/BETA
--- ././etc/BETA	Fri Apr 13 03:20:44 2001
+++ ././etc/BETA	Wed May  1 01:05:14 2002
@@ -3,51 +3,78 @@
 * Introduction
 ==============
 
-You are running an experimental version of XEmacs.  Please do not
-report problems with Beta XEmacs to comp.emacs.xemacs.  Report them to
-xemacs-beta@xemacs.org.
-
-** XEmacs Beta Mailing List
-===========================
-
-*** Subscribing
----------------
-
-If you are not subscribed to the XEmacs beta list you should be.  Send
-an email message to xemacs-beta-request@xemacs.org with `subscribe'
-(without the quotes) as the BODY of the message.
-
-*** Unsubscribing
------------------
-
-To unsubscribe from the list send an email message to
-xemacs-beta-request@xemacs.org with `unsubscribe' (without the quotes)
-as the BODY of the message.
-
-*** Administrivia
------------------
-
-The XEmacs beta list is managed by the Majordomo mailing list package,
-and the usual Majordomo commands work.  Do not send mailing list
-requests to the main address (xemacs-beta@xemacs.org), always send
-them to xemacs-beta-request@xemacs.org.  If you have problems with the
-list itself, they should be brought to the attention of the XEmacs
-Mailing List manager Jason Mastaler <list-manager@xemacs.org>.
+You are running a potentially unstable version of XEmacs.  Please do
+not report problems with Beta XEmacs to comp.emacs.xemacs.  Report
+them to xemacs-beta@xemacs.org.
+
+** Mailing Lists
+================
+
+*** XEmacs Beta Mailing List
+----------------------------
+
+If you are not subscribed to the XEmacs beta list you should be.
+Currently all discussion of development issues, including bug reports
+and coding discussion, takes place on the XEmacs Beta mailing list.
+Only patches and administrative actions regarding patches are sent
+elsewhere (to the XEmacs Patches list).
+
+** XEmacs Patches Mailing List
+==============================
+
+XEmacs Patches records proposed changes to XEmacs, and their
+disposition.  It is open subscription, but only patches and actions by
+members of the XEmacs Review Board should be posted to this list.  You
+can follow progress of your patch by subscribing to the mailing list
+or in the archives.
 
+** List Administrivia
+=====================
 
-** Beta Release Schedule
-========================
+In the descriptions below, the word LIST (all uppercase) is a
+variable.  Substitute "beta" or "patches" as appropriate (to get
+"xemacs-beta" as the mailbox for the XEmacs Beta mailing list, or
+http://www.xemacs.org/Lists/#xemacs-beta for its URL).
+
+The XEmacs mailing lists are managed by the Mailman mailing list
+package, and the usual Mailman commands work.  Do not send mailing
+list requests to the main address (xemacs-LIST@xemacs.org), always
+send them to xemacs-LIST-request@xemacs.org.  If you have problems
+with the list itself, they should be brought to the attention of the
+XEmacs Mailing List manager <list-manager@xemacs.org> (the same
+mailbox, "list-manager", for all lists).  All public mailing lists
+have searchable archives.  The URL is
+
+	     http://list-archive.xemacs.org/xemacs-LIST
+
+*** Managing your subscription via the Web
+------------------------------------------
+
+Subscription, unsubscription, and options (such as digests and
+temporarily suspending delivery) can be accomplished via the web
+interface at http://www.xemacs.org/Lists/#xemacs-LIST.
+
+*** Subscribing by e-mail
+-------------------------
+
+Send an email message to xemacs-LIST-request@xemacs.org with
+`subscribe' (without the quotes) as the BODY of the message.
 
-The URL ftp://ftp.xemacs.org/pub/xemacs/beta/README always contains
-the best estimate of when the next beta XEmacs will be released.  For
-weekend betas the release time is generally in the vicinity of 2PM to
-5PM US Pacific Time (Universal Time minus 8 hours).  For weekday
-betas, the release time is generally in the vicinity of 8PM to
-Midnight US Pacific Time on the listed day.
+*** Unsubscribing by e-mail
+---------------------------
 
-Betas are nominally a week apart, scheduled on every Saturday.
-Midweek releases are made when a serious enough problem warrants it.
+Send an email message to xemacs-LIST-request@xemacs.org with
+`unsubscribe' (without the quotes) as the BODY of the message.
+
+** Beta Release Schedule
+========================
 
+Betas are now released rather sporadically.  We would like to achieve
+a weekly release schedule, but personnel availability does not
+permit.  For access to the most recent code, use CVS (see
+http://www.xemacs.org/Develop/cvsaccess.html for more information).
+If you have need for FTP access, please let us know.  It will make it
+more likely that we release betas more often.
 
 ** Reporting Problems
 =====================
@@ -66,11 +93,16 @@
     problem is actually occurring.
  
 2.  Attempt to recreate the problem starting with an invocation of
-    XEmacs with `xemacs -q -no-site-file'.  Quite often, problems are
-    due to package interdependencies, and the like.  An actual bug in
-    XEmacs should be reproducible in a default configuration without
-    loading any special packages (or the one or two specific packages
-    that cause the bug to appear).
+    XEmacs with `xemacs -q -no-site-file -no-autoloads'.  Quite often,
+    problems are due to package interdependencies, and the like.  An
+    actual bug in XEmacs should be reproducible in a default
+    configuration without loading any special packages (or the one or
+    two specific packages that cause the bug to appear).  If you have
+    trouble getting anything to work at all with the above invocation,
+    use `xemacs -q -no-site-file' instead.  If you need to load your
+    user init file or the site file to get the problem to occur, then
+    it has something to do with them, and you should try to isolate
+    the issue in those files.
 
 3.  A picture can be worth a thousand words.  When reporting an
     unusual display, it is generally best to capture the problem in a
@@ -84,7 +116,9 @@
 =====================
 
 In addition to the normal tar distribution, XEmacs source is now
-available via CVS.  Please see the URL: <URL:http://cvs.xemacs.org/~xemacs/>.
+available via CVS.  Please see
+
+	    http://www.xemacs.org/Develop/cvsaccess.html
 
 * Compiling Beta XEmacs
 =======================
@@ -136,7 +170,10 @@
 	--with-scrollbars=athena3d --with-dialogs=athena3d \
 	--with-mule --with-xfs --with-xim=xlib
 
-Part of the configure output is a summary that looks something like:
+Part of the configure output is a summary that looks something like
+the following.  (In XEmacs 21.1 and later, this summary is also
+available as the file Installation in the top directory of your build
+tree, and via the command M-x describe-installation.)
 
 uname -a: Linux altair.xemacs.org 2.0.32 #2 Sun Nov 16 18:52:14 PST 1997 i586
 
@@ -197,7 +234,18 @@
 
 After you have verified that you have a functional editor, fire up
 your favorite mail program and send a build report to
-xemacs-build-reports@xemacs.org.  The build report should include
+xemacs-build-reports@xemacs.org.
+
+Preferrably this is done from XEmacs, following these simple steps:
+
+M-x customize-group RET build-report RET
+M-x build-report RET
+
+See also
+http://www.xemacs.org/Releases/Public-21.2/tester.html#reporting
+
+If you create the report manually by other means, here is what the
+build report should include:
 
 1. Your hardware configuration (OS version, etc.)
 
@@ -217,12 +265,18 @@
 5. Any other unusual items you feel should be brought to the attention
    of the developers.
 
+
+* Patching XEmacs
+=================
+
 ** Creating patches for submission
 ==================================
 
 Patches to XEmacs should be mailed to <xemacs-patches@xemacs.org>.
 Each patch will be reviewed by the patches review board, and will be
-acked and added to the distribution, or rejected with an explanation.
+acknowledged and added to the distribution, or rejected with an
+explanation.  Progress of the patch is tracked on the XEmacs Patches
+mailing list, which is open subscription.
 
 Patches to XEmacs Lisp packages should be sent to the maintainer of
 the package.  If the maintainer is listed as `XEmacs Development Team'
@@ -231,9 +285,19 @@
 Emailed patches should preferably be sent in MIME format and quoted
 printable encoding (if necessary).
 
-When making patches, please use the `-u' option, or if your diff
-doesn't support it, `-c'.  Using ordinary (context-free) diffs are
-notoriously prone to error, since line numbers tend to change when
+The simplest way to create well-formed patches is to use CVS and
+Didier Verna's Patcher library (available as patcher.el in the
+xemacs-devel package).  Patcher is new and requires some setup, but
+most of the core developers are now using it for their own patches.
+Patcher also can be configured to create patches for several projects,
+and recognize the project from the directory it is invoked in.  This
+makes it a useful general tool (as long as XEmacs-style patches are
+accepted at your other projects, which is likely since they conform to
+the GNU standards).
+
+When making patches by hand, please use the `-u' option, or if your
+diff doesn't support it, `-c'.  Using ordinary (context-free) diffs
+are notoriously prone to error, since line numbers tend to change when
 others make changes to the same source file.
 
 An example of the `diff' usage:
@@ -251,50 +315,93 @@
   hack, hack, hack....
 $ diff -u lwlib/xlwmenu.c.orig lwlib/xlwmenu.c
 
-Each patch should be accompanied by an update to the appropriate
-ChangeLog file.  Please don't mail patches to ChangeLog because they
-have an extremely high rate of failure; just mail us the new part of
-the ChangeLog you added.
-
 Also note that if you cut & paste from an xterm to an XEmacs mail buffer
 you will probably lose due to tab expansion.  The best thing to do is
 to use an XEmacs shell buffer to run the diff commands, or ...
 M-x cd to the appropriate directory, and issue the command `C-u M-!' from
 within XEmacs.
 
-Guidelines for writing ChangeLog entries is governed by the GNU coding 
-standards.  Please see
-	http://www.gnu.org/prep/standards_toc.html   [Change Logs section]
-for details.
-
 Patches should be as single-minded as possible.  Mammoth patches can
 be very difficult to place into the right slot.  They are much easier
 to deal with when broken down into functional or conceptual chunks.
 The patches submitted by Kyle Jones and Hrvoje Niksic are stellar
 examples of how to Do The Right Thing.
 
-** Packages directory on the FTP Site
-=====================================
-
-The packages directory
-	ftp://ftp.xemacs.org/pub/xemacs/beta/xemacs-21.0/packages/
-
-is divided into subdirectory by the major type of package.
-
-drwxr-xr-x   2 beta-f   beta-f      1024 Oct 10 00:43 binary-packages
-drwxr-xr-x   2 beta-f   beta-f       512 Oct 10 00:44 package-sources
-drwxr-xr-x   2 beta-f   beta-f       512 Oct 10 00:44 utils
-
-** Support Utilities (utils)
-============================
+Each patch should be accompanied by an update to the appropriate
+ChangeLog file.  Guidelines for writing ChangeLog entries is governed
+by the GNU coding standards.  Please see
+	http://www.gnu.org/prep/standards_toc.html   [Change Logs section]
+for details.
 
-The utils directory contains tools to deal with current Lisp sources that
-have not had yet gotten XEmacs package integration.  The script `xpackage.sh'
-is used with Quassia Gnus.  Edit the appropriate variables at the top of
-the script to reflect the local configuration and run it in the top level
-directory of a Quassia Gnus source tree to install an update to Quassia Gnus.
+Do not submit context diffs (either -c or -u) of ChangeLogs.  Because
+of the "stack" nature of ChangeLogs (new entries are always pushed on
+the top), context diffs will fail to apply more often than they
+succeed.  Simply cutting and pasting the entry from an Emacs buffer to
+the mail buffer (beware of tab expansion!) is probably easiest.  The
+Patcher library also will set up your ChangeLogs for you, and copy
+them to the mail.  Contextless unified diffs (-U 0) are also
+acceptable but perhaps more trouble than they are worth.
+
+*** Patch discussion etiquette
+-------------------------------
+
+If you intend a patch for _application_ to the sources as is, _always_
+post it to xemacs-patches, even if there are minor points you would
+like to have discussed by others.  Not doing so will resulting in
+patches getting "lost".  If you expect that the patch will not be
+acceptable, but are using it to stimulate discussion, then don't post
+to xemacs-patches.  Intermediate cases are up to your judgement;
+unless you're sure you'll follow up with a "real" patch, better to err
+on the side of posting to xemacs-patches.
+
+Discussion of the _content_ of the patch (ie responses to reviewer
+comments beyond "that's right, ok, I'll do it your way") should _always_
+be posted to xemacs-beta.  (We may split xemacs-beta into code
+discussion and stuff that is more relevant to non-developer testers at
+some point, but at this point xemacs-beta is the correct place for
+this.)
+
+If discussion results in a bright idea and you come up with a new
+patch, normally you should post it to both mailing lists.  The people
+discussing on XEmacs Beta will want to know the outcome of the thread,
+and you need to submit to XEmacs Patches as the "list of record."
+
+If the old patch has been applied to CVS, then just submit the new one
+as usual.  If it has not been applied, then it is best to submit a new
+patch against CVS.  If possible do this as a reply to the original
+patch post, or something following it in the thread.  (The point is to
+get the original patch post's Message-ID in your References header.)
+In this case, also use the keyword SUPERCEDES in the Subject header to
+indicate that the old patch is no longer valid, and that this one
+replaces it.
+
+These rules will result in a fair number of cross posts, but we don't
+yet have a better way to handle that.
+
+Note: Developers should never post to xemacs-patches unless there is a
+patch in the post.  We plan to enforce this with an automatic filter.
+
+The exceptions are administrative.  If you have commit authorization,
+then post a short COMMIT notice to xemacs-patches when you commit to
+CVS.  Members of the Review Board will also post short notices of
+administrative action (APPROVE, VETO, QUERY, etc) to xemacs-patches.
+
+* Packages
+====================================
+
+[Note: these instructions have been partly updated, but not carefully
+reviewed in some time.  Caveat tester.]
+
+Starting with XEmacs 21.1, much of the functionality of XEmacs has
+been unbundled into "the packages."  For more information about the
+package system, see the Info nodes on Packages (in the XEmacs User
+Manual) and on Packaging (in the Lisp Reference).
+
+When bootstrapping XEmacs, you may need to manually install some
+packages (at least xemacs-base and efs).  These packages are available
+by FTP at ftp://ftp.xemacs.org/pub/xemacs/packages/.
 
-** Binary package installation (binary-packages)
+** Binary package installation
 ================================================
 
 Prerequisite:  XEmacs 21.0-b1.
@@ -315,16 +422,15 @@
 directory called `lisp-utils', the command to rebuild the
 auto-autoloads.el file is:
 
-xemacs-21.0 -vanilla -batch -l autoload -f batch-update-directory lisp-utils
+xemacs -vanilla -batch -l autoload -f batch-update-directory lisp-utils
 
 The command to rebuild the custom-load.el file is:
 
-xemacs-21.0 -vanilla -batch -l cus-dep \
-	-f Custom-make-dependencies lisp-utils
+xemacs -vanilla -batch -l cus-dep -f Custom-make-dependencies lisp-utils
 
 To bytecompile both of these files the command is:
 
-xemacs-21.0 -vanilla -batch -f batch-byte-compile \
+xemacs -vanilla -batch -f batch-byte-compile \
 	lisp-utils/auto-autoloads.el lisp-utils/custom-load.el
 
 ** Building XEmacs and XEmacs packages from scratch
diff --text -u /dev/null 'xemacs-21.4.7/etc/TUTORIAL.se'
Index: ././etc/TUTORIAL.se
--- ././etc/TUTORIAL.se	Thu Jan  1 09:00:00 1970
+++ ././etc/TUTORIAL.se	Wed May  1 01:05:16 2002
@@ -0,0 +1,1165 @@
+Detta dokument är baserat på den engelska handledningen, som har
+Copyright (c) 1985, 1996 Free Software Foundation, Inc. Se slutet av
+dokumentet för villkor och förutsättningar.
+
+Detta är den Svenska användarhandledningen till Emacs.
+
+Emacs-kommandon innebär ofta användning av kontrolltangenten (oftast
+märkt CTRL eller CTL) eller META-tangenten. På vissa tangentbord är
+META-tangenten märkt ALT eller EDIT eller något annat. På Suns
+tangentbord, till exempel, är det rutertangenten till vänster om
+mellanslagstangenten. Om du inte har någon META-tangent kan du använda
+ESC. Istället för att skriva META eller KONTROLL kommer vi här att
+använda följande förkortningar:
+
+ C-<chr> betyder att du skall hålla ner kontrolltangenten samtidigt
+         som du skriver bokstaven <chr>. Alltså betyder C-f: håll ner
+         kontrolltangenten och tryck f.
+ M-<chr> betyder att du skall hålla ned META-, EDIT- eller
+         ALT-tangenten samtidigt som du skriver <chr>. Om du inte har
+         någon META-, EDIT- eller ALT-tangent kan du trycka <ESC>,
+         släppa tangenten och sedan trycka bokstaven <chr>. När vi
+         skriver <ESC> avser vi ESC-tangenten.
+
+Viktigt: För att avsluta Emacs trycker du C-x C-c (två tecken).
+Tecknen ">>" i vänstermarginalen anger att du kan prova ett
+kommando. Till exempel:
+<<Tomma rader sätts in här när help-with-tutorial aktiveras>>
+>> Tryck C-v (View next screen) för att hoppa till nästa skärmbild.
+        Prova nu. Håll ned kontrolltangenten och tryck v.
+        Från och med nu bör du göra detta när du är färdig med en
+        skärmbild.
+
+Notera att det är ett överlapp på två rader när du byter från
+skärmbild till skärmbild. Detta är för att behålla sammanhanget när du
+bläddrar framåt i filen.
+
+Det första du behöver veta är hur du manövrerar från plats till plats
+i texten. Du har redan lärt dig hur du flyttar en skärmbild framåt,
+med C-v. För att flytta dig en skärmbild bakåt trycker du M-v. (Håll
+ned META-tangenten och tryck v eller tryck <ESC>v om du inte har
+META-, EDIT- eller ALT-tangent.)
+
+>> Prova att trycka M-v och C-v några gånger.
+
+
+* SAMMANFATTNING
+----------------
+
+Följande kommandon är bra för att se hela skärmbilder:
+
+        C-v     Flytta en skärmbild framåt.
+        M-v     Flytta en skärmbild bakåt.
+        C-l     Rita om skärmen och placera texten där markören står
+                mitt på skärmbilden. (Det är KONTROLL-L, inte
+                KONTROLL-1.)
+
+>> Leta reda på markören och se vad som står där. Tryck sedan C-l.
+   Hitta markören igen och notera att det är samma text som står kring
+   markören nu.
+
+
+* GRUNDLÄGGANDE MARKÖRRÖRELSER
+------------------------------
+
+Att flytta sig från skärmbild till skärmbild kan vara bra, men hur
+förflyttar man sig till en speciell plats på skärmen?
+
+Det finns flera sätt att göra detta på. Det vanligaste är att använda
+kommandona C-p, C-b, C-f och C-n. Vart och ett av dessa kommandon
+flyttar markören en rad eller en kolumn i en bestämd riktning på
+skärmen. Här visas dessa fyra kommandon och i vilken riktning de
+flyttar markören:
+
+ 
+			 Föregående rad, C-p
+                                  :
+                                  :
+   Bakåt, C-b .... Nuvarande markörposition .... Framåt, C-f
+                                  :
+                                  :
+                           Nästa rad, C-n
+
+>> Flytta markören till linjen mitt i diagrammet genom att använda C-n
+   och C-p. Använd sedan C-l för att centrera diagrammet på
+   skärmbilden.
+
+Detta är säkert lite enklare att förstå om du tänker på dessa
+förkortningar: P för föregående (previous), N för nästa (next), B för
+bakåt (backward) och F för framåt (forward). Detta är de grundläggande
+kommandona för att flytta markören och du kommer säkert att använda
+dem hela tiden, så det är en stor fördel om du lär dig dem nu.
+
+>> Gör några C-n så att du kommer ned till den här raden.
+
+>> Flytta dig in i raden med hjälp av några C-f och sedan uppåt
+   med några C-p. Lägg märke till vad C-p gör när markören står mitt
+   på en rad.
+
+Textrader är åtskilda med radslutstecken. Den sista raden i filen
+avslutas också vanligtvis med ett radslut men Emacs kräver inte att
+den gör det.
+
+>> Prova med C-b i början av en rad. Detta gör att markören
+   flyttas till slutet av den tidigare raden. Detta är för att den
+   flyttar markören över radslutstecknet.
+
+C-f flyttar också över radslut, precis som C-b.
+
+>> Gör några fler C-b så att du får en känsla för var markören
+   är. Tryck sedan några C-f tills du kommer till slutet av
+   raden. Tryck ytterligare en C-f så att du flyttar markören till
+   nästa rad.
+
+När du flyttar markören förbi toppen eller botten av skärmbilden
+kommer texten utanför skärmen att komma fram. Detta kallas "rullning"
+och gör det möjligt för Emacs att flytta markören utan att den
+försvinner ut ur skärmbilden.
+
+>> Prova att flytta markören förbi skärmbildens nederkant med hjälp av
+   C-n och se vad som händer.
+
+Om det går för sakta att flytta markören ett tecken i taget kan du
+flytta den ett ord. M-f flyttar markören ett ord framåt och M-b
+flyttar den ett ord bakåt.
+
+>> Prova några M-f och M-b.
+
+Om markören står mitt i ett ord kommer M-f att flytta markören till
+slutet av ordet. Om du står mitt emellan två ord kommer M-f att flytta
+markören till slutet av nästa ord. M-b fungerar på samma sätt men i
+motsatt riktning.
+
+>> Tryck M-f och M-b några gånger och skifta markörposition med några
+   C-f och C-b så att du ser hur M-f och M-b uppför sig vid olika
+   placeringar av markören både i och mellan ord.
+
+Lägg märke till likheten mellan C-f och C-b å ena sidan och M-f och
+M-b å den andra. Ofta används META-kommandon till språkrelaterade
+operationer (ord, stycken, avsnitt), medan kontrollkommandon används
+till grundläggande operationer som inte beror av vad man redigerar
+(bokstäver, rader, etc.).
+
+Denna likhet finns också mellan rader och stycken: C-a och C-e flyttar
+markören till början av en rad eller till slutet av en rad, medan M-a
+och M-e flyttar den till början respektive slutet av ett stycke.
+
+>> Prova några C-a och sedan några C-e.
+   Prova också några M-a och sedan några M-e.
+
+Se hur efterföljande C-a efter varandra inte gör något, medan flera
+M-a fortsätter att flytta markören till nästa stycke. Även om detta
+inte verkar självklart är det ganska naturligt.
+
+Platsen där markören är i texten kallas också för "arbetspunkt"
+(point). Eller omskrivet: Markören visar på skärmen var arbetspunkten
+är i texten.
+
+Här är en kort sammanfattning av de enklaste markörförflyttnings-
+kommandona, inklusive ord- och styckesförflyttningskommandon:
+
+        C-f     Flytta markören ett steg framåt
+        C-b     Flytta markören ett steg bakåt
+
+        M-f     Flytta markören ett ord framåt
+        M-b     Flytta markören ett ord bakåt
+
+        C-n     Flytta markören till nästa rad
+        C-p     Flytta markören till föregående rad
+
+        C-a     Flytta markören till början av raden
+        C-e     Flytta markören till slutet av raden
+
+        M-a     Flytta markören till början av meningen
+        M-e     Flytta markören till slutet av meningen
+
+>> Prova alla dessa kommandon några gånger för tränings skull.
+   Dessa är de kommandon som används mest.
+
+Två andra viktiga markörrörelsekommandon är M-< (META mindre-än), som
+flyttar markören till början av texten, och M-> (META större-än), som
+flyttar den till slutet av texten.
+
+På en del tangentbord är "<" placerad över komma, så att man måste
+använda skift för att få fram den. På dessa tangentbord måste man
+också använda skift för att skriva M-<. Utan skifttangenten skulle det
+bli M-komma.
+
+>> Prova M-< nu för att flytta markören till början av vägledningen.
+   Använd sedan C-v för att flytta markören tillbaka hit igen.
+
+>> Prova också M-> för att flytta markören till slutet av vägledningen.
+   Använd sedan M-v för att flytta markören tillbaka hit igen.
+
+Du kan också flytta markören med hjälp av piltangenterna, om
+terminalen har piltangenter. Vi föreslår att du lär dig C-b, C-f, C-n
+och C-p av tre skäl. För det första kommer de att fungera på alla
+slags terminaler. För det andra kommer du att finna, när du har fått
+lite träning i att använda Emacs, att det går mycket snabbare att
+använda kontrollfunktionerna än piltangenterna (för att du undviker
+att ändra fingersättningen). Den tredje anledningen är att när man har
+lärt sig att använda kontrolltangenten blir det lättare att lära sig
+de mer avancerade kontrollfunktionerna.
+
+De flesta kommandon i Emacs tar ett numeriskt argument och för de
+flesta kommandon leder detta till att de repeteras. Ett numeriskt
+argument anges genom att du skriver C-u och sedan talet, innan du
+skriver kommandot. Om du har en META- (eller EDIT- eller ALT-) tangent
+så finns det ett annat alternativ för att ge numeriska argument: skriv
+talet medan du håller ned META-tangenten. Vi föreslår att du använder
+C-u för det fungerar på alla slags terminaler. Det numeriska
+argumentet kallas också för "prefixargument" eftersom det skrivs före
+kommandot.
+
+Till exempel: C-u 8 C-f flyttar markören åtta steg framåt.
+
+>> Prova C-n eller C-p med ett numeriskt argument så att du
+   kommer så nära den här raden som möjligt med ett enda kommando.
+
+De flesta kommandon använder det numeriska argumentet för ett
+repeterat utförande men det finns kommandon som använder det
+annorlunda. Flera kommandon, men inga av dem du lärt dig hittills,
+använder det som en flagga. Med ett prefixargument, och oberoende av
+dess värde, gör kommandot något annat.
+
+C-v och M-v finns med bland dessa undantag. Om man ger ett argument
+till ett av dessa kommandon kommer skärmbilden flytta sig upp eller
+ned så många rader som argumentet anger, istället för så många
+skärmbilder. Till exempel kommer C-u 8 C-v flytta skärmbilden 8 rader
+uppåt.
+
+>> Prova C-u 8 C-v nu.
+
+Detta borde ha flyttat skärmbilden 8 rader uppåt. Om du önskar flytta
+tillbaka igen är det bara att ge samma argument till M-v.
+
+Om du använder Emacs under ett fönstersystem, som X11 eller
+MS-Windows, finns det troligen ett rektangulärt område på vänster sida
+av Emacs-fönstret, en så kallad rullningslist. Genom att klicka i den
+med musen kan du rulla texten.
+
+>> Prova att trycka med den mellersta musknappen i det utvalda området
+   på rullningslisten. Detta bör flytta skärmbilden till en plats i
+   texten beroende på var i rullningslisten du trycker.
+
+>> Prova att flytta musen upp och ner medan du håller ner den
+   mellersta musknappen. Du ser att texten rullar upp och ner beroende
+   på hur du för musen.
+
+
+* MARKÖRFÖRFLYTTNINGAR PÅ EN X-TERMINAL
+---------------------------------------
+
+Om du sitter vid en X-terminal kommer du antagligen finna det mycket
+enklare att använda piltangenterna för att flytta markören. Vänster-,
+höger-, upp- och nedåt-pilarna flyttar markören i önskad riktning. De
+fungerar på samma sätt som C-b, C-f, C-p och C-n men är enklare att
+slå och förstå. Du kan också använda C-vänsterpil och C-högerpil för
+att flytta markören över ord och C-uppåtpil och C-nedåtpil för att
+flytta den över textblock. (Till exempel för att flytta förbi ett
+stycke om du redigerar text.)
+
+Om du har tangenter märkta med HOME (eller BEGIN) och END kan du
+använda dessa för att gå till början respektive slutet av raden och
+C-HOME och C-END kommer att gå till början respektive slutet av
+filen. Om tangentbordet har PgUp- och PgDn-tangenter kan du använda
+dem för att gå upp och ner en skärmbild åt gången på samma sätt som
+med M-v och C-v.
+
+Alla dessa kan också ta numeriska argument, som beskrivits tidigare.
+Du kan också använda en genväg för att skriva in dessa argument: håll
+ned CONTROL eller META tangenten och skriv in numret. Till exempel för
+att gå 12 ord till höger trycker du C-1 C-2 C-högerpil. Lägg märke
+till att det är mycket enkelt att skriva eftersom du inte behöver
+släppa kontrolltangenten mellan tangenttryckningarna.
+
+
+* OM EMACS HÄNGER
+-----------------
+
+Om Emacs slutar att reagera på kommandon kan du lugnt stoppa dem genom
+att trycka C-g. Du kan också använda C-g för att stoppa ett kommando
+som tar för lång tid att utföra.
+
+Det är också möjligt att använda C-g för att avbryta ett numeriskt
+argument eller början på ett kommando som du inte önskar att utföra.
+
+>> Skriv C-u 100 för att ge ett numeriskt argument på 100 och tryck
+   C-g. Tryck nu C-f. Markören skall nu flytta sig bara ett steg, för att
+   du avbröt argumentet med C-g.
+
+Om du av misstag slår <ESC> blir du kvitt detta med ett C-g.
+
+
+* SPÄRRADE KOMMANDON
+--------------------
+
+En del Emacs-kommandon är "spärrade" så att nybörjare inte skall
+använda dem av misstag.
+
+Om du provar ett av dessa spärrade kommandon kommer Emacs ge ett
+meddelande som berättar vilket kommando det är och kommer att fråga om
+du verkligen vill fortsätta och utföra detta kommando.
+
+Om du verkligen önskar att utföra kommandot trycker du mellanslag som
+svar på frågan. Normalt, om du inte önskar att utföra detta kommando,
+svarar du "n" på frågan.
+
+>> Skriv C-x n p (som är ett spärrat kommando).
+   Skriv n som svar på frågan.
+
+
+* FÖNSTER
+---------
+
+Emacs kan ha flera fönster och varje fönster kan visa sin egen text.
+Lägg märke till att "fönster" i Emacs inte refererar till separata
+överlappande fönster i fönstersystemet, utan till separata delar i ett
+enda X-fönster.(Emacs kan också ha flera X-fönster eller "ramar" i
+Emacs-terminologi. Detta beskrivs senare.)
+
+Vi kommer förklara senare hur man använder flera fönster. Här skall vi
+förklara hur man blir av med extra fönster för att komma tillbaka till
+det grundläggande läget med endast ett fönster. Det är enkelt:
+
+        C-x 1      Ett fönster (dvs. ta bort alla andra fönster).
+
+Det är KONTROLL-x följt av siffran 1. C-x 1 utvidgar fönstret där
+markören står så att det fyller hela skärmbilden. Alla andra fönster
+tas bort.
+
+>> Flytta markören till den här raden och tryck C-u 0 C-l.
+
+(Kom ihåg att C-l rensar skärmen och mittställer raden där markören
+står. Om du ger ett numeriskt argument till detta kommando betyder det
+"rensa skärmen och placera raden där markören står på raden som
+argumentet anger". Därför betyder C-u 0 C-l att skärmen skall rensas
+och raden där markören står placeras överst.)
+
+>> Skriv C-x 2.
+   Se hur det här fönstret krymper samtidigt som ett nytt uppträder
+   med samma innehåll som detta.
+
+>> Slå C-x 1 och se hur det nya fönstret nu försvinner.
+
+
+* SKRIVA OCH TA BORT TEXT
+-------------------------
+
+Om du önskar att sätta in text är det bara att skriva in
+texten. Tecken som du kan se, så som A, 7, *, etc. tolkas som text och
+sätts in direkt. Skriv <Return> (retur-tangenten) för att sätta in en
+radbrytning.
+
+Du kan radera det sista tecknet du skrev genom att trycka <Delete>.
+<Delete> är en tangent på tangentbordet, som kan vara märkt "Del". I
+några fall fungerar också "backsteg" som <Delete> men inte alltid!
+
+Generellt raderar <Delete> tecknet precis före den aktuella
+markörspositionen.
+
+>>  Gör detta nu: Skriv in några tecken och ta bort dem genom att
+    använda <Delete>. Var inte rädd för att skriva i den här filen, du
+    kommer inte att kunna förändra originalet till vägledningen. Detta
+    är bara en lokal kopia.
+
+När en rad blir för lång för att rymmas på en skärmbredd så fortsätter
+den på raden under. Ett bakstreck ("\") (eller om du kör under ett
+fönstersystem, en liten böjd pil) i slutet av högermarginalen
+indikerar att raden fortsätter.
+
+>>  Skriv in lite text så att du kommer till slutet av raden och
+    fortsätt att skriva lite till. Du kommer då att se hur
+    fortsättningstecknet ser ut.
+
+>>  Använd <Delete> för att radera texten tills raden ryms på en
+    skärmbredd igen. Fortsättningstecknet kommer då att försvinna.
+
+Du kan radera radbrytning precis som andra tecken. Genom att radera
+radbrytningen mellan två rader slås dessa samman till en. Om
+resultatet av denna sammanslagning blir för stor för att passa inom en
+skärmbredd, så kommer den att visas med ett fortsättningstecken.
+
+>> Flytta markören till början av en rad och tryck <Delete>.
+   Detta kommer att klistra ihop raden med raden över.
+
+>> Tryck <Return> för att sätta in radbrytningen du tog bort.
+
+Tänk på att de flesta Emacs-kommandon kan ta numeriska argument. Detta
+gäller också texttecken. Genom att repetera ett texttecken kommer det
+skrivas flera gånger.
+
+>> Prova det nu: Skriv C-u 8 * för att sätta in ********.
+
+Du har nu lärt dig de mest grundläggande sätten att skriva något i
+Emacs och att rätta fel. Du kan radera ord och rader också. Här är en
+översikt över kommandon för radering:
+
+        <Delete>     raderar tecknet som står precis före markören
+        C-d          raderar tecknet som står precis under markören
+
+        M-<Delete>   raderar ordet precis före markören
+        M-d          raderar ordet precis efter markören
+
+        C-k          raderar från markören till slutet av raden
+        M-k          raderar till slutet av stycket
+        
+Lägg märke till att <Delete> och C-d kontra M-<Delete> och M-d följer
+mönstret som började med C-f och M-f. (<Delete> är inte precis
+ett kontrolltecken men låt oss inte bry oss om det.) C-k och M-k
+fungerar på samma sätt som C-e och M-e (nästan).
+
+När du raderar mer än ett tecken åt gången kommer Emacs att spara den
+borttagna texten så att du han hämta tillbaka den igen. Denna text
+kallas borttagen (killed). Att få tillbaka borttagen text kallas att
+hämta den (yank). Du kan antingen hämta tillbaka borttagen text till
+samma plats som den blev raderad eller också kan du sätta in den på en
+annan plats i texten. Du kan också hämta tillbaka den flera gånger så
+att du får flera lika förekomster av den. Kommandot för att hämta
+tillbaka texten är C-y.
+
+Skillnaden mellan att "ta bort" (killing) och "radera" (deleting) text
+är att "borttagen" text kan hämtas tillbaka, medan raderad text inte
+kan det. Återinsättning av borttagen text kallas "återhämtning"
+(yanking).  Generellt kan man säga att kommandon som tar bort fler än
+ett tecken sparar undan texten (så att den kan återhämtas) medan
+kommandon som bara raderar ett tecken eller tomma rader och mellanrum
+inte sparar någonting (och den texten kan alltså inte återhämtas).
+
+>> Flytta markören till början av en rad som inte är tom.
+   Tryck C-k för att ta bort texten på raden.
+>> Tryck C-k en gång till. Du kommer nu se att den raderar den tomma
+   raden som var kvar.
+
+Lägg märke till att ett enstaka C-k bara raderar texten på raden och
+att det andra C-k raderar själva raden och flyttar upp texten på raden
+under ett steg. C-k hanterar numeriska argument lite speciellt. Den
+raderar så många rader OCH innehållet i dem. Detta är alltså inte bara
+en repetition av kommandot. C-u 2 C-k raderar två rader samt de tomma
+raderna, medan C-k två gånger inte kommer att göra det.
+
+Kommandot för att hämta tillbaka text är C-y. Kommandot hämtar
+tillbaka den sist borttagna texten och placerar den där markören är.
+
+>> Prova: Gör C-y för att få tillbaka texten.
+
+Tänk på C-y som om du rycker, eller drar, tillbaka något som någon
+tagit ifrån dig. Notera att om du gör flera C-k i rad så kommer all
+bortagen text att sparas samlat så att ett C-y återhämtar alla raderna
+på en gång.
+
+>> Prova detta. Tryck C-k ett par gånger.
+
+Och hämta så tillbaka igen:
+
+>> Tryck C-y. Flytta markören några rader ned och tryck C-y igen.
+   Så kopierar man text.
+
+Men vad gör du om du har en text du önskar att hämta tillbaka men du
+har redan tagit bort något nytt? C-y skulle hämta tillbaka den senaste
+texten som blev borttagen men tidigare bortagen text är inte
+förlorad. Du kan få tillbaka den med kommandot M-y. Efter att du har
+använt C-y för att hämta tillbaka den sist borttagna texten kommer M-y
+ersätta denna text med tidigare borttagen text. Genom att göra M-y om
+och om igen hämtas allt tidigare borttagen text tillbaka. När du har
+nått den önskade texten behöver du inte göra något ytterligare för att
+behålla den. Fortsätt bara med din redigeringen och lämna den
+återtagna texten där den är.
+
+Om du gör M-y tillräckligt många gånger kommer du att komma tillbaka
+till startpunkten (texten som sist blev borttagen).
+
+>> Ta bort en rad, flytta markören till en ny rad och ta bort även
+   denna rad. Använd C-y för att hämta tillbaka den sista raden. Tryck
+   M-y för att byta den mot den tidigare borttagna raden. Tryck flera
+   M-y och se vad du får. Fortsätt med detta tills du får tillbaka den
+   första raden igen och sedan några gånger till. Om du vill kan du
+   prova med positiva och negativa argument till M-y.
+ 
+
+* ÅNGRA
+-------
+
+Om du gör en förändring i texten och sedan ångrar dig, så kan du
+upphäva ändringen med kommandot C-x u (undo).
+
+Normalt kommer C-x u upphäva förändringen som gjordes av det sist
+utförda kommandot. Om du repeterar C-x u flera gånger kommer varje
+repetition upphäva ett kommando till.
+
+Det finns två undantag. Kommandon som inte förändrar texten räknas
+inte (detta inkluderar markörförflyttningar och bläddringskommandon),
+och inskrivna enkelbokstäver blir vanligtvis grupperade i grupper om
+upp till 20 tecken. Detta är för att reducera antalet C-x u som behövs
+för att ångra inskriven text.
+
+>> Ta bort den här raden med C-k. C-x u kommer att hämta tillbaka den
+   igen.
+
+C-_ är ett alternativ till ångra-kommandot. Den fungerar på samma sätt
+som C-x u men är enklare att trycka flera gånger i följd. Det
+olämpliga med C-_ är att den är svår att hitta på en del tangentbord.
+Det är därför vi också har C-x u. På en del terminaler kan du få fram
+C-_ genom att trycka / samtidigt som Ctrl hålls nere.
+
+Ett numeriskt argument till C-_ eller C-x u medför repetering.
+
+Du kan ångra radering av text precis på samma sätt som du kan ångra
+att du tagit bort text. Skillnaden mellan att ta bort och att radera
+någonting påverkar endast om du kan hämta tillbaka det med C-y. För
+ångerfunktionen spelar det ingen roll hur texten försvunnit.
+
+
+* FILER
+-------
+
+För att texten du har förändrat skall sparas permanent måste du lägga
+den i en fil. Om du inte gör det kommer texten att försvinna när du
+avslutar Emacs. Du lägger texten i en fil genom att först finna (find)
+denna fil. Detta kallas också för att besöka filen (visit).
+
+Att finna en fil innebär att du ser filens innehåll i Emacs. På många
+sätt är det som om du förändrar själva filen men förändringen du gör
+kommer inte bli permanent förrän filen sparas (save). Detta är för att
+undvika att halvförändrade filer sparas när du inte vill det. Till och
+med när du sparar filen kommer Emacs att behålla originalet under ett
+nytt namn, som backup, ifall du senare ångrar alltihop.
+
+Om du tittar nästan längst ner på skärmbilden så kommer du se en rad
+som börjar och slutar med minustecken, och som innehåller texten
+"--:-- TUTORIAL.se". Denna del av skärmbilden visar alltid namnet på
+filen du besöker. Just nu är du inne i en fil som heter "TUTORIAL.se"
+och som är en personlig kopia av vägledningen till Emacs. Vilken fil
+du än är inne i så kommer filnamnet stå där.
+
+Kommandot för att finna filer och spara filer skiljer sig lite från
+andra kommandon du har lärt dig eftersom de består av två tecken.
+Bägge startar med tecknet KONTROLL-x. Det är faktisk många kommandon
+som startar med KONTROLL-x och många av dem har med filer, skärmbilder
+och liknande saker att göra. Dessa kommandon är två, tre eller fyra
+tecken långa.
+
+En annan sak med kommandot för att finna filer är att du måste ange
+vilket filnamn du önskar. Vi säger att kommandot "läser ett argument
+från terminalen". I detta fall är argumentet namnet på filen. Efter
+att du gett kommandot
+
+        C-x C-f   Finn en fil
+
+kommer Emacs fråga efter ett filnamn. Filnamnet du skriver syns på den
+nedersta raden i skärmbilden. Denna sista rad kallas minibuffert när
+den används på det här sättet. Du kan använda vanliga Emacs-kommandon
+för att förändra filnamnet.
+
+När du skriver in filnamnet, eller något annat i minibufferten, kan du
+avbryta med kommandot C-g.
+
+>> Skriv C-x C-f och så C-g. Detta avbryter minibufferten och
+   avbryter också C-x C-f kommandot som använde minibufferten. Så att
+   du inte finner någon fil.
+
+När du är färdig med att skriva filnamnet trycker du <Return> för att
+utföra kommandot. Då kommer C-x C-f kommandot att börja leta fram
+filen. Minibufferten försvinner när C-x C-f kommandot är färdigt.
+
+Efter en liten stund kommer filen upp på skärmen och du kan börja
+redigera innehållet. När du vill spara filen kan du använda detta
+kommando
+
+        C-x C-s   Spara fil
+
+Detta sparar texten på skärmen till filen. Första gången detta görs
+kommer Emacs att ge originalfilen ett nytt namn så att den inte går
+förlorad. Det nya filnamnet bildas genom att lägga till ett "~" i
+slutet av det ursprungliga filnamnet.
+
+När lagringen är utförd kommer Emacs skriva ut namnet på filen som
+blev sparad. Du bör spara ofta så att du inte förlorar så mycket om
+systemet kraschar.
+
+>> Skriv C-x C-s för att spara en kopia av denna vägledning.
+   Detta skall leda till att "Wrote ...TUTORIAL.se" skrivs ut nederst
+   på skärmbilden.
+
+Observera: På vissa system leder C-x C-s till att skärmen låser
+sig. Detta tyder på att systemet har "flödeskontroll" och att denna
+har fångat C-s och inte skickat den vidare till Emacs. För att
+fortsätta måste du trycka C-q. Se i så fall i avsnittet "Spontaneous
+Entry to Incremental Search" i Emacs-manualen för att få tips på hur
+detta kan undvikas.
+
+Du kan finna en existerande fil, antingen för att förändra den eller
+för att titta på den. Du kan också finna en fil som inte existerar.
+Det är så man skapar nya filer med Emacs: finn filen, som är tom till
+att börja med, och sätt igång med att skriva texten som skall in i
+filen. Först när du sparar filen kommer Emacs att verkligen skapa
+filen med den text du har skrivit. Från och med detta editerar du en
+fil som existerar.
+
+
+* BUFFERTAR
+-----------
+
+Om du finner en ny fil med C-x C-f kommer den första filen fortsätta
+att vara öppen i Emacs. Du kan byta tillbaka till den genom att finna
+den på nytt med C-x C-f. På så sätt kan du ha ett stort antal filer
+öppna i Emacs.
+
+>> Skapa en fil med namnet "foo" genom att trycka C-x C-f foo <Return>.
+   Skriv in lite text, redigera den och spara "foo" genom att använda
+   C-x C-s. Skriv till slut C-x C-f TUTORIAL.se<Return> för att komma
+   tillbaka till den här vägledningen.
+
+Emacs sparar texten för varje fil i ett objekt kallat "buffert". När
+du finner en ny fil skapas en ny buffert i Emacs. För att se en lista
+över existerande buffertar i Emacs kan du skriva
+
+        C-x C-b      Listning av buffertar.
+
+>> Prova C-x C-b nu.
+
+Se hur varje buffert har ett namn och att de också kan ha namnet på
+den fil som innehållet kommer från. En del buffertar är inte knutna
+till någon fil, till exempel bufferten "*Buffer List*". Det är den
+buffert som innehåller buffertlistan som skapades med C-x C-b. Vilken
+text du än ser i ett Emacs-fönster så tillhör den alltid en buffert.
+
+>> Skriv C-x 1 för att bli kvitt buffertlistan.
+
+Om du ändrar texten till en fil och sedan öppnar en ny fil, så kommer
+inte den första filen sparas. Förändringen ligger kvar i
+bufferten. Skapande och redigering av den nya filen påverkar inte den
+första filens buffert. Detta kan vara bra men betyder också att du
+behöver ett lämpligt sätt att spara den första filens buffert. Det är
+omständligt att flytta tillbaka till den tidigare bufferten med C-x
+C-f för att sedan spara filen med C-x C-s. Därför finns kommandot
+
+        C-x s      Spara buffertar
+
+C-x s frågar för varje buffert med ändringar, som inte sparats, om du
+vill spara eller ej.
+
+>> Sätt in en rad med text och spara med C-x s
+   Du skall nu få frågan om du önskar spara bufferten
+   TUTORIAL.se. Svara ja på frågan genom att trycka "y" (yes).
+
+
+* ANVÄNDNING AV MENYER
+----------------------
+
+Om du använder en X-terminal kommer du säkert att lägga märke till
+menyerna på toppen av skärmbilden. Via dessa menyer får du tillgång
+till de mest använda Emacs-kommandona, till exempel find-file
+(Open...). Detta är enklast i början, när du inte känner till alla
+tangenttryckningar som skall till för varje kommando. När du lärt
+känna Emacs kommer det vara lättare att använda tangentbordet.
+Tangentbordskombinationen står precis efter respektive menykommando.
+
+Lägg märke till att det är många menykommandon som inte har någon
+tangentbordskombination. Ett exempel är buffertmenyn (Buffers), som
+listar alla tillgängliga buffertar. Du kan enkelt byta till en buffert
+genom att välja namnet på den i buffertmenyn.
+
+
+* ANVÄNDNING AV MUSEN
+---------------------
+
+När du kör Emacs under X är det möjligt att använda musen. Du kan
+placera markören genom att trycka på den vänstra musknappen vid önskad
+position och du kan markera text genom att hålla ned vänstra
+musknappen samtidigt som du flyttar markören över texten du vill
+markera. Alternativt kan du klicka med vänster musknapp i den ena
+änden av texten du önskar att markera, flytta muspekaren till den
+andra änden och använd skiftklick (tryck med musknappen samtidigt som
+skifttangenten trycks ned) för att markera texten.
+
+För att ta bort den markerade texten kan du använda kommandot C-w
+eller välja "Klipp" (Cut) från redigeramenyn (Edit). Lägg märke till
+att dessa *inte* är likvärdiga. C-w sparar bara texten internt i Emacs
+(a`la C-k, som beskrivits tidigare), medan Klipp också lägger texten i
+X klippbord, där den är tillgänglig även för andra applikationer.
+
+För att hämta text från klippbordet kan du använda "Klistra in"
+(Paste) från redigeramenyn.
+
+Den mellersta musknappen används vanligen för att välja saker från
+skärmen. Om du till exempel går in i Info (on-line dokumentationen
+till Emacs) med C-h i eller via hjälpmenyn (Help), kan du följa
+länkarna genom att trycka med den mellersta musknappen. Om du skriver
+in ett filnamn (till exempel efter C-x C-f) och trycker TAB för att få
+fram en fillistning, så kan du avsluta filnamnet genom att trycka ned
+den mellersta musknappen på filnamnet.
+
+Genom att trycka med höger musknapp kan du få fram en popupmeny.
+Innehållet i den menyn är beroende av vilket läge du är i och
+vanligtvis innehåller den några av de mest använda kommandona så att
+de blir lätt tillgängliga.
+
+>> Tryck på höger musknapp nu.
+
+Du måste hålla knappen nere för att menyn skall visas.
+
+
+* UTVIDGNING AV KOMMANDOMÄNGDEN
+-------------------------------
+
+Det finns mycket fler Emacs-kommandon än antalet KONTROLL- eller
+META-tangenter. För att komma förbi denna begränsning har Emacs ett
+"X"- (eXtend) kommando. Detta finns i två varianter:
+
+        C-x     Tecken-utvidgning. Följs av ett tecken.
+        M-x     Namngiven kommandoutvidgning. Följs av ett
+                kommandonamn.
+
+Detta är kommandon som är bra att ha men används mer sällan än de
+kommandon du redan har lärt dig. Du har redan sett två av dem, C-x C-f
+för finn, och C-x C-s för spara. Ett annat exempel är kommandot för
+att avsluta Emacs som är C-x C-c. Var inte rädd för att förlora
+förändringar du har gjort. C-x C-c erbjuder dig att spara förändringar
+innan Emacs avslutas.
+
+C-z är kommandot för att avsluta Emacs *tillfälligt* så att du kan
+återvända till samma Emacs senare.
+
+På system som tillåter det kommer C-z suspendera Emacs, dvs. returnera
+till kommandoraden utan att avsluta Emacs. I de flesta system kan du få
+tillbaka Emacs med kommandot 'fg' eller '%emacs'.
+
+På system som saknar suspendering startar C-z ett skal som kör under
+Emacs och som ger dig chansen till att köra andra program och sedan
+återgå till Emacs efteråt. Den ger ingen riktig avslutning av Emacs. I
+detta fall återvänder man vanligtvis till Emacs med kommandot 'exit'.
+
+C-x C-c används när du skall avsluta Emacs. Det är klokt att avsluta
+Emacs om den har startats av ett mail-program eller andra
+applikationer eftersom det inte är säkert att de kan hantera
+suspendering av Emacs. Under normala omständigheter, om du inte har
+tänkt att logga ut, är det bättre att suspendera Emacs med C-z
+istället för att avsluta.
+
+Det finns många C-x kommandon. Här är en lista över de du har lärt dig
+hittills:
+
+	C-x C-f		Finn fil.
+	C-x C-s		Spara fil.
+	C-x C-b		Lista buffertar.
+	C-x C-c		Avsluta Emacs.
+	C-x 1		Ta bort alla utom ett fönster.
+	C-x u		Ångra.
+
+Namngivna utvidgade kommandon är kommandon som används mycket sällan
+eller bara i vissa lägen. Ett exempel på ett sådant kommando är
+replace-string, som globalt ersätter en teckensträng med en annan. När
+du skriver M-x kommer Emacs visa en prompt nederst i skärmbilden med
+M-x där du skall skriva in kommandot du önskar att köra, i det här
+fallet "replace-string". Det är bara att skriva "repl s<TAB>" och
+Emacs kommer då att fylla i kommandonamnet. (<TAB> är
+tabulatortangenten, som vanligtvis finns över CapsLock- eller
+skifttangenten nära den vänstra kanten på tangentbordet.) Avsluta
+kommandot med <Return>.
+
+Kommandot replace-string kräver två argument, teckensträngen som skall
+ersättas och teckensträngen som den skall ersättas med. Du måste
+avsluta bägge argumenten med <Return>.
+
+>> Flytta markören till den blanka raden två rader under denna rad.
+   Skriv M-x repl s<Return>förändrad<Return>ändrad<Return>.
+
+   Lägg märke till hur den här raden har blivit förändrad. Du har
+   ersatt ordet f-ö-r-ä-n-d-r-a-d med "ändrad" på alla platser där
+   ordet förekom, från markören och nedåt.
+
+
+* SPARAUTOMATIK
+---------------
+
+När du har gjort förändringar i en fil men inte sparat den, så kommer
+ändringarna att gå förlorade om maskinen kraschar. Som ett skydd mot
+detta sparar Emacs periodiskt ändringarna i en autosparfil för varje
+fil du redigerar. Denna fil har ett # i början och slutet av
+filnamnet. Om du till exempel har en fil med namnet "hej.c" så kommer
+namnet på autosparfilen bli "#hej.c#". När du sparar filen på vanlig
+sätt kommer Emacs radera autosparfilen.
+
+Om maskinen kraschar kan du återfå dina automatiskt sparade ändringar
+genom att finna filen på vanlig sätt (filen du redigerade, inte
+autosparfilen) och skriva M-x recover-file<Return>. När Emacs vill ha
+bekräftelse svarar du yes<Return> för att återställa filen.
+
+
+* EKOOMRÅDE
+-----------
+
+Om Emacs ser att du skriver kommandon långsamt så kommer de att visas
+på den nedersta raden i skärmbilden i ett område som kallas
+"ekoområde" (echo area). Detta område innehåller den nedersta raden på
+skärmbilden.
+
+
+* LÄGESRADEN
+------------
+
+Raden precis över ekoområdet kallas "lägesrad" (modeline). Den ser
+ungefär ut så här:
+
+--:**  TUTORIAL          (Fundamental)--L670--58%----------------
+
+Raden innehåller information om Emacs och texten du redigerar.
+
+Du vet redan vad filnamnet betyder, det är den fil du har funnit.
+-NN%-- visar den aktuella positionen i texten, dvs. NN procent av
+texten befinner sig över toppen av skärmbilden. Om toppen av filen är
+i skärmbilden kommer det stå --Top-- istället för --00%-- och om
+slutet av filen är i skärmbilden kommer det stå --Bot--. Om du ser på
+en fil där hela texten passar in på en sida kommer det stå --All--.
+
+Bokstaven L följd av siffror anger positionen på ett annat
+sätt. Siffrorna visar vilken rad som markören befinner sig på.
+
+Stjärnorna nära början av raden visar att det har skett förändringar i
+filen sedan den sist blev sparad. När du precis har öppnat en fil
+kommer det inte stå något här, bara minustecken.
+
+Den del av lägesraden som står inom parentes visar vilket
+redigeringsläge (mode) du använder. Standardläget är "Fundamental",
+som du använder nu. Det är ett exempel på ett huvudläge (major mode).
+
+Emacs har många olika huvudlägen. Några av dem är gjorda för
+redigering av olika programmeringsspråk eller typer av text, till
+exempel Lisp mode och Text mode. Det kan bara vara ett huvudläge åt
+gången och lägesnamnet står alltid där det står Fundamental nu.
+
+Varje huvudläge gör att en del kommandon uppför sig annorlunda. Det
+finns till exempel kommandon för att sätta in kommentarer i programkod
+och eftersom varje programmeringsspråk har sitt sätt att skriva
+kommentarer på så måste de olika huvudlägena sätta in dessa
+kommentarer på olika sätt. Varje huvudläge namnger ett utvidgat
+kommando som används för att byte till det läget. Till exempel är M-x
+fundamental-mode kommandot för att byta till huvudläget Fundamental.
+
+Om du skall redigera text, såsom den här filen, bör du troligen
+använda Text-läge.
+
+>> Skriv M-x text mode<Return>.
+
+Inget av kommandona du har lärt dig hittills förändrar Emacs i någon
+högre grad. Men lägg märke till att M-f och M-b nu behandlar
+apostrofer som en del av ord. Tidigare, i Fundamental mode, behandlade
+M-f och M-b apostrofer som ordavskiljare.
+
+Varje huvudläge gör vanligtvis små förändringar som denna och de flesta
+kommandon gör samma sak i varje huvudläge, de fungerar bara lite
+annorlunda.
+
+För att få fram dokumentationen för det läge du är i nu kan du skriva
+C-h m.
+
+>> Använd C-u C-v så att denna rad kommer nära toppen av
+   skärmbilden.
+>> Skriv C-h m och se hur Text-läget skiljer sig från
+   Fundamental-läget.
+>> Tryck q för att ta bort dokumentationen från skärmbilden.
+
+Huvudläge kallas så för att det även finns sidolägen (minor mode).
+Ett sidoläge ersätter inte ett huvudläge, utan modifierar det. Varje
+sidoläge kan stängas av och på oberoende av andra sidolägen och
+oberoende av huvudläget. Därför kan du använda ett sidoläge, en
+kombination av flera sidolägen eller inget sidoläge alls.
+
+Ett bra sidoläge, speciellt för redigering av text, är
+radbrytningsläget (auto-fill-mode). När detta läge är på bryter Emacs
+rader mellan ord automatisk när du skriver in text så att en rad blir
+för lång.
+
+Du kan slå på radbrytningsläget genom att skriva M-x auto fill
+mode<Return>. När läget är påslaget kan du slå av det igen genom att
+upprepa M-x auto fill mode<Return>. Om läget är avslaget slår
+kommandot på det och vice versa. Vi säger att kommandot "växlar
+läget".
+
+>> Skriv M-x auto fill mode<Return> nu. Skriv så in en rad med
+   "asdf " tills raden delar sig. Du måste sätta in blanktecken, för
+   Auto Fill bryter bara raden mellan ord.
+
+Marginalen är vanligtvis satt till 70 tecken men du kan ändra detta
+genom att använda kommandot C-x f. Antalet tecken ges till kommandot
+genom ett numeriskt argument.
+
+>> Skriv C-x f med ett argument på 20. (C-u 2 0 C-x f). Skriv sedan in
+   någon text och lägg märke till att Emacs bryter rader som är längre
+   än 20 tecken. Sätt tillbaka marginalen till 70 tecken igen, genom
+   att använda C-x f en gång till.
+
+Om du gör förändringar mitt i en rad så kommer inte sidoläget Auto
+Fill att kunna omformattera raderna för dig. 
+För att göra detta kan du trycka M-q med markören inne i det avsnittet
+du önskar att omformatera.
+
+>> Flytta markören in i föregående stycke och tryck M-q.
+
+
+* SÖKNING
+---------
+
+Emacs kan söka efter textsträngar (grupper med sammanhängande
+bokstäver eller ord) antingen framåt eller bakåt i texten. När du
+söker efter text kommer markören att flytta sig till nästa plats där
+teckensträngen uppträder.
+
+Sökmetoden i Emacs skiljer sig lite från sökmetoder i andra
+redigeringsprogram genom att den är inkrementell. Detta betyder att
+sökandet fortgår medan du skriver in teckensträngen du skall söka
+efter.
+
+Kommandot för att inleda en sökning är C-s för att söka framåt och C-r
+för att söka bakåt. MEN VÄNTA! Prova dem inte än.
+
+När du skriver C-s kommer du lägga märke till att texten "I-search"
+dyker upp i eko-området. Detta säger dig att Emacs är inne i sidoläget
+inkrementell sökning och väntar på att du skall skriva in det du letar
+efter. <Return> avslutar sökandet.
+
+>> Skriv nu C-s för att starta en sökning. Skriv nu långsamt, en
+   bokstav i taget, ordet 'markör', och gör en paus efter varje gång
+   du skriver en bokstav så att du ser vad som sker med markören. Nu
+   har du sökt efter ordet "markör" en gång.
+>> Skriv C-s en gång till för att söka efter nästa förekomst av ordet
+   "markör".
+>> Tryck nu på <Delete> fyra gånger och se hur markören flyttar sig
+>> Tryck <Return> för att avsluta sökandet.
+
+Såg du vad som hände? Under inkrementell sökning försöker Emacs att gå
+till den första förekomsten av texten som du har skrivit så långt, och
+markerar träffen så att du ser var den är. För att gå till nästa
+förekomst av ordet 'markör' är det bara att trycka C-s en gång till.
+Om det inte finns flera förekomster kommer Emacs att pipa och meddela
+att sökandet har misslyckats. C-g avbryter också sökandet.
+
+Observera: På vissa system gör C-s att skärmen låser sig. Detta tyder
+på att systemets flödeskontroll har fångat upp C-s och inte skickat
+den vidare till Emacs. För att fortsätta måste du trycka C-q. Se i så
+fall avsnittet "Spontaneous Entry to Incremental Search" i
+Emacs-manualen för råd om hur detta kan undvikas.
+
+Om du är inne i en inkrementell sökning och trycker <Delete> kommer du
+lägga märke till att den sista bokstaven i söksträngen blir raderad
+och sökandet hoppar tillbaka till en tidigare förekomst. Om du till
+exempel skriver "m" för att söka efter den första förekomsten av "m",
+och sedan trycker "a" så kommer markören flytta sig till första
+förekomsten av "ma". Tryck nu <Delete>. Detta avlägsnar "a" från
+söksträngen, och markören flyttar sig tillbaka till den första
+förekomsten av "m".
+
+Om du är mitt i en sökning och trycker ett KONTROLL- eller META-tecken
+så avbryts sökandet. Undantag är tecken som används under sökningen,
+så som C-s och C-r.
+
+C-s startar en sökning som letar efter varje förekomst av söksträngen
+EFTER markörspositionen. Om du skall söka efter en sträng tidigare i
+texten måste du använda C-r. Allt vi har sagt om C-s gäller också för
+C-r, bortsett från att riktningen på sökningen är den omvända.
+
+
+* FLERA FÖNSTER
+---------------
+
+En av egenskaperna hos Emacs är att den kan visa mera än en buffert på
+skärmen samtidig.
+
+>> Flytta markören till den här raden och tryck C-u 0 C-l (alltså
+   KONTROLL-L, inte KONTROLL-1).
+
+>> Skriv nu C-x 2, som leder till att skärmen delas i två
+   fönster. Bägge fönstren visar den här vägledningen. Markören står i
+   det övre fönstret.
+
+>> Skriv C-M-v för att rulla det nedre fönstret.
+   (Om du inte har META-tangenten trycker du ESC C-v.)
+
+>> Skriv C-x o (o för other) för att flytta markören till det
+   nedre fönstret.
+
+>> Använd C-v och M-v i det nedre fönstret för att flytta upp 
+   och ned i texten. Fortsätt att läsa den här texten i det övre
+   fönstret.
+
+>> Skriv C-x o igen för att flytta markören tillbaka till det övre
+   fönstret. Markören i det övre fönstret står på samma plats som det
+   gjorde när du lämnade det.
+
+Du kan fortsätta att använda C-x o för att byta mellan de två
+fönstren. Vart och ett av fönstren har sin egen markörposition men det
+är bara ett av fönstren som visar den. Alla redigeringskommandon
+fungerar i det fönster där markören är synlig. Vi kallar detta fönster
+för det valda fönstret (selected window).
+
+Kommandot C-M-v är bra när du redigerar text i ett fönster och
+använder det andra fönstret för referenser. Då kan du kan ha markören
+i samma fönster hela tiden och du kan använda C-M-v för att flytta dig
+i det andra fönstret.
+
+C-M-v är ett exempel på en KONTROLL-META-kombination. Om du har
+META-tangenten håller du både KONTROLL och META nedtryckt samtidigt
+som du trycker v. Det har ingen betydelse vilken av tangenterna
+KONTROLL och META som trycks först, för bägge fungerar så att de
+"modifierar" de andra tangenterna du trycker.
+
+Om du inte har META-tangenten och använder ESC istället är
+ordningsföljden viktig. Du måste trycka ESC följt av KONTROLL-v,
+KONTROLL-ESC v fungerar inte. Det är för att ESC är ett tecken i sig
+och inte en äkta "modifierare".
+
+>> Skriv C-x 1 i det övre fönstret för att bli kvitt det nedre
+   fönstret.
+
+Om du hade skrivit C-x 1 i det nedre fönstret skulle det övre ha
+försvunnit. Tänk på detta kommando som "Behåll bara ett fönster, det
+som markören står i."
+
+Du måste inte ha samma buffert i bägge fönstren. Du kan använda C-x
+C-f för att finna en ny fil i ett av fönstren samtidigt som det andra
+fönstret förblir oförändrat. Du kommer att märka att fönstren är helt
+oberoende.
+
+Här är ett annat sätt att använda två fönster till att visa två olika
+filer:
+
+>> Skriv C-x 4 C-f följt av ett filnamn. Avsluta med <Return>.
+   Den nya filen kommer då att dyka upp i det nedre fönstret.
+   Markören flyttats också dit.
+
+>> Skriv C-x o för att gå tillbaka till det övre fönstret och C-x
+   1 för att bli kvitt det nedre igen.
+
+
+* REKURSIVA REDIGERINGSNIVÅER
+-----------------------------
+
+Ibland kan du hamna i något som kallas "rekursiv redigering"
+(recursive editing level). Detta indikeras med hakparenteser runt
+huvudläget i lägesraden. Till exempel kan det stå [(Fundamental)]
+istället för (Fundamental).
+
+För att komma ur rekursiv redigering trycker du ESC ESC ESC. Detta är
+ett generellt brytkommando. Du kan också använda det för att bli kvitt
+extra fönster och för att komma ut ur minibufferten.
+
+>> Skriv M-x för att komma in i minibufferten. Skriv så ESC ESC ESC
+   för att komma ut.
+
+Du kan inte använda C-g för att komma ut ur rekursiv redigering.
+Detta är för att C-g används för att avbryta kommandon och argument
+under rekursiv redigering.
+
+
+* MER HJÄLP
+-----------
+
+I denna vägledning har vi försökt inkludera precis så mycket
+information att du kan börja använda Emacs. Det finns så många
+möjligheter i Emacs att det skulle vara omöjligt att förklara alla
+här. Men du VILL säkert lära dig mer om Emacs eftersom den har många
+goda egenskaper. Emacs tillhandahåller kommandon för att läsa all
+dokumentation. Dessa hjälpkommandon startas med teckenkombinationen
+C-h.
+
+För att använda hjälpen skriver du C-h följt av ett tecken för den
+hjälp du behöver. Om du verkligen är helt villrådig kan du trycka C-h
+? för att Emacs skall visa vilken hjälp som finns tillgänglig. Om du
+har skrivit C-h och bestämmer dig för att du inte behöver ha någon
+hjälp kan du trycka C-g för att avbryta.
+
+(På vissa platser är C-h omkonfigurerad. Det är normalt ingen bra ide´,
+så du kan på goda grunder klaga hos systemadministratören. Under
+tiden, om C-h inte visar ett hjälpmeddelande längst ner på skärmen,
+kan du i stället försöka med funktionstangenten F1 eller M-x
+help<Return>.)
+
+Den mest grundläggande hjälp-funktionen är C-h c. Skriv C-h, ett "c"
+och en knappsekvens. Emacs ger då en beskrivning av kommandot.
+
+>> Skriv C-h c C-p.
+   Meddelandet skall då bli något i stil med
+
+        C-p runs the command previous-line
+
+Detta ger ett funktionsnamn. Funktionsnamnen används huvudsakligen för
+att specialanpassa och utvidga Emacs. Men eftersom funktionerna har
+beskrivande namn kan de också fungera som en enkel dokumentation,
+tillräckligt för att påminna dig om kommandon du redan lärt dig.
+
+Flerteckenskommandon, så som C-x C-s och (om du inte har META, EDIT
+eller ALT tangenten) <ESC> v, är också tillåtna efter C-h c.
+
+För att få mer information om ett kommando kan du använda C-h k
+istället för C-h c.
+
+>> Skriv C-h k C-p.
+
+Detta kommer visa funktionens dokumentation och namn i ett eget
+fönster. För att avsluta hjälpfönstret kan du trycka q. Du behöver
+inte göra det omedelbart. Du kan editera med hjälptexten som stöd för
+att först senare ta bort fönstret med q.
+
+Här är fler varianter på C-h:
+
+   C-h f        Beskriv en funktion. Du skriver in funktionsnamnet.
+
+>> Prova att skriva C-h f previous-line<Return>.
+   Detta ger den information Emacs har om funktionen
+   som implementerar kommandot C-p.
+
+   C-h a        Apropos. Listar alla funktioner och variabler som
+                innehåller söksträngen. Kommandon som startas med M-x
+                markeras med en stjärna (*) till vänster om
+                funktionsnamnet.
+
+>> Skriv C-h a newline<Return>.
+
+Detta ger en lista över alla funktioner och variabler där "newline"
+ingår i namnet. Du kan trycka <Return> eller klicka med den mellersta
+musknappen för att hitta mer information om en funktion eller
+variabel. Tryck q för att avsluta.
+
+
+* TILL SIST
+-----------
+
+Tänk på att använda C-x C-c för att avsluta Emacs permanent. För att
+tillfälligt gå till ett skal, så att du senare kan komma tillbaka
+igen, använd C-z. (Under X kommer detta att minimera Emacs.)
+
+Denna vägledningen är avsedd för nya användare, om det är något som är
+oklart duger det inte att sitta och tycka synd om sig själv -- Skicka
+ett mail och klaga!
+
+
+* KOPIERING
+-----------
+
+Denna vägledning härstammar från en hel rad Emacs-vägledningar och den
+första skrevs av Stuart Cracraft för den ursprungliga Emacs. Ben Wing
+uppdaterade vägledningen för X Windows. Martin Buchholz och Hrvoje
+Niksic lade till mer ändringar för XEmacs och Mats Lidell översatte
+den till Svenska.
+
+This version of the tutorial, like GNU Emacs, is copyrighted, and
+comes with permission to distribute copies on certain conditions:
+
+Copyright (c) 1985, 1996 Free Software Foundation
+
+   Permission is granted to anyone to make or distribute verbatim copies
+   of this document as received, in any medium, provided that the
+   copyright notice and permission notice are preserved,
+   and that the distributor grants the recipient permission
+   for further redistribution as permitted by this notice.
+
+   Permission is granted to distribute modified versions
+   of this document, or of portions of it,
+   under the above conditions, provided also that they
+   carry prominent notices stating who last altered them.
+
+The conditions for copying Emacs itself are more complex, but in the
+same spirit.  Please read the file COPYING and then do give copies of
+GNU Emacs to your friends.  Help stamp out software obstructionism
+("ownership") by using, writing, and sharing free software!
diff --text -u 'xemacs-21.4.6/etc/package-index.LATEST.pgp' 'xemacs-21.4.7/etc/package-index.LATEST.pgp'
Index: ././etc/package-index.LATEST.pgp
--- ././etc/package-index.LATEST.pgp	Mon Dec 17 14:49:04 2001
+++ ././etc/package-index.LATEST.pgp	Wed May  1 01:05:17 2002
@@ -1,43 +1,153 @@
 ;; Package Index file -- Do not edit manually.
 ;;;@@@
 (package-get-update-base-entry (quote
-(clearcase
-  (standards-version 1.0
-   version "1.00"
-   author-version "21.5b3"
-   date "2001-12-09"
-   build-date "2001-12-10"
-   maintainer "Adrian Aichner <adrian@xemacs.org>"
+(xslide
+  (standards-version 1.1
+   version "1.01"
+   author-version "0.2"
+   date "2002-03-25"
+   build-date "2002-03-26"
+   maintainer "Ville Skyttä <ville.skytta@xemacs.org>"
    distribution xemacs
-   priority low
+   priority medium
    category "standard"
    dump nil
-   description "New Clearcase Version Control for XEmacs (UNIX, Windows)."
-   filename "clearcase-1.00-pkg.tar.gz"
-   md5sum "6ae8f1896b97f90a94a6391beeb6f018"
-   size 88185
-   provides (clearcase)
-   requires (dired fsf-compat mail-lib xemacs-base)
+   description "XSL editing support."
+   filename "xslide-1.01-pkg.tar.gz"
+   md5sum "8f23eb3d45f7c2ca2f6024c3771a6d80"
+   size 35451
+   provides (xslide-abbrev xslide-data xslide-font xslide-process xslide)
+   requires (ispell mail-lib xemacs-base)
    type regular
 ))
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
-(tramp
+(liece
+  (standards-version 1.1
+   version "1.02"
+   author-version "1.4.7"
+   date "2002-03-27"
+   build-date "2002-03-27"
+   maintainer "Daiki Ueno <ueno@unixuser.org>"
+   distribution xemacs
+   priority high
+   category "standard"
+   dump nil
+   description "IRC (Internet Relay Chat) client for Emacs."
+   filename "liece-1.02-pkg.tar.gz"
+   md5sum "7c899f30aa09060a654293ea34cc69a2"
+   size 197898
+   provides (liece-xemacs gettext liece-clfns liece-handler liece-compat liece-version liece-vars liece-globals liece-inlines liece-filter liece-coding liece-dcc liece-menu liece-000 liece-200 liece-300 liece-400 liece-500 liece-nick liece-channel liece-commands liece-ctcp liece-q-el liece-message liece-handle liece-hilit liece-intl liece-mail liece-minibuf liece-misc liece-tcp liece-url liece-x-face liece-window liece)
+   requires (apel mail-lib fsf-compat xemacs-base)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(latin-unity
+  (standards-version 1.1
+   version "1.02"
+   author-version "1.02"
+   date "2002-03-27"
+   build-date "2002-03-27"
+   maintainer "Stephen J. Turnbull <stephen@xemacs.org>"
+   distribution mule
+   priority high
+   category "mule"
+   dump nil
+   description "MULE: find single ISO 8859 character set to encode a buffer."
+   filename "latin-unity-1.02-pkg.tar.gz"
+   md5sum "a805ae51271723aa4bf50b43e24d197f"
+   size 84953
+   provides (latin-unity latin-unity-tables latin-unity-utils)
+   requires (mule-base mule-ucs leim fsf-compat)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(mmm-mode
   (standards-version 1.1
    version "1.00"
-   author-version "2.46"
-   date "2001-12-08"
-   build-date "2001-12-08"
+   author-version "0.4.7"
+   date "2002-02-24"
+   build-date "2002-02-28"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution xemacs
+   priority medium
+   category "standard"
+   dump nil
+   description "Multiple major modes in a single buffer"
+   filename "mmm-mode-1.00-pkg.tar.gz"
+   md5sum "c07c752ffd029d9a430c2fb118127e88"
+   size 176080
+   provides (mmm-auto mmm-class mmm-cmds mmm-compat mmm-mason mmm-mode mmm-region mmm-rpm mmm-sample mmm-univ mmm-utils mmm-vars)
+   requires (xemacs-base fsf-compat )
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(ibuffer
+  (standards-version 1.1
+   version "1.04"
+   author-version "21.5b5"
+   date "2002-03-25"
+   build-date "2002-03-25"
+   maintainer "John Paul Wallington <jpw@shootybangbang.com>"
+   distribution xemacs
+   priority medium
+   category "standard"
+   dump nil
+   description "Advanced replacement for buffer-menu"
+   filename "ibuffer-1.04-pkg.tar.gz"
+   md5sum "318cb38fcc9f27227ae147327e924d73"
+   size 78461
+   provides (ibuf-ext ibuf-macs ibuffer)
+   requires (ibuffer xemacs-base)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(xemacs-base
+  (standards-version 1.1
+   version "1.61"
+   author-version "21.5b5"
+   date "2002-03-27"
+   build-date "2002-03-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
+   priority high
+   category "standard"
+   dump nil
+   description "Fundamental XEmacs support, you almost certainly need this."
+   filename "xemacs-base-1.61-pkg.tar.gz"
+   md5sum "f6e0bb7401bfce2d5a670c352b2376bb"
+   size 457628
+   provides (add-log advice-preload 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 passwd pp regexp-opt regi ring shell skeleton sort thing time-stamp timezone tq xbm-button xpm-button)
+   requires ()
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(tramp
+  (standards-version 1.1
+   version "1.04"
+   author-version "2002-02-18"
+   date "2002-03-25"
+   build-date "2002-03-26"
+   maintainer "Kai Großjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE>"
+   distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Remote shell-based file editing."
-   filename "tramp-1.00-pkg.tar.gz"
-   md5sum "31d4925445293ad091381218fc9e10fa"
-   size 130274
+   filename "tramp-1.04-pkg.tar.gz"
+   md5sum "76d676178f448ba174e74a964d1dbfaf"
+   size 135053
    provides (tramp tramp-util tramp-vc trampcache)
    requires (tramp xemacs-base vc fsf-compat efs dired mail-lib gnus)
    type regular
@@ -45,21 +155,263 @@
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
+(text-modes
+  (standards-version 1.1
+   version "1.40"
+   author-version "21.5b5"
+   date "2002-03-25"
+   build-date "2002-03-25"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution xemacs
+   priority high
+   category "standard"
+   dump nil
+   description "Miscellaneous support for editing text files."
+   filename "text-modes-1.40-pkg.tar.gz"
+   md5sum "add592d9c4166ae6d46f0f49d1934f85"
+   size 271468
+   provides (ansi-color autoinsert crontab-edit filladapt flyspell folding fold-isearch hexl htmlize image-mode iso-acc iso-ascii iso-cvt iso-insert iso-swed rtf-support swedish tabify whitespace-mode winmgr-mode xpm-mode xrdb-mode)
+   requires (ispell fsf-compat xemacs-base)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(pcl-cvs
+  (standards-version 1.1
+   version "1.60"
+   author-version "R-2_9_9"
+   date "2002-03-25"
+   build-date "2002-03-25"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution xemacs
+   priority low
+   category "standard"
+   dump nil
+   description "CVS frontend."
+   filename "pcl-cvs-1.60-pkg.tar.gz"
+   md5sum "d9927da2c1602b6e1797ca64b9974164"
+   size 163055
+   provides (cvs-compat cvs-edit cvs-log cvs-status easy-mmode pcl-cvs-defs pcl-cvs-info pcl-cvs-parse pcl-cvs-util pcl-cvs)
+   requires (xemacs-base elib vc dired edebug ediff edit-utils mail-lib prog-modes)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(mail-lib
+  (standards-version 1.1
+   version "1.44"
+   author-version "21.5b5"
+   date "2002-03-25"
+   build-date "2002-03-25"
+   maintainer "Simon Josefsson <simon@josefsson.org>"
+   distribution xemacs
+   priority medium
+   category "standard"
+   dump nil
+   description "Fundamental lisp files for providing email support."
+   filename "mail-lib-1.44-pkg.tar.gz"
+   md5sum "8b45218d6c18a7bebcfce5c82ef47356"
+   size 183119
+   provides (base64 browse-url-xemacs browse-url highlight-headers mail-abbrevs mail-extr mail-utils mailheader pop3 reporter rfc2104 rfc822 rmail rmail-mini rmailout sendmail smtpmail starttls)
+   requires (eterm xemacs-base)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(jde
+  (standards-version 1.1
+   version "1.34"
+   author-version "2.2.8"
+   date "2002-03-28"
+   build-date "2002-03-28"
+   maintainer "Paul Kinnucan <paulk@mathworks.com>"
+   distribution xemacs
+   priority medium
+   category "standard"
+   dump nil
+   description "Java language and development support."
+   filename "jde-1.34-pkg.tar.gz"
+   md5sum "b72427bec9bd028931e4893a0a91dbdb"
+   size 1635561
+   provides (jde)
+   requires (jde cc-mode semantic debug speedbar edit-utils eterm mail-lib xemacs-base xemacs-devel eieio elib sh-script)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(fsf-compat
+  (standards-version 1.1
+   version "1.11"
+   author-version "21.5b5"
+   date "2002-03-25"
+   build-date "2002-03-25"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution xemacs
+   priority high
+   category "standard"
+   dump nil
+   description "FSF Emacs compatibility files."
+   filename "fsf-compat-1.11-pkg.tar.gz"
+   md5sum "5616165f4aa5bf4a45982e9185851d22"
+   size 21263
+   provides (overlay thingatpt timer x-popup-menu)
+   requires (xemacs-base)
+   type single
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(edit-utils
+  (standards-version 1.1
+   version "1.82"
+   author-version "21.5b5"
+   date "2002-03-25"
+   build-date "2002-03-25"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution xemacs
+   priority high
+   category "standard"
+   dump nil
+   description "Miscellaneous editor extensions, you probably need this."
+   filename "edit-utils-1.82-pkg.tar.gz"
+   md5sum "0d37ebd1f1841c864809c7486d1dc47b"
+   size 649444
+   provides (abbrevlist after-save-commands 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 makesum man mic-paren paren mode-motion+ outl-mouse outln-18 page-ext blink-paren paren permanent-buffers popper power-macros recent-files redo reportmail resume rsz-minibuf saveconf savehist saveplace scroll-in-place setnu shell-font tempo toolbar-utils tree-menu uniquify vertical-mode where-was-i-db winring)
+   requires (xemacs-base fsf-compat dired mail-lib)
+   type single
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(skk
+  (standards-version 1.1
+   version "1.21"
+   author-version "10.62a"
+   date "2002-01-26"
+   build-date "2002-01-27"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution mule
+   priority medium
+   category "mule"
+   dump nil
+   description "MULE: Japanese Language Input Method."
+   filename "skk-1.21-pkg.tar.gz"
+   md5sum "9552a22b8f1cb3c4fb79c7a182f46e2b"
+   size 1504736
+   provides (skk-auto skk-comp skk-cursor skk-develop skk-foreword skk-gadget skk-isearch skk-kakasi skk-kcode skk-leim skk-look skk-num skk-obsolete skk-server skk-tut skk-vars skk-viper skk vip)
+   requires (viper mule-base elib xemacs-base apel)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(ps-print
+  (standards-version 1.1
+   version "1.03"
+   author-version "6.5.6"
+   date "2002-02-01"
+   build-date "2002-02-13"
+   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   distribution xemacs
+   priority medium
+   category "standard"
+   dump nil
+   description "Printing functions and utilities"
+   filename "ps-print-1.03-pkg.tar.gz"
+   md5sum "b2d8db1073568d4301eb1c3a0935fa4e"
+   size 153654
+   provides (lpr ps-bdf ps-mule ps-print)
+   requires (text-modes)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(sieve
+  (standards-version 1.1
+   version "1.02"
+   author-version "21.5b5"
+   date "2002-03-25"
+   build-date "2002-03-25"
+   maintainer "Simon Josefsson <simon@josefsson.org>"
+   distribution xemacs
+   priority low
+   category "standard"
+   dump nil
+   description "Manage Sieve email filtering scripts."
+   filename "sieve-1.02-pkg.tar.gz"
+   md5sum "146231a5fe41f68ed0387ffe1846843c"
+   size 23338
+   provides (sieve sieve-mode sieve-manage)
+   requires (xemacs-base mail-lib cc-mode)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(mule-ucs
+  (standards-version 1.1
+   version "1.04"
+   author-version "0.84"
+   date "2002-03-25"
+   build-date "2002-03-25"
+   maintainer "Stephen J. Turnbull <stephen@xemacs.org>"
+   distribution mule
+   priority high
+   category "mule"
+   dump nil
+   description "MULE: Extended coding systems (including Unicode) for XEmacs."
+   filename "mule-ucs-1.04-pkg.tar.gz"
+   md5sum "08df8359e7999c60f62f6ec92cccc197"
+   size 1313726
+   provides (mccl-font mucs-ccl mucs-error mucs-type mucs mule-uni tae tbl-mg trans-util txt-tbl un-data un-define un-supple un-tools un-trbase unicode unidata utf u-cns-1 u-cns-2 u-cns-3 u-cns-4 u-cns-5 u-cns-6 u-cns-7 uascii ubig5 uetiopic ugb2312 uipa uiscii uiso8859-1 uiso8859-14 uiso8859-15 uiso8859-2 uiso8859-3 uiso8859-4 uiso8859-5 uiso8859-6 uiso8859-7 uiso8859-8 uiso8859-9 ujisx0201 ujisx0208 ujisx0212 uksc5601 usisheng usupple utibetan utis620 uviscii)
+   requires (mule-base)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(clearcase
+  (standards-version 1.0
+   version "1.03"
+   author-version "21.5b4"
+   date "2002-02-12"
+   build-date "2002-02-13"
+   maintainer "Michael Diers <mdiers@elego.de>"
+   distribution xemacs
+   priority low
+   category "standard"
+   dump nil
+   description "New Clearcase Version Control for XEmacs (UNIX, Windows)."
+   filename "clearcase-1.03-pkg.tar.gz"
+   md5sum "f77f179bbb57b496a5ca9a8199858e29"
+   size 89096
+   provides (clearcase)
+   requires (dired fsf-compat mail-lib xemacs-base)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
 (dictionary
   (standards-version 1.1
-   version "1.05"
+   version "1.08"
    author-version "1.7"
-   date "2001-12-15"
-   build-date "2001-12-16"
+   date "2002-03-25"
+   build-date "2002-03-25"
    maintainer "Torsten Hilbrich <dictionary@myrkr.in-berlin.de>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Interface to RFC2229 dictionary servers."
-   filename "dictionary-1.05-pkg.tar.gz"
-   md5sum "17b8074cee3e85f26f939a26a3848daf"
-   size 37435
+   filename "dictionary-1.08-pkg.tar.gz"
+   md5sum "908bf76c8f0e5d5463ff1282ae66f9b8"
+   size 38956
    provides (dictionary connection link)
    requires (xemacs-base)
    type regular
@@ -69,19 +421,19 @@
 (package-get-update-base-entry (quote
 (build
   (standards-version 1.0
-   version "1.03"
-   author-version "21.5b3"
-   date "2001-12-02"
-   build-date "2001-12-03"
+   version "1.05"
+   author-version "21.5b4"
+   date "2002-01-07"
+   build-date "2002-01-14"
    maintainer "Adrian Aichner <adrian@xemacs.org>"
    distribution stable
    priority low
    category "standard"
    dump nil
    description "Build XEmacs from within (UNIX, Windows)."
-   filename "build-1.03-pkg.tar.gz"
-   md5sum "beaa6b5e8731f13de47c4b5d5ef6fde4"
-   size 31341
+   filename "build-1.05-pkg.tar.gz"
+   md5sum "3d6158756a1990e92ff2ed77d6e39425"
+   size 31606
    provides (build)
    requires (xemacs-base pcl-cvs dired w3 prog-modes)
    type regular
@@ -91,19 +443,19 @@
 (package-get-update-base-entry (quote
 (xslt-process
   (standards-version 1.0
-   version "1.05"
+   version "1.06"
    author-version "1.2.1"
-   date "2001-08-25"
-   build-date "2001-08-27"
+   date "2002-01-15"
+   build-date "2002-01-15"
    maintainer "Ovidiu Predescu <ovidiu@xemacs.org>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "XSLT processing support."
-   filename "xslt-process-1.05-pkg.tar.gz"
-   md5sum "f38db5adcbff961d8b542fc5840cab22"
-   size 202235
+   filename "xslt-process-1.06-pkg.tar.gz"
+   md5sum "29c91cf906a685b3197bc4ab13d27735"
+   size 200263
    provides (xslt-process)
    requires (jde cc-mode semantic debug speedbar edit-utils eterm mail-lib xemacs-base elib eieio sh-script)
    type regular
@@ -113,48 +465,26 @@
 (package-get-update-base-entry (quote
 (eieio
   (standards-version 1.1
-   version "1.01"
+   version "1.02"
    author-version "0.16"
-   date "2001-02-20"
-   build-date "2001-02-20"
+   date "2002-01-13"
+   build-date "2002-01-14"
    maintainer "Eric Ludlam <zappo@gnu.org>"
    distribution xemacs
    priority low
-   category "libs"
+   category "standard"
    dump nil
    description "Enhanced Implementation of Emacs Interpreted Objects"
-   filename "eieio-1.01-pkg.tar.gz"
-   md5sum "936e2330f1ac6e76f437154ad60f5b0f"
-   size 136677
-   provides (eieio chart tree)
+   filename "eieio-1.02-pkg.tar.gz"
+   md5sum "ab05fadf432fb733fcae6b6517741902"
+   size 136679
+   provides (call-tree chart compare-strings eieio-base eieio-comp eieio-custom eieio-doc eieio-opt eieio-speedbar eieio-tests eieio tree)
    requires (eieio speedbar xemacs-base )
    type regular
 ))
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
-(skk
-  (standards-version 1.1
-   version "1.19"
-   author-version "10.62a"
-   date "2001-06-18"
-   build-date "2001-07-02"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution mule
-   priority medium
-   category "mule"
-   dump nil
-   description "MULE: Japanese Language Input Method."
-   filename "skk-1.19-pkg.tar.gz"
-   md5sum "1655024ec7091ec05558062e7344a93f"
-   size 1505369
-   provides (skk skk-tut)
-   requires (viper mule-base elib xemacs-base apel)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
 (egg-its
   (standards-version 1.1
    version "1.26"
@@ -179,19 +509,19 @@
 (package-get-update-base-entry (quote
 (edict
   (standards-version 1.1
-   version "1.12"
-   author-version "0.9.8"
-   date "2000-11-08"
-   build-date "2001-01-15"
-   maintainer "Stephen J. Turnbull <turnbull@sk.tsukuba.ac.jp>"
+   version "1.13"
+   author-version "0.9.9"
+   date "2002-01-30"
+   build-date "2002-02-13"
+   maintainer "Stephen J. Turnbull <stephen@xemacs.org>"
    distribution mule
    priority high
    category "mule"
    dump nil
    description "MULE: Lisp Interface to EDICT, Kanji Dictionary"
-   filename "edict-1.12-pkg.tar.gz"
-   md5sum "ac774d2ae02fe32de755e758af5dac11"
-   size 71792
+   filename "edict-1.13-pkg.tar.gz"
+   md5sum "ceef82c336de553e504aa3d216fbd366"
+   size 95541
    provides (dui-registry dui edict-edit edict-english edict-japanese edict-morphology edict-test edict ts-mode)
    requires (mule-base xemacs-base)
    type regular
@@ -201,20 +531,20 @@
 (package-get-update-base-entry (quote
 (lookup
   (standards-version 1.1
-   version "1.08"
+   version "1.10"
    author-version "1.0"
-   date "2001-01-14"
-   build-date "2001-07-02"
+   date "2002-03-25"
+   build-date "2002-03-25"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution mule
    priority high
    category "mule"
    dump nil
    description "MULE: Dictionary support"
-   filename "lookup-1.08-pkg.tar.gz"
-   md5sum "49e7d04e5a9f85f060365433cd45f31d"
-   size 214238
-   provides (lookup)
+   filename "lookup-1.10-pkg.tar.gz"
+   md5sum "e3938ad866de0a22df8cc1042ddb62f3"
+   size 214515
+   provides (evi-mule evi lookup-content lookup-defs lookup-entry lookup-select lookup-package lookup-select lookup-types lookup-utils lookup-vars lookup-vse lookup ndcookie ndeb ndic ndict ndkks ndmisc ndnmz ndspell ndsrd ndtp sdicf stem)
    requires (mule-base cookie lookup)
    type regular
 ))
@@ -317,37 +647,15 @@
    build-date "2001-01-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
-   priority medium
-   category "oa"
-   dump nil
-   description "Display time & date on the modeline."
-   filename "time-1.11-pkg.tar.gz"
-   md5sum "93ca34fe3275dc3ef5b8fd4c6824551d"
-   size 19983
-   provides (time)
-   requires (xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(text-modes
-  (standards-version 1.1
-   version "1.32"
-   author-version "21.5b1"
-   date "2001-07-18"
-   build-date "2001-07-21"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority high
-   category "standard"
+   priority medium
+   category "oa"
    dump nil
-   description "Miscellaneous support for editing text files."
-   filename "text-modes-1.32-pkg.tar.gz"
-   md5sum "6af333dc07f90ef72f735ae5a53da5f3"
-   size 225512
-   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)
+   description "Display time & date on the modeline."
+   filename "time-1.11-pkg.tar.gz"
+   md5sum "93ca34fe3275dc3ef5b8fd4c6824551d"
+   size 19983
+   provides (time)
+   requires (xemacs-base)
    type regular
 ))
 ))
@@ -399,20 +707,20 @@
 (package-get-update-base-entry (quote
 (psgml
   (standards-version 1.1
-   version "1.23"
+   version "1.27"
    author-version "1.22"
-   date "2001-02-18"
-   build-date "2001-02-28"
+   date "2002-02-15"
+   build-date "2002-02-23"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
-   category "oa"
+   category "standard"
    dump nil
    description "Validated HTML/SGML editing."
-   filename "psgml-1.23-pkg.tar.gz"
-   md5sum "de5bcf5e4ab559cc239ec060c0db0710"
-   size 650527
-   provides (psgml sgml)
+   filename "psgml-1.27-pkg.tar.gz"
+   md5sum "e2ee0ca808175b7904e03865fb5e9f2f"
+   size 652565
+   provides (iso-sgml psgml-api psgml-charent psgml-debug psgml-dtd psgml-edit psgml-fs psgml-html psgml-info psgml-parse psgml-xemacs psgml sgml-mode)
    requires (xemacs-base edit-utils edebug xemacs-devel mail-lib)
    type regular
 ))
@@ -421,19 +729,19 @@
 (package-get-update-base-entry (quote
 (pc
   (standards-version 1.1
-   version "1.20"
-   author-version "21.5b1"
-   date "2000-02-12"
-   build-date "2001-05-10"
+   version "1.21"
+   author-version "21.5b4"
+   date "2002-01-10"
+   build-date "2002-01-14"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
-   category "oa"
+   category "standard"
    dump nil
    description "PC style interface emulation."
-   filename "pc-1.20-pkg.tar.gz"
-   md5sum "ceab8a41e2992aebfa6efe247c6c851c"
-   size 16703
+   filename "pc-1.21-pkg.tar.gz"
+   md5sum "5e4818857e3132288c7c1d069f2aa75e"
+   size 17095
    provides (delbs fusion pc-select pending-del s-region)
    requires (xemacs-base)
    type regular
@@ -443,19 +751,19 @@
 (package-get-update-base-entry (quote
 (ispell
   (standards-version 1.1
-   version "1.23"
+   version "1.24"
    author-version "3.2"
-   date "2001-08-02"
-   build-date "2001-08-07"
+   date "2002-01-07"
+   build-date "2002-01-14"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Spell-checking with GNU ispell."
-   filename "ispell-1.23-pkg.tar.gz"
-   md5sum "d6313eaf9fd77554cd4ee2fc42b898e9"
-   size 72495
+   filename "ispell-1.24-pkg.tar.gz"
+   md5sum "409bfa4ca95d91bc03d8dcfe7c8f7810"
+   size 72543
    provides (ispell)
    requires ()
    type regular
@@ -465,20 +773,20 @@
 (package-get-update-base-entry (quote
 (hm--html-menus
   (standards-version 1.1
-   version "1.16"
+   version "1.18"
    author-version "5.9"
-   date "2000-10-05"
-   build-date "2001-01-15"
+   date "2002-03-25"
+   build-date "2002-03-25"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
-   category "oa"
+   category "standard"
    dump nil
    description "HTML editing."
-   filename "hm--html-menus-1.16-pkg.tar.gz"
-   md5sum "defc795c8c783b13599927399df7bf18"
-   size 178704
-   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)
+   filename "hm--html-menus-1.18-pkg.tar.gz"
+   md5sum "ad6c2d438e56fdc1cf0a81945f52605d"
+   size 179112
+   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 internal-drag-and-drop tmpl-minor-mode)
    requires (dired xemacs-base)
    type regular
 ))
@@ -509,19 +817,19 @@
 (package-get-update-base-entry (quote
 (forms
   (standards-version 1.1
-   version "1.13"
+   version "1.14"
    author-version "2.37"
-   date "1999-10-07"
-   build-date "2001-01-15"
+   date "2002-01-07"
+   build-date "2002-01-14"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
-   category "oa"
+   category "standard"
    dump nil
    description "Forms editing support (obsolete, use Widget instead)."
-   filename "forms-1.13-pkg.tar.gz"
-   md5sum "f18fd40a2068b851890ca59d3f1845a7"
-   size 48380
+   filename "forms-1.14-pkg.tar.gz"
+   md5sum "c6530292a349a0c567311502c2038270"
+   size 48263
    provides (forms forms-mode)
    requires ()
    type regular
@@ -531,20 +839,20 @@
 (package-get-update-base-entry (quote
 (calendar
   (standards-version 1.1
-   version "1.17"
+   version "1.18"
    author-version "21.5b3"
-   date "2001-12-10"
-   build-date "2001-12-10"
+   date "2001-12-22"
+   build-date "2001-12-22"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Calendar and diary support."
-   filename "calendar-1.17-pkg.tar.gz"
-   md5sum "8821f0209b1ecf2bdb24cddb5b480956"
-   size 252183
-   provides (appt cal-dst cal-french cal-mayan cal-x cal-xemacs calendar diary-ins diary-lib holidays lunar solar)
+   filename "calendar-1.18-pkg.tar.gz"
+   md5sum "1fbd29614f2b1b29494dc2ea3241c16a"
+   size 252308
+   provides (appt cal-china cal-coptic cal-dst cal-french cal-hebrew cal-islam cal-iso cal-japanese cal-julian cal-mayan cal-move cal-persia cal-tex cal-x cal-xemacs calendar diary-lib holidays lunar solar)
    requires (xemacs-base)
    type regular
 ))
@@ -553,20 +861,20 @@
 (package-get-update-base-entry (quote
 (calc
   (standards-version 1.1
-   version "1.17"
+   version "1.19"
    author-version "2.02fX3"
-   date "2001-07-30"
-   build-date "2001-07-31"
+   date "2002-03-25"
+   build-date "2002-03-25"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Emacs calculator"
-   filename "calc-1.17-pkg.tar.gz"
-   md5sum "96d9973ad70e2d7b8a8b9682188335ef"
-   size 1614612
-   provides (calc)
+   filename "calc-1.19-pkg.tar.gz"
+   md5sum "50adc786650be5b3c07f752a0e9481d3"
+   size 1614659
+   provides (calc-ext calc-macs calc)
    requires ()
    type regular
 ))
@@ -575,48 +883,26 @@
 (package-get-update-base-entry (quote
 (speedbar
   (standards-version 1.1
-   version "1.21"
+   version "1.23"
    author-version "0.13"
-   date "2001-07-26"
-   build-date "2001-07-28"
+   date "2002-03-25"
+   build-date "2002-03-25"
    maintainer "Eric M. Ludlam <zappo@gnu.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Provides a separate frame with convenient references."
-   filename "speedbar-1.21-pkg.tar.gz"
-   md5sum "0cc730cc05aebd7ab14ad60d5cd53065"
-   size 136610
-   provides (speedbar)
+   filename "speedbar-1.23-pkg.tar.gz"
+   md5sum "768952f9dcce464670fb4737b576dd89"
+   size 136753
+   provides (bigclock dframe rpm sb-gud sb-image sb-info sb-rmail sb-texinfo sb-w3 speedbar)
    requires (xemacs-base)
    type regular
 ))
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
-(edit-utils
-  (standards-version 1.1
-   version "1.73"
-   author-version "21.5b3"
-   date "2001-12-13"
-   build-date "2001-12-13"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority high
-   category "standard"
-   dump nil
-   description "Miscellaneous editor extensions, you probably need this."
-   filename "edit-utils-1.73-pkg.tar.gz"
-   md5sum "508d8b321a81bfc69b2ddc3ae3f49174"
-   size 697616
-   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 fsf-compat)
-   type single
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
 (pcomplete
   (standards-version 1.1
    version "1.01"
@@ -641,20 +927,20 @@
 (package-get-update-base-entry (quote
 (eshell
   (standards-version 1.1
-   version "1.01"
+   version "1.03"
    author-version "2.4.1"
-   date "2000-12-20"
-   build-date "2001-01-15"
+   date "2002-03-25"
+   build-date "2002-03-25"
    maintainer "John Wiegley <johnw@gnu.org>"
    distribution xemacs
    priority medium
-   category "os"
+   category "standard"
    dump nil
    description "Command shell implemented entirely in Emacs Lisp"
-   filename "eshell-1.01-pkg.tar.gz"
-   md5sum "71d400303baad4de19334b4693b443da"
-   size 231267
-   provides (eshell)
+   filename "eshell-1.03-pkg.tar.gz"
+   md5sum "d78600bee5b93c9dfc491bd8c03d012e"
+   size 231181
+   provides (em-alias em-banner em-basic em-cmpl em-dirs em-glob em-hist em-ls em-pred em-prompt em-rebind em-script em-smart em-term em-unix em-xtra esh-arg esh-cmd esh-ext esh-io esh-maint esh-mode esh-module esh-opt esh-proc esh-test esh-toggle esh-util esh-var eshell)
    requires (xemacs-base eterm)
    type regular
 ))
@@ -683,44 +969,22 @@
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
-(ps-print-nomule
-  (standards-version 1.1
-   version "1.05"
-   author-version "3.05x1"
-   date "2000-10-28"
-   build-date "2001-01-15"
-   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.05-pkg.tar.gz"
-   md5sum "c071d71ac89d9a540c0799fb33f40c3a"
-   size 52879
-   provides (ps-print)
-   requires (xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
 (os-utils
   (standards-version 1.1
-   version "1.25"
-   author-version "21.1"
-   date "2000-11-09"
-   build-date "2001-01-15"
+   version "1.26"
+   author-version "21.5b4"
+   date "2002-01-13"
+   build-date "2002-01-14"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
-   category "os"
+   category "standard"
    dump nil
    description "Miscellaneous O/S utilities."
-   filename "os-utils-1.25-pkg.tar.gz"
-   md5sum "e71b109e0fb81032fa664768c98b6bcc"
-   size 202651
-   provides (archive-mode background crypt crypt++ inf-lisp jka-compr lpr mchat tar-mode telnet terminal uncompress)
+   filename "os-utils-1.26-pkg.tar.gz"
+   md5sum "f347b3ea62543a6e637eaf73e6772c0a"
+   size 198764
+   provides (archive-mode background crypt++ crypt ftelnet inf-lisp jka-compr mchat rlogin ssh tar-mode telnet terminal uncompress)
    requires (xemacs-base)
    type single
 ))
@@ -729,20 +993,20 @@
 (package-get-update-base-entry (quote
 (ilisp
   (standards-version 1.1
-   version "1.19"
+   version "1.20"
    author-version "5.11.1"
-   date "2001-07-05"
-   build-date "2001-07-05"
+   date "2002-01-13"
+   build-date "2002-01-14"
    maintainer "ilisp Maintainers <ilisp@cons.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Front-end for Inferior Lisp."
-   filename "ilisp-1.19-pkg.tar.gz"
-   md5sum "c4379cdfd02c0d578e8877191d3658ff"
-   size 335570
-   provides (ilisp completer)
+   filename "ilisp-1.20-pkg.tar.gz"
+   md5sum "0ee4440213bb4cb3144af60300c3dbc9"
+   size 335386
+   provides (bridge comint-ipc comint completer ilcompat compat-fsf18 compat-fsf-19 compat-fsf-20 ilisp-chs ilisp-cl-easy-menu ilisp-ext ilisp-lw ilisp-key ilisp-menu ilisp-mnb ilisp-scheme-easy-menu ilisp il-luc19 il-luc19)
    requires (xemacs-base mail-lib fsf-compat eterm)
    type regular
 ))
@@ -795,20 +1059,20 @@
 (package-get-update-base-entry (quote
 (viper
   (standards-version 1.1
-   version "1.29"
+   version "1.33"
    author-version "3.09"
-   date "2001-10-13"
-   build-date "2001-11-26"
+   date "2002-03-25"
+   build-date "2002-03-26"
    maintainer "Michael Kifer <kifer@cs.sunysb.edu>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "VI emulation support."
-   filename "viper-1.29-pkg.tar.gz"
-   md5sum "aa4126c14967ab99fe5584ff8d1d7365"
-   size 327443
-   provides (viper)
+   filename "viper-1.33-pkg.tar.gz"
+   md5sum "68a659e67f5f9c533f76229ad3a9a1b5"
+   size 328311
+   provides (viper-cmd viper-ex viper-init viper-keym viper-macs viper-mous viper-util viper)
    requires (xemacs-base)
    type regular
 ))
@@ -883,20 +1147,20 @@
 (package-get-update-base-entry (quote
 (reftex
   (standards-version 1.1
-   version "1.23"
+   version "1.25"
    author-version "4.16"
-   date "artin@xema"
-   build-date "2001-06-14"
+   date "2002-03-25"
+   build-date "2002-03-25"
    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.23-pkg.tar.gz"
-   md5sum "418d13bcf80e929e27be7c68bf718e3c"
-   size 330411
-   provides (reftex)
+   filename "reftex-1.25-pkg.tar.gz"
+   md5sum "e044e921fe940d63e20ac5185e4bf8ca"
+   size 330512
+   provides (reftex-auc reftex-cite reftex-dcr reftex-vcr reftex-global reftex-index reftex-parse reftex-ref reftex-sel reftex-toc reftex-vars reftex)
    requires (fsf-compat xemacs-base)
    type regular
 ))
@@ -949,20 +1213,20 @@
 (package-get-update-base-entry (quote
 (auctex
   (standards-version 1.1
-   version "1.28"
+   version "1.30"
    author-version "10.0g"
-   date "2001-12-13"
-   build-date "2001-12-13"
+   date "2002-03-25"
+   build-date "2002-03-25"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "Basic TeX/LaTeX support."
-   filename "auctex-1.28-pkg.tar.gz"
-   md5sum "a159936d264c746b33776ca9ec078ee8"
-   size 385145
-   provides (auc-old bib-cite font-latex latex multi-prompt tex-buf tex-info tex-jp tex-site tex)
+   filename "auctex-1.30-pkg.tar.gz"
+   md5sum "52459679ad7e9fa4eb558c59d19e51c4"
+   size 385528
+   provides (auc-old auc-tex bib-cite font-latex latex multi-prompt tex-buf tex-info tex-jp tex-mik tex-site tex texmathp)
    requires (xemacs-base)
    type regular
 ))
@@ -971,21 +1235,21 @@
 (package-get-update-base-entry (quote
 (vhdl
   (standards-version 1.1
-   version "1.13"
+   version "1.15"
    author-version "3.31.20"
-   date "2001-02-16"
-   build-date "2001-02-18"
+   date "2002-01-13"
+   build-date "2002-01-14"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
-   category "prog"
+   category "standard"
    dump nil
    description "Support for VHDL."
-   filename "vhdl-1.13-pkg.tar.gz"
-   md5sum "76ef5bea9a7f1c5fb899306089efd0d8"
-   size 272552
+   filename "vhdl-1.15-pkg.tar.gz"
+   md5sum "3670d96619d49ae091326134aa3efc2f"
+   size 272784
    provides (vhdl-mode)
-   requires (xemacs-base edit-utils c-support speedbar ps-print-nomule os-utils)
+   requires (xemacs-base edit-utils c-support speedbar ps-print os-utils)
    type regular
 ))
 ))
@@ -993,19 +1257,19 @@
 (package-get-update-base-entry (quote
 (vc
   (standards-version 1.1
-   version "1.29"
+   version "1.30"
    author-version "21.5b3"
-   date "2001-12-03"
-   build-date "2001-12-03"
+   date "2001-12-17"
+   build-date "2001-12-17"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Version Control for Free systems."
-   filename "vc-1.29-pkg.tar.gz"
-   md5sum "2c183467360502ae808424ecb179d178"
-   size 91255
+   filename "vc-1.30-pkg.tar.gz"
+   md5sum "f62e070f0f5e04c8b9ee4ec7badaa787"
+   size 91668
    provides (vc)
    requires (dired xemacs-base vc mail-lib ediff)
    type regular
@@ -1037,19 +1301,19 @@
 (package-get-update-base-entry (quote
 (sh-script
   (standards-version 1.1
-   version "1.13"
+   version "1.14"
    author-version "2.0e"
-   date "2000-07-11"
-   build-date "2001-01-15"
+   date "2002-03-02"
+   build-date "2002-03-06"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
-   category "prog"
+   category "standard"
    dump nil
    description "Support for editing shell scripts."
-   filename "sh-script-1.13-pkg.tar.gz"
-   md5sum "d9fa57da5e44091bf31282886de25687"
-   size 35304
+   filename "sh-script-1.14-pkg.tar.gz"
+   md5sum "c8b3614f5fc4696e552d7d76806ce032"
+   size 35380
    provides (sh-script executable)
    requires (xemacs-base)
    type regular
@@ -1081,43 +1345,21 @@
 (package-get-update-base-entry (quote
 (prog-modes
   (standards-version 1.1
-   version "1.44"
-   author-version "21.5b3"
-   date "2001-12-05"
-   build-date "2001-12-10"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
+   version "1.53"
+   author-version "21.5b5"
+   date "2002-03-25"
+   build-date "2002-03-25"
+   maintainer "Ville Skyttä <ville.skytta@xemacs.org>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "Support for various programming languages."
-   filename "prog-modes-1.44-pkg.tar.gz"
-   md5sum "dbe40bbe4ec194c5ed777b0c5f1548ea"
-   size 720453
-   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 cc-mode ps-print-nomule fsf-compat edit-utils ediff emerge efs)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(jde
-  (standards-version 1.1
-   version "1.31"
-   author-version "2.2.8"
-   date "2001-10-14"
-   build-date "2001-11-26"
-   maintainer "Paul Kinnucan <paulk@mathworks.com>"
-   distribution xemacs
-   priority medium
-   category "standard"
-   dump nil
-   description "Java language and development support."
-   filename "jde-1.31-pkg.tar.gz"
-   md5sum "1013e43ea81d2cc354da2bb19f44b205"
-   size 1620042
-   provides (jde)
-   requires (jde cc-mode semantic debug speedbar edit-utils eterm mail-lib xemacs-base xemacs-devel eieio elib sh-script)
+   filename "prog-modes-1.53-pkg.tar.gz"
+   md5sum "aed44c778da85591f3c267af073f928a"
+   size 944335
+   provides (autoconf-mode awk-mode c-mode cperl-mode cvs diff-mode eiffel3 f90 fortran inf-ruby javascript-mode ksh-mode m4-mode makefile mode-compile mode-compile-kill modula2 p4 perl-mode php-mode postscript pydoc python-mode rexx-mode ruby-mode simula-mode sql tcl teco verilog-mode)
+   requires (mail-lib xemacs-devel xemacs-base cc-mode ps-print fsf-compat edit-utils ediff emerge efs vc speedbar dired ilisp)
    type regular
 ))
 ))
@@ -1125,20 +1367,20 @@
 (package-get-update-base-entry (quote
 (idlwave
   (standards-version 1.1
-   version "1.23"
+   version "1.25"
    author-version "4.7"
-   date "2000-12-08"
-   build-date "2001-01-15"
+   date "2002-03-25"
+   build-date "2002-03-25"
    maintainer "Carsten Dominik <dominik@astro.uva.nl>"
    distribution xemacs
    priority medium
-   category "prog"
+   category "standard"
    dump nil
    description "Editing and Shell mode for the Interactive Data Language"
-   filename "idlwave-1.23-pkg.tar.gz"
-   md5sum "71163a118316b2da6cff6371455dad4c"
-   size 345555
-   provides (idlwave)
+   filename "idlwave-1.25-pkg.tar.gz"
+   md5sum "e828f3c89e29306bb573b3f720582c50"
+   size 345055
+   provides (idlw-rinfo idlwave-rinfo idlw-shell idlwave-shell idlw-toolbar idlwave-toolbar idlwave)
    requires (fsf-compat xemacs-base)
    type regular
 ))
@@ -1169,20 +1411,20 @@
 (package-get-update-base-entry (quote
 (ediff
   (standards-version 1.1
-   version "1.33"
+   version "1.39"
    author-version "2.75"
-   date "2001-09-27"
-   build-date "2001-09-29"
+   date "2002-03-25"
+   build-date "2002-03-25"
    maintainer "Michael Kifer <kifer@cs.sunysb.edu>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "Interface over GNU patch."
-   filename "ediff-1.33-pkg.tar.gz"
-   md5sum "8a5b50752086adb44f7d2ec99e10d2eb"
-   size 295809
-   provides (ediff)
+   filename "ediff-1.39-pkg.tar.gz"
+   md5sum "d679f8d1a43dda8f51d6e6ba3cf24a35"
+   size 301259
+   provides (ediff-diff ediff-help ediff-hook ediff-init ediff-merg ediff-mult ediff-ptch ediff-tbar ediff-util ediff-vers ediff-wind ediff)
    requires (pcl-cvs elib dired xemacs-base edebug prog-modes)
    type regular
 ))
@@ -1255,44 +1497,22 @@
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
-(pcl-cvs
-  (standards-version 1.1
-   version "1.55"
-   author-version "R-2_9_9"
-   date "2001-06-06"
-   build-date "2001-07-15"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "CVS frontend."
-   filename "pcl-cvs-1.55-pkg.tar.gz"
-   md5sum "d4f7b40492290a31139f2233b035d3d7"
-   size 160861
-   provides (pcl-cvs generic-sc)
-   requires (xemacs-base elib vc dired edebug ediff edit-utils mail-lib prog-modes)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
 (cc-mode
   (standards-version 1.1
-   version "1.26"
+   version "1.27"
    author-version "5.28"
-   date "2001-08-13"
-   build-date "2001-08-14"
+   date "2002-01-13"
+   build-date "2002-01-14"
    maintainer "Martin Stjernholm <bug-cc-mode@gnu.org>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "C, C++ and Java language support."
-   filename "cc-mode-1.26-pkg.tar.gz"
-   md5sum "206a11ebe3e1e4639e9e3cbf681d9096"
-   size 262806
-   provides (cc-mode)
+   filename "cc-mode-1.27-pkg.tar.gz"
+   md5sum "40d0d6638b94ec0fe40f1b29df6d4efd"
+   size 262878
+   provides (cc-bytecomp cc-align cc-cmds cc-compat cc-defs cc-engine cc-guess cc-langs cc-lobotomy cc-menus cc-mode-19 cc-mode cc-styles cc-vars)
    requires (xemacs-base mail-lib)
    type regular
 ))
@@ -1301,20 +1521,20 @@
 (package-get-update-base-entry (quote
 (semantic
   (standards-version 1.1
-   version "1.10"
+   version "1.12"
    author-version "1.4beta8"
-   date "2001-08-16"
-   build-date "2001-08-16"
+   date "2002-03-25"
+   build-date "2002-03-25"
    maintainer "Eric M. Ludlam <zappo@gnu.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Semantic bovinator (Yacc/Lex for XEmacs). Includes Senator."
-   filename "semantic-1.10-pkg.tar.gz"
-   md5sum "a3806bbbd6d4cd1ebb11ed969ccc37ec"
-   size 281656
-   provides (semantic senator)
+   filename "semantic-1.12-pkg.tar.gz"
+   md5sum "45b5137c5a17528ede8a667c0219208d"
+   size 281805
+   provides (document-vars document semantic-bnf semantic-c semantic-ctxt semantic-el semantic-imenu semantic-java semantic-load semantic-make semantic-sb semantic-scm semantic-texi semantic-util semantic semanticdb senator-isearch senator sformat working)
    requires (eieio xemacs-base xemacs-devel edit-utils speedbar texinfo)
    type regular
 ))
@@ -1389,19 +1609,19 @@
 (package-get-update-base-entry (quote
 (cookie
   (standards-version 1.1
-   version "1.13"
-   author-version "21.1"
-   date "1998-04-07"
-   build-date "2001-01-15"
+   version "1.14"
+   author-version "21.5b5"
+   date "2002-03-25"
+   build-date "2002-03-25"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
-   category "games"
+   category "standard"
    dump nil
    description "Spook and Yow (Zippy quotes)."
-   filename "cookie-1.13-pkg.tar.gz"
-   md5sum "9aeaa055b157c6fa50991758851ec16d"
-   size 34192
+   filename "cookie-1.14-pkg.tar.gz"
+   md5sum "50581960785fb3949faabaae49896c32"
+   size 34543
    provides (cookie1 yow)
    requires (xemacs-base)
    type regular
@@ -1409,44 +1629,22 @@
 ))
 ;;;@@@
 (package-get-update-base-entry (quote
-(eicq
-  (standards-version 1.1
-   version "1.05"
-   author-version "0.2.14"
-   date "2001-06-06"
-   build-date "2001-07-02"
-   maintainer "Steve Youngs <youngs@xemacs.org>"
-   distribution xemacs
-   priority low
-   category "standard"
-   dump nil
-   description "ICQ Client developed and tested on Linux x86; only supported on that platform"
-   filename "eicq-1.05-pkg.tar.gz"
-   md5sum "09c41ae8e50c418bc73029a05c0694f3"
-   size 299679
-   provides (eicq eicq-toolbar eicq-report)
-   requires (xemacs-base mail-lib eicq gnus fsf-compat cookie)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
 (bbdb
   (standards-version 1.1
-   version "1.16"
-   author-version "2.32"
-   date "2001-08-29"
-   build-date "2001-09-01"
+   version "1.20"
+   author-version "2.34"
+   date "2002-03-25"
+   build-date "2002-03-25"
    maintainer "Ronan Waide <waider@waider.ie>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "The Big Brother Data Base"
-   filename "bbdb-1.16-pkg.tar.gz"
-   md5sum "076538ab2bf64b6bfbe0ce02edf51eac"
-   size 338066
-   provides (bbdb)
+   filename "bbdb-1.20-pkg.tar.gz"
+   md5sum "f5f772c6e77a6d97f53a60acb5203bf7"
+   size 373721
+   provides (bbdb-com bbdb-ftp bbdb-gnus bbdb-gui bbdb-hooks bbdb-merge bbdb-mhe bbdb-migrate bbdb-print bbdb-reportmail bbdb-rmail bbdb-sc bbdb-snarf bbdb-srv bbdb-vm bbdb-w3 bbdb-whois bbdb-xemacs bbdb)
    requires (bbdb edit-utils gnus mh-e rmail supercite vm tm apel mail-lib xemacs-base w3)
    type regular
 ))
@@ -1455,20 +1653,20 @@
 (package-get-update-base-entry (quote
 (zenirc
   (standards-version 1.1
-   version "1.11"
+   version "1.13"
    author-version "2.112"
-   date "2001-06-16"
-   build-date "2001-07-28"
+   date "2002-01-07"
+   build-date "2002-01-14"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "ZENIRC IRC Client."
-   filename "zenirc-1.11-pkg.tar.gz"
-   md5sum "ef56684bdf71cae7e15f58c3819a7ee9"
-   size 276478
-   provides (zenirc)
+   filename "zenirc-1.13-pkg.tar.gz"
+   md5sum "38200c80672a32056426ed32c09473cf"
+   size 276760
+   provides (zenirc-18 zenirc-8ball zenirc-away zenirc-bork zenirc-color zenirc-command-queue zenirc-complete zenirc-ctcp-flood zenirc-dcc zenirc-doto zenirc-fill zenirc-finnish zenirc-format zenirc-fortran zenirc-french zenirc-history zenirc-ignore zenirc-iwantop zenirc-klingon zenirc-latin zenirc-meditate zenirc-netsplit zenirc-notify zenirc-oink zenirc-ojnk zenirc-pjg zenirc-popup zenirc-random-away zenirc-random-nick zenirc-signal zenirc-stamp zenirc-swedish zenirc-trigger zenirc-yow-filter zenirc-yow zenirc)
    requires (zenirc)
    type regular
 ))
@@ -1477,20 +1675,20 @@
 (package-get-update-base-entry (quote
 (mew
   (standards-version 1.1
-   version "1.14"
+   version "1.17"
    author-version "1.94.2"
-   date "2001-02-05"
-   build-date "2001-02-05"
+   date "2002-03-25"
+   build-date "2002-03-25"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
-   category "comm"
+   category "standard"
    dump nil
    description "Messaging in an Emacs World."
-   filename "mew-1.14-pkg.tar.gz"
-   md5sum "c46627866de19034116a0c739be8e1eb"
-   size 655083
-   provides (mew)
+   filename "mew-1.17-pkg.tar.gz"
+   md5sum "03fa0583b534322d0375901796d22ec5"
+   size 654737
+   provides (mew-addrbook mew-attach mew-bq mew-cache mew-complete mew-decode mew-demo mew-draft mew-encode mew-env mew-ext mew-fib mew-func mew-header mew-highlight mew-lang-jp mew-mark mew-message mew-mime mew-minibuf mew-mule mew-mule0 mew-mule2 mew-mule3 mew-os2 mew-pgp mew-pick mew-refile mew-scan mew-sort mew-summary mew-syntax mew-temacs mew-unix mew-vars mew-virtual mew-win32 mew-xemacs mew)
    requires (mew w3 efs mail-lib xemacs-base fsf-compat)
    type regular
 ))
@@ -1499,20 +1697,20 @@
 (package-get-update-base-entry (quote
 (tm
   (standards-version 1.1
-   version "1.29"
-   author-version "21.5b2"
-   date "2001-07-31"
-   build-date "2001-07-31"
+   version "1.32"
+   author-version "21.5b5"
+   date "2002-03-27"
+   build-date "2002-03-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Emacs MIME support. Not needed for gnus >= 5.8.0"
-   filename "tm-1.29-pkg.tar.gz"
-   md5sum "ae9c106bafbfb471ceaaaf16b7acb8ac"
-   size 332928
-   provides (tm tm-edit tm-view mime-setup)
+   filename "tm-1.32-pkg.tar.gz"
+   md5sum "f4b825c093897e785ef3dc06c9e263a2"
+   size 189142
+   provides (char-util cless gnus-art-mime gnus-charset gnus-mime gnus-sum-mime latex-math-symbol mel-b mel-g mel-q mel-u mel message-mime mime-setup mu-bbdb mu-cite range sc-setup signature texi-util tl-atype tl-list tl-misc tl-num tl-seq tl-str tm-bbdb tm-def tm-edit-mc tm-edit tm-ew-d tm-ew-e tm-file tm-ftp tm-html tm-image tm-latex tm-mail tm-mh-e tm-parse tm-partial tm-pgp tm-play tm-rmail tm-setup tm-tar tm-text tm-view tm-vm tmh-comp)
    requires (gnus mh-e rmail vm mailcrypt mail-lib apel xemacs-base fsf-compat)
    type regular
 ))
@@ -1521,20 +1719,20 @@
 (package-get-update-base-entry (quote
 (gnus
   (standards-version 1.1
-   version "1.57"
+   version "1.59"
    author-version "5.8.8"
-   date "2001-08-29"
-   build-date "2001-09-01"
+   date "2002-03-25"
+   build-date "2002-03-25"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "The Gnus Newsreader and Mailreader."
-   filename "gnus-1.57-pkg.tar.gz"
-   md5sum "e0d0ffe9792aad3c28af0077b5809c07"
-   size 2350636
-   provides (gnus message)
+   filename "gnus-1.59-pkg.tar.gz"
+   md5sum "3dfb92934e1723f88a6cab69f2c97be1"
+   size 2350665
+   provides (binhex drums earcon flow-fill format-spec gnus-agent gnus-art gnus-async gnus-audio gnus-bcklg gnus-cache gnus-cite gnus-cus gnus-demon gnus-draft gnus-dup gnus-eform gnus-ems gnus-gl gnus-group gnus-int gnus-kill gnus-load gnus-logic gnus-mh gnus-ml gnus-mlspl gnus-move gnus-msg gnus-nocem gnus-picon gnus-range gnus-salt gnus-score gnus-setup gnus-soup gnus-spec gnus-srvr gnus-start gnus-sum gnus-topic gnus-undo gnus-util gnus-uu gnus-vm gnus-win gnus-xmas gnus ietf-drums imap lpath mail-parse mail-prsvr mail-source mailcap md5 message messagexmas messcompat mm-bodies mm-decode mm-encode mm-util mm-uu mm-view mml-smime mml nnagent nnbabyl nndb nndir nndoc nndraft nneething nnfolder nngateway nnheader nnheaderxm nnimap nnkiboze nnlistserv nnmail nnmbox nnmh nnml nnoo nnslashdot nnsoup nnspool nntp nnultimate nnvirtual nnwarchive nnweb nnwfm parse-time qp rfc1843 rfc2015 rfc2045 rfc2047 rfc2231 score-mode smiley smiley smime time-date utf7 uudecode vcard webmail)
    requires (gnus w3 mh-e mailcrypt rmail eterm mail-lib xemacs-base fsf-compat)
    type regular
 ))
@@ -1543,20 +1741,20 @@
 (package-get-update-base-entry (quote
 (rmail
   (standards-version 1.1
-   version "1.12"
-   author-version "21.1"
-   date "1998-06-28"
-   build-date "2001-01-15"
+   version "1.13"
+   author-version "21.5b4"
+   date "2002-01-13"
+   build-date "2002-01-14"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
-   category "comm"
+   category "standard"
    dump nil
    description "An obsolete Emacs mailer."
-   filename "rmail-1.12-pkg.tar.gz"
-   md5sum "ef29f27bfb5b7af89ae57be18b94da6f"
-   size 96401
-   provides (rmail rmailsum)
+   filename "rmail-1.13-pkg.tar.gz"
+   md5sum "4da12b01ea3735412f95edeb2a2bd0bd"
+   size 96265
+   provides (rmail-kill rmail-xemacs rmail rmailsort)
    requires (tm apel mail-lib xemacs-base)
    type regular
 ))
@@ -1565,20 +1763,20 @@
 (package-get-update-base-entry (quote
 (mailcrypt
   (standards-version 1.1
-   version "2.09"
+   version "2.11"
    author-version "3.5.6"
-   date "2001-07-01"
-   build-date "2001-07-02"
+   date "2002-01-07"
+   build-date "2002-01-14"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Support for messaging encryption with PGP."
-   filename "mailcrypt-2.09-pkg.tar.gz"
-   md5sum "34b06d81b131c89d83b1c9387e23975a"
-   size 141199
-   provides (mailcrypt)
+   filename "mailcrypt-2.11-pkg.tar.gz"
+   md5sum "ae92827caef07632a64a9a9f8589f42d"
+   size 141467
+   provides (expect mailcrypt)
    requires (mail-lib fsf-compat xemacs-base cookie gnus mh-e rmail vm)
    type regular
 ))
@@ -1587,19 +1785,19 @@
 (package-get-update-base-entry (quote
 (supercite
   (standards-version 1.1
-   version "1.18"
+   version "1.19"
    author-version "3.55x3"
-   date "2001-08-06"
-   build-date "2001-08-15"
+   date "2002-01-07"
+   build-date "2002-01-14"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "An Emacs citation tool for News & Mail messages."
-   filename "supercite-1.18-pkg.tar.gz"
-   md5sum "e19c81599495ff2a010e81f4b175b9fd"
-   size 100848
+   filename "supercite-1.19-pkg.tar.gz"
+   md5sum "8f6767ea4e03306d1e5553501ed7cd2e"
+   size 100881
    provides (supercite)
    requires (mail-lib xemacs-base)
    type regular
@@ -1609,20 +1807,20 @@
 (package-get-update-base-entry (quote
 (mh-e
   (standards-version 1.1
-   version "1.13"
-   author-version "21.1"
-   date "2000-05-08"
-   build-date "2001-01-15"
+   version "1.14"
+   author-version "21.5b4"
+   date "2002-01-13"
+   build-date "2002-01-14"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
-   category "comm"
+   category "standard"
    dump nil
    description "Front end support for MH."
-   filename "mh-e-1.13-pkg.tar.gz"
-   md5sum "213d2484432c141ba2017d437922076b"
-   size 176657
-   provides (mh-e)
+   filename "mh-e-1.14-pkg.tar.gz"
+   md5sum "fe842594b7e7c403b2f7e4ac1f37e040"
+   size 176937
+   provides (mh-comp mh-e mh-funcs mh-mime mh-pick mh-seq mh-utils)
    requires (mail-lib xemacs-base)
    type regular
 ))
@@ -1631,19 +1829,19 @@
 (package-get-update-base-entry (quote
 (gnats
   (standards-version 1.1
-   version "1.12"
+   version "1.14"
    author-version "3.101"
-   date "2000-10-05"
-   build-date "2001-01-15"
+   date "2002-03-25"
+   build-date "2002-03-25"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority high
-   category "comm"
+   category "standard"
    dump nil
    description "XEmacs bug reports."
-   filename "gnats-1.12-pkg.tar.gz"
-   md5sum "8487d89459c7be544547558d39f42945"
-   size 189342
+   filename "gnats-1.14-pkg.tar.gz"
+   md5sum "f5bcbcdb6ec241c9f22a29105b1debc9"
+   size 189561
    provides (gnats gnats-admin send-pr)
    requires (mail-lib xemacs-base)
    type regular
@@ -1653,20 +1851,20 @@
 (package-get-update-base-entry (quote
 (footnote
   (standards-version 1.1
-   version "1.13"
+   version "1.14"
    author-version "0.18x"
-   date "2000-01-22"
-   build-date "2001-01-15"
+   date "2002-02-12"
+   build-date "2002-02-13"
    maintainer "SL Baur <steve@xemacs.org>"
    distribution xemacs
    priority low
-   category "comm"
+   category "standard"
    dump nil
    description "Footnoting in mail message editing modes."
-   filename "footnote-1.13-pkg.tar.gz"
-   md5sum "23aa290969664f5edb96c79ae322759b"
-   size 21084
-   provides (footnote)
+   filename "footnote-1.14-pkg.tar.gz"
+   md5sum "0052618f7875e79c20f2024e985d39fb"
+   size 21817
+   provides (footnote-cyrillic footnote-greek footnote-han footnote-hebrew footnote-kana footnote)
    requires (mail-lib xemacs-base)
    type regular
 ))
@@ -1675,21 +1873,21 @@
 (package-get-update-base-entry (quote
 (eudc
   (standards-version 1.1
-   version "1.34"
+   version "1.36"
    author-version "1.32"
-   date "2001-07-28"
-   build-date "2001-08-20"
+   date "2002-02-13"
+   build-date "2002-02-23"
    maintainer "Oscar Figueiredo <oscar@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Emacs Unified Directory Client (LDAP, PH)."
-   filename "eudc-1.34-pkg.tar.gz"
-   md5sum "31aaecdc3bbf2660999ad8b668eb6d9d"
-   size 78955
+   filename "eudc-1.36-pkg.tar.gz"
+   md5sum "899aaa20a136715c06f35b73f97cfa71"
+   size 79111
    provides (eudc eudc-vars eudc-hotlist eudc-export eudc-bob eudcb-ldap eudcb-ph eudcb-bbdb)
-   requires (fsf-compat xemacs-base bbdb)
+   requires (fsf-compat xemacs-base bbdb mail-lib gnus)
    type regular
 ))
 ))
@@ -1697,20 +1895,20 @@
 (package-get-update-base-entry (quote
 (net-utils
   (standards-version 1.1
-   version "1.23"
-   author-version "21.5b3"
-   date "2001-09-28"
-   build-date "2001-09-29"
+   version "1.24"
+   author-version "21.5b4"
+   date "2002-02-23"
+   build-date "2002-02-23"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Miscellaneous Networking Utilities."
-   filename "net-utils-1.23-pkg.tar.gz"
-   md5sum "3677407752d20aa6f72be5d497eae0c8"
-   size 119855
-   provides (ilisp-browse-cltl2 emacsbug feedmail metamail net-utils rcompile shadowfile webjump webster-www)
+   filename "net-utils-1.24-pkg.tar.gz"
+   md5sum "316b8f852ea625d89535b75028de1c1c"
+   size 119981
+   provides (ilisp-browse-cltl2 xemacsbug feedmail metamail net-utils rcompile shadowfile webjump webster-www)
    requires (w3 efs mail-lib xemacs-base)
    type single
 ))
@@ -1719,20 +1917,20 @@
 (package-get-update-base-entry (quote
 (w3
   (standards-version 1.1
-   version "1.20"
+   version "1.22"
    author-version "4.0pre46"
-   date "2001-06-18"
-   build-date "2001-07-03"
+   date "2002-03-25"
+   build-date "2002-03-26"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority high
    category "standard"
    dump nil
    description "A Web browser."
-   filename "w3-1.20-pkg.tar.gz"
-   md5sum "d2887a223788fec1deb43ba7489cf603"
-   size 689279
-   provides (w3 url)
+   filename "w3-1.22-pkg.tar.gz"
+   md5sum "1ac52ca40fd12b250e5a639f6549f652"
+   size 689366
+   provides (css devices w3-auto dsssl-flow dsssl font images md5 mm mule-sysdp socks ssl urlauth url-cache url-cookie url-file url-gopher url-gw url-http url-ldap url-mail url-misc url-news url-ns url-parse url-vars url w3-about w3-auto w3-cfg w3-cus w3-display w3-emacs19 w3-e19 w3-e20 w3-elisp w3-emulate w3-forms w3-hot w3-hotindex w3-imap w3-java w3-jscript w3-keyword w3-latex w3-menu w3-mouse w3-parse w3-print w3-props w3-script w3-structure w3-speak w3-style w3-sysdp w3-toolbar w3-vars w3-widget w3-xemacs w3-xemac w3)
    requires (w3 mail-lib xemacs-base)
    type regular
 ))
@@ -1741,20 +1939,20 @@
 (package-get-update-base-entry (quote
 (vm
   (standards-version 1.1
-   version "7.00"
-   author-version "7.00"
-   date "2001-12-09"
-   build-date "2001-12-09"
+   version "7.03"
+   author-version "7.03"
+   date "2002-03-25"
+   build-date "2002-03-26"
    maintainer "Kyle Jones <kyle_jones@wonderworks.com>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "An Emacs mailer."
-   filename "vm-7.00-pkg.tar.gz"
-   md5sum "5cda132d6599eab758ff8623f93bad40"
-   size 699259
-   provides (vm)
+   filename "vm-7.03-pkg.tar.gz"
+   md5sum "ad490c8dacf885a28f897d93382d250b"
+   size 714118
+   provides (tapestry vm-byteopts vm-delete vm-digest vm-easymenu vm-edit vm-folder vm-imap vm-license vm-macro vm-mark vm-menu vm-message vm-mime vm-minibuf vm-misc vm-motion vm-mouse vm-page vm-pop vm-reply vm-save vm-search vm-sort vm-startup vm-summary vm-thread vm-toolbar vm-undo vm-user vm-vars vm vm-version vm-virtual vm-window)
    requires (mail-lib xemacs-base)
    type regular
 ))
@@ -1807,21 +2005,21 @@
 (package-get-update-base-entry (quote
 (xemacs-devel
   (standards-version 1.1
-   version "1.38"
-   author-version "21.5b3"
-   date "2001-09-08"
-   build-date "2001-09-11"
+   version "1.43"
+   author-version "21.5b4"
+   date "2002-03-04"
+   build-date "2002-03-06"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "Emacs Lisp developer support."
-   filename "xemacs-devel-1.38-pkg.tar.gz"
-   md5sum "ba233ed84cb2f6bb41813297b7adc988"
-   size 156662
-   provides (docref eldoc elp find-func hide-copyleft ielm regexp-opt trace)
-   requires (xemacs-base ispell mail-lib)
+   filename "xemacs-devel-1.43-pkg.tar.gz"
+   md5sum "ddbfe9135401490d5f3c2d8fd4f5ff24"
+   size 179426
+   provides (checkdoc docref eldoc elp eval-expr find-func hide-copyleft ielm patcher pp trace patch-keywords)
+   requires (xemacs-base ispell mail-lib gnus)
    type single
 ))
 ))
@@ -1851,19 +2049,19 @@
 (package-get-update-base-entry (quote
 (elib
   (standards-version 1.1
-   version "1.08"
+   version "1.10"
    author-version "1.0"
-   date "2000-10-05"
-   build-date "2001-01-15"
+   date "2002-01-07"
+   build-date "2002-01-14"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority high
-   category "libs"
+   category "standard"
    dump nil
    description "Portable Emacs Lisp utilities library."
-   filename "elib-1.08-pkg.tar.gz"
-   md5sum "dd8c626d4a2b967febe68bcaa1cd1b96"
-   size 72867
+   filename "elib-1.10-pkg.tar.gz"
+   md5sum "01deb690554da8c3f7c97e0ae170ae69"
+   size 73309
    provides (avltree bintree cookie dll elib-node queue-f queue-m read stack-f stack-m string)
    requires ()
    type single
@@ -1917,19 +2115,19 @@
 (package-get-update-base-entry (quote
 (apel
   (standards-version 1.1
-   version "1.20"
+   version "1.21"
    author-version "10.2"
-   date "2000-11-14"
-   build-date "2001-01-15"
+   date "2002-03-25"
+   build-date "2002-03-25"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority high
-   category "libs"
+   category "standard"
    dump nil
    description "A Portable Emacs Library.  Used by XEmacs MIME support."
-   filename "apel-1.20-pkg.tar.gz"
-   md5sum "0d3ac6c109783e1cc48cc4608843d6c3"
-   size 107611
+   filename "apel-1.21-pkg.tar.gz"
+   md5sum "cf0e8f72176963be1a0c0a55d70dae82"
+   size 107681
    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
@@ -1939,20 +2137,20 @@
 (package-get-update-base-entry (quote
 (efs
   (standards-version 1.0
-   version "1.26"
+   version "1.28"
    author-version "1.20pre2"
-   date "2001-06-09"
-   build-date "2001-06-14"
+   date "2002-03-25"
+   build-date "2002-03-25"
    maintainer "Mike Sperber <sperber@informatik.uni-tuebingen.de>"
    distribution stable
    priority medium
    category "standard"
    dump nil
    description "Treat files on remote systems the same as local files."
-   filename "efs-1.26-pkg.tar.gz"
-   md5sum "cecc2e953d90dd3fc3938d26fce4f0f7"
-   size 369938
-   provides (efs)
+   filename "efs-1.28-pkg.tar.gz"
+   md5sum "7622650d9c754337d7fd97c61ea8942b"
+   size 370073
+   provides (default-dir efs-auto efs-cms-knet efs-cms efs-coke efs-cp-p efs-cu efs-defun efs-dired efs-unix:dl efs-dos-distinct efs-dump efs-fnh efs-guardian efs-gwp efs-hell efs-ka9q efs-kerberos efs-mpe efs-ms-unix efs-mts efs-mvs efs-netrc efs-netware efs-nos-ve efs-ovwrt efs-pc efs-plan9 efs-report efs-ti-explorer efs-ti-twenex efs-tops-20 efs-vms efs-vos efs-x19\.15 efs)
    requires (xemacs-base dired)
    type regular
 ))
@@ -1976,72 +2174,6 @@
    size 193695
    provides (diff dired)
    requires (xemacs-base prog-modes)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(mail-lib
-  (standards-version 1.1
-   version "1.40"
-   author-version "21.5b3"
-   date "2001-11-27"
-   build-date "2001-11-28"
-   maintainer "Simon Josefsson <simon@josefsson.org>"
-   distribution xemacs
-   priority medium
-   category "standard"
-   dump nil
-   description "Fundamental lisp files for providing email support."
-   filename "mail-lib-1.40-pkg.tar.gz"
-   md5sum "9bac3da5281026155fd6fadb93efb938"
-   size 177170
-   provides (browse-url highlight-headers mail-abbrevs mail-extr mail-utils reporter rfc822 rmail-mini rmailout sendmail smtpmail)
-   requires (eterm xemacs-base)
-   type regular
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(fsf-compat
-  (standards-version 1.1
-   version "1.09"
-   author-version "21.4"
-   date "2001-04-28"
-   build-date "2001-04-28"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority high
-   category "libs"
-   dump nil
-   description "FSF Emacs compatibility files."
-   filename "fsf-compat-1.09-pkg.tar.gz"
-   md5sum "b0f33bb047d8c64020b1fa0bf35eb12e"
-   size 21096
-   provides (overlay thingatpt timer x-popup-menu)
-   requires (xemacs-base)
-   type single
-))
-))
-;;;@@@
-(package-get-update-base-entry (quote
-(xemacs-base
-  (standards-version 1.1
-   version "1.56"
-   author-version "21.5b3"
-   date "2001-12-10"
-   build-date "2001-12-10"
-   maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
-   distribution xemacs
-   priority high
-   category "standard"
-   dump nil
-   description "Fundamental XEmacs support, you almost certainly need this."
-   filename "xemacs-base-1.56-pkg.tar.gz"
-   md5sum "c619c482b36b55468f4e29d775b2f12f"
-   size 454879
-   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 tq)
-   requires ()
    type regular
 ))
 ))
diff --text -u 'xemacs-21.4.6/etc/sample.init.el' 'xemacs-21.4.7/etc/sample.init.el'
Index: ././etc/sample.init.el
--- ././etc/sample.init.el	Wed Jul 25 16:46:44 2001
+++ ././etc/sample.init.el	Sat May  4 21:07:16 2002
@@ -24,16 +24,20 @@
 ;; Boston, MA 02111-1307, USA.
 
 ;; #### to do:
-;; -- #### figure out how init.el and custom.el interact and put
-;;         documentation about it here. (perhaps it already exists
-;;         elsewhere?)
-
-;;; This is a sample init.el file.  It can be used without
-;;; modification as your init.el or .emacs.  In older versions of
-;;; XEmacs, this file was called .emacs and placed in your home
-;;; directory. (Under MS Windows, that directory is controlled by the
-;;; HOME environment variable and defaults to C:\.  You can find out
-;;; where XEmacs thinks your home directory is using
+;; -- scan for #### markers and fix the problems noted there.
+;; -- #### maybe the setqs in this file should be changed to defvars
+;;    to avoid tromping on customizations when custom.el is loaded
+;;    early (dv and sjt at least favor making this the default)
+;; -- #### update documentation in (lispref)Starting Up XEmacs, in
+;;    (xemacs)Entering Emacs, and in (custom), then point to them
+;;    instead of going into detail here.
+
+;;; This is a sample init file.  It can be used without modification
+;;; as your init.el or .emacs.  In older versions of XEmacs, this file
+;;; was called .emacs and placed in your home directory. (Under MS
+;;; Windows, that directory is controlled by the HOME environment
+;;; variable and defaults to C:\.  You can find out where XEmacs
+;;; thinks your home directory is using
 ;;;
 ;;;   ESC : (expand-file-name "~")
 ;;;
@@ -52,7 +56,9 @@
 ;;; The language that this file (and most other XEmacs init files) is
 ;;; written in is called "XEmacs Lisp" or more commonly "Elisp".
 
-;;; There are many sources of further information:
+;;; Brief descriptions of how the init process works and how to
+;;; accomplish many useful customizations are given below in this
+;;; file.  There are many sources of further information:
 
 ;;; -- the XEmacs User's Manual (Access using the online Info browser:
 ;;;       Use `Help->Info (Online Docs)->XEmacs User's Manual' (if
@@ -121,6 +127,130 @@
 
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;;                       Theory of Operation                        ;;
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;;; XEmacs allows you to make persistent changes to editor behavior by
+;;; saving code in files which are by default loaded at startup.
+
+;; These files are just Lisp libraries with names built in to XEmacs.
+;; There are files for the use of the user (the init file and the
+;; custom file), for the site administrator (default.el and
+;; site-start.el), and for the XEmacs maintainers (auto-autoloads
+;; files).  See the Lispref for user and site files (node Starting Up
+;; XEmacs, currently inaccurate (it doesn't describe the custom
+;; file)).  Interactions among the files are complex; see
+;; lisp/startup.el for details.
+
+;; Briefly, after very basic initializations including processing a
+;; special command line options (including GUI toolkit options),
+;; setting up the terminal, and setting up `load-path', it executes
+;; customization code as follows:
+
+;; 1. It runs the normal hook `before-init-hook'.
+;; 2. It loads the library `site-start' (by default `site-start.el').
+;; 3. It loads the init file (by default `~/.xemacs/init.el').
+;; 4. It loads the custom file (by default `~/.xemacs/custom.el').
+;; 5. It loads the library `default' (by default `default.el').
+;; 6. It runs the normal hook `after-init-hook'.
+
+;; After this the *scratch* buffer is set up and the remaining command
+;; line arguments (actions and file names) are processed.
+
+;; N.B. Switching the order of steps 3 and 4 is under discussion and
+;; favored by several core developers.
+
+;; Step 2 is inhibited by the -no-site-file command line switch.
+;; Steps 3 and 4 are inhibited (as a unit) by the -no-init-file
+;; command line switch (-q is a convenient synonym).  Step 5 is
+;; inhibited by -no-init-file or a non-nil value of
+;; `inhibit-default-init' (set it in the init file).  From now on the
+;; hooks and the site initialization files will be ignored.
+
+;; The custom file and the init file contain customizations managed by
+;; XEmacs itself via the Custom subsystem and manual customizations,
+;; respectively.  Originally both were placed in the same file,
+;; usually ~/.emacs, but occasionally XEmacs would trash user settings
+;; when automatically changing options, and more frequently users
+;; would trash the automatically generated code.  So these functions
+;; have been reallocated to separate files, usually named custom.el
+;; and init.el, respectively.
+
+;; The Custom system is accessed most conveniently from the
+;; Options->Advanced (Customize) menu (also, the Options->Fonts and
+;; Options->Sizes menus are implicitly managed by Custom, and
+;; Options->Edit Faces explicitly invokes Custom).  You can also use
+;; the suite of customize commands directly (cf C-h a customize RET).
+;; Currently, Custom possesses specialized facilities for setting
+;; ordinary variables of many types, and for customizing faces.  As a
+;; general rule, variable and face initialization should be done using
+;; Custom, and other initializations should be done in the init file.
+
+;; A possible exception is a subsystem with its own complex init file,
+;; eg, Gnus and .gnus.  In these cases it is often preferable to keep
+;; even simple variable initializations together, and you may wish to
+;; maintain these configurations by hand.
+
+;; You should avoid editing the custom file by hand.  The syntax used
+;; is complex but concise, and it is easy to silently break the whole
+;; file with a single error that happens to result in a valid Lisp
+;; form.  On the other hand, the init file is just a Lisp library that
+;; is loaded before starting the read-eval-redisplay loop.
+
+;; The interactions between the custom file and other init files are
+;; governed by a simple idea:
+
+;; Custom to User:  ALL VARIABLES YOURS OURS NOW ARE.
+
+;; To be precise, Custom is pretty good about noticing and respecting
+;; existing settings in interactive use.  However, it is weak in
+;; understanding advanced use of specifier variables (these are used
+;; for customizations which depend on display characteristics and
+;; configuration in complex ways), and can be quite brutal at
+;; initialization.
+
+;; Normal practice for Custom at initialization is to (1) reset all
+;; customized faces before applying customizations and (2) force all
+;; variables to the values specified in custom.el.  For this reason,
+;; and because it is generally the case that the init file can
+;; usefully depend on customized variables, but Custom pays no
+;; attention to behavior of the init file, it is probably a good idea
+;; to force custom.el to be loaded before the init file.  (As
+;; mentioned, this will probably become the default in future versions
+;; of XEmacs.)
+
+;; To enable early loading of custom.el, uncomment the following line:
+;(setq Init-inhibit-custom-file-p (not (assoc custom-file load-history)))
+
+;; Code to implement early loading where late loading is the default.
+;; A crucial snippet of code must be the last thing in this file.
+
+;; defvars only initialize uninitialized variables; if the setq above
+;; is active, the variable below is defined but the value will not be
+;; altered.
+(defvar Init-inhibit-custom-file-p nil
+  "Internal user init flag.  Don't use this yourself.
+
+Non-nil if we need to inhibit XEmacs from loading custom.el after init.el.")
+
+(when Init-inhibit-custom-file-p
+  ;; This is the default custom-file.
+  (let ((file (expand-file-name "~/.xemacs/custom.el")))
+    (add-one-shot-hook 'after-init-hook
+		       `(lambda () (setq custom-file ,file)))
+    (cond ((file-readable-p file)
+	   (load file))
+	  ((file-exists-p file)
+	   (warn "Existing custom file \"%s\" is not readable!" file)))
+    (cond ((not (file-exists-p file))
+	   (display-warning ' resource
+	     (format "Custom file \"%s\" not found." file)
+	     'info))
+	  ((not (file-writable-p file))
+	   (warn "Existing custom file \"%s\" is not writable!" file)))))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                      Basic Customization                         ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
@@ -1399,7 +1529,7 @@
 
 ;;; ********************
 ;;; resize-minibuffer-mode makes the minibuffer automatically
-;;; resize as necessary when it's too big to hold its contents.
+;;; resize as necessary when it's too small to hold its contents.
 
 (when (fboundp 'resize-minibuffer-mode)
   (resize-minibuffer-mode)
@@ -1429,3 +1559,11 @@
 ;      ;; of the session, specify the number of lines here.
 ;      w3-telnet-header-length 4
 ;      )
+
+;;; Inhibit loading of custom-file
+
+;; make-temp-name returns a name which does not refer to an existing file,
+;; and thus the named file is unreadable.
+(when Init-inhibit-custom-file-p
+  (setq custom-file (make-temp-name "/tmp/non-existent-")))
+
diff --text -u 'xemacs-21.4.6/lib-src/ChangeLog' 'xemacs-21.4.7/lib-src/ChangeLog'
Index: ././lib-src/ChangeLog
--- ././lib-src/ChangeLog	Mon Dec 17 18:33:19 2001
+++ ././lib-src/ChangeLog	Sat May  4 21:34:19 2002
@@ -1,6 +1,6 @@
-2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
+2002-05-04  Stephen J. Turnbull  <stephen@xemacs.org>
 
-	* XEmacs 21.4.6 "Common Lisp" is released.
+	* XEmacs 21.4.7 "Economic Science" is released.
 
 2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
 
diff --text -u 'xemacs-21.4.6/lisp/ChangeLog' 'xemacs-21.4.7/lisp/ChangeLog'
Index: ././lisp/ChangeLog
--- ././lisp/ChangeLog	Mon Dec 17 18:33:19 2001
+++ ././lisp/ChangeLog	Sat May  4 21:34:19 2002
@@ -1,6 +1,84 @@
-2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
+2002-05-04  Stephen J. Turnbull  <stephen@xemacs.org>
 
-	* XEmacs 21.4.6 "Common Lisp" is released.
+	* XEmacs 21.4.7 "Economic Science" is released.
+
+2002-03-18  Adrian Aichner  <adrian@xemacs.org>
+
+	* cus-edit.el (customize-save-variable): Fix typo in prompt.
+
+2002-03-26  John Paul Wallington  <jpw@xemacs.org>
+
+	* obsolete.el (assq-delete-all): New compatibility alias for 
+	remassq.
+
+2002-01-09  Simon Josefsson  <jas@extundo.com>
+
+	* files.el (auto-mode-alist): Support Sieve (*.siv, *.sieve).
+
+2002-01-04  Adrian Aichner  <adrian@xemacs.org>
+
+	* info.el (Info-auto-generate-directory): Default
+	Info-auto-generate-directory to 'if-outdated.
+
+2002-03-28  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* startup.el (normal-top-level): Prevent migration code from
+	trashing .emacs on an error in loading the init files.
+
+2002-03-14  Ville Skyttä  <ville.skytta@xemacs.org>
+
+	* files.el (auto-mode-alist): GNUmakefile is a Makefile,
+	"system default" Xdefaults and friends get xrdb-mode.
+
+2002-03-05  Mats Lidell  <matsl@contactor.se>
+ 
+ 	* help-nomule.el (tutorial-supported-languages): Added Swedish
+ 	tutorial. Sorted languages.
+
+2002-02-11  Mike Sperber <mike@xemacs.org>
+
+	* info.el (Info-maybe-update-dir): Regenerate dir if we're
+	regenerating outdated dir files and dir is non-existent.
+
+2002-01-27  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* code-files.el (convert-mbox-coding-system): Improve comment.
+	(write-region): Improve docstring.  Reformat to 80 columns.  Add
+	coding-system argument to `write-region-pre-hook' call.
+	(write-region-pre-hook): Fix docstring to mention lockname argument.
+
+2002-01-18  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* minibuf.el (completing-read): Remove redundant wrong arg list.
+
+	* help.el (with-displaying-help-buffer): Put usage advice in docstring.
+
+2001-12-27  John Paul Wallington  <jpw@shootybangbang.com>
+
+	* obsolete.el (interactive-form): new compatibility alias for 
+	function-interactive.
+
+2001-11-29  Adrian Aichner  <adrian@xemacs.org>
+
+	* menubar-items.el (Menubar-items-truncate-list): Removed.
+	* menubar-items.el (Menubar-items-truncate-history): New.
+	* menubar-items.el (default-menubar): Use
+	Menubar-items-truncate-history.
+
+2002-02-03  Adrian Aichner  <adrian@xemacs.org>
+
+	* printer.el (generic-print-region): Pass correct arguments to
+	lpr-region.  Thanks to Nevin Kapur <nevin@jhu.edu> and Björn
+	Torkelsson <torkel@acc.umu.se>.
+
+2002-01-09  John Paul Wallington  <jpw@shootybangbang.com>
+
+	* help.el (describe-mode): synched with FSF 19.34; handle nil
+	minor mode indicators.
+
+2001-12-03  Christoph Wedler  <Christoph.Wedler@sap.com>
+
+	* minibuf.el (completing-read): Update docstring.
 
 2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
 
diff --text -u 'xemacs-21.4.6/lisp/code-files.el' 'xemacs-21.4.7/lisp/code-files.el'
Index: ././lisp/code-files.el
--- ././lisp/code-files.el	Mon Dec 17 14:49:08 2001
+++ ././lisp/code-files.el	Wed May  1 01:05:34 2002
@@ -198,12 +198,11 @@
 	    ((find-coding-system codesys))
 	    ))))
 
-;; This is completely broken, not only in implementation (does not
+;; This was completely broken, not only in implementation (does not
 ;; understand MIME), but in concept -- such high-level decoding should
-;; be done by mail readers, not by IO code!
+;; be done by mail readers, not by IO code!  Removed 2000-04-18.
 
-;(defun convert-mbox-coding-system (filename visit start end)
-;...
+;(defun convert-mbox-coding-system (filename visit start end) ...)
 
 (defun find-coding-system-magic-cookie ()
   "Look for the coding-system magic cookie in the current buffer.
@@ -461,20 +460,19 @@
 (defvar write-region-pre-hook nil
   "A special hook to decide the coding system used for writing out a file.
 
-Before writing a file, `write-region' calls the functions on this hook
-with arguments START, END, FILENAME, APPEND, VISIT, and CODING-SYSTEM,
-the same as the corresponding arguments in the call to
-`write-region'.
+Before writing a file, `write-region' calls the functions on this hook with
+arguments START, END, FILENAME, APPEND, VISIT, LOCKNAME and CODING-SYSTEM,
+the same as the corresponding arguments in the call to `write-region'.
 
-The return value of the functions should be either
+The return value of each function should be one of
 
 -- nil
 -- A coding system or a symbol denoting it, indicating the coding system
-   to be used for reading the file
+   to be used for writing the file
 -- A list of two elements (absolute pathname and length of data written),
-   which is used as the return value to `write-region'.  In this
-   case, `write-region' assumes that the function has written
-   the file for itself and suppresses further writing.
+   which is used as the return value to `write-region'.  In this case,
+   `write-region' assumes that the function has written the file and
+   returns.
 
 If any function returns non-nil, the remaining functions are not called.")
 
@@ -482,13 +480,17 @@
   "A hook called by `write-region' after a file has been written out.
 
 The functions on this hook are called with arguments START, END,
-FILENAME, APPEND, VISIT, and CODING-SYSTEM, the same as the
+FILENAME, APPEND, VISIT, LOCKNAME, and CODING-SYSTEM, the same as the
 corresponding arguments in the call to `write-region'.")
 
-(defun write-region (start end filename &optional append visit lockname coding-system)
+(defun write-region (start end filename
+		     &optional append visit lockname coding-system)
   "Write current region into specified file.
 By default the file's existing contents are replaced by the specified region.
-When called from a program, takes three arguments:
+Called interactively, prompts for a file name.  With a prefix arg, prompts
+for a coding system as well.
+
+When called from a program, takes three required arguments:
 START, END and FILENAME.  START and END are buffer positions.
 Optional fourth argument APPEND if non-nil means
   append to existing file contents (if any).
@@ -507,19 +509,19 @@
 Optional seventh argument CODING-SYSTEM specifies the coding system
   used to encode the text when it is written out, and defaults to
   the value of `buffer-file-coding-system' in the current buffer.
-  Interactively, with a prefix arg, you will be prompted for the
-  coding system.
 See also `write-region-pre-hook' and `write-region-post-hook'."
   (interactive "r\nFWrite region to file: \ni\ni\ni\nZCoding-system: ")
   (setq coding-system
 	(or coding-system-for-write
 	    (run-hook-with-args-until-success
-	     'write-region-pre-hook start end filename append visit lockname)
+	     'write-region-pre-hook
+	     start end filename append visit lockname coding-system)
 	    coding-system
 	    buffer-file-coding-system
 	    (find-file-coding-system-for-write-from-filename filename)
 	    ))
   (if (consp coding-system)
+      ;; One of the `write-region-pre-hook' functions wrote the file
       coding-system
     (let ((func
 	   (coding-system-property coding-system 'pre-write-conversion)))
diff --text -u 'xemacs-21.4.6/lisp/cus-edit.el' 'xemacs-21.4.7/lisp/cus-edit.el'
Index: ././lisp/cus-edit.el
--- ././lisp/cus-edit.el	Mon Dec 17 14:49:08 2001
+++ ././lisp/cus-edit.el	Wed May  1 01:05:35 2002
@@ -750,7 +750,7 @@
 `:prompt-value' property of that widget will be used for reading the value.
 
 If given a prefix (or a COMMENT argument), also prompt for a comment."
-  (interactive (custom-prompt-variable "Set and ave variable: "
+  (interactive (custom-prompt-variable "Set and save variable: "
 				       "Set and save value for %s as: "
 				       current-prefix-arg))
   (funcall (or (get variable 'custom-set) 'set-default) variable value)
diff --text -u 'xemacs-21.4.6/lisp/files.el' 'xemacs-21.4.7/lisp/files.el'
Index: ././lisp/files.el
--- ././lisp/files.el	Tue Oct 23 17:35:21 2001
+++ ././lisp/files.el	Wed May  1 01:05:37 2002
@@ -1185,6 +1185,7 @@
     ("\\.icn\\'" . icon-mode)
     ("\\.\\(?:[ckz]?sh\\|shar\\)\\'" . sh-mode)
     ("\\.[Pp][Rr][Oo]\\'" . idlwave-mode)
+    ("\\.si\\(v\\|eve\\)\\'" . sieve-mode)
     ;; #### Unix-specific!
     ("/\\.\\(?:bash_\\|z\\)?\\(profile\\|login\\|logout\\)\\'" . sh-mode)
     ("/\\.\\(?:[ckz]sh\\|bash\\|tcsh\\|es\\|xinit\\|startx\\)rc\\'" . sh-mode)
@@ -1226,8 +1227,8 @@
     ("configure\\(\\.in\\|\\.ac\\)\\'" . autoconf-mode)
     ("\\.ml\\'" . lisp-mode)
     ("\\.ma?ke?\\'" . makefile-mode)
-    ("[Mm]akefile\\(\\.\\|\\'\\)" . makefile-mode)
-    ("\\.X\\(defaults\\|environment\\|resources\\|modmap\\)\\'" . xrdb-mode)
+    ("\\(GNU\\)?[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)
     ("\\.[^/]*wm2?\\(?:rc\\)?\\'" . winmgr-mode)
diff --text -u 'xemacs-21.4.6/lisp/help-nomule.el' 'xemacs-21.4.7/lisp/help-nomule.el'
Index: ././lisp/help-nomule.el
--- ././lisp/help-nomule.el	Fri Apr 13 03:21:27 2001
+++ ././lisp/help-nomule.el	Wed May  1 01:05:40 2002
@@ -31,12 +31,15 @@
 ;;; Code:
 
 (defconst tutorial-supported-languages
-  '(("French" fr iso-8859-1)
+  '(
+    ("Croatian" hr iso-8859-2)
+    ("French" fr iso-8859-1)
     ("German" de iso-8859-1)
     ("Norwegian" no iso-8859-1)
-    ("Croatian" hr iso-8859-2)
     ("Polish" pl iso-8859-2)
-    ("Romanian" ro iso-8859-2))
+    ("Romanian" ro iso-8859-2)
+    ("Swedish" se iso-8859-1)
+    )
   "Alist of supported languages in TUTORIAL files.
 Add languages here, as more are translated.")
 
diff --text -u 'xemacs-21.4.6/lisp/help.el' 'xemacs-21.4.7/lisp/help.el'
Index: ././lisp/help.el
--- ././lisp/help.el	Wed Jul 25 16:44:26 2001
+++ ././lisp/help.el	Wed May  1 01:05:40 2002
@@ -433,11 +433,7 @@
 	(format "*%s*" name))
     (format "*%s*" help-buffer-prefix-string)))
 
-;; Use this function for displaying help when C-h something is pressed
-;; or in similar situations.  Do *not* use it when you are displaying
-;; a help message and then prompting for input in the minibuffer --
-;; this macro usually selects the help buffer, which is not what you
-;; want in those situations.
+;; with-displaying-help-buffer
 
 ;; #### Should really be a macro to eliminate the requirement of
 ;; caller to code a lambda form in THUNK -- mrb
@@ -464,7 +460,13 @@
 
 (defun with-displaying-help-buffer (thunk &optional name)
   "Form which makes a help buffer with given NAME and evaluates BODY there.
-The actual name of the buffer is generated by the function `help-buffer-name'."
+The actual name of the buffer is generated by the function `help-buffer-name'.
+
+Use this function for displaying help when C-h something is pressed or
+in similar situations.  Do *not* use it when you are displaying a help
+message and then prompting for input in the minibuffer -- this macro
+usually selects the help buffer, which is not what you want in those
+situations."
   (let* ((winconfig (current-window-configuration))
 	 (was-one-window (one-window-p))
 	 (buffer-name (help-buffer-name name))
@@ -579,8 +581,11 @@
 		   (setq indicator (cdr indicator)))
 		 (while (and indicator (symbolp indicator))
 		   (setq indicator (symbol-value indicator)))
-		 (princ (format "%s minor mode (indicator%s):\n"
-				pretty-minor-mode indicator))
+		 (princ (format "%s minor mode (%s):\n"
+				pretty-minor-mode
+				(if indicator
+				    (format "indicator%s" indicator)
+				  "no indicator")))
 		 (princ (documentation minor-mode))
 		 (princ "\n\n----\n\n"))))
 	 (setq minor-modes (cdr minor-modes)))))
diff --text -u 'xemacs-21.4.6/lisp/info.el' 'xemacs-21.4.7/lisp/info.el'
Index: ././lisp/info.el
--- ././lisp/info.el	Fri Apr 13 03:21:27 2001
+++ ././lisp/info.el	Wed May  1 01:05:42 2002
@@ -393,7 +393,7 @@
   :type '(repeat directory)
   :group 'info)
 
-(defcustom Info-auto-generate-directory 'if-missing
+(defcustom Info-auto-generate-directory 'if-outdated
   "*When to auto generate an info directory listing.
 Possible values are:
 nil or `never' never auto-generate a directory listing,
@@ -1087,8 +1087,8 @@
 	      (null (Info-directory-files file 'all)))
     (if (not (find-buffer-visiting file))
 	(if (not (file-exists-p file))
-	    (if (or (eq Info-auto-generate-directory 'always)
-		    (eq Info-auto-generate-directory 'if-missing))
+	    (if (or (memq Info-auto-generate-directory
+			  '(always if-missing if-outdated)))
 		(Info-build-dir-anew (file-name-directory file)))
 	  (if (or (eq Info-auto-generate-directory 'always)
 		  (and (eq Info-auto-generate-directory 'if-outdated)
diff --text -u 'xemacs-21.4.6/lisp/menubar-items.el' 'xemacs-21.4.7/lisp/menubar-items.el'
Index: ././lisp/menubar-items.el
--- ././lisp/menubar-items.el	Tue Oct 23 17:35:21 2001
+++ ././lisp/menubar-items.el	Wed May  1 01:05:44 2002
@@ -54,12 +54,18 @@
 
 ;;; Code:
 
-(defun Menubar-items-truncate-list (list n)
+(defun Menubar-items-truncate-history (list count label-length)
+  "Truncate a history LIST to first COUNT items.
+Return a list of (label value) lists with labels truncated to last
+LABEL-LENGTH characters of value."
   (mapcar #'(lambda (x)
-	      (if (<= (length x) 50) x (concat "..." (substring x -50))))
-	  (if (<= (length list) n)
+	      (if (<= (length x) label-length)
+                  (list x x)
+                (list
+                 (concat "..." (substring x (- label-length))) x)))
+	  (if (<= (length list) count)
 	      list
-	    (butlast list (- (length list) n)))))
+	    (butlast list (- (length list) count)))))
 
 (defun submenu-generate-accelerator-spec (list &optional omit-chars-list)
   "Add auto-generated accelerator specifications to a submenu.
@@ -435,10 +441,11 @@
 	     menu
 	   (let ((items
 		  (submenu-generate-accelerator-spec
-		   (mapcar #'(lambda (string)
-			       (vector string
-				       (list 'grep string)))
-			   (Menubar-items-truncate-list grep-history 10)))))
+                   (mapcar #'(lambda (label-value)
+			       (vector (first label-value)
+				       (list 'grep (second label-value))))
+			   (Menubar-items-truncate-history
+                            grep-history 10 50)))))
 	     (append menu '("---") items))))
        ["%_Grep..." grep :active (fboundp 'grep)]
        ["%_Kill Grep" kill-compilation
@@ -543,10 +550,11 @@
 	     menu
 	   (let ((items
 		  (submenu-generate-accelerator-spec
-		   (mapcar #'(lambda (string)
-			       (vector string
-				       (list 'compile string)))
-			   (Menubar-items-truncate-list compile-history 10)))))
+		   (mapcar #'(lambda (label-value)
+			       (vector (first label-value)
+				       (list 'compile (second label-value))))
+			   (Menubar-items-truncate-history
+                            compile-history 10 50)))))
 	     (append menu '("---") items))))
        ["%_Compile..." compile :active (fboundp 'compile)]
        ["%_Repeat Compilation" recompile :active (fboundp 'recompile)]
diff --text -u 'xemacs-21.4.6/lisp/minibuf.el' 'xemacs-21.4.7/lisp/minibuf.el'
Index: ././lisp/minibuf.el
--- ././lisp/minibuf.el	Mon Dec 17 14:49:10 2001
+++ ././lisp/minibuf.el	Wed May  1 01:05:46 2002
@@ -765,17 +765,21 @@
                         &optional predicate require-match
                                   initial-contents history default)
   "Read a string in the minibuffer, with completion.
-Args: PROMPT, TABLE, PREDICATE, REQUIRE-MATCH, INITIAL-CONTENTS, HISTORY.
+
 PROMPT is a string to prompt with; normally it ends in a colon and a space.
 TABLE is an alist whose elements' cars are strings, or an obarray.
+TABLE can also be a function which does the completion itself.
 PREDICATE limits completion to a subset of TABLE.
-See `try-completion' for more details on completion, TABLE, and PREDICATE.
+See `try-completion' and `all-completions' for more details
+  on completion, TABLE, and PREDICATE.
+
 If REQUIRE-MATCH is non-nil, the user is not allowed to exit unless
- the input is (or completes to) an element of TABLE or is null.
- If it is also not t, Return does not exit if it does non-null completion.
+  the input is (or completes to) an element of TABLE or is null.
+  If it is also not t, Return does not exit if it does non-null completion.
 If INITIAL-CONTENTS is non-nil, insert it in the minibuffer initially.
   If it is (STRING . POSITION), the initial input
   is STRING, but point is placed POSITION characters into the string.
+
 HISTORY, if non-nil, specifies a history list
   and optionally the initial position in the list.
   It can be a symbol, which is the history list variable to use,
@@ -785,7 +789,9 @@
   which INITIAL-CONTENTS corresponds to).
   If HISTORY is `t', no history will be recorded.
   Positions are counted starting from 1 at the beginning of the list.
-DEFAULT, if non-nil, is the default value.
+DEFAULT, if non-nil, will be returned when the user enters an empty
+  string.
+
 Completion ignores case if the ambient value of
   `completion-ignore-case' is non-nil."
   (let ((minibuffer-completion-table table)
diff --text -u 'xemacs-21.4.6/lisp/mule/european.el' 'xemacs-21.4.7/lisp/mule/european.el'
Index: ././lisp/mule/european.el
--- ././lisp/mule/european.el	Fri Apr 13 03:21:44 2001
+++ ././lisp/mule/european.el	Wed May  1 01:05:55 2002
@@ -25,7 +25,8 @@
 
 ;;; Commentary:
 
-;; For Europeans, five character sets ISO8859-1,2,3,4,9 are supported.
+;; For Europeans, six coded character sets ISO8859-1,2,3,4,9 are supported.
+;; Note: ISO 8859/15 (Latin-9) is supported via the latin-unity package.
 
 ;; #### latin.el would be a better name for this file.
 
diff --text -u 'xemacs-21.4.6/lisp/obsolete.el' 'xemacs-21.4.7/lisp/obsolete.el'
Index: ././lisp/obsolete.el
--- ././lisp/obsolete.el	Fri Apr 13 03:21:32 2001
+++ ././lisp/obsolete.el	Wed May  1 01:05:47 2002
@@ -257,6 +257,11 @@
 
 (make-obsolete-variable 'executing-macro 'executing-kbd-macro)
 
+(define-compatible-function-alias 'interactive-form 
+  'function-interactive) ;GNU 21.1
+(define-compatible-function-alias 'assq-delete-all
+  'remassq) ;GNU 21.1
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;; modeline
 
 (define-compatible-function-alias 'redraw-mode-line 'redraw-modeline)
diff --text -u 'xemacs-21.4.6/lisp/printer.el' 'xemacs-21.4.7/lisp/printer.el'
Index: ././lisp/printer.el
--- ././lisp/printer.el	Wed Jul 25 16:44:31 2001
+++ ././lisp/printer.el	Wed May  1 01:05:48 2002
@@ -443,5 +443,5 @@
 	     (setq copies (1- copies)))))
 	((and (not (eq system-type 'windows-nt))
 	      (fboundp 'lpr-region))
-	 (lpr-region buffer))
+	 (lpr-region start end))
 	(t (error "No print support available"))))
diff --text -u 'xemacs-21.4.6/lisp/startup.el' 'xemacs-21.4.7/lisp/startup.el'
Index: ././lisp/startup.el
--- ././lisp/startup.el	Tue Oct 23 17:35:22 2001
+++ ././lisp/startup.el	Wed May  1 01:05:49 2002
@@ -433,8 +433,11 @@
 	  (packages-load-package-auto-autoloads late-package-load-path)
 	  (packages-load-package-auto-autoloads last-package-load-path)))
 
-    (unwind-protect
-	(command-line)
+    (let (error-data)
+      (condition-case data
+	  (command-line)
+	;; catch non-error signals, especially quit
+	(t (setq error-data data)))
       ;; Do this again, in case the init file defined more abbreviations.
       (setq default-directory (abbreviate-file-name default-directory))
       ;; Specify the file for recording all the auto save files of
@@ -459,7 +462,11 @@
       ;;	  (font-menu-add-default))
       (when window-setup-hook
 	(run-hooks 'window-setup-hook))
-      (setq window-setup-hook nil))
+      (setq window-setup-hook nil)
+      (if error-data
+	  ;; re-signal, and don't allow continuation as that will probably
+          ;; wipe out the user's .emacs if she hasn't migrated yet!
+	  (signal-error (car error-data) (cdr error-data))))
 
     (if load-user-init-file-p
 	(maybe-migrate-user-init-file))
@@ -551,6 +558,7 @@
 	  (push (pop args) new-args)))
        (t (push arg new-args))))
 
+    ;; obsolete, initialize for backward compatibility
     (setq init-file-user (and load-user-init-file-p ""))
 
     (nreverse new-args)))
@@ -785,6 +793,8 @@
 	    (find-user-init-file user-init-directory)))
   (if (not custom-file)
       (setq custom-file (make-custom-file-name user-init-file)))
+  ;; #### should test load-user-init-file-p here, not in load-init-file
+  ;; see comment there
   (if (and user-init-file
 	   (file-readable-p user-init-file))
       (load user-init-file t t t))
@@ -819,12 +829,15 @@
 	(debug-on-error-initial
 	 (if (eq init-file-debug t) 'startup init-file-debug)))
     (let ((debug-on-error debug-on-error-initial))
+      ;; #### I believe this test is incorrect, it leads to custom-file
+      ;; (at least) being undefined
       (if (and load-user-init-file-p init-file-debug)
 	  (progn
 	    ;; Do this without a condition-case if the user wants to debug.
 	    (load-user-init-file))
 	(condition-case error
 	    (progn
+	      ;; #### probably incorrect, see comment above
 	      (if load-user-init-file-p
 		  (load-user-init-file))
 	      (setq init-file-had-error nil))
diff --text -u 'xemacs-21.4.6/lwlib/ChangeLog' 'xemacs-21.4.7/lwlib/ChangeLog'
Index: ././lwlib/ChangeLog
--- ././lwlib/ChangeLog	Mon Dec 17 18:33:19 2001
+++ ././lwlib/ChangeLog	Sat May  4 21:34:19 2002
@@ -1,7 +1,15 @@
-2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
+2002-05-04  Stephen J. Turnbull  <stephen@xemacs.org>
 
-	* XEmacs 21.4.6 "Common Lisp" is released.
+	* XEmacs 21.4.7 "Economic Science" is released.
 
+2002-02-13  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* lwlib-Xm.c (make_dialog): Fix XmProcessTraversal crash.
+
+2001-12-19  Valdis Kletnieks  <Valdis.Kletnieks@vt.edu>
+
+	* xlwscrollbar.c: Fix Xt translations comment.
+	
 2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.4.6 "Common Lisp" is released.
diff --text -u 'xemacs-21.4.6/lwlib/lwlib-Xm.c' 'xemacs-21.4.7/lwlib/lwlib-Xm.c'
Index: ././lwlib/lwlib-Xm.c
--- ././lwlib/lwlib-Xm.c	Tue Oct 23 17:35:22 2001
+++ ././lwlib/lwlib-Xm.c	Wed May  1 01:05:59 2002
@@ -1298,6 +1298,7 @@
 	 list activate the default button */
       XtAddCallback (value, XmNdefaultActionCallback, activate_button, button);
     }
+  /* else add nothing; it's a separator */
 
   ac = 0;
   XtSetArg(al[ac], XmNalignment, XmALIGNMENT_BEGINNING);	ac++;
@@ -1335,11 +1336,12 @@
       XtInstallAccelerators (value, button);
       XmProcessTraversal(value, XmTRAVERSE_CURRENT);
     }
-  else
+  else if (radio_box)
     {
       XtInstallAccelerators (form, button);
       XmProcessTraversal(value, XmTRAVERSE_CURRENT);
     }
+  /* else we don' need no STEENKIN' assellerators. */
 
 #ifdef DND_KLUDGE
   XtFree ((char *) dnd_override);
diff --text -u 'xemacs-21.4.6/lwlib/xlwscrollbar.c' 'xemacs-21.4.7/lwlib/xlwscrollbar.c'
Index: ././lwlib/xlwscrollbar.c
--- ././lwlib/xlwscrollbar.c	Fri Apr 13 03:21:56 2001
+++ ././lwlib/xlwscrollbar.c	Wed May  1 01:06:01 2002
@@ -30,7 +30,8 @@
  *
  * Emacs*XlwScrollBar.translations: #override \n\
  *   <Btn1Down>:     PageDownOrRight()	  \n\
- *   <Btn3Down>:     PageUpOrLeft()
+ *   <Btn3Down>:     PageUpOrLeft()	\n\
+ *   <Btn3Up>:	Release()
  *
  */
 
diff --text -u 'xemacs-21.4.6/man/ChangeLog' 'xemacs-21.4.7/man/ChangeLog'
Index: ././man/ChangeLog
--- ././man/ChangeLog	Mon Dec 17 18:33:19 2001
+++ ././man/ChangeLog	Sat May  4 21:34:19 2002
@@ -1,12 +1,74 @@
+2002-05-04  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.7 "Economic Science" is released.
+
+2002-05-04  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* custom.texi (The Init File): Rewrite completely.
+
+2002-03-19  Adrian Aichner  <adrian@xemacs.org>
+
+	* widget.texi (constants): Typo fix.
+
+2002-02-07  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* external-widget.texi (External Client Widget Internals): New node.
+
+2001-11-15  Darryl Okahata  <darrylo@xemacs.org>
+
+	* lispref/glyphs.texi:
+	lispref/lispref.texi: Add examples of how to insert graphics into a
+	buffer.
+	
 2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
 
-	* XEmacs 21.4.6 "Common Lisp" is released.
+	* xemacs/packages.texi (Packages):
+	(Package Terminology):
+	Carefully distinguish libraries and packages.
+	(Package Terminology):
+	More careful definitions of ``category'' and ``distribution.''
+	Use ``generic'' instead of ``normal'' (N.B. package tools use
+	``standard''.)
+	(Installing Packages):
+	Use @var to mark variable version strings, not @t or <>.
+	(Sumo):
+	Add disk space estimate when unpacked.
+
+2002-02-06  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* xemacs-faq.texi (Q1.3.8, Q1.3.9): Unicode support via Mule-UCS.
+
+2002-02-01  Steve Youngs  <youngs@xemacs.org>
+
+	* xemacs/packages.texi (Removing Packages): The interactive
+	function is 'package-get-delete-package'.
+
+2001-01-24  Adrian Aichner  <adrian@xemacs.org>
+
+	* xemacs-faq.texi (Q1.0.6): Update mail-to-news gateway information.
+
+2001-11-27  Adrian Aichner  <adrian@xemacs.org>
+
+	* xemacs-faq.texi: Hyperlink fixes.
+	
+2002-02-04  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* xemacs-faq.texi (Q4.7.7): New FAQ on remote files.
+
+2002-01-24  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* xemacs-faq.texi (Q1.0.6): Update mail-to-news gateway information.
+
+2002-02-04  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* xemacs/files.texi (Files):
+	(File Names):
+	Document remote file editing, refer to EFS and TRAMP.
 
 2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.4.6 "Common Lisp" is released.
 
-man/ChangeLog
 2001-12-15  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* lispref/packaging.texi (The User's View):
diff --text -u 'xemacs-21.4.6/man/custom.texi' 'xemacs-21.4.7/man/custom.texi'
Index: ././man/custom.texi
--- ././man/custom.texi	Fri Apr 13 03:21:59 2001
+++ ././man/custom.texi	Sat May  4 19:02:03 2002
@@ -278,12 +278,24 @@
 @comment  node-name,  next,  previous,  up
 @section The Init File
 
-When you save the customizations, call to @code{custom-set-variables},
-@code{custom-set-faces} are inserted into the file specified by
-@code{custom-file}.  By default @code{custom-file} is your @file{.emacs}
-file.  If you use another file, you must explicitly load it yourself.
-The two functions will initialize variables and faces as you have
-specified.
+Customizations are saved to the file specified by @code{custom-file}, as
+calls to @code{custom-set-variables} and @code{custom-set-faces}.
+
+When you save customizations, the current implementation removes the
+calls to @code{custom-set-variables} and @code{custom-set-faces}, and
+replaces them with code generated on the basis of the current
+customization state in Emacs.
+
+By default @code{custom-file} is your @file{.emacs} file (for GNU Emacs
+and older XEmacs) and is @file{custom.el} in the same directory as
+@file{init.el} (in XEmacs 21.4 and later).  If you use another file, you
+must explicitly load it yourself.
+
+As of XEmacs 21.4.7, when @var{custom-file} is present, it is loaded
+@emph{after} @file{init.el}.  This is likely to change in the future,
+because (1) actions in @file{init.el} often would like to depend on
+customizations for consistent appearance and (2) Custom is quite brutal
+about enforcing its idea of the correct values at initialization.
 
 @node Wishlist,  , The Init File, Top
 @comment  node-name,  next,  previous,  up
diff --text -u 'xemacs-21.4.6/man/external-widget.texi' 'xemacs-21.4.7/man/external-widget.texi'
Index: ././man/external-widget.texi
--- ././man/external-widget.texi	Fri Apr 13 03:22:00 2001
+++ ././man/external-widget.texi	Wed May  1 01:06:06 2002
@@ -18,6 +18,7 @@
 * Using an External Client Widget::
 * External Client Widget Resource Settings::
 * Motif-Specific Info About the External Client Widget::
+* External Client Widget Internals::
 @end menu
 
 
@@ -111,7 +112,7 @@
 made by parent or child widgets.
 
 
-@node Motif-Specific Info About the External Client Widget, , External Client Widget Resource Settings, Top
+@node Motif-Specific Info About the External Client Widget, External Client Widget Internals, External Client Widget Resource Settings, Top
 @chapter Motif-Specific Info About the External Client Widget
 
 By default, the external client widget has navigation type
@@ -124,6 +125,113 @@
 semantics of the Motif text widget.  The traversal keystrokes
 @kbd{Ctrl-@key{TAB}} and @kbd{Shift-@key{TAB}} are silently filtered by
 the external client widget and are not seen by Emacs.
+
+@node External Client Widget Internals, , Motif-Specific Info About the External Client Widget, Top
+@chapter External Client Widget Internals
+
+The following text is lifted verbatim from Ben Wing's comments in
+@file{ExternalShell.c}.
+
+This is a special Shell that is designed to use an externally-
+provided window created by someone else (possibly another process).
+That other window should have an associated widget of class
+ExternalClient.  The two widgets communicate with each other using
+ClientMessage events and properties on the external window.
+
+Ideally this feature should be independent of Emacs.  Unfortunately
+there are lots and lots of specifics that need to be dealt with
+for this to work properly, and some of them can't conveniently
+be handled within the widget's methods.  Some day the code may
+be rewritten so that the embedded-widget feature can be used by
+any application, with appropriate entry points that are called
+at specific points within the application.
+
+This feature is similar to the OLE (Object Linking & Embedding)
+feature provided by MS Windows.
+
+Communication between this shell and the client widget:
+
+Communication is through ClientMessage events with message_type
+EXTW_NOTIFY and format 32.  Both the shell and the client widget
+communicate with each other by sending the message to the same
+window (the "external window" below), and the data.l[0] value is
+used to determine who sent the message.
+
+The data is formatted as follows:
+
+data.l[0] = who sent this message: external_shell_send (0) or
+            external_client_send (1)
+data.l[1] = message type (see enum en_extw_notify below)
+data.l[2-4] = data associated with this message
+
+EventHandler() handles messages from the other side.
+
+extw_send_notify_3() sends a message to the other side.
+
+extw_send_geometry_value() is used when an XtWidgetGeometry structure
+   needs to be sent.  This is too much data to fit into a
+   ClientMessage, so the data is stored in a property and then
+   extw_send_notify_3() is called.
+
+extw_get_geometry_value() receives an XtWidgetGeometry structure from a
+   property.
+
+extw_wait_for_response() is used when a response to a sent message
+   is expected.  It looks for a matching event within a
+   particular timeout.
+
+The particular message types are as follows:
+
+1) extw_notify_init (event_window, event_mask)
+
+This is sent from the shell to the client after the shell realizes
+its EmacsFrame widget on the client's "external window".  This
+tells the client that it should start passing along events of the
+types specified in event_mask.  event_window specifies the window
+of the EmacsFrame widget, which is a child of the client's
+external window.
+
+extw_notify_init (client_type)
+
+When the client receives an extw_notify_init message from the
+shell, it sends back a message of the same sort specifying the type
+of the toolkit used by the client (Motif, generic Xt, or Xlib).
+
+2) extw_notify_end ()
+
+This is sent from the shell to the client when the shell's
+EmacsFrame widget is destroyed, and tells the client to stop
+passing events along.
+
+3) extw_notify_qg (result)
+
+This is sent from the client to the shell when a QueryGeometry
+request is received on the client.  The XtWidgetGeometry structure
+specified in the QueryGeometry request is passed on in the
+EXTW_QUERY_GEOMETRY property (of type EXTW_WIDGET_GEOMETRY) on the
+external window.  result is unused.
+
+In response, the shell passes the QueryGeometry request down the
+widget tree, and when a response is received, sends a message of
+type extw_notify_qg back to the client, with result specifying the
+GeometryResult value.  If this value is XtGeometryAlmost, the
+returned XtWidgetGeometry structure is stored into the same property
+as above. [BPW is there a possible race condition here?]
+
+4) extw_notify_gm (result)
+
+A very similar procedure to that for extw_notify_qg is followed
+when the shell's RootGeometryManager method is called, indicating
+that a child widget wishes to change the shell's geometry.  The
+XtWidgetGeometry structure is stored in the EXTW_GEOMETRY_MANAGER
+property.
+
+5) extw_notify_focus_in (), extw_notify_focus_out ()
+
+These are sent from the client to the shell when the client gains
+or loses the keyboard focus.  It is done this way because Xt
+maintains its own concept of keyboard focus and only the client
+knows this information.
 
 @summarycontents
 @contents
diff --text -u 'xemacs-21.4.6/man/widget.texi' 'xemacs-21.4.7/man/widget.texi'
Index: ././man/widget.texi
--- ././man/widget.texi	Fri Apr 13 03:22:04 2001
+++ ././man/widget.texi	Wed May  1 01:06:07 2002
@@ -1058,8 +1058,8 @@
 @subsection The Constant Widgets.
 
 The @code{const} widget can contain any lisp expression, but the user is
-prohibited from editing edit it, which is mainly useful as a component
-of one of the composite widgets.
+prohibited from editing it, which is mainly useful as a component of one
+of the composite widgets.
 
 The syntax for the @code{const} widget is
 
diff --text -u 'xemacs-21.4.6/man/xemacs-faq.texi' 'xemacs-21.4.7/man/xemacs-faq.texi'
Index: ././man/xemacs-faq.texi
--- ././man/xemacs-faq.texi	Tue Oct 23 17:35:23 2001
+++ ././man/xemacs-faq.texi	Wed May  1 01:06:09 2002
@@ -7,7 +7,7 @@
 @finalout
 @titlepage
 @title XEmacs FAQ
-@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2001/10/23 08:35:23 $
+@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2002/04/30 16:06:09 $
 @sp 1
 @author Tony Rossini <rossini@@biostat.washington.edu>
 @author Ben Wing <ben@@xemacs.org>
@@ -28,7 +28,6 @@
 
 @node Top, Introduction, (dir), (dir)
 @top XEmacs FAQ
-@unnumbered Introduction
 
 This is the guide to the XEmacs Frequently Asked Questions list---a
 compendium of questions and answers pertaining to one of the finest
@@ -125,6 +124,8 @@
 * Q1.3.5::      Please explain the various input methods in MULE/XEmacs
 * Q1.3.6::      How do I portably code for MULE/XEmacs?
 * Q1.3.7::      How about Cyrillic Modes?
+* Q1.3.8::      Does XEmacs support Unicode?
+* Q1.3.9::      How does XEmacs display Unicode?
 
 Getting Started:
 * Q1.4.1::      What is an @file{init.el} or @file{.emacs} and is there a sample one?
@@ -317,6 +318,7 @@
 * Q4.7.4::      Problems installing AUC TeX
 * Q4.7.5::      Is there a reason for an Emacs package not to be included in XEmacs?
 * Q4.7.6::      Is there a MatLab mode?
+* Q4.7.7::      Can I edit files on other hosts?
 
 The Miscellaneous Stuff
 
@@ -486,6 +488,8 @@
 * Q1.3.5::      Please explain the various input methods in MULE/XEmacs
 * Q1.3.6::      How do I portably code for MULE/XEmacs?
 * Q1.3.7::      How about Cyrillic Modes?
+* Q1.3.8::      Does XEmacs support Unicode?
+* Q1.3.9::      How does XEmacs display Unicode?
 
 Getting Started:
 * Q1.4.1::      What is an @file{init.el} or @file{.emacs} and is there a sample one?
@@ -635,11 +639,13 @@
 gnu.emacs.help.
 
 If you cannot post or read Usenet news, there is a corresponding mailing
-list which is available.  It can be subscribed to by sending a message
-to @email{xemacs-request@@xemacs.org} with @samp{subscribe} in the
-body of the message.  Send to the list at @email{xemacs@@xemacs.org}.
-list.  To cancel a subscription, you @strong{must} use the
-xemacs-request address.  Send a message with a subject of
+list @email{xemacs-news@@xemacs.org} which is available.  It can be
+subscribed to via the Mailman Web interface or by sending mail to to
+@email{xemacs-news-request@@xemacs.org} with @samp{subscribe} in the
+body of the message.  See also
+@uref{http://www.xemacs.org/Lists/#xemacs-news}.  To cancel a
+subscription, you may use the @email{xemacs-news-request@@xemacs.org}
+address or the Web interface.  Send a message with a subject of
 @samp{unsubscribe} to be removed.
 
 @node Q1.0.7, Q1.0.8, Q1.0.6, Introduction
@@ -1040,7 +1046,7 @@
 @end lisp
 @end quotation
 
-@node Q1.3.7, Q1.4.1, Q1.3.6, Introduction
+@node Q1.3.7, Q1.3.8, Q1.3.6, Introduction
 @unnumberedsubsec Q1.3.7: How about Cyrillic Modes?
 
 @email{ilya@@math.ohio-state.edu, Ilya Zakharevich} writes:
@@ -1078,7 +1084,49 @@
 XEmacs) is @uref{http://www.ibiblio.org/sergei/Software/Software.html}
 @end quotation
 
-@node Q1.4.1, Q1.4.2, Q1.3.7, Introduction
+@node Q1.3.8, Q1.3.9, Q1.3.7, Introduction
+@unnumberedsubsec Q1.3.8: Does XEmacs support Unicode?
+
+Partially, as an external encoding for files, processes, and terminals.
+It does not yet support Unicode fonts @ref{Q1.3.9, Does XEmacs support
+Unicode Fonts?}
+
+To get Unicode support, you need a Mule-enabled XEmacs.  Install
+Mule-UCS from packages in the usual way.  Put
+
+(require 'un-define)
+(set-coding-priority-list '(utf-8))
+(set-coding-category-system 'utf-8 utf-8)
+
+Install standard national fonts (not Unicode fonts) for all
+character sets you use.
+
+Mule-UCS also supports 16-bit forms of Unicode (UTF-16).  It does not
+support 31-bit forms of Unicode (UTF-32 or UCS-4).
+
+@node Q1.3.9, Q1.4.1, Q1.3.8, Introduction
+@unnumberedsubsec Q1.3.9: How does XEmacs display Unicode?
+
+Mule doesn't have a Unicode charset internally, so there's nothing to
+bind a Unicode registry to.  It would not be straightforward to create,
+either, because Unicode is not ISO 2022-compatible.  You'd have to
+translate it to multiple 96x96 pages.
+
+This means that Mule-UCS uses ordinary national fonts for display.  This
+is not really a problem, except for those languages that use the Unified
+Han characters.  The problem here is that Mule-UCS maps from Unicode
+code points to national character sets in a deterministic way.  By
+default, this means that Japanese fonts are tried first, then Chinese,
+then Korean.  To change the priority ordering, use the command
+`un-define-change-charset-order'.
+
+It also means you can't use Unicode fonts directly, at least not without
+extreme hackery.  You can run -nw with (set-terminal-coding-system
+'utf-8) if you really want a Unicode font for some reason.
+
+Real Unicode support will be introduced in XEmacs 22.0.
+
+@node Q1.4.1, Q1.4.2, Q1.3.9, Introduction
 @unnumberedsec 1.4: Getting Started, Backing up & Recovery
 @unnumberedsubsec Q1.4.1: What is an @file{init.el} or @file{.emacs} and is there a sample one?
 
@@ -3829,6 +3877,7 @@
 * Q4.7.4::      Problems installing AUC TeX
 * Q4.7.5::      Is there a reason for an Emacs package not to be included in XEmacs?
 * Q4.7.6::      Is there a MatLab mode?
+* Q4.7.7::      Can I edit files on other hosts?
 @end menu
 
 @node Q4.0.1, Q4.0.2, Subsystems, Subsystems
@@ -4630,13 +4679,29 @@
 appreciated.
 @end enumerate
 
-@node Q4.7.6,  , Q4.7.5, Subsystems
+@node Q4.7.6,  Q4.7.7, Q4.7.5, Subsystems
 @unnumberedsubsec Q4.7.5: Is there a MatLab mode?
 
 Yes, a matlab mode and other items are available at the
 @uref{ftp://ftp.mathworks.com/pub/contrib/emacs_add_ons,
 MathWorks' emacs_add_ons ftp directory}.
 
+@node Q4.7.7,  , Q4.7.6, Subsystems
+@unnumberedsubsec Q4.7.7: Can I edit files on other hosts?
+
+Yes.  Of course XEmacs can use any network file system (such as NFS or
+Windows file sharing) you have available, and includes some
+optimizations and safety features appropriate to those environments.
+
+It is also possible to transparently edit files via FTP, ssh, or rsh.  That
+is, XEmacs makes a local copy using the transport in the background, and
+automatically refreshes the remote original from that copy when you save
+it.  XEmacs also is capable of doing file system manipulations like
+creating and removing directories and files.  The FTP interface is
+provided by the standard @samp{efs} package @ref{Top, EFS, , efs}.  The
+ssh/rsh interface is provided by the optional @samp{tramp} package
+@ref{Top, TRAMP, , tramp}.
+
 @node Miscellaneous, MS Windows, Subsystems, Top
 @unnumbered 5 The Miscellaneous Stuff
 
@@ -6624,7 +6689,7 @@
 directory of the XEmacs distribution, or use @kbd{C-h n} or the
 @samp{Help} menu to view this file inside of XEmacs.
 
-@unnumberedsubsubsec User-visible changes
+@unnumberedsubsubsec User-visible changes in XEmacs 21.4
 
 @itemize @bullet
 
@@ -6709,7 +6774,7 @@
 Etags changes.  See @file{NEWS} for full details.
 @end itemize
 
-@unnumberedsubsubsec Lisp and internal changes
+@unnumberedsubsubsec Lisp and internal changes in XEmacs 21.4
 
 Not yet written.
 
@@ -6729,7 +6794,7 @@
 directory of the XEmacs distribution, or use @kbd{C-h n} or the
 @samp{Help} menu to view this file inside of XEmacs.
 
-@unnumberedsubsubsec User-visible changes
+@unnumberedsubsubsec User-visible changes in XEmacs 21.1
 
 @itemize @bullet
 
@@ -6792,7 +6857,7 @@
 
 @end itemize
 
-@unnumberedsubsubsec Lisp and internal changes
+@unnumberedsubsubsec Lisp and internal changes in XEmacs 21.1
 
 @itemize @bullet
 
diff --text -u 'xemacs-21.4.6/man/xemacs/files.texi' 'xemacs-21.4.7/man/xemacs/files.texi'
Index: ././man/xemacs/files.texi
--- ././man/xemacs/files.texi	Fri Apr 13 03:22:27 2001
+++ ././man/xemacs/files.texi	Wed May  1 01:06:18 2002
@@ -10,6 +10,19 @@
 Emacs.  Your changes appear in the file itself only when you @dfn{save} the
 buffer back into the file.
 
+@cindex files, remote
+@cindex remote files
+  Emacs is also able to handle ``remote files'' which are stored on
+other hosts.  Not only is Emacs somewhat aware of the special issues
+involved with network file systems, but it can also use FTP and ssh (or
+rsh) to make local copies of the files, and refresh them on the remote
+host automatically when you save the buffer.  The FTP interface is
+provided by the standard @samp{efs} package @ref{Top, EFS, , efs}.  The
+ssh/rsh interface is provided by the optional @samp{tramp} package
+@ref{Top, TRAMP, , tramp}.  These packages attempt to implement all of
+the operations described below, making remote file use transparent
+(except for unavoidable network delays).
+
   In addition to visiting and saving files, Emacs can delete, copy, rename,
 and append to files, and operate on file directories.
 
@@ -43,6 +56,17 @@
 makes it easy to operate on that file with any of the Emacs file
 commands.
 
+The syntax for accessing remote files unfortunately varies depending on
+the method used.  The syntax for using FTP is
+@samp{/@var{user}@@@var{remote-host}:@var{path-on-remote-host}}.  The
+syntax for using ssh is
+@samp{/[@var{user}@@@var{remote-host}]@var{path-on-remote-host}}.
+
+  In both cases the @samp{@var{user}@@} portion is optional (it defaults
+to your local user name).  @var{path-on-remote-host} may use the
+@samp{~} notation to indicate @var{user}'s home directory on the remote
+host.  The default file name will reflect the remote host information.
+
 @vindex default-directory
   Each buffer has a default directory, normally the same as the
 directory of the file visited in that buffer.  When Emacs reads a file
@@ -58,6 +82,10 @@
 which does not specify a directory, it is short for @file{/u/rms/gnu/foo}.
 @samp{../.login} would stand for @file{/u/rms/.login}.  @samp{new/foo}
 would stand for the filename @file{/u/rms/gnu/new/foo}.
+
+  When visiting a remote file via EFS or TRAMP, the remote directory
+becomes the default directory (@pxref{Visiting}) for that buffer, just
+as a local directory would.
 
 @vindex default-directory-alist
 The variable @code{default-directory-alist} takes an alist of major
diff --text -u 'xemacs-21.4.6/man/xemacs/packages.texi' 'xemacs-21.4.7/man/xemacs/packages.texi'
Index: ././man/xemacs/packages.texi
--- ././man/xemacs/packages.texi	Tue Oct 23 17:35:25 2001
+++ ././man/xemacs/packages.texi	Wed May  1 01:06:19 2002
@@ -392,7 +392,7 @@
 
 No need to panic, you don't have to go through the
 @file{pkinfo/MANIFEST.pkgname} and manually delete the files.  Instead, use
-@code{M-x package-admin-delete-binary-package RET}.
+@code{M-x package-get-delete-package RET}.
 
 Note that the interactive package tools included with XEmacs already do
 this for you.
diff --text -u 'xemacs-21.4.6/netinstall/ChangeLog' 'xemacs-21.4.7/netinstall/ChangeLog'
Index: ././netinstall/ChangeLog
Prereq:  1.2.2.13 
--- ././netinstall/ChangeLog	Mon Dec 17 18:33:19 2001
+++ ././netinstall/ChangeLog	Sat May  4 21:34:19 2002
@@ -1,6 +1,6 @@
-2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
+2002-05-04  Stephen J. Turnbull  <stephen@xemacs.org>
 
-	* XEmacs 21.4.6 "Common Lisp" is released.
+	* XEmacs 21.4.7 "Economic Science" is released.
 
 2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
 
diff --text -u 'xemacs-21.4.6/nt/ChangeLog' 'xemacs-21.4.7/nt/ChangeLog'
Index: ././nt/ChangeLog
--- ././nt/ChangeLog	Mon Dec 17 18:33:19 2001
+++ ././nt/ChangeLog	Sat May  4 21:34:19 2002
@@ -1,6 +1,10 @@
-2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
+2002-05-04  Stephen J. Turnbull  <stephen@xemacs.org>
 
-	* XEmacs 21.4.6 "Common Lisp" is released.
+	* XEmacs 21.4.7 "Economic Science" is released.
+
+2002-03-29  Jonathan Harris  <jonathan@xemacs.org>
+
+	* xemacs.mak: Define STACK_TRACE_EYE_CATCHER.
 
 2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
 
@@ -390,7 +394,7 @@
 
 	* xemacs.mak: Fix for generation of $(XEMACS)\Installation.
 
-2000-03-14  Adrian Aichner  <adrain@xemacs.org>
+2000-03-14  Adrian Aichner  <adrian@xemacs.org>
 
 	* xemacs.mak (LIB_SRC_TOOLS): LIB_SRC_TOOLS depend on
 	XEMACS_INCLUDES when we USE_PORTABLE_DUMPER.
diff --text -u 'xemacs-21.4.6/nt/xemacs.mak' 'xemacs-21.4.7/nt/xemacs.mak'
Index: ././nt/xemacs.mak
--- ././nt/xemacs.mak	Wed Jul 25 16:46:56 2001
+++ ././nt/xemacs.mak	Wed May  1 01:06:23 2002
@@ -207,6 +207,9 @@
 !else
 ! error Unknown processor architecture type $(PROCESSOR_ARCHITECTURE)
 !endif
+STACK_TRACE_EYE_CATCHER=$(XEMACS_VERSION_STRING:.=_)
+STACK_TRACE_EYE_CATCHER=xemacs_$(STACK_TRACE_EYE_CATCHER:-=_)_$(EMACS_CONFIGURATION:-=_)
+PROGRAM_DEFINES=$(PROGRAM_DEFINES) -DSTACK_TRACE_EYE_CATCHER=$(STACK_TRACE_EYE_CATCHER)
 
 #
 # Conf error checks
diff --text -u 'xemacs-21.4.6/src/ChangeLog' 'xemacs-21.4.7/src/ChangeLog'
Index: ././src/ChangeLog
--- ././src/ChangeLog	Mon Dec 17 18:33:19 2001
+++ ././src/ChangeLog	Sat May  4 21:34:19 2002
@@ -1,6 +1,81 @@
-2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
+2002-05-04  Stephen J. Turnbull  <stephen@xemacs.org>
 
-	* XEmacs 21.4.6 "Common Lisp" is released.
+	* XEmacs 21.4.7 "Economic Science" is released.
+
+2002-04-17  Nix  <nix@esperi.demon.co.uk>
+
+	* process.h (PROCESS_LIVE_P): Use the process status as
+	evidence of health, not the state of the input stream.
+
+2002-04-30  Charles G. Waldman <cgw@xemacs.org>
+
+        * sysdep.c (sys_siglist): change "signum" to "signal"
+
+2001-04-21  Martin Buchholz  <martin@xemacs.org>
+
+	* s/darwin.h: New file.
+	Thanks to Greg Parker <gparker@cs.stanford.edu>.
+	
+2002-04-23  Andreas Jaeger  <aj@suse.de>
+
+	* s/linux.h (LIB_STANDARD): Define correctly for x86-64 and s390x
+	which use lib64 for 64-bit libs.
+        (START_FILES): Likewise.
+
+2002-02-11  Mike Sperber  <mike@xemacs.org>
+
+	* device-x.c: 
+	(x_IO_error_handler):
+	(x_init_device): Temporarily keep device in static variable
+	`device_being_initialized' so we can recover gracefully from
+	internal XOpenDevice failure.  (XOpenDevice is documented to
+	return NULL on failure, but sometimes calls the IO error handler
+	instead.)
+
+2002-01-31  John H. Palmieri  <palmieri@math.washington.edu>
+
+	* dired.c (Ffile_name_all_completions): Change documentation --
+	remove reference to completion-ignored-extensions.
+	* dired.c (vars_of_dired): Change documentation for
+	completion-ignored-extensions -- remove reference to
+	file-name-all-completions.
+
+2002-03-06  Jerry James  <james@xemacs.org>
+
+	* emodules.c (emodules_load): Fix multiple loading of same module.
+
+2002-01-25  Andrew Begel <abegel@cs.berkeley.edu>
+	* sysdll.c (dll_open): Changed to use RTLD_NOW instead of
+	RTLD_LAZY to avoid incorrect symbol binding when using nested
+	shared libraries on Solaris.
+
+2002-02-12  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* fileio.c (Ffind_file_name_handler): Improve docstring.
+
+2002-01-20  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* fns.c (Fmapconcat): Improve docstring.
+
+2002-01-03  Eric Gillespie, Jr.  <epg@pretzelnet.org>
+
+	* device-gtk.c: Add prototype for
+	emacs_gtk_selection_clear_event_handle.
+	(gtk_init_device): Call gtk_selection_add_target for CLIPBOARD
+	selection.  Setup signal handler for "selection_clear_event"
+	(emacs_gtk_selection_clear_event_handle).
+
+	* select-gtk.c (emacs_gtk_selection_clear_event_handle): Handle
+	other applications owning the clipboard (based on
+	x_handle_selection_clear).
+
+2001-12-23  William M. Perry  <wmperry@gnu.org>
+
+	* menubar-gtk.c (gtk_popup_menu)  Add sanity checks, fix crash.
+	
+2002-01-04  Martin Buchholz  <martin@xemacs.org>
+
+	* keymap.c (define_key_alternate_name): Parenthesize EQ.
 
 2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
 
@@ -104,13 +179,13 @@
 2001-09-10  Nix  <nix@esperi.demon.co.uk>
 
 	* src/buffer.c (kill_buffer): Undedicate windows showing BUF
-        before replacing them.
+	before replacing them.
 
-        * src/window.c (window_loop): Implement new UNDEDICATE_BUFFER
-        operation.
+	* src/window.c (window_loop): Implement new UNDEDICATE_BUFFER
+	operation.
 
-        * src/window.c (undedicate_windows): Use it.
-        * src/window.h: Add prototype.
+	* src/window.c (undedicate_windows): Use it.
+	* src/window.h: Add prototype.
 
 2001-09-17  Ben Wing  <ben@xemacs.org>
 
@@ -3415,8 +3490,8 @@
 
 2000-04-26  IKEYAMA Tomonori  <tomonori@suiyokai.org>
 
-        * redisplay-msw.c (mswindows_output_dibitmap): Set foreground
-        color if the image is a mono pixmap.
+	* redisplay-msw.c (mswindows_output_dibitmap): Set foreground
+	color if the image is a mono pixmap.
 
 2000-07-30  Ben Wing  <ben@xemacs.org>
 
@@ -4036,12 +4111,12 @@
 
 2000-07-15  Ben Wing  <ben@xemacs.org>
 
-        * s/cygwin32.h:
-        * s/cygwin32.h (CYGWIN_CONV_PATH):
-        Add missing logb prototype for v1.1.
-        Use post-b20 names and alias to pre-b20 names when pre-b20.
+	* s/cygwin32.h:
+	* s/cygwin32.h (CYGWIN_CONV_PATH):
+	Add missing logb prototype for v1.1.
+	Use post-b20 names and alias to pre-b20 names when pre-b20.
 
-        * s/windowsnt.h: [5].
+	* s/windowsnt.h: [5].
 
 2000-07-15  Ben Wing  <ben@xemacs.org>
 
@@ -4050,624 +4125,624 @@
 	* Makefile.in.in (objs):
 	added win32.o, cosmetic cleanups.
 
-        * alloc.c (Fmake_byte_code):
-        [[[1]]]: Changes for new LIST_LOOP, EXTERNAL_LIST_LOOP,
-        etc. macros which declare their own args now.
+	* alloc.c (Fmake_byte_code):
+	[[[1]]]: Changes for new LIST_LOOP, EXTERNAL_LIST_LOOP,
+	etc. macros which declare their own args now.
 
-        * alloc.c (syms_of_alloc):
-        [[[2]]]: Use DEFSYMBOL, DEFKEYWORD, DEFERROR and friends.
+	* alloc.c (syms_of_alloc):
+	[[[2]]]: Use DEFSYMBOL, DEFKEYWORD, DEFERROR and friends.
 
-        * buffer.c:
-        Moved buffer-dedicated-frame, set-buffer-dedicated-frame into lisp.
+	* buffer.c:
+	Moved buffer-dedicated-frame, set-buffer-dedicated-frame into lisp.
 
-        * buffer.c (Fget_file_buffer):
-        Fixed GCPRO problem.
+	* buffer.c (Fget_file_buffer):
+	Fixed GCPRO problem.
 
-        * buffer.c (get_truename_buffer):
-        Fixed comment about GC checking.
+	* buffer.c (get_truename_buffer):
+	Fixed comment about GC checking.
 
-        * buffer.c (syms_of_buffer):
-        Undeclared those dedicated frame funs.
-        [2].
+	* buffer.c (syms_of_buffer):
+	Undeclared those dedicated frame funs.
+	[2].
 
-        * buffer.h:
-        Define convenience macros for internal/external conversions.
+	* buffer.h:
+	Define convenience macros for internal/external conversions.
 	[[[3]]]: Define codesys aliases Qcommand_argument_encoding
-        and Qenvironment_variable_encoding for cleaner code.
-
-        * bufslots.h:
-        Remove dedicated-frame; in lisp.
+	and Qenvironment_variable_encoding for cleaner code.
 
-        * bytecode.c (funcall_compiled_function):
-        [1].
+	* bufslots.h:
+	Remove dedicated-frame; in lisp.
 
-        * bytecode.c (syms_of_bytecode):
-        [2].
+	* bytecode.c (funcall_compiled_function):
+	[1].
 
-        * console-msw.c:
-        * console-msw.c (mswindows_show_console): Rewrote.
+	* bytecode.c (syms_of_bytecode):
+	[2].
 
-        * console-msw.c (Fmswindows_debugging_output): New.
-        Sends to OutputDebugString (special MSWin debugger interface).
+	* console-msw.c:
+	* console-msw.c (mswindows_show_console): Rewrote.
 
-        * console-msw.c (Fmswindows_message_box):
-        Fixed stupid bugs so it works when called from kill-emacs.
+	* console-msw.c (Fmswindows_debugging_output): New.
+	Sends to OutputDebugString (special MSWin debugger interface).
 
-        * console-msw.c (syms_of_console_mswindows):
-        Declare Fmswindows_debugging_output.
+	* console-msw.c (Fmswindows_message_box):
+	Fixed stupid bugs so it works when called from kill-emacs.
 
-        * console-msw.h:
-        New MSWin prototypes.
+	* console-msw.c (syms_of_console_mswindows):
+	Declare Fmswindows_debugging_output.
 
-        * console-msw.h (struct mswindows_frame):
-        New entry last-click-mods for improved button-modifier support.
+	* console-msw.h:
+	New MSWin prototypes.
 
-        * console-msw.h (FRAME_MSWINDOWS_POPUP):
-        New struct entry `popup' with corresponding accessor.
+	* console-msw.h (struct mswindows_frame):
+	New entry last-click-mods for improved button-modifier support.
 
-        * console-x.c:
-        * console-x.c (split_up_display_spec):
-        * console-x.c (get_display_arg_connection):
-        * console-x.c (x_semi_canonicalize_console_connection):
-        * console-x.c (x_canonicalize_device_connection):
-        [[[6]]]: Change char to more specific type.
-        [[[8]]]: Make use of abstracting codesys aliases defined in [3], [4];
+	* console-msw.h (FRAME_MSWINDOWS_POPUP):
+	New struct entry `popup' with corresponding accessor.
 
-        * console-x.c (x_semi_canonicalize_console_connection):
-        * console-x.c (x_canonicalize_device_connection):
-        [[[9]]]: Fix up error signalling to use new structured error system.
+	* console-x.c:
+	* console-x.c (split_up_display_spec):
+	* console-x.c (get_display_arg_connection):
+	* console-x.c (x_semi_canonicalize_console_connection):
+	* console-x.c (x_canonicalize_device_connection):
+	[[[6]]]: Change char to more specific type.
+	[[[8]]]: Make use of abstracting codesys aliases defined in [3], [4];
+
+	* console-x.c (x_semi_canonicalize_console_connection):
+	* console-x.c (x_canonicalize_device_connection):
+	[[[9]]]: Fix up error signalling to use new structured error system.
 
-        * console-x.h:
-        [[[4]]]: Define codesys aliases:
-        Qlwlib_encoding, Qx_atom_name_encoding, Qx_font_name_encoding,
-        Qx_color_name_encoding, Qx_display_name_encoding.
+	* console-x.h:
+	[[[4]]]: Define codesys aliases:
+	Qlwlib_encoding, Qx_atom_name_encoding, Qx_font_name_encoding,
+	Qx_color_name_encoding, Qx_display_name_encoding.
 
-        * console.h (struct console_methods):
-        New method make_dialog_box_internal supersedes older
-        popup_dialog_box method.
+	* console.h (struct console_methods):
+	New method make_dialog_box_internal supersedes older
+	popup_dialog_box method.
 
-        * data.c:
-        Define many new errors, part of new structured errors.
+	* data.c:
+	Define many new errors, part of new structured errors.
 
-        * data.c (init_errors_once_early):
-        * data.c (syms_of_data):
-        [2].
+	* data.c (init_errors_once_early):
+	* data.c (syms_of_data):
+	[2].
 
-        * device-msw.c (mswindows_init_device):
-        [[[5]]]: Cleanup to support NT 3.51.
+	* device-msw.c (mswindows_init_device):
+	[[[5]]]: Cleanup to support NT 3.51.
 
-        * device-msw.c (decode_devmode): Cleanup.
+	* device-msw.c (decode_devmode): Cleanup.
 
-        * device-msw.c (mswindows_handle_print_setup_dialog_box):
-        * device-msw.c (mswindows_handle_print_dialog_box):
-        * device-msw.c (mswindows_handle_page_setup_dialog_box):
-        * device-msw.c (syms_of_device_mswindows):
-        Delete the dialog box primitives recently introduced by Kirill and
+	* device-msw.c (mswindows_handle_print_setup_dialog_box):
+	* device-msw.c (mswindows_handle_print_dialog_box):
+	* device-msw.c (mswindows_handle_page_setup_dialog_box):
+	* device-msw.c (syms_of_device_mswindows):
+	Delete the dialog box primitives recently introduced by Kirill and
 	instead interface to general dialog box interface.
 
-        * device-x.c:
-        * device-x.c (compute_x_app_name):
-        * device-x.c (x_init_device):
-        * device-x.c (Fx_valid_keysym_name_p):
-        * device-x.c (Fx_set_font_path):
-        [6].
-        [7].
-
-        * device.h (wrap_device): New.
-        First of its kind; meant to replace XSETDEVICE.
-
-        * dialog-msw.c: Many file-dialog symbols.
-
-        * dialog-msw.c (mswindows_register_popup_frame): New.
-        * dialog-msw.c (mswindows_is_dialog_msg): New.
-        For supporting kbd traversal in dialog boxes.
-
-        * dialog-msw.c (dialog_proc):
-        Support hitting ESC in dialogs.
-
-        * dialog-msw.c (struct):
-        Common dialog box errors.
-
-        * dialog-msw.c (handle_file_dialog_box): New.
-        Add file dialog code.
-
-        * dialog-msw.c (handle_question_dialog_box):
-        Redo existing code to support new question dialog syntax.
-
-        * dialog-msw.c (console_type_create_dialog_mswindows):
-        We support new dialog console method.
-
-        * dialog-msw.c (syms_of_dialog_mswindows):
-        * dialog-msw.c (vars_of_dialog_mswindows):
-        New file dialog symbols, vars.
-
-        * dialog-x.c:
-        * dialog-x.c (maybe_run_dbox_text_callback):
-        * dialog-x.c (dbox_descriptor_to_widget_value):
-        * dialog-x.c (x_make_dialog_box_internal):
-        * dialog-x.c (console_type_create_dialog_x):
-        Mule-ize entire file.
-        Redo to support question dialog syntax.
-        [6].
-
-        * dialog.c:
-        * dialog.c (Fmake_dialog_box_internal):
-        * dialog.c (syms_of_dialog):
-        Kill old popup-dialog-box, replace with new primitive.
-        Just call device method or signal error.
-
-        * eldap.c (Fldap_open):
-        * eldap.c (Fldap_search_basic):
-        * eldap.c (Fldap_add):
-        * eldap.c (Fldap_modify):
-        [1].
-        [7].
-
-        * emacs.c:
-        * emacs.c (make_arg_list_1):
-        * emacs.c (make_arg_list):
-        Mule-ize call to dll_init().
-        [6].
-        [8].
-
-        * emacs.c (make_argc_argv):
-        * emacs.c (free_argc_argv):
-        * emacs.c (init_cmdargs):
-        * emacs.c (main_1):
-        * emacs.c (Fkill_emacs):
-        * emacs.c (Fdump_emacs):
-        Update comments about what can be used in syms_* etc.
-        Call init_win32() when necessary.
-        Fix up MS Win dialog box in kill-buffer to actually work right.
-        [7].
-
-        * eval.c:
-        * eval.c (For):
-        * eval.c (Fand):
-        * eval.c (Fprogn):
-        * eval.c (Fprog1):
-        * eval.c (Fprog2):
-        * eval.c (FletX):
-        * eval.c (Flet):
-        * eval.c (condition_case_3):
-        * eval.c (Feval):
-        * eval.c (function_argcount):
-        * eval.c (funcall_lambda):
-        [1].
-
-        * eval.c (type_error): New.
-        * eval.c (maybe_type_error): New.
-        * eval.c (continuable_type_error): New.
-        * eval.c (maybe_continuable_type_error): New.
-        * eval.c (type_error_with_frob): New.
-        * eval.c (maybe_type_error_with_frob): New.
-        * eval.c (continuable_type_error_with_frob): New.
-        * eval.c (maybe_continuable_type_error_with_frob): New.
-        New functions for use with structured errors.
-
-        * event-Xt.c:
-        * event-Xt.c (x_event_to_emacs_event):
-        Buttons are now modifiers too.
-
-        * event-Xt.c (emacs_Xt_current_event_timestamp):
-        Implement new event method.
-        * event-Xt.c (reinit_vars_of_event_Xt): Set it.
-
-        * event-msw.c:
-        * event-msw.c (ntpipe_shove_writer): [5].
-        * event-msw.c (mswindows_enqueue_mouse_button_event):
-        * event-msw.c (mswindows_drain_windows_queue):
-        * event-msw.c (mswindows_wnd_proc): [7].
-        * event-msw.c (mswindows_current_layout_has_AltGr): [5].
-        * event-msw.c (mswindows_modifier_state):
-        Throughout: support new button modifiers.
-
-        * event-msw.c (emacs_mswindows_current_event_timestamp):
-        Implement new event method.
-        * event-msw.c (reinit_vars_of_event_mswindows): Set it.
-
-        * event-stream.c:
-        * event-stream.c (event_stream_current_event_timestamp): New.
-        * event-stream.c (maybe_kbd_translate): New functionality.
-        * event-stream.c (vars_of_event_stream):
-        Document new kbd-translate-table functionality.
-
-        * event-stream.c (Fcurrent_event_timestamp): New.
-        New primitive for use in fabricated events.
-        * event-stream.c (syms_of_event_stream): [2]. Declare new primitive.
-
-        * events-mod.h (XEMACS_MOD_BUTTON1): new button modifiers.
-
-        * events.c:
-        * events.c (Fmake_event):
-        * events.c (WRONG_EVENT_TYPE_FOR_PROPERTY):
-        [1].
-        [9].
+	* device-x.c:
+	* device-x.c (compute_x_app_name):
+	* device-x.c (x_init_device):
+	* device-x.c (Fx_valid_keysym_name_p):
+	* device-x.c (Fx_set_font_path):
+	[6].
+	[7].
+
+	* device.h (wrap_device): New.
+	First of its kind; meant to replace XSETDEVICE.
+
+	* dialog-msw.c: Many file-dialog symbols.
 
-        * events.c (format_event_object): fix gcc warnings.
+	* dialog-msw.c (mswindows_register_popup_frame): New.
+	* dialog-msw.c (mswindows_is_dialog_msg): New.
+	For supporting kbd traversal in dialog boxes.
+
+	* dialog-msw.c (dialog_proc):
+	Support hitting ESC in dialogs.
 
-        * events.c (Fevent_timestamp): Document new primitives.
+	* dialog-msw.c (struct):
+	Common dialog box errors.
 
-        * events.c (TIMESTAMP_HALFSPACE): New.
+	* dialog-msw.c (handle_file_dialog_box): New.
+	Add file dialog code.
 
-        * events.c (Fevent_timestamp_lessp): New.  New primitive for
+	* dialog-msw.c (handle_question_dialog_box):
+	Redo existing code to support new question dialog syntax.
+
+	* dialog-msw.c (console_type_create_dialog_mswindows):
+	We support new dialog console method.
+
+	* dialog-msw.c (syms_of_dialog_mswindows):
+	* dialog-msw.c (vars_of_dialog_mswindows):
+	New file dialog symbols, vars.
+
+	* dialog-x.c:
+	* dialog-x.c (maybe_run_dbox_text_callback):
+	* dialog-x.c (dbox_descriptor_to_widget_value):
+	* dialog-x.c (x_make_dialog_box_internal):
+	* dialog-x.c (console_type_create_dialog_x):
+	Mule-ize entire file.
+	Redo to support question dialog syntax.
+	[6].
+
+	* dialog.c:
+	* dialog.c (Fmake_dialog_box_internal):
+	* dialog.c (syms_of_dialog):
+	Kill old popup-dialog-box, replace with new primitive.
+	Just call device method or signal error.
+
+	* eldap.c (Fldap_open):
+	* eldap.c (Fldap_search_basic):
+	* eldap.c (Fldap_add):
+	* eldap.c (Fldap_modify):
+	[1].
+	[7].
+
+	* emacs.c:
+	* emacs.c (make_arg_list_1):
+	* emacs.c (make_arg_list):
+	Mule-ize call to dll_init().
+	[6].
+	[8].
+
+	* emacs.c (make_argc_argv):
+	* emacs.c (free_argc_argv):
+	* emacs.c (init_cmdargs):
+	* emacs.c (main_1):
+	* emacs.c (Fkill_emacs):
+	* emacs.c (Fdump_emacs):
+	Update comments about what can be used in syms_* etc.
+	Call init_win32() when necessary.
+	Fix up MS Win dialog box in kill-buffer to actually work right.
+	[7].
+
+	* eval.c:
+	* eval.c (For):
+	* eval.c (Fand):
+	* eval.c (Fprogn):
+	* eval.c (Fprog1):
+	* eval.c (Fprog2):
+	* eval.c (FletX):
+	* eval.c (Flet):
+	* eval.c (condition_case_3):
+	* eval.c (Feval):
+	* eval.c (function_argcount):
+	* eval.c (funcall_lambda):
+	[1].
+
+	* eval.c (type_error): New.
+	* eval.c (maybe_type_error): New.
+	* eval.c (continuable_type_error): New.
+	* eval.c (maybe_continuable_type_error): New.
+	* eval.c (type_error_with_frob): New.
+	* eval.c (maybe_type_error_with_frob): New.
+	* eval.c (continuable_type_error_with_frob): New.
+	* eval.c (maybe_continuable_type_error_with_frob): New.
+	New functions for use with structured errors.
+
+	* event-Xt.c:
+	* event-Xt.c (x_event_to_emacs_event):
+	Buttons are now modifiers too.
+
+	* event-Xt.c (emacs_Xt_current_event_timestamp):
+	Implement new event method.
+	* event-Xt.c (reinit_vars_of_event_Xt): Set it.
+
+	* event-msw.c:
+	* event-msw.c (ntpipe_shove_writer): [5].
+	* event-msw.c (mswindows_enqueue_mouse_button_event):
+	* event-msw.c (mswindows_drain_windows_queue):
+	* event-msw.c (mswindows_wnd_proc): [7].
+	* event-msw.c (mswindows_current_layout_has_AltGr): [5].
+	* event-msw.c (mswindows_modifier_state):
+	Throughout: support new button modifiers.
+
+	* event-msw.c (emacs_mswindows_current_event_timestamp):
+	Implement new event method.
+	* event-msw.c (reinit_vars_of_event_mswindows): Set it.
+
+	* event-stream.c:
+	* event-stream.c (event_stream_current_event_timestamp): New.
+	* event-stream.c (maybe_kbd_translate): New functionality.
+	* event-stream.c (vars_of_event_stream):
+	Document new kbd-translate-table functionality.
+
+	* event-stream.c (Fcurrent_event_timestamp): New.
+	New primitive for use in fabricated events.
+	* event-stream.c (syms_of_event_stream): [2]. Declare new primitive.
+
+	* events-mod.h (XEMACS_MOD_BUTTON1): new button modifiers.
+
+	* events.c:
+	* events.c (Fmake_event):
+	* events.c (WRONG_EVENT_TYPE_FOR_PROPERTY):
+	[1].
+	[9].
+
+	* events.c (format_event_object): fix gcc warnings.
+
+	* events.c (Fevent_timestamp): Document new primitives.
+
+	* events.c (TIMESTAMP_HALFSPACE): New.
+
+	* events.c (Fevent_timestamp_lessp): New.  New primitive for
 	comparing timestamps correctly (half-space algorithm).
 
-        * events.c (Fevent_modifier_bits): Doc fix.
+	* events.c (Fevent_modifier_bits): Doc fix.
+
+	* events.c (Fevent_modifiers): Major doc addition.
+	* events.c (event_x_y_pixel_internal): Typo fix.
+	* events.c (syms_of_events): Declare new primitives.
+
+	* events.h:
+	Update long comment for button modifiers, timestamps.
+
+	* events.h (struct event_stream):
+	New current_event_timestamp method.
+
+	* extents.c:
+	* extents.c (extent_in_region_p):
+	* extents.c (decode_extent):
+	* extents.c (Fset_extent_parent):
+	* extents.c (decode_map_extents_flags):
+	Fix gcc warnings.
+	[9].
+
+	* extents.c (struct extent_at_arg):
+	* extents.c (decode_extent_at_flag):
+	* extents.c (extent_at_mapper):
+	* extents.c (extent_at_bytind):
+	* extents.c (Fextent_at): Adapt to new lower-level interface. [9].
+	* extents.c (Fextents_at): New primitive. [9].
+	* extents.c (symbol_to_glyph_layout): [9].
+	Support new primitive `extents-at'.
+
+
+	* extents.c (get_text_property_bytind):
+	extent_at_bytind has another arg.
+	[9].
+
+	* extents.c (syms_of_extents): New primitive.
+
+	* file-coding.c (Fmake_coding_system): [1].
+	* file-coding.c (subsidiary_coding_system): fix gcc warning
+	* file-coding.c (syms_of_file_coding): [2].
+
+	* fileio.c (Fexpand_file_name):
+	* fileio.c (Fsysnetunam):
+	* fileio.c (Ffile_exists_p):
+	* fileio.c (Ffile_executable_p):
+	* fileio.c (Fverify_visited_file_modtime):
+	Clean up GCPROing.
+
+	* fileio.c (syms_of_fileio): [2].
+
+	* filelock.c (lock_file_1):
+	* filelock.c (current_lock_owner):
+	* filelock.c (lock_if_free):
+	* filelock.c (lock_file):
+	* filelock.c (unlock_file):
+	Clean up GCPROing.
+
+	* fns.c (concat): Fix gcc warning.
+
+	* fns.c (Fmember):
+	* fns.c (Fold_member):
+	* fns.c (Fmemq):
+	* fns.c (Fold_memq):
+	* fns.c (memq_no_quit):
+	* fns.c (Fassoc):
+	* fns.c (Fold_assoc):
+	* fns.c (Fassq):
+	* fns.c (Fold_assq):
+	* fns.c (assq_no_quit):
+	* fns.c (Frassoc):
+	* fns.c (Fold_rassoc):
+	* fns.c (Frassq):
+	* fns.c (Fold_rassq):
+	* fns.c (rassq_no_quit):
+	* fns.c (Fdelete):
+	* fns.c (Fold_delete):
+	* fns.c (Fdelq):
+	* fns.c (Fold_delq):
+	* fns.c (delq_no_quit):
+	* fns.c (Fremassoc):
+	* fns.c (Fremassq):
+	* fns.c (remassq_no_quit):
+	* fns.c (Fremrassoc):
+	* fns.c (Fremrassq):
+	* fns.c (remrassq_no_quit):
+	* fns.c (Freverse):
+	* fns.c (mapcar1):
+	[1].
+
+	* frame-msw.c (mswindows_init_frame_1):
+	* frame-msw.c (mswindows_delete_frame):
+	Register popups with dialog code so keyboard traversing works.
+
+	* frame-tty.c (tty_raise_frame_no_select): [1].
+
+	* frame-x.c:
+	* frame-x.c (x_set_frame_text_value):
+	* frame-x.c (x_set_frame_properties):
+	* frame-x.c (x_create_widgets):
+	[7].
+
+	* frame.c:
+	* frame.c (Fmouse_pixel_position): Minor doc fixes.
+
+	* frame.h (wrap_frame): New.
+	Macro like wrap_device.
+
+	* general.c:
+	* general.c (SYMBOL):
+	* general.c (syms_of_general):
+	Major reorg.  This is now just a wrapper and symbols themselves
+	are listed in general-slots.h.
+
+	* glyphs-eimage.c (tiff_instantiate): Need cast to fix warning.
+	* glyphs-msw.c (mswindows_resource_instantiate): [5].
+
+	* glyphs-msw.c (mswindows_native_layout_instantiate):
+	Add DS_CONTROL so keyboard traversal will work.
+
+	* glyphs-widget.c:
+	* glyphs-widget.c (syms_of_glyphs_widget):
+	Move some symbols to general-slots.h.
+
+	* glyphs-x.c:
+	* glyphs-x.c (xbm_instantiate_1):
+	* glyphs-x.c (x_xbm_instantiate):
+	* glyphs-x.c (x_xface_instantiate):
+	* glyphs-x.c (autodetect_instantiate):
+	* glyphs-x.c (cursor_font_instantiate):
+	* glyphs-x.c (x_update_widget):
+	* glyphs-x.c (x_widget_instantiate):
+	* glyphs.c (bitmap_to_lisp_data):
+	* glyphs.c (pixmap_to_lisp_data):
+	[7].
+
+	* glyphs.c (syms_of_glyphs):
+	[2].
+
+	* gui-x.c:
+	* gui-x.c (print_widget_value):
+	* gui-x.c (menu_separator_style_and_to_external):
+	* gui-x.c (add_accel_and_to_external):
+	* gui-x.c (button_item_to_widget_value):
+	* gui-x.c (gui_items_to_widget_values_1):
+	* gui-x.c (gui_items_to_widget_values):
+	* gui-x.c (syms_of_gui_x):
+	* gui-x.c (vars_of_gui_x):
+	Mule-ize entire file.  Move menu-no-selection-hook to gui.c.
+	[9].
+
+	* gui-x.h:
+	Muleize, prototype changes matching gui-x.c.
+
+	* gui.c:
+	* gui.c (separator_string_p):
+	* gui.c (gui_item_add_keyval_pair):
+	* gui.c (make_gui_item_from_keywords_internal):
+	* gui.c (signal_too_long_error):
+	* gui.c (parse_gui_item_tree_item):
+	* gui.c (syms_of_gui):
+	* gui.c (vars_of_gui):
+	* gui.h:
+	menu-no-selection-hook moved here (used by MSWin).
+	Move some symbols to general-slots.h.
+	[6].
+	[9].
+
+	* insdel.c (get_buffer_pos_char):
+	* insdel.c (get_buffer_range_char):
+	Add GC comments.
+
+	* keymap.c (keymap_lookup_directly):
+	* keymap.c (keymap_store):
+	* keymap.c (ensure_meta_prefix_char_keymapp):
+	* keymap.c (describe_map):
+	* keymap.h:
+	Support new button modifiers.
+
+	* lisp-disunion.h (wrap_object):
+	* lisp-disunion.h (XSETOBJ):
+	Rename make_obj to wrap_object.
+
+	* lisp-union.h:
+	* lisp-union.h (make_int):
+	* lisp-union.h (make_char):
+	Support wrap_object.
 
-        * events.c (Fevent_modifiers): Major doc addition.
-        * events.c (event_x_y_pixel_internal): Typo fix.
-        * events.c (syms_of_events): Declare new primitives.
-
-        * events.h:
-        Update long comment for button modifiers, timestamps.
-
-        * events.h (struct event_stream):
-        New current_event_timestamp method.
-
-        * extents.c:
-        * extents.c (extent_in_region_p):
-        * extents.c (decode_extent):
-        * extents.c (Fset_extent_parent):
-        * extents.c (decode_map_extents_flags):
-        Fix gcc warnings.
-        [9].
-
-        * extents.c (struct extent_at_arg):
-        * extents.c (decode_extent_at_flag):
-        * extents.c (extent_at_mapper):
-        * extents.c (extent_at_bytind):
-        * extents.c (Fextent_at): Adapt to new lower-level interface. [9].
-        * extents.c (Fextents_at): New primitive. [9].
-        * extents.c (symbol_to_glyph_layout): [9].
-        Support new primitive `extents-at'.
-
-
-        * extents.c (get_text_property_bytind):
-        extent_at_bytind has another arg.
-        [9].
-
-        * extents.c (syms_of_extents): New primitive.
-
-        * file-coding.c (Fmake_coding_system): [1].
-        * file-coding.c (subsidiary_coding_system): fix gcc warning
-        * file-coding.c (syms_of_file_coding): [2].
-
-        * fileio.c (Fexpand_file_name):
-        * fileio.c (Fsysnetunam):
-        * fileio.c (Ffile_exists_p):
-        * fileio.c (Ffile_executable_p):
-        * fileio.c (Fverify_visited_file_modtime):
-        Clean up GCPROing.
-
-        * fileio.c (syms_of_fileio): [2].
-
-        * filelock.c (lock_file_1):
-        * filelock.c (current_lock_owner):
-        * filelock.c (lock_if_free):
-        * filelock.c (lock_file):
-        * filelock.c (unlock_file):
-        Clean up GCPROing.
-
-        * fns.c (concat): Fix gcc warning.
-
-        * fns.c (Fmember):
-        * fns.c (Fold_member):
-        * fns.c (Fmemq):
-        * fns.c (Fold_memq):
-        * fns.c (memq_no_quit):
-        * fns.c (Fassoc):
-        * fns.c (Fold_assoc):
-        * fns.c (Fassq):
-        * fns.c (Fold_assq):
-        * fns.c (assq_no_quit):
-        * fns.c (Frassoc):
-        * fns.c (Fold_rassoc):
-        * fns.c (Frassq):
-        * fns.c (Fold_rassq):
-        * fns.c (rassq_no_quit):
-        * fns.c (Fdelete):
-        * fns.c (Fold_delete):
-        * fns.c (Fdelq):
-        * fns.c (Fold_delq):
-        * fns.c (delq_no_quit):
-        * fns.c (Fremassoc):
-        * fns.c (Fremassq):
-        * fns.c (remassq_no_quit):
-        * fns.c (Fremrassoc):
-        * fns.c (Fremrassq):
-        * fns.c (remrassq_no_quit):
-        * fns.c (Freverse):
-        * fns.c (mapcar1):
-        [1].
-
-        * frame-msw.c (mswindows_init_frame_1):
-        * frame-msw.c (mswindows_delete_frame):
-        Register popups with dialog code so keyboard traversing works.
-
-        * frame-tty.c (tty_raise_frame_no_select): [1].
-
-        * frame-x.c:
-        * frame-x.c (x_set_frame_text_value):
-        * frame-x.c (x_set_frame_properties):
-        * frame-x.c (x_create_widgets):
-        [7].
-
-        * frame.c:
-        * frame.c (Fmouse_pixel_position): Minor doc fixes.
-
-        * frame.h (wrap_frame): New.
-        Macro like wrap_device.
-
-        * general.c:
-        * general.c (SYMBOL):
-        * general.c (syms_of_general):
-        Major reorg.  This is now just a wrapper and symbols themselves
-        are listed in general-slots.h.
-
-        * glyphs-eimage.c (tiff_instantiate): Need cast to fix warning.
-        * glyphs-msw.c (mswindows_resource_instantiate): [5].
-
-        * glyphs-msw.c (mswindows_native_layout_instantiate):
-        Add DS_CONTROL so keyboard traversal will work.
-
-        * glyphs-widget.c:
-        * glyphs-widget.c (syms_of_glyphs_widget):
-        Move some symbols to general-slots.h.
-
-        * glyphs-x.c:
-        * glyphs-x.c (xbm_instantiate_1):
-        * glyphs-x.c (x_xbm_instantiate):
-        * glyphs-x.c (x_xface_instantiate):
-        * glyphs-x.c (autodetect_instantiate):
-        * glyphs-x.c (cursor_font_instantiate):
-        * glyphs-x.c (x_update_widget):
-        * glyphs-x.c (x_widget_instantiate):
-        * glyphs.c (bitmap_to_lisp_data):
-        * glyphs.c (pixmap_to_lisp_data):
-        [7].
-
-        * glyphs.c (syms_of_glyphs):
-        [2].
-
-        * gui-x.c:
-        * gui-x.c (print_widget_value):
-        * gui-x.c (menu_separator_style_and_to_external):
-        * gui-x.c (add_accel_and_to_external):
-        * gui-x.c (button_item_to_widget_value):
-        * gui-x.c (gui_items_to_widget_values_1):
-        * gui-x.c (gui_items_to_widget_values):
-        * gui-x.c (syms_of_gui_x):
-        * gui-x.c (vars_of_gui_x):
-        Mule-ize entire file.  Move menu-no-selection-hook to gui.c.
-        [9].
-
-        * gui-x.h:
-        Muleize, prototype changes matching gui-x.c.
-
-        * gui.c:
-        * gui.c (separator_string_p):
-        * gui.c (gui_item_add_keyval_pair):
-        * gui.c (make_gui_item_from_keywords_internal):
-        * gui.c (signal_too_long_error):
-        * gui.c (parse_gui_item_tree_item):
-        * gui.c (syms_of_gui):
-        * gui.c (vars_of_gui):
-        * gui.h:
-        menu-no-selection-hook moved here (used by MSWin).
-        Move some symbols to general-slots.h.
-        [6].
-        [9].
-
-        * insdel.c (get_buffer_pos_char):
-        * insdel.c (get_buffer_range_char):
-        Add GC comments.
-
-        * keymap.c (keymap_lookup_directly):
-        * keymap.c (keymap_store):
-        * keymap.c (ensure_meta_prefix_char_keymapp):
-        * keymap.c (describe_map):
-        * keymap.h:
-        Support new button modifiers.
-
-        * lisp-disunion.h (wrap_object):
-        * lisp-disunion.h (XSETOBJ):
-        Rename make_obj to wrap_object.
-
-        * lisp-union.h:
-        * lisp-union.h (make_int):
-        * lisp-union.h (make_char):
-        Support wrap_object.
-
-        * lisp.h:
-        * lisp.h (LIST_LOOP):
-        * lisp.h (EXTERNAL_LIST_LOOP):
-        * lisp.h (LIST_LOOP_2):
-        * lisp.h (EXTERNAL_LIST_LOOP_1):
-        * lisp.h (EXTERNAL_LIST_LOOP_2):
-        * lisp.h (EXTERNAL_LIST_LOOP_3):
-        * lisp.h (EXTERNAL_LIST_LOOP_4_NO_DECLARE):
-        * lisp.h (PRIVATE_EXTERNAL_LIST_LOOP_6):
-        * lisp.h (GET_EXTERNAL_LIST_LENGTH):
-        * lisp.h (EXTERNAL_ALIST_LOOP_5):
-        * lisp.h (EXTERNAL_ALIST_LOOP_6):
-        * lisp.h (EXTERNAL_ALIST_LOOP_6_NO_DECLARE):
-        * lisp.h (EXTERNAL_PROPERTY_LIST_LOOP_5_NO_DECLARE):
-        * lisp.h (EXTERNAL_PROPERTY_LIST_LOOP_7):
-        * lisp.h (struct Lisp_Symbol):
-        * lisp.h (maybe_continuable_error_with_frob):
-        Fix up section comments.
-        Add new types for char to indicate usage.
-        Delete symbols auto-generated from general-slots.h.
-        Add prototypes for structured error functions.
-        Add long comments describing looping macros and change interface
-        so that lvalues are automatically declared.
+	* lisp.h:
+	* lisp.h (LIST_LOOP):
+	* lisp.h (EXTERNAL_LIST_LOOP):
+	* lisp.h (LIST_LOOP_2):
+	* lisp.h (EXTERNAL_LIST_LOOP_1):
+	* lisp.h (EXTERNAL_LIST_LOOP_2):
+	* lisp.h (EXTERNAL_LIST_LOOP_3):
+	* lisp.h (EXTERNAL_LIST_LOOP_4_NO_DECLARE):
+	* lisp.h (PRIVATE_EXTERNAL_LIST_LOOP_6):
+	* lisp.h (GET_EXTERNAL_LIST_LENGTH):
+	* lisp.h (EXTERNAL_ALIST_LOOP_5):
+	* lisp.h (EXTERNAL_ALIST_LOOP_6):
+	* lisp.h (EXTERNAL_ALIST_LOOP_6_NO_DECLARE):
+	* lisp.h (EXTERNAL_PROPERTY_LIST_LOOP_5_NO_DECLARE):
+	* lisp.h (EXTERNAL_PROPERTY_LIST_LOOP_7):
+	* lisp.h (struct Lisp_Symbol):
+	* lisp.h (maybe_continuable_error_with_frob):
+	Fix up section comments.
+	Add new types for char to indicate usage.
+	Delete symbols auto-generated from general-slots.h.
+	Add prototypes for structured error functions.
+	Add long comments describing looping macros and change interface
+	so that lvalues are automatically declared.
 	Add NO_DECLARE macro in case callers want to declare lvalues
 	themselves.
 
-        * lread.c (read_syntax_error):
-        * lread.c (continuable_read_syntax_error):
-        * lread.c (read_structure):
-        * lread.c (sequence_reader):
-        * lread.c (read_list_conser):
-        * lread.c (read_compiled_function):
-        Rename syntax_error and continuable_syntax_error to avoid clash
-        with same-named structured error functions.
-
-        * menubar-msw.c (mswindows_translate_menu_or_dialog_item):
-        * menubar-msw.c (populate_menu_add_item):
-        * menubar-msw.c (populate_or_checksum_helper):
-        [5].
-        [9].
-
-        * menubar-x.c:
-        * menubar-x.c (menu_item_descriptor_to_widget_value_1):
-        Mule-ize whole file.
-
-        * menubar.c (Fnormalize_menu_item_name): Add optimization.
-
-        * mule-charset.c (Fmake_charset):
-        * mule-wnnfns.c (Fwnn_set_param):
-        [1].
-
-        * ntproc.c (create_child):
-        * ntproc.c (Fwin32_set_current_locale):
-        Add comments portending doom.
-
-        * objects-msw.c:
-        * objects-msw.c (old_font_enum_callback_2):
-        * objects-msw.c (font_enum_callback_1):
-        * objects-msw.c (mswindows_enumerate_fonts):
-        [5].
-
-        * objects-x.c:
-        * objects-x.c (allocate_nearest_color):
-        * objects-x.c (x_parse_nearest_color):
-        * objects-x.c (x_initialize_color_instance):
-        * objects-x.c (x_print_color_instance):
-        * objects-x.c (x_finalize_color_instance):
-        * objects-x.c (x_valid_color_name_p):
-        * objects-x.c (x_initialize_font_instance):
-        * objects-x.c (x_print_font_instance):
-        * objects-x.c (valid_x_font_name_p):
-        * objects-x.c (truename_via_FONT_prop):
-        * objects-x.c (truename_via_random_props):
-        * objects-x.c (truename_via_XListFonts):
-        * objects-x.c (x_font_truename):
-        * objects-x.c (x_font_instance_truename):
-        * objects-x.c (x_font_instance_properties):
-        * objects-x.c (x_list_fonts):
-        * objects-x.c (x_find_charset_font):
-        Mule-ize entire file.
-        [7].
-
-        * objects-x.h:
-        Mule-verify.
-
-        * print.c:
-        * print.c (std_handle_out_external):
-        * print.c (debug_print_no_newline):
-        * print.c (syms_of_print):
-        Output to all debugger kinds in debug-print.
-        Fix console-output code under MSWin to actually work.
-
-        * process-nt.c (send_signal):
-        * process-nt.c (nt_create_process):
-        Use newer Unicode macros.
-
-        * process-unix.c (unix_create_process):
-        * process-unix.c (unix_canonicalize_host_name):
-        * process-unix.c (unix_open_network_stream):
-        [7].
-
-        * scrollbar-x.c:
-        Mule-verify.
-
-        * search.c (syms_of_search):
-        [2].
-
-        * select-msw.c (mswindows_destroy_selection):
-        Use LIST_LOOP_2.
-
-        * select-x.c (symbol_to_x_atom):
-        [7].
-
-        * select.c (syms_of_select):
-        [2].
-
-        * sound.c (Fplay_sound_file):
-        [7].
-
-        * specifier.c:
-        * specifier.c (decode_specifier_type):
-        * specifier.c (Fvalid_specifier_locale_type_p):
-        * specifier.c (check_valid_locale_or_locale_type):
-        * specifier.c (decode_locale):
-        * specifier.c (decode_locale_type):
-        * specifier.c (decode_locale_list):
-        * specifier.c (check_valid_domain):
-        * specifier.c (decode_specifier_tag_set):
-        * specifier.c (Fcanonicalize_tag_set):
-        * specifier.c (Fdefine_specifier_tag):
-        * specifier.c (Fspecifier_tag_predicate):
-        * specifier.c (check_valid_inst_list):
-        * specifier.c (check_valid_spec_list):
-        * specifier.c (decode_how_to_add_specification):
-        * specifier.c (check_modifiable_specifier):
-        * specifier.c (specifier_add_spec):
-        * specifier.c (boolean_validate):
-        * specifier.c (display_table_validate):
-        [9].
-
-        * specifier.c (syms_of_specifier):
-        Move some symbols to general-slots.h.
-        [2].
-
-        * symbols.c:
-        * symbols.c (Fmapatoms):
-        * symbols.c (Fapropos_internal):
-        Add GCPROs.
-
-        * symbols.c (set_default_buffer_slot_variable):
-        * symbols.c (set_default_console_slot_variable):
-        [1].
-
-        * symbols.c (defsymbol_massage_name_1):
-        * symbols.c (defkeyword_massage_name):
-        * symbols.c (deferror_1):
-        * symbols.c (deferror):
-        * symbols.c (deferror_massage_name_and_message):
-        * symeval.h:
-        * symeval.h (DEFSYMBOL):
-        Support DEFSYMBOL*, DEFKEYWORD, DEFERROR
-
-        * symbols.c (syms_of_symbols):
-        [2].
-
-        * symsinit.h:
-        * symsinit.h (init_win32): New.
-        Also new is syms_of_dialog_mswindows.
+	* lread.c (read_syntax_error):
+	* lread.c (continuable_read_syntax_error):
+	* lread.c (read_structure):
+	* lread.c (sequence_reader):
+	* lread.c (read_list_conser):
+	* lread.c (read_compiled_function):
+	Rename syntax_error and continuable_syntax_error to avoid clash
+	with same-named structured error functions.
+
+	* menubar-msw.c (mswindows_translate_menu_or_dialog_item):
+	* menubar-msw.c (populate_menu_add_item):
+	* menubar-msw.c (populate_or_checksum_helper):
+	[5].
+	[9].
+
+	* menubar-x.c:
+	* menubar-x.c (menu_item_descriptor_to_widget_value_1):
+	Mule-ize whole file.
+
+	* menubar.c (Fnormalize_menu_item_name): Add optimization.
+
+	* mule-charset.c (Fmake_charset):
+	* mule-wnnfns.c (Fwnn_set_param):
+	[1].
+
+	* ntproc.c (create_child):
+	* ntproc.c (Fwin32_set_current_locale):
+	Add comments portending doom.
+
+	* objects-msw.c:
+	* objects-msw.c (old_font_enum_callback_2):
+	* objects-msw.c (font_enum_callback_1):
+	* objects-msw.c (mswindows_enumerate_fonts):
+	[5].
+
+	* objects-x.c:
+	* objects-x.c (allocate_nearest_color):
+	* objects-x.c (x_parse_nearest_color):
+	* objects-x.c (x_initialize_color_instance):
+	* objects-x.c (x_print_color_instance):
+	* objects-x.c (x_finalize_color_instance):
+	* objects-x.c (x_valid_color_name_p):
+	* objects-x.c (x_initialize_font_instance):
+	* objects-x.c (x_print_font_instance):
+	* objects-x.c (valid_x_font_name_p):
+	* objects-x.c (truename_via_FONT_prop):
+	* objects-x.c (truename_via_random_props):
+	* objects-x.c (truename_via_XListFonts):
+	* objects-x.c (x_font_truename):
+	* objects-x.c (x_font_instance_truename):
+	* objects-x.c (x_font_instance_properties):
+	* objects-x.c (x_list_fonts):
+	* objects-x.c (x_find_charset_font):
+	Mule-ize entire file.
+	[7].
+
+	* objects-x.h:
+	Mule-verify.
+
+	* print.c:
+	* print.c (std_handle_out_external):
+	* print.c (debug_print_no_newline):
+	* print.c (syms_of_print):
+	Output to all debugger kinds in debug-print.
+	Fix console-output code under MSWin to actually work.
+
+	* process-nt.c (send_signal):
+	* process-nt.c (nt_create_process):
+	Use newer Unicode macros.
+
+	* process-unix.c (unix_create_process):
+	* process-unix.c (unix_canonicalize_host_name):
+	* process-unix.c (unix_open_network_stream):
+	[7].
+
+	* scrollbar-x.c:
+	Mule-verify.
+
+	* search.c (syms_of_search):
+	[2].
+
+	* select-msw.c (mswindows_destroy_selection):
+	Use LIST_LOOP_2.
+
+	* select-x.c (symbol_to_x_atom):
+	[7].
+
+	* select.c (syms_of_select):
+	[2].
+
+	* sound.c (Fplay_sound_file):
+	[7].
+
+	* specifier.c:
+	* specifier.c (decode_specifier_type):
+	* specifier.c (Fvalid_specifier_locale_type_p):
+	* specifier.c (check_valid_locale_or_locale_type):
+	* specifier.c (decode_locale):
+	* specifier.c (decode_locale_type):
+	* specifier.c (decode_locale_list):
+	* specifier.c (check_valid_domain):
+	* specifier.c (decode_specifier_tag_set):
+	* specifier.c (Fcanonicalize_tag_set):
+	* specifier.c (Fdefine_specifier_tag):
+	* specifier.c (Fspecifier_tag_predicate):
+	* specifier.c (check_valid_inst_list):
+	* specifier.c (check_valid_spec_list):
+	* specifier.c (decode_how_to_add_specification):
+	* specifier.c (check_modifiable_specifier):
+	* specifier.c (specifier_add_spec):
+	* specifier.c (boolean_validate):
+	* specifier.c (display_table_validate):
+	[9].
+
+	* specifier.c (syms_of_specifier):
+	Move some symbols to general-slots.h.
+	[2].
+
+	* symbols.c:
+	* symbols.c (Fmapatoms):
+	* symbols.c (Fapropos_internal):
+	Add GCPROs.
+
+	* symbols.c (set_default_buffer_slot_variable):
+	* symbols.c (set_default_console_slot_variable):
+	[1].
+
+	* symbols.c (defsymbol_massage_name_1):
+	* symbols.c (defkeyword_massage_name):
+	* symbols.c (deferror_1):
+	* symbols.c (deferror):
+	* symbols.c (deferror_massage_name_and_message):
+	* symeval.h:
+	* symeval.h (DEFSYMBOL):
+	Support DEFSYMBOL*, DEFKEYWORD, DEFERROR
+
+	* symbols.c (syms_of_symbols):
+	[2].
+
+	* symsinit.h:
+	* symsinit.h (init_win32): New.
+	Also new is syms_of_dialog_mswindows.
 
-        * syswindows.h:
+	* syswindows.h:
 	Add new Unicode macros, missing Cygwin wide-char functions,
 	convenience conversion macros for Qmswindows_tstr, macros for
 	encapsulating required MSWin <-> Cygwin filename conversions,
 	prototype for dynamically-extracted (not in NT 3.51) functions.
 
-        * toolbar-x.c:
-        Mule-verify.
+	* toolbar-x.c:
+	Mule-verify.
 
-        * tooltalk.c (Fadd_tooltalk_message_arg):
-        * tooltalk.c (Fadd_tooltalk_pattern_attribute):
-        * tooltalk.c (Fadd_tooltalk_pattern_arg):
-        [7].
-
-        * tooltalk.c (syms_of_tooltalk):
-        [2].
-
-        * unexnt.c:
-        * unexnt.c (unexec):
-        Fix up headers, declaration of unexec() to be more standard.
+	* tooltalk.c (Fadd_tooltalk_message_arg):
+	* tooltalk.c (Fadd_tooltalk_pattern_attribute):
+	* tooltalk.c (Fadd_tooltalk_pattern_arg):
+	[7].
+
+	* tooltalk.c (syms_of_tooltalk):
+	[2].
+
+	* unexnt.c:
+	* unexnt.c (unexec):
+	Fix up headers, declaration of unexec() to be more standard.
 
 2000-07-20  Martin Buchholz  <martin@xemacs.org>
 
@@ -4965,36 +5040,36 @@
 
 2000-07-05  Craig Lanning  <lanning@scra.org>
 
-        * Makefile.in.in: Add support for including the Windows resources
-        when building with the cygwin and mingw targets.
+	* Makefile.in.in: Add support for including the Windows resources
+	when building with the cygwin and mingw targets.
 
-        * buffer.c: from Dan Holmsand, on Windows $PWD is most likely either
-        not set or not correct.
-        (directory_is_current_directory): Don't compile for WIN32_NATIVE.
-        (init_initial_directory): Don't try to use $PWD on the
-        WIN32_NATIVE target.
+	* buffer.c: from Dan Holmsand, on Windows $PWD is most likely either
+	not set or not correct.
+	(directory_is_current_directory): Don't compile for WIN32_NATIVE.
+	(init_initial_directory): Don't try to use $PWD on the
+	WIN32_NATIVE target.
 
-        * s\cygwin32.h:
+	* s\cygwin32.h:
 	[[Add -mwindows to eliminate console window.]] not required --ben
-        (HAVE_NATIVE_SOUND): removed; now handled by configure.
-        (MAIL_USE_POP): removed; now handled by configure.
+	(HAVE_NATIVE_SOUND): removed; now handled by configure.
+	(MAIL_USE_POP): removed; now handled by configure.
 
-        * s\mingw32.h: [[Add -mwindows to eliminate console window.]] not in
+	* s\mingw32.h: [[Add -mwindows to eliminate console window.]] not in
 	C_SWITCH_SYSTEM or it will affect lib-src progs. --ben
-        (HAVE_NATIVE_SOUND): removed; now handled by configure.
-        (MAIL_USE_POP): removed; now handled by configure.
-        (ENCAPSULATE_STAT): from Dan Holmsand, added.
-        (ENCAPSULATE_FSTAT): from Dan Holmsand, added.
-        (DIRECTORY_SEP): from Dan Holmsand, use lisp variable instead of
-        constant string.
-        (HAVE_TIMEVAL): from Dan Holmsand, added; struct timeval is picked
-        up from <winsock.h> via systime.h.
-        (HAVE_GETPAGESIZE): from Dan Holmsand, added.
-        (getpagesize): from Dan Holmsand, added.
-        Added #endif which was left dangling by Ben's mega patch; added
-        comment to help prevent this in the future.
+	(HAVE_NATIVE_SOUND): removed; now handled by configure.
+	(MAIL_USE_POP): removed; now handled by configure.
+	(ENCAPSULATE_STAT): from Dan Holmsand, added.
+	(ENCAPSULATE_FSTAT): from Dan Holmsand, added.
+	(DIRECTORY_SEP): from Dan Holmsand, use lisp variable instead of
+	constant string.
+	(HAVE_TIMEVAL): from Dan Holmsand, added; struct timeval is picked
+	up from <winsock.h> via systime.h.
+	(HAVE_GETPAGESIZE): from Dan Holmsand, added.
+	(getpagesize): from Dan Holmsand, added.
+	Added #endif which was left dangling by Ben's mega patch; added
+	comment to help prevent this in the future.
 
-        * sysdll.c: added #include <windows.h> for WIN32_NATIVE case.
+	* sysdll.c: added #include <windows.h> for WIN32_NATIVE case.
 
 2000-07-05  Kirill 'Big K' Katsnelson  <kkm@dtmx.com>
 
@@ -5092,13 +5167,13 @@
 
 2000-06-08  Mike Alexander  <mta@arbortext.com>
 
-        (MAX_SHOVE_BUFFER_SIZE): Change to 512 to match stream buffer size
-        (shove_thread): Don't write the same output twice
-        (make_ntpipe_output_stream): Increase priority of shove thread
-        (ntpipe_shove_writer): Call SwitchToThread to give shove thread a
-        chance to run
-        (ntpipe_shove_closer): Don't delete the pipe until we're done with
-        it.
+	(MAX_SHOVE_BUFFER_SIZE): Change to 512 to match stream buffer size
+	(shove_thread): Don't write the same output twice
+	(make_ntpipe_output_stream): Increase priority of shove thread
+	(ntpipe_shove_writer): Call SwitchToThread to give shove thread a
+	chance to run
+	(ntpipe_shove_closer): Don't delete the pipe until we're done with
+	it.
 
 2000-06-12  Ben Wing  <ben@xemacs.org>
 
@@ -6889,12 +6964,12 @@
 
 	* redisplay.c (add_glyph_rune): Don't set 0 to bufpos for text
 	image glyph if allow_cursor.
-        (add_hscroll_rune): Don't allow cursor to border glyph.
-        (create_text_block): Ditto.
+	(add_hscroll_rune): Don't allow cursor to border glyph.
+	(create_text_block): Ditto.
 
 	* redisplay-output.c (redisplay_move_cursor): Do nothing even if
 	text not in buffer.
-        (redisplay_output_layout): Call ensure_face_cachel_complete for
+	(redisplay_output_layout): Call ensure_face_cachel_complete for
 	text image glyph.
 
 
@@ -7473,7 +7548,7 @@
 	* alloc.c (pdump_register_struct):
 	* alloc.c (pdump_dump_data):
 	* alloc.c (pdump_reloc_one):
-        Minor cleanups.
+	Minor cleanups.
 
  	* console-msw.c:
 	* console-msw.c (GetConsoleHwnd):
@@ -7483,16 +7558,16 @@
 	* console-msw.c (msw_output_console_string):
 	* console-msw.c (console_type_create_mswindows):
 
-        a) Added functions to manipulate the console window for use with
-        shell support.
+	a) Added functions to manipulate the console window for use with
+	shell support.
 
-        b) Added support for writing text to the console, which is now
-        used under Windows when xemacs is not being run non-interactively,
-        to write text that would otherwise be destined for stdout because
-        under these circumstances, text written to stdout tends to
-        disappear and not be seen.
+	b) Added support for writing text to the console, which is now
+	used under Windows when xemacs is not being run non-interactively,
+	to write text that would otherwise be destined for stdout because
+	under these circumstances, text written to stdout tends to
+	disappear and not be seen.
 
-        * console-msw.h:
+	* console-msw.h:
 	* event-Xt.c:
 	* event-Xt.c (x_event_to_emacs_event):
 	* event-Xt.c (describe_event_window):
@@ -7546,20 +7621,20 @@
 	* device-msw.c (msw_get_workspace_coords):
 	* device-msw.c (mswindows_device_system_metrics):
 	and various other files, added support for a new
-        device property called offset-workspace which returns the position
-        of the upper left corner of the workspace area and goes along with
-        the existing size-workspace property.
+	device property called offset-workspace which returns the position
+	of the upper left corner of the workspace area and goes along with
+	the existing size-workspace property.
 
 	* dialog-msw.c:
 	* dialog-msw.c (push_bufbyte_string_as_unicode):
 	* dialog-msw.c (mswindows_popup_dialog_box):
-        Added support for XEmacs-style accelerator specifications in
-        button text.  Note: I didn't add support for this under X Windows,
-        and somebody needs to do this.
+	Added support for XEmacs-style accelerator specifications in
+	button text.  Note: I didn't add support for this under X Windows,
+	and somebody needs to do this.
 
 	* dialog.c:
 	* dialog.c (Fpopup_dialog_box):
-        Documented the support for accelerators that was just mentioned.
+	Documented the support for accelerators that was just mentioned.
 
 	editfns.c (get_home_directory): Changed behavior under Windows
 	when HOME not defined; former behavior was irretrievably broken.
@@ -7578,9 +7653,9 @@
 	* print.c (debug_print):
 	* print.c (debug_backtrace):
 	* print.c (debug_short_backtrace):
-        Cleaned up the code that prints text to stdout so that this can be
-        changed to output into a console window instead under MS Windows,
-        as described above.
+	Cleaned up the code that prints text to stdout so that this can be
+	changed to output into a console window instead under MS Windows,
+	as described above.
 
 	* eval.c:
 	* eval.c (DEFEND_AGAINST_THROW_RECURSION):
@@ -7602,14 +7677,14 @@
 	* event-msw.c (mswindows_modifier_state):
 	* event-msw.c (emacs_mswindows_quit_p):
 	* event-msw.c (vars_of_event_mswindows):
-        a) Added support for using the alt key to select menu items as is
-        standard under MS Windows.  This is controlled using the variable
-        menu-accelerator-enabled, just like under X Windows.  There is an
-        option on the options menu to turn this support on.  I really
-        think that it should be on by default under Windows, but I'm not
-        going to make this change yet.
+	a) Added support for using the alt key to select menu items as is
+	standard under MS Windows.  This is controlled using the variable
+	menu-accelerator-enabled, just like under X Windows.  There is an
+	option on the options menu to turn this support on.  I really
+	think that it should be on by default under Windows, but I'm not
+	going to make this change yet.
 
-        b)  Added support for dynamic display size changes under Windows.
+	b)  Added support for dynamic display size changes under Windows.
 
 	* event-stream.c:
 	* event-stream.c (maybe_echo_keys):
@@ -7624,30 +7699,30 @@
 	* event-stream.c (complex_vars_of_event_stream):
 	* events.h (struct command_builder):
 
-        a) Tried to clean up a little bit the horribly written x-specific
-        accelerator code that crept into this file.  I moved this code
-        into menubar-x.c where it belongs. I also needed to move the
-        command builder structure into the file events.h because it is
-        accessed directly by this accelerator code.  What I didn't do, but
-        which should be done at some point, is to properly abstract this
-        code using device methods instead of the kludgy way that it
-        currently hooks into the event code.
-
-        b) Added the lisp variables this-command-properties and
-        last-command- properties, which should be used to synchronize two
-        adjacent commands in preference to playing games with the variable
-        this-command, which is typically what happens.
-
-        c) Added some slightly nasty code to hook into the lisp support
-        for shifted- motion-key selection.  This is actually necessary for
-        somewhat complicated reasons, which are described in
-        simple.el. (NB: I think the proper thing would be to have the code
-        that calls the pre and post command hooks also call out to generic
-        lisp functions in simple.el, where all built-in stuff could be
-        added.  I will think about this more.)
+	a) Tried to clean up a little bit the horribly written x-specific
+	accelerator code that crept into this file.  I moved this code
+	into menubar-x.c where it belongs. I also needed to move the
+	command builder structure into the file events.h because it is
+	accessed directly by this accelerator code.  What I didn't do, but
+	which should be done at some point, is to properly abstract this
+	code using device methods instead of the kludgy way that it
+	currently hooks into the event code.
+
+	b) Added the lisp variables this-command-properties and
+	last-command- properties, which should be used to synchronize two
+	adjacent commands in preference to playing games with the variable
+	this-command, which is typically what happens.
+
+	c) Added some slightly nasty code to hook into the lisp support
+	for shifted- motion-key selection.  This is actually necessary for
+	somewhat complicated reasons, which are described in
+	simple.el. (NB: I think the proper thing would be to have the code
+	that calls the pre and post command hooks also call out to generic
+	lisp functions in simple.el, where all built-in stuff could be
+	added.  I will think about this more.)
 
 	* event-unixoid.c (poll_fds_for_input):
-        * lread.c (readchar):
+	* lread.c (readchar):
 	* redisplay-tty.c (tty_clear_frame):
 	* redisplay-x.c (x_get_gc):
 	* signal.c (interrupt_signal):
@@ -7660,33 +7735,33 @@
 
 	* frame-msw.c:
 	* frame-msw.c (mswindows_size_frame_internal):
-        Fixed the computation of frame size and position to keep the frame
-        within the workspace area, rather than within the physical
-        dimensions of the screen, so that the frame doesn't overlap window
-        manager decorations, such as the start menu and toolbar, typically
-        at the bottom of the screen.
+	Fixed the computation of frame size and position to keep the frame
+	within the workspace area, rather than within the physical
+	dimensions of the screen, so that the frame doesn't overlap window
+	manager decorations, such as the start menu and toolbar, typically
+	at the bottom of the screen.
 
 	* frame.c (vars_of_frame):
-        Changed the default frame title format under MS Windows to consist
-        of buffername-XEmacs, which is standard under MS Windows.  I think
-        it might be a good idea to change this everywhere because I think
-        it is superior to the current frame title format, but this is the
-        kind of change that is likely to cause some people to get annoyed,
-        so I'm not making it.
+	Changed the default frame title format under MS Windows to consist
+	of buffername-XEmacs, which is standard under MS Windows.  I think
+	it might be a good idea to change this everywhere because I think
+	it is superior to the current frame title format, but this is the
+	kind of change that is likely to cause some people to get annoyed,
+	so I'm not making it.
 
 	* glyphs-eimage.c (png_instantiate): Fixed some compile warnings.
 
 	* gui-msw.c (mswindows_handle_gui_wm_command):
-        Fixed compile warnings.
+	Fixed compile warnings.
 
 	* gui-x.c:
 	* gui-x.c (strdup_and_add_accel):
 	* gui-x.c (button_item_to_widget_value):
 	* gui-x.h:
-        Added code to automatically put an accelerator onto the beginning
-        of menu items that don't have one as is now the standard, and is
-        described more later.  Also fixed things so that the menu item
-        name can be an evaluated expression, again a new standard.
+	Added code to automatically put an accelerator onto the beginning
+	of menu items that don't have one as is now the standard, and is
+	described more later.  Also fixed things so that the menu item
+	name can be an evaluated expression, again a new standard.
 
 	* gui.c:
 	* gui.c (gui_item_add_keyval_pair):
@@ -7705,9 +7780,9 @@
 	* line-number.c (buffer_line_number):
 	* lisp.h:
 	* lisp.h (EMACS_INT_MAX):
-        Added the manifest constant EMACS_INT_MIN corresponding to the
-        existing constant EMACS_INT_MAX.  This is partially to fix compile
-        warnings under Windows, and partly for cleanliness.
+	Added the manifest constant EMACS_INT_MIN corresponding to the
+	existing constant EMACS_INT_MAX.  This is partially to fix compile
+	warnings under Windows, and partly for cleanliness.
 
 	* menubar-msw.c:
 	* menubar-msw.c (REPLACE_ME_WITH_GLOBAL_VARIABLE_WHICH_CONTROLS_RIGHT_FLUSH):
@@ -7726,15 +7801,15 @@
 	* menubar-msw.c (mswindows_update_frame_menubars):
 	* menubar-msw.c (mswindows_free_frame_menubars):
 	* menubar-msw.c (mswindows_popup_menu):
-        Fixed a bug in handling accelerators where an extra character
-        would be displayed in the menu item.  Also generalized the
-        function displayable_menu_item because it is now used by the
-        dialog box code as well.  And finally, added code in the functions
-        that create the menubar to extract a list of accelerators for the
-        top level menubar, which is used in the event code to determine
-        whether a particular alt-key combination should be used to invoke
-        a menu item, or should be passed through to access the standard
-        XEmacs keymap binding for this key combination.
+	Fixed a bug in handling accelerators where an extra character
+	would be displayed in the menu item.  Also generalized the
+	function displayable_menu_item because it is now used by the
+	dialog box code as well.  And finally, added code in the functions
+	that create the menubar to extract a list of accelerators for the
+	top level menubar, which is used in the event code to determine
+	whether a particular alt-key combination should be used to invoke
+	a menu item, or should be passed through to access the standard
+	XEmacs keymap binding for this key combination.
 
 	Much needed GCPROing.
 
@@ -7753,10 +7828,10 @@
 	* menubar-x.c (command_builder_find_menu_accelerator):
 	* menubar-x.c (Faccelerate_menu):
 	* menubar.h:
-        Moved a whole bunch of code here that was previously in
-        event-stream.c as described above.  There is also code connected
-        to the new standard of adding an accelerator to the beginning of
-        menu items that don't have one as described above and below.
+	Moved a whole bunch of code here that was previously in
+	event-stream.c as described above.  There is also code connected
+	to the new standard of adding an accelerator to the beginning of
+	menu items that don't have one as described above and below.
 
 	* menubar.c:
 	* menubar.c (menu_parse_submenu_keywords):
@@ -7766,31 +7841,31 @@
 	* menubar.c (vars_of_menubar):
 	* menubar.c (complex_vars_of_menubar):
 
-        a) Cleaned up a bunch of documentation and improved it.
+	a) Cleaned up a bunch of documentation and improved it.
 
-        b) XEmacs now automatically adds an accelerator onto the beginning
-        of any menu items that don't have one.  I did this because there
-        will inevitably be some menu items on the main menubar that don't
-        have accelerators on them because the package that adds that
-        particular menu item hasn't yet been fixed up to have accelerators
-        in them and it looked rather strange to have some items with and
-        some items without accelerators, especially since even in items
-        without accelerators, you can, at least under windows, still
-        access the item through an accelerator corresponding to the first
-        character in the item's name.  If people don't like this behavior,
-        I can add a variable to turn it off optionally, but I'm not sure
-        this is a good idea because we really do need to have accelerators
-        on all of the menu items, and if a package doesn't like the
-        accelerators being put on the first character, then it should put
-        the accelerators where they belong.
-
-        c) I made a behavior change, which is that the descriptor that
-        specifies the text of the menu item, which formerly was just a
-        string, can now also be an evaluated expression.  This makes this
-        descriptor parallel with all of the others, which could also be
-        evaluated expressions.  This also obviates the need for the
-        keyword :label, which was previously listed in the documentation
-        as unimplemented, and which was for the same purpose.
+	b) XEmacs now automatically adds an accelerator onto the beginning
+	of any menu items that don't have one.  I did this because there
+	will inevitably be some menu items on the main menubar that don't
+	have accelerators on them because the package that adds that
+	particular menu item hasn't yet been fixed up to have accelerators
+	in them and it looked rather strange to have some items with and
+	some items without accelerators, especially since even in items
+	without accelerators, you can, at least under windows, still
+	access the item through an accelerator corresponding to the first
+	character in the item's name.  If people don't like this behavior,
+	I can add a variable to turn it off optionally, but I'm not sure
+	this is a good idea because we really do need to have accelerators
+	on all of the menu items, and if a package doesn't like the
+	accelerators being put on the first character, then it should put
+	the accelerators where they belong.
+
+	c) I made a behavior change, which is that the descriptor that
+	specifies the text of the menu item, which formerly was just a
+	string, can now also be an evaluated expression.  This makes this
+	descriptor parallel with all of the others, which could also be
+	evaluated expressions.  This also obviates the need for the
+	keyword :label, which was previously listed in the documentation
+	as unimplemented, and which was for the same purpose.
 
 	d) GCPROing.
 
@@ -7799,10 +7874,10 @@
 	* ntproc.c (sys_spawnve):
 	* ntproc.c (find_child_console):
 	* ntproc.c (sys_kill):
-        Fixed compile warnings.  By the way, this file should really go
-        away entirely, and this will happen as soon as Kirill makes his
-        final round of process cleanups, which affect the function
-        call-process.
+	Fixed compile warnings.  By the way, this file should really go
+	away entirely, and this will happen as soon as Kirill makes his
+	final round of process cleanups, which affect the function
+	call-process.
 
 	* process-nt.c:
 	* process-nt.c (struct nt_process_data):
@@ -7818,17 +7893,17 @@
 	* process-nt.c (nt_kill_process_by_pid):
 	* process-nt.c (nt_open_network_stream):
 	* process-nt.c (vars_of_process_nt):
-        Copied over code from Emacs 20.5 to correctly send signals to sub-
-        processes under Windows 95.  Also added code to automatically
-        create and hide console window when a sub-process is created under
-        Windows 95, which obviates the need for the separate runemacs.exe
-        executable, and finally implemented some variables that were
-        implemented in Emacs 20.5, but previously not in XEmacs.  These
-        include mswindows- start-process-share-console and
-        mswindows-start-process-inherit-error-mode. (Both of these only
-        apply to Windows 95.)
+	Copied over code from Emacs 20.5 to correctly send signals to sub-
+	processes under Windows 95.  Also added code to automatically
+	create and hide console window when a sub-process is created under
+	Windows 95, which obviates the need for the separate runemacs.exe
+	executable, and finally implemented some variables that were
+	implemented in Emacs 20.5, but previously not in XEmacs.  These
+	include mswindows- start-process-share-console and
+	mswindows-start-process-inherit-error-mode. (Both of these only
+	apply to Windows 95.)
 
-        * regex.c (regex_compile): Fixed a compile warning.
+	* regex.c (regex_compile): Fixed a compile warning.
 
 	* select-msw.c:
 	* select-msw.c (mswindows_own_selection):
@@ -7836,20 +7911,20 @@
 	* select-msw.c (mswindows_disown_selection):
 	* select-msw.c (console_type_create_select_mswindows):
 	* select-msw.c (syms_of_select_mswindows):
-        Cleaned up the file and implemented the device method
-        selection_exists_p, which had accidentally been left out.  Also
-        removed four lisp functions that were remnants from before the
-        time when the selection code was properly device abstracted.
-        These functions are no longer needed because there are generic
-        equivalents, and because they were added recently and don't exist
-        in FSF Emacs, I don't think there's any problem with just deleting
-        them.
+	Cleaned up the file and implemented the device method
+	selection_exists_p, which had accidentally been left out.  Also
+	removed four lisp functions that were remnants from before the
+	time when the selection code was properly device abstracted.
+	These functions are no longer needed because there are generic
+	equivalents, and because they were added recently and don't exist
+	in FSF Emacs, I don't think there's any problem with just deleting
+	them.
 
 	* sysdep.c:
 	* sysdep.c (sys_subshell):
-        Fixed a compile warning, although in this case there's probably
-        something wrong with this code, and it ought to be looked into
-        more thoroughly by somebody who understands it.
+	Fixed a compile warning, although in this case there's probably
+	something wrong with this code, and it ought to be looked into
+	more thoroughly by somebody who understands it.
 
 	* window.c:
 	* window.c (Fwindow_text_area_height):
@@ -7858,13 +7933,13 @@
 	* window.c (Fwindow_pixel_width):
 	* window.c (debug_print_window):
 	* window.c (syms_of_window):
-        Added functions window-text-area-height and window-full-width,
-        which are functions for returning various width and height
-        characteristics of a window. (One of these functions is necessary
-        for making the file dialog box work correctly, and the other one
-        was added for completeness.)  Also added a table to the
-        documentation for window-height which describes the entire scheme
-        for accessing width and height characteristics of a window.
+	Added functions window-text-area-height and window-full-width,
+	which are functions for returning various width and height
+	characteristics of a window. (One of these functions is necessary
+	for making the file dialog box work correctly, and the other one
+	was added for completeness.)  Also added a table to the
+	documentation for window-height which describes the entire scheme
+	for accessing width and height characteristics of a window.
 
 2000-03-12  Kirill 'Big K' Katsnelson  <kkm@dtmx.com>
 
diff --text -u 'xemacs-21.4.6/src/device-gtk.c' 'xemacs-21.4.7/src/device-gtk.c'
Index: ././src/device-gtk.c
--- ././src/device-gtk.c	Tue Oct 23 17:35:30 2001
+++ ././src/device-gtk.c	Wed May  1 01:06:28 2002
@@ -126,6 +126,9 @@
 					guint info,
 					guint time_stamp,
 					gpointer data);
+extern void emacs_gtk_selection_clear_event_handle (GtkWidget *widget,
+                                                    GdkEventSelection *event,
+                                                    gpointer data);
 extern void emacs_gtk_selection_received (GtkWidget *widget,
 					  GtkSelectionData *selection_data,
 					  gpointer user_data);
@@ -284,9 +287,15 @@
   /* Need to set up some selection handlers */
   gtk_selection_add_target (GTK_WIDGET (app_shell), GDK_SELECTION_PRIMARY,
 			    GDK_SELECTION_TYPE_STRING, 0);
+  gtk_selection_add_target (GTK_WIDGET (app_shell),
+                            gdk_atom_intern("CLIPBOARD", FALSE),
+			    GDK_SELECTION_TYPE_STRING, 0);
   
   gtk_signal_connect (GTK_OBJECT (app_shell), "selection_get",
 		      GTK_SIGNAL_FUNC (emacs_gtk_selection_handle), NULL);
+  gtk_signal_connect (GTK_OBJECT (app_shell), "selection_clear_event",
+                      GTK_SIGNAL_FUNC (emacs_gtk_selection_clear_event_handle),
+                      NULL);
   gtk_signal_connect (GTK_OBJECT (app_shell), "selection_received",
 		      GTK_SIGNAL_FUNC (emacs_gtk_selection_received), NULL);
 
diff --text -u 'xemacs-21.4.6/src/device-x.c' 'xemacs-21.4.7/src/device-x.c'
Index: ././src/device-x.c
--- ././src/device-x.c	Fri Apr 13 03:23:33 2001
+++ ././src/device-x.c	Wed May  1 01:06:29 2002
@@ -168,6 +168,8 @@
 /*		      initializing an X connection			*/
 /************************************************************************/
 
+static struct device *device_being_initialized = NULL;
+
 static void
 allocate_x_device_struct (struct device *d)
 {
@@ -562,7 +564,9 @@
    */
   slow_down_interrupts ();
   /* May not be needed but XtOpenDisplay could not deal with signals here. */
+  device_being_initialized = d;
   dpy = DEVICE_X_DISPLAY (d) = XOpenDisplay (disp_name);
+  device_being_initialized = NULL;
   speed_up_interrupts ();
 
   if (dpy == 0)
@@ -1115,6 +1119,9 @@
   /* This function can GC */
   Lisp_Object dev;
   struct device *d = get_device_from_display_1 (disp);
+
+  if (!d)
+    d = device_being_initialized;
 
   assert (d != NULL);
   XSETDEVICE (dev, d);
diff --text -u 'xemacs-21.4.6/src/dired.c' 'xemacs-21.4.7/src/dired.c'
Index: ././src/dired.c
--- ././src/dired.c	Mon Dec 17 14:49:23 2001
+++ ././src/dired.c	Wed May  1 01:06:31 2002
@@ -217,11 +217,6 @@
 DEFUN ("file-name-all-completions", Ffile_name_all_completions, 2, 2, 0, /*
 Return a list of all completions of PARTIAL-FILENAME in DIRECTORY.
 These are all file names in DIRECTORY which begin with PARTIAL-FILENAME.
-
-File names which end with any member of `completion-ignored-extensions'
-are not considered as possible completions for PARTIAL-FILENAME unless
-there is no other possible completion. `completion-ignored-extensions'
-is not applied to the names of directories.
 */
        (partial_filename, directory))
 {
@@ -898,8 +893,7 @@
 *Completion ignores filenames ending in any string in this list.
 This variable does not affect lists of possible completions,
 but does affect the commands that actually do completions.
-It is used by the functions `file-name-completion' and
-`file-name-all-completions'.
+It is used by the function `file-name-completion'.
 */ );
   Vcompletion_ignored_extensions = Qnil;
 }
diff --text -u 'xemacs-21.4.6/src/emodules.c' 'xemacs-21.4.7/src/emodules.c'
Index: ././src/emodules.c
--- ././src/emodules.c	Fri Apr 13 03:23:39 2001
+++ ././src/emodules.c	Wed May  1 01:06:33 2002
@@ -426,6 +426,7 @@
     {
       emodules_depth--;
       dll_close (dlhandle);
+      dlhandle = 0;  /* Zero this out before module_load_unwind runs */
       return;
     }
 
diff --text -u 'xemacs-21.4.6/src/fileio.c' 'xemacs-21.4.7/src/fileio.c'
Index: ././src/fileio.c
--- ././src/fileio.c	Mon Dec 17 14:49:25 2001
+++ ././src/fileio.c	Wed May  1 01:06:34 2002
@@ -364,6 +364,8 @@
 any handlers that are members of `inhibit-file-name-handlers',
 but we still do run any other handlers.  This lets handlers
 use the standard functions without calling themselves recursively.
+
+Otherwise, OPERATION is the name of a funcall'able function.
 */
        (filename, operation))
 {
diff --text -u 'xemacs-21.4.6/src/fns.c' 'xemacs-21.4.7/src/fns.c'
Index: ././src/fns.c
--- ././src/fns.c	Fri Apr 13 03:23:45 2001
+++ ././src/fns.c	Wed May  1 01:06:38 2002
@@ -3027,10 +3027,12 @@
 }
 
 DEFUN ("mapconcat", Fmapconcat, 3, 3, 0, /*
-Apply FUNCTION to each element of SEQUENCE, and concat the results as strings.
-In between each pair of results, insert SEPARATOR.  Thus, using " " as
-SEPARATOR results in spaces between the values returned by FUNCTION.
-SEQUENCE may be a list, a vector, a bit vector, or a string.
+Apply FUNCTION to each element of SEQUENCE, and concat the results to a string.
+Between each pair of results, insert SEPARATOR.
+
+Each result, and SEPARATOR, should be strings.  Thus, using " " as SEPARATOR
+results in spaces between the values returned by FUNCTION.  SEQUENCE itself
+may be a list, a vector, a bit vector, or a string.
 */
        (function, sequence, separator))
 {
diff --text -u 'xemacs-21.4.6/src/keymap.c' 'xemacs-21.4.7/src/keymap.c'
Index: ././src/keymap.c
--- ././src/keymap.c	Fri Apr 13 03:23:57 2001
+++ ././src/keymap.c	Wed May  1 01:06:41 2002
@@ -1649,7 +1649,7 @@
   returned_value->modifiers = 0;
   if (modifiers_sans_meta == XEMACS_MOD_CONTROL)
     {
-      if EQ (keysym, QKspace)
+      if (EQ (keysym, QKspace))
         MACROLET (make_char ('@'), modifiers);
       else if (!CHARP (keysym))
         return;
diff --text -u 'xemacs-21.4.6/src/menubar-gtk.c' 'xemacs-21.4.7/src/menubar-gtk.c'
Index: ././src/menubar-gtk.c
--- ././src/menubar-gtk.c	Fri Apr 13 03:24:01 2001
+++ ././src/menubar-gtk.c	Wed May  1 01:06:43 2002
@@ -1216,11 +1216,21 @@
 gtk_popup_menu (Lisp_Object menu_desc, Lisp_Object event)
 {
   struct Lisp_Event *eev = NULL;
-  GtkWidget *widget = menu_descriptor_to_widget (menu_desc);
-  GtkWidget *menu = GTK_MENU_ITEM (widget)->submenu;
-  gpointer id = gtk_object_get_data (GTK_OBJECT (widget), XEMACS_MENU_GUIID_TAG);
+  GtkWidget *widget = NULL;
+  GtkWidget *menu = NULL;
+  gpointer id = NULL;
 
+  /* Do basic error checking first... */
+  if (SYMBOLP (menu_desc))
+    menu_desc = Fsymbol_value (menu_desc);
+  CHECK_CONS (menu_desc);
+  CHECK_STRING (XCAR (menu_desc));
+
+  /* Now lets get down to business... */
+  widget = menu_descriptor_to_widget (menu_desc);
+  menu = GTK_MENU_ITEM (widget)->submenu;
   gtk_widget_set_name (widget, "XEmacsPopupMenu");
+  id = gtk_object_get_data (GTK_OBJECT (widget), XEMACS_MENU_GUIID_TAG);
 
   __activate_menu (GTK_MENU_ITEM (widget), id);
 
diff --text -u 'xemacs-21.4.6/src/process.h' 'xemacs-21.4.7/src/process.h'
Index: ././src/process.h
--- ././src/process.h	Fri Apr 13 03:24:12 2001
+++ ././src/process.h	Sat May  4 17:32:06 2002
@@ -45,7 +45,7 @@
 #define XSETPROCESS(x, p) XSETRECORD (x, p, process)
 #define PROCESSP(x) RECORDP (x, process)
 #define CHECK_PROCESS(x) CHECK_RECORD (x, process)
-#define PROCESS_LIVE_P(x) (!NILP ((x)->pipe_instream))
+#define PROCESS_LIVE_P(x) (EQ ((x)->status_symbol, Qrun))
 
 #define CHECK_LIVE_PROCESS(x) do {			\
   CHECK_PROCESS (x);					\
diff --text -u /dev/null 'xemacs-21.4.7/src/s/darwin.h'
Index: ././src/s/darwin.h
--- ././src/s/darwin.h	Thu Jan  1 09:00:00 1970
+++ ././src/s/darwin.h	Wed May  1 01:06:50 2002
@@ -0,0 +1,18 @@
+/* s/ file for Darwin/MacOS X systems */
+
+#define SYSTEM_TYPE "darwin"
+
+/* Defines this as a BSD system, used in fakemail, for example */
+#ifndef NOT_C_CODE
+#include <sys/param.h>
+#endif
+
+/* The builtin malloc is broken in the sense that replacing it
+   with a user implementation is impossible. */
+#define SYSTEM_MALLOC
+
+#define HAVE_PTYS
+
+/* TAB3 is defined in Unix98, but darwin doesn't have it. 
+   OXTABS is the traditional BSD equivalent. */
+#define TAB3 OXTABS
diff --text -u 'xemacs-21.4.6/src/s/linux.h' 'xemacs-21.4.7/src/s/linux.h'
Index: ././src/s/linux.h
--- ././src/s/linux.h	Fri Apr 13 03:24:43 2001
+++ ././src/s/linux.h	Wed May  1 01:06:50 2002
@@ -95,8 +95,11 @@
 #if	defined(__linux__) && defined(powerpc)	/*Added by Fukui*/
 #define START_FILES		/*Added by Fukui*/
 #else				/*Added by Fukui*/
-
+#if defined __s390x__ || defined __x86_64__
+#define START_FILES "pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o"
+#else
 #define START_FILES "pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o"
+#endif
 #endif				/*Added by Fukui*/
 #endif
 
@@ -117,7 +120,11 @@
 #else
 /*#undef LIB_GCC
   #define LIB_GCC*/
+#if defined __s390x__  || defined __x86_64__
+#define LIB_STANDARD "-lgcc -lc -lgcc /usr/lib64/crtn.o"
+#else
 #define LIB_STANDARD "-lgcc -lc -lgcc /usr/lib/crtn.o"
+#endif
 #define LINKER "$(CC) -nostdlib"
 #endif
 
diff --text -u 'xemacs-21.4.6/src/select-gtk.c' 'xemacs-21.4.7/src/select-gtk.c'
Index: ././src/select-gtk.c
--- ././src/select-gtk.c	Tue Oct 23 17:35:38 2001
+++ ././src/select-gtk.c	Wed May  1 01:06:45 2002
@@ -209,6 +209,40 @@
 }
 
 
+void
+emacs_gtk_selection_clear_event_handle (GtkWidget *widget,
+                                        GdkEventSelection *event,
+                                        gpointer data)
+{
+  GdkAtom selection = event->selection;
+  guint32 changed_owner_time = event->time;
+  struct device *d = decode_gtk_device (Qnil);
+
+  Lisp_Object selection_symbol, local_selection_time_lisp;
+  guint32 local_selection_time;
+
+  selection_symbol = atom_to_symbol (d, selection);
+
+  local_selection_time_lisp = Fget_selection_timestamp (selection_symbol);
+
+  /* We don't own the selection, so that's fine. */
+  if (NILP (local_selection_time_lisp))
+    return;
+
+  local_selection_time = *(guint32 *) XOPAQUE_DATA (local_selection_time_lisp);
+
+  /* This SelectionClear is for a selection that we no longer own, so we can
+     disregard it.  (That is, we have reasserted the selection since this
+     request was generated.)
+   */
+  if (changed_owner_time != GDK_CURRENT_TIME &&
+      local_selection_time > changed_owner_time)
+    return;
+
+  handle_selection_clear (selection_symbol);
+}
+
+
 
 static GtkWidget *reading_selection_reply;
 static GdkAtom reading_which_selection;
diff --text -u 'xemacs-21.4.6/src/sysdep.c' 'xemacs-21.4.7/src/sysdep.c'
Index: ././src/sysdep.c
--- ././src/sysdep.c	Wed Jul 25 16:45:38 2001
+++ ././src/sysdep.c	Wed May  1 00:21:05 2002
@@ -3582,7 +3582,7 @@
     DEFER_GETTEXT ("bad argument to system call"),	/* 12 SIGSYS */
     DEFER_GETTEXT ("write on a pipe with no one to read it"), /* 13 SIGPIPE */
     DEFER_GETTEXT ("alarm clock"),			/* 14 SIGALRM */
-    DEFER_GETTEXT ("software termination signum"),	/* 15 SIGTERM */
+    DEFER_GETTEXT ("software termination signal"),	/* 15 SIGTERM */
     DEFER_GETTEXT ("user defined signal 1"),		/* 16 SIGUSR1 */
     DEFER_GETTEXT ("user defined signal 2"),		/* 17 SIGUSR2 */
     DEFER_GETTEXT ("death of a child"),			/* 18 SIGCLD */
@@ -3621,7 +3621,7 @@
     DEFER_GETTEXT ("bad argument to system call"),	/* 12 SIGSYS */
     DEFER_GETTEXT ("write on a pipe with no one to read it"), /* 13 SIGPIPE */
     DEFER_GETTEXT ("alarm clock"),			/* 14 SIGALRM */
-    DEFER_GETTEXT ("software termination signum"),	/* 15 SIGTERM */
+    DEFER_GETTEXT ("software termination signal"),	/* 15 SIGTERM */
     DEFER_GETTEXT ("user defined signal 1"),		/* 16 SIGUSR1 */
     DEFER_GETTEXT ("user defined signal 2"),		/* 17 SIGUSR2 */
     DEFER_GETTEXT ("death of a child"),			/* 18 SIGCLD */
diff --text -u 'xemacs-21.4.6/src/sysdll.c' 'xemacs-21.4.7/src/sysdll.c'
Index: ././src/sysdll.c
--- ././src/sysdll.c	Fri Apr 13 03:24:22 2001
+++ ././src/sysdll.c	Wed May  1 01:06:47 2002
@@ -42,6 +42,10 @@
 # define RTLD_GLOBAL 0
 #endif
 
+#ifndef RTLD_NOW
+# define RTLD_NOW 2
+#endif
+
 int
 dll_init (const char *arg)
 {
@@ -51,7 +55,7 @@
 dll_handle
 dll_open (const char *fname)
 {
-  return (dll_handle) dlopen (fname, RTLD_LAZY | RTLD_GLOBAL);
+  return (dll_handle) dlopen (fname, RTLD_NOW | RTLD_GLOBAL);
 }
 
 int
diff --text -u 'xemacs-21.4.6/tests/ChangeLog' 'xemacs-21.4.7/tests/ChangeLog'
Index: ././tests/ChangeLog
--- ././tests/ChangeLog	Mon Dec 17 18:33:19 2001
+++ ././tests/ChangeLog	Sat May  4 21:34:19 2002
@@ -1,6 +1,11 @@
-2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
+2002-05-04  Stephen J. Turnbull  <stephen@xemacs.org>
 
-	* XEmacs 21.4.6 "Common Lisp" is released.
+	* XEmacs 21.4.7 "Economic Science" is released.
+
+2002-04-27  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* automated/test-harness.el (test-harness-from-buffer): Clean up
+	Check-Message and Check-Error-Message when done.
 
 2001-12-17  Stephen J. Turnbull  <stephen@xemacs.org>
 
diff --text -u 'xemacs-21.4.6/tests/automated/test-harness.el' 'xemacs-21.4.7/tests/automated/test-harness.el'
Index: ././tests/automated/test-harness.el
--- ././tests/automated/test-harness.el	Fri Apr 13 03:24:55 2001
+++ ././tests/automated/test-harness.el	Wed May  1 01:06:55 2002
@@ -276,6 +276,8 @@
 	(message "Test suite execution failed unexpectedly."))
       (fmakunbound 'Assert)
       (fmakunbound 'Check-Error)
+      (fmakunbound 'Check-Message)
+      (fmakunbound 'Check-Error-Message)
       (fmakunbound 'Ignore-Ebola)
       (fmakunbound 'Int-to-Marker)
       )))
diff --text -u 'xemacs-21.4.6/version.sh' 'xemacs-21.4.7/version.sh'
Index: ././version.sh
--- ././version.sh	Mon Dec 17 18:33:19 2001
+++ ././version.sh	Sat May  4 21:34:19 2002
@@ -2,8 +2,9 @@
 emacs_is_beta=
 emacs_major_version=21
 emacs_minor_version=4
-emacs_beta_version=6
-xemacs_codename="Common Lisp"
+emacs_beta_version=7
+emacs_kit_version=
+xemacs_codename="Economic Science"
 infodock_major_version=4
 infodock_minor_version=0
 infodock_build_version=8
#### End of Patch data ####

#### ApplyPatch data follows ####
# Data version        : 1.0
# Date generated      : Sat May  4 21:34:21 2002
# Generated by        : makepatch 2.00_03
# Recurse directories : Yes
# Excluded files      : (\A|/).*\.png\Z
#                       (\A|/).*\.bmp\Z
#                       (\A|/)MANIFEST\Z
#                       (\A|/)\.precious\Z
# c './CHANGES-msw' 0 1020182622 0100644
# p './CHANGES-release' 8352 1020182622 0100644
# p './ChangeLog' 146059 1020515659 0100644
# p './PROBLEMS' 77989 1020501331 0100644
# c './build-msw-release.sh' 0 1020182624 0100755
# p './configure' 457419 1020515643 0100755
# p './configure.in' 172632 1020182705 0100644
# p './etc/BETA' 14253 1020182714 0100644
# c './etc/TUTORIAL.se' 0 1020182716 0100644
# p './etc/package-index.LATEST.pgp' 52960 1020182717 0100644
# p './etc/sample.init.el' 58856 1020514036 0100644
# p './lib-src/ChangeLog' 39973 1020515659 0100644
# p './lisp/ChangeLog' 346522 1020515659 0100644
# p './lisp/code-files.el' 22350 1020182734 0100644
# p './lisp/cus-edit.el' 125383 1020182735 0100644
# p './lisp/files.el' 127592 1020182737 0100644
# p './lisp/help-nomule.el' 4177 1020182740 0100644
# p './lisp/help.el' 60038 1020182740 0100644
# p './lisp/info.el' 115804 1020182742 0100644
# p './lisp/menubar-items.el' 71479 1020182744 0100644
# p './lisp/minibuf.el' 92790 1020182746 0100644
# p './lisp/mule/european.el' 13332 1020182755 0100644
# p './lisp/obsolete.el' 15709 1020182747 0100644
# p './lisp/printer.el' 17618 1020182748 0100644
# p './lisp/startup.el' 50728 1020182749 0100644
# p './lwlib/ChangeLog' 23037 1020515659 0100644
# p './lwlib/lwlib-Xm.c' 63685 1020182759 0100644
# p './lwlib/xlwscrollbar.c' 52344 1020182761 0100644
# p './man/ChangeLog' 84325 1020515659 0100644
# p './man/custom.texi' 13515 1020506523 0100644
# p './man/external-widget.texi' 5623 1020182766 0100644
# p './man/widget.texi' 51124 1020182767 0100644
# p './man/xemacs-faq.texi' 249737 1020182769 0100644
# p './man/xemacs/files.texi' 79762 1020182778 0100644
# p './man/xemacs/packages.texi' 29791 1020182779 0100644
# p './netinstall/ChangeLog' 7629 1020515659 0100644
# p './nt/ChangeLog' 40014 1020515659 0100644
# p './nt/xemacs.mak' 46985 1020182783 0100644
# p './src/ChangeLog' 325029 1020515659 0100644
# p './src/device-gtk.c' 21373 1020182788 0100644
# p './src/device-x.c' 63700 1020182789 0100644
# p './src/dired.c' 27803 1020182791 0100644
# p './src/emodules.c' 18649 1020182793 0100644
# p './src/fileio.c' 133859 1020182794 0100644
# p './src/fns.c' 107988 1020182798 0100644
# p './src/keymap.c' 134939 1020182801 0100644
# p './src/menubar-gtk.c' 35528 1020182803 0100644
# p './src/process.h' 4289 1020501126 0100644
# c './src/s/darwin.h' 0 1020182810 0100644
# p './src/s/linux.h' 7007 1020182810 0100644
# p './src/select-gtk.c' 28096 1020182805 0100644
# p './src/sysdep.c' 111910 1020180065 0100644
# p './src/sysdll.c' 5197 1020182807 0100644
# p './tests/ChangeLog' 11758 1020515659 0100644
# p './tests/automated/test-harness.el' 13414 1020182815 0100644
# p './version.sh' 196 1020515659 0100644
#### End of ApplyPatch data ####

#### End of Patch kit [created: Sat May  4 21:34:21 2002] ####
#### Patch checksum: 13226 496865 18907 ####
#### Checksum: 13262 498120 57450 ####