Index: CHANGES-beta
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/CHANGES-beta,v
retrieving revision 1.204
retrieving revision 1.206
diff -u -u -r1.204 -r1.206
--- CHANGES-beta	2002/07/02 12:12:13	1.204
+++ CHANGES-beta	2002/07/27 03:52:44	1.206
@@ -1,3 +1,59 @@
+to 21.5.8 "broccoli"
+
+Lots of fixes and changes.  This release is primarily been done to
+make way for the new GC stuff from Mike Sperber.
+
+CHANGES now uses surnames as listed in the ChangeLogs to identify
+contributors.  And I haven't sorted the changes into different
+categories.  Maybe next release...
+
+-- New configure option "--use-kkcc" for the upcoming new GC
+   algorithms - Sperber.
+-- Identify "--with-modules" as an autodetected configure option -
+   James. 
+-- Add a couple of configuration questions to PROBLEMS - Turnball.
+-- Test for wchar.h in configure - Sperber.
+-- Update package-index files - Youngs.
+-- s/Xemacs/XEmacs/ doc fixes - Aichner.
+-- Sync make-docfile.c with GNU - James.
+-- Updates to gutter-items - Palmieri.
+-- Sync setenv with GNU - Wallington.
+-- Remove package-get's dependence on APEL - Youngs.
+-- Fix case fold bug in replace-in-string - Verna.
+-- Updates to code-process.el and process.el - Alexander.
+-- Updates to mule/kinsoku.el - Yamaoka.
+-- Updates to define-derived-mode - Wallington.
+-- Printer fixes - Piper.
+-- Updates to window-xemacs.el & frame.el - James.
+-- Doc fix gutter-items.el - Piper.
+-- Sync ":set-after" in custom with GNU - Piper.
+-- Sort the lists in enabled-behavior-list - Galibert
+-- Updates to lwlib-Xm.c - Piper.
+-- Various doc fixes to the TeXinfo docs - Aichner.
+-- GC fixes - Sperber.
+-- Updates to lisp.h, symbols.c for DSO's - James.
+-- Fix to mswindows_need_event - Alexander.
+-- Declare Fcdr_safe to be callable from C - Turnball.
+-- Ffunctionp return nil for autoloaded macros & keymaps - Niksic.
+-- Subwindow fixes - Ueno.
+-- Include wchar.h only if available, define wclsen if not - Sperber.
+-- Fixes to Fstart_process_internal - Sperber.
+-- Fixes to init_ralloc for pdump - Sperber.
+-- Remove duplicated definition of Lisp_Devmode - Bush.
+-- Fixes to toolbar/redisplay - Piper.
+-- Windows DDE fixes - Moore.
+-- Fixes to 'query_string_geometry' and 'widget_logical_unit_height' -
+   Piper.
+-- Fix problem with XEmacs freezing with certain virtual window
+   managers on Windows - Rankin.
+-- Conditionalise calls to syms_of_dired_mswindows &
+   vars_of_dired_mswindows on WIN32_NATIVE instead of HAVE_MSW_C_DIRED
+   - Harris.
+-- Process related fixes - Sperber.
+-- Fix #includes in input-method-motif.c - Galibert.
+-- Fixes to automated tests - Sperber.
+
+
 to 21.5.7 "broccoflower"
 
 CHANGES now uses @xemacs.org alias to identify contributors.  If the
@@ -82,9 +138,8 @@
    bound-and-true-p, propertize, delete-and-extract-region, add-to-list,
    string-to-char-list, find-non-ascii-charset-region,
    find-non-ascii-charset-string, truncate-string-to-width, plist-to-alist,
-   kill-ring-max, kill-new
-   -- John Paul Wallington, youngs, ben, james
-   set-frame-pixel-width, set-frame-pixel-size -- andy
+   kill-ring-max, kill-new -- John Paul Wallington, youngs, ben, james, ville
+-- Add: set-frame-pixel-width, set-frame-pixel-size -- andy
 -- Add: args to map-specifier, various "heuristic" specifier functions -- ben
 -- Fix: call-process moves to Lisp -- ben
    -- allows a buffer to be specified for input and stderr output
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/ChangeLog,v
retrieving revision 1.308
retrieving revision 1.313
diff -u -u -r1.308 -r1.313
--- ChangeLog	2002/07/02 15:01:30	1.308
+++ ChangeLog	2002/07/27 03:52:44	1.313
@@ -1,3 +1,24 @@
+2002-07-27  Steve Youngs  <youngs@xemacs.org>
+
+	* XEmacs 21.5.8 "broccoli" is released.
+
+2002-07-09  Mike Sperber <mike@xemacs.org>
+
+	* configure.usage: 
+	* configure.in: Add --use-kkcc option for new GC algorithms.
+
+2002-06-04  Jerry James  <james@xemacs.org>
+
+	* configure.usage: Identify --with-modules as autodetecting.
+
+2002-07-04  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* PROBLEMS: Add two basic configuration questions.
+
+2002-07-08  Mike Sperber <mike@xemacs.org>
+
+	* configure.in: Test for wchar.h.
+
 2002-07-02  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.7 "broccoflower" is released.
Index: PROBLEMS
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/PROBLEMS,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -u -r1.52 -r1.53
--- PROBLEMS	2002/07/02 12:27:54	1.52
+++ PROBLEMS	2002/07/10 06:23:37	1.53
@@ -30,6 +30,25 @@
 ===============================
 
 ** General
+    Much general information is in INSTALL.  If it's covered in
+    INSTALL, we don't repeat it here.
+
+*** How does I configure to get the buffer tabs/progress bars?
+
+These features depend on support for "native widgets".  Use the
+--with-widgets option to configure.  Configuration of widgets is
+automatic for "modern" toolkits (MS Windows, GTK, and Motif), but if
+you are using Xt and the Athena widgets, you will probably want to
+specify a "3d" widget set.  See configure --usage, and don't forget to
+install the corresponding development libraries.
+
+*** I know I have libfoo installed, but configure doesn't find it.
+
+Typical of Linux systems with package managers.  To link with a shared
+library, you only need the shared library.  To compile objects that
+link with it, you need the headers---and distros don't provide them with
+the libraries.  You need the additional "development" package, too.
+
 *** Don't use -O2 with gcc 2.8.1 and egcs 1.0 under SPARC architectures
 without also using `-fno-schedule-insns'.
 
Index: configure
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure,v
retrieving revision 1.178
retrieving revision 1.180
diff -u -u -r1.178 -r1.180
--- configure	2002/07/02 15:01:22	1.178
+++ configure	2002/07/16 08:26:39	1.180
@@ -354,6 +354,7 @@
 	with_netinstall | \
 	with_ipv6_cname | \
 	external_widget | \
+	use_kkcc	| \
 	verbose		| \
 	extra_verbose	| \
 	usage_tracking	| \
@@ -856,7 +857,7 @@
 fi
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:860: checking whether ln -s works" >&5
+echo "configure:861: checking whether ln -s works" >&5
 
 rm -f conftestdata
 if ln -s X conftestdata 2>/dev/null
@@ -1132,7 +1133,7 @@
 
 
 echo $ac_n "checking "host system type"""... $ac_c" 1>&6
-echo "configure:1136: checking "host system type"" >&5
+echo "configure:1137: 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/'`
@@ -1645,7 +1646,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:1649: checking for $ac_word" >&5
+echo "configure:1650: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1672,7 +1673,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:1676: checking for $ac_word" >&5
+echo "configure:1677: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1720,7 +1721,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:1724: checking for $ac_word" >&5
+echo "configure:1725: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1749,7 +1750,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1753: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1754: 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'
@@ -1762,12 +1763,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 1766 "configure"
+#line 1767 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1771: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1772: \"$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
@@ -1795,19 +1796,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:1799: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1800: 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:1804: checking whether we are using GNU C" >&5
+echo "configure:1805: 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:1811: \"$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:1812: \"$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
@@ -1825,7 +1826,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1829: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1830: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -1858,7 +1859,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:1862: checking for $ac_word" >&5
+echo "configure:1863: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1885,7 +1886,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:1889: checking for $ac_word" >&5
+echo "configure:1890: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1933,7 +1934,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:1937: checking for $ac_word" >&5
+echo "configure:1938: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1962,7 +1963,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1966: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1967: 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'
@@ -1975,12 +1976,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 1979 "configure"
+#line 1980 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1985: \"$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
@@ -2008,19 +2009,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:2012: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2013: 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:2017: checking whether we are using GNU C" >&5
+echo "configure:2018: 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:2024: \"$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:2025: \"$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
@@ -2038,7 +2039,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2042: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2043: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -2071,7 +2072,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:2075: checking for $ac_word" >&5
+echo "configure:2076: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2098,7 +2099,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:2102: checking for $ac_word" >&5
+echo "configure:2103: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2146,7 +2147,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:2150: checking for $ac_word" >&5
+echo "configure:2151: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2175,7 +2176,7 @@
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2179: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2180: 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'
@@ -2188,12 +2189,12 @@
 
 cat > conftest.$ac_ext << EOF
 
-#line 2192 "configure"
+#line 2193 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:2197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2198: \"$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
@@ -2221,19 +2222,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:2225: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2226: 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:2230: checking whether we are using GNU C" >&5
+echo "configure:2231: 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:2237: \"$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:2238: \"$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
@@ -2251,7 +2252,7 @@
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2255: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2256: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -2288,7 +2289,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:2292: checking how to run the C preprocessor" >&5
+echo "configure:2293: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -2301,13 +2302,13 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 2305 "configure"
+#line 2306 "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:2312: \"$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 +2319,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 2322 "configure"
+#line 2323 "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:2329: \"$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
   :
@@ -2335,13 +2336,13 @@
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 2339 "configure"
+#line 2340 "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:2345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2346: \"$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
   :
@@ -2367,9 +2368,9 @@
 
 
 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:2371: checking for AIX" >&5
+echo "configure:2372: checking for AIX" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2373 "configure"
+#line 2374 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -2396,9 +2397,9 @@
  
 
 echo $ac_n "checking for GNU libc""... $ac_c" 1>&6
-echo "configure:2400: checking for GNU libc" >&5
+echo "configure:2401: checking for GNU libc" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2402 "configure"
+#line 2403 "configure"
 #include "confdefs.h"
 #include <features.h>
 int main() {
@@ -2410,7 +2411,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:2414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2415: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   have_glibc=yes
 else
@@ -2487,7 +2488,7 @@
 esac
 
 cat > conftest.$ac_ext <<EOF
-#line 2491 "configure"
+#line 2492 "configure"
 #include "confdefs.h"
 int main () {
 #if defined __SUNPRO_C
@@ -2501,7 +2502,7 @@
 #endif
 }
 EOF
-if { (eval echo configure:2505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:2506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -2753,17 +2754,17 @@
 
 if test "$__USLC__" = yes; then
   echo $ac_n "checking for whether the -Kalloca compiler flag is needed""... $ac_c" 1>&6
-echo "configure:2757: checking for whether the -Kalloca compiler flag is needed" >&5
+echo "configure:2758: checking for whether the -Kalloca compiler flag is needed" >&5
   need_kalloca=no
   cat > conftest.$ac_ext <<EOF
-#line 2760 "configure"
+#line 2761 "configure"
 #include "confdefs.h"
 
 int main() {
 void *x = alloca(4);
 ; return 0; }
 EOF
-if { (eval echo configure:2767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   :
 else
@@ -2774,14 +2775,14 @@
     xe_save_c_switch_system="$c_switch_system"
     c_switch_system="$c_switch_system -Kalloca"
     cat > conftest.$ac_ext <<EOF
-#line 2778 "configure"
+#line 2779 "configure"
 #include "confdefs.h"
 
 int main() {
 void *x = alloca(4);
 ; return 0; }
 EOF
-if { (eval echo configure:2785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    need_kalloca=yes 
 else
@@ -2819,7 +2820,7 @@
 
 if test "$GCC" = "yes"; then
 echo $ac_n "checking for buggy gcc versions""... $ac_c" 1>&6
-echo "configure:2823: checking for buggy gcc versions" >&5
+echo "configure:2824: 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.*)
@@ -2877,7 +2878,7 @@
 
 if test "$pdump" != "yes"; then
   echo $ac_n "checking for \"-z nocombreloc\" linker flag""... $ac_c" 1>&6
-echo "configure:2881: checking for \"-z nocombreloc\" linker flag" >&5
+echo "configure:2882: 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 ;;
@@ -2966,7 +2967,7 @@
  fi
 
 echo $ac_n "checking for dynodump""... $ac_c" 1>&6
-echo "configure:2970: checking for dynodump" >&5
+echo "configure:2971: checking for dynodump" >&5
 if test "$unexec" != "unexsol2.o"; then
   echo "$ac_t""no" 1>&6
 else
@@ -3004,12 +3005,12 @@
   done
   
 echo $ac_n "checking for terminateAndUnload in -lC""... $ac_c" 1>&6
-echo "configure:3008: checking for terminateAndUnload in -lC" >&5
+echo "configure:3009: 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 3013 "configure"
+#line 3014 "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
@@ -3020,7 +3021,7 @@
 terminateAndUnload()
 ; return 0; }
 EOF
-if { (eval echo configure:3024: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3025: \"$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
@@ -3128,7 +3129,7 @@
 
 if test "$add_runtime_path" = "yes"; then
       echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6
-echo "configure:3132: checking "for runtime libraries flag"" >&5
+echo "configure:3133: checking "for runtime libraries flag"" >&5
   case "$opsys" in
     sol2 ) dash_r="-R" ;;
     decosf* | linux* | irix*) dash_r="-rpath " ;;
@@ -3150,14 +3151,14 @@
   done
 fi
         cat > conftest.$ac_ext <<EOF
-#line 3154 "configure"
+#line 3155 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   dash_r="$try_dash_r"
 else
@@ -3258,10 +3259,10 @@
 fi
 after_morecore_hook_exists=yes
 echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6
-echo "configure:3262: checking for malloc_set_state" >&5
+echo "configure:3263: checking for malloc_set_state" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3265 "configure"
+#line 3266 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char malloc_set_state(); below.  */
@@ -3284,7 +3285,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3289: \"$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
@@ -3304,16 +3305,16 @@
 fi
 
 echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6
-echo "configure:3308: checking whether __after_morecore_hook exists" >&5
+echo "configure:3309: checking whether __after_morecore_hook exists" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3310 "configure"
+#line 3311 "configure"
 #include "confdefs.h"
 extern void (* __after_morecore_hook)();
 int main() {
 __after_morecore_hook = 0
 ; return 0; }
 EOF
-if { (eval echo configure:3317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3318: \"$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
@@ -3369,7 +3370,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:3373: checking for $ac_word" >&5
+echo "configure:3374: checking for $ac_word" >&5
 
 if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -3424,7 +3425,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:3428: checking for a BSD compatible install" >&5
+echo "configure:3429: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 
   IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
@@ -3478,7 +3479,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:3482: checking for $ac_word" >&5
+echo "configure:3483: checking for $ac_word" >&5
 
 if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
@@ -3506,19 +3507,19 @@
 test -n "$YACC" || YACC="yacc"
 
 
-for ac_hdr in   a.out.h   elf.h   cygwin/version.h   fcntl.h   inttypes.h   libgen.h   locale.h   mach/mach.h   sys/param.h   sys/pstat.h   sys/time.h   sys/timeb.h   sys/times.h   sys/un.h   ulimit.h   unistd.h 
+for ac_hdr in   a.out.h   elf.h   cygwin/version.h   fcntl.h   inttypes.h   libgen.h   locale.h   wchar.h   mach/mach.h   sys/param.h   sys/pstat.h   sys/time.h   sys/timeb.h   sys/times.h   sys/un.h   ulimit.h   unistd.h 
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3514: checking for $ac_hdr" >&5
+echo "configure:3515: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3517 "configure"
+#line 3518 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3522: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3523: \"$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*
@@ -3548,10 +3549,10 @@
 done
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3552: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:3553: checking for sys/wait.h that is POSIX.1 compatible" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3555 "configure"
+#line 3556 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -3567,7 +3568,7 @@
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:3571: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -3591,10 +3592,10 @@
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3595: checking for ANSI C header files" >&5
+echo "configure:3596: checking for ANSI C header files" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3598 "configure"
+#line 3599 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3602,7 +3603,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3606: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3607: \"$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*
@@ -3619,7 +3620,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 3623 "configure"
+#line 3624 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -3637,7 +3638,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 3641 "configure"
+#line 3642 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3655,7 +3656,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 3659 "configure"
+#line 3660 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3666,7 +3667,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:3670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:3671: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -3692,10 +3693,10 @@
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3696: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3697: checking whether time.h and sys/time.h may both be included" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3699 "configure"
+#line 3700 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -3704,7 +3705,7 @@
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:3708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3709: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -3728,10 +3729,10 @@
 fi
 
 echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:3732: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+echo "configure:3733: checking for sys_siglist declaration in signal.h or unistd.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3735 "configure"
+#line 3736 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3743,7 +3744,7 @@
 char *msg = *(sys_siglist + 1);
 ; return 0; }
 EOF
-if { (eval echo configure:3747: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3748: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_decl_sys_siglist=yes
 else
@@ -3769,9 +3770,9 @@
 
 
 echo $ac_n "checking for utime""... $ac_c" 1>&6
-echo "configure:3773: checking for utime" >&5
+echo "configure:3774: checking for utime" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3775 "configure"
+#line 3776 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <utime.h>
@@ -3779,7 +3780,7 @@
 struct utimbuf x; x.actime = x.modtime = 0; utime ("/", &x);
 ; return 0; }
 EOF
-if { (eval echo configure:3783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3784: \"$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
@@ -3798,10 +3799,10 @@
       for ac_func in utimes
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3802: checking for $ac_func" >&5
+echo "configure:3803: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3805 "configure"
+#line 3806 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3824,7 +3825,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3829: \"$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
@@ -3856,10 +3857,10 @@
 
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3860: checking return type of signal handlers" >&5
+echo "configure:3861: checking return type of signal handlers" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3863 "configure"
+#line 3864 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3876,7 +3877,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:3880: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3881: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -3898,10 +3899,10 @@
 
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3902: checking for size_t" >&5
+echo "configure:3903: checking for size_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3905 "configure"
+#line 3906 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3932,10 +3933,10 @@
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:3936: checking for pid_t" >&5
+echo "configure:3937: checking for pid_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3939 "configure"
+#line 3940 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3966,10 +3967,10 @@
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:3970: checking for uid_t in sys/types.h" >&5
+echo "configure:3971: checking for uid_t in sys/types.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3973 "configure"
+#line 3974 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -4005,10 +4006,10 @@
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:4009: checking for mode_t" >&5
+echo "configure:4010: checking for mode_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4012 "configure"
+#line 4013 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4039,10 +4040,10 @@
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:4043: checking for off_t" >&5
+echo "configure:4044: checking for off_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4046 "configure"
+#line 4047 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4073,10 +4074,10 @@
 fi
 
 echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
-echo "configure:4077: checking for ssize_t" >&5
+echo "configure:4078: checking for ssize_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4080 "configure"
+#line 4081 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4108,9 +4109,9 @@
 
 
 echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
-echo "configure:4112: checking for socklen_t" >&5
+echo "configure:4113: checking for socklen_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4114 "configure"
+#line 4115 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 socklen_t x;
@@ -4119,7 +4120,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -4128,7 +4129,7 @@
   rm -rf conftest*
   
 cat > conftest.$ac_ext <<EOF
-#line 4132 "configure"
+#line 4133 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 int accept (int, struct sockaddr *, size_t *);
@@ -4137,7 +4138,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4141: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4142: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 echo "$ac_t""size_t" 1>&6
@@ -4169,9 +4170,9 @@
 rm -f conftest*
 
 echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
-echo "configure:4173: checking for struct timeval" >&5
+echo "configure:4174: checking for struct timeval" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4175 "configure"
+#line 4176 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -4187,7 +4188,7 @@
 static struct timeval x; x.tv_sec = x.tv_usec;
 ; return 0; }
 EOF
-if { (eval echo configure:4191: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
   HAVE_TIMEVAL=yes
@@ -4209,10 +4210,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:4213: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:4214: checking whether struct tm is in sys/time.h or time.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4216 "configure"
+#line 4217 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -4220,7 +4221,7 @@
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:4224: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4225: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
 else
@@ -4244,10 +4245,10 @@
 fi
 
 echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:4248: checking for tm_zone in struct tm" >&5
+echo "configure:4249: checking for tm_zone in struct tm" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4251 "configure"
+#line 4252 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
@@ -4255,7 +4256,7 @@
 struct tm tm; tm.tm_zone;
 ; return 0; }
 EOF
-if { (eval echo configure:4259: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4260: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm_zone=yes
 else
@@ -4278,10 +4279,10 @@
 
 else
   echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:4282: checking for tzname" >&5
+echo "configure:4283: checking for tzname" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4285 "configure"
+#line 4286 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
@@ -4291,7 +4292,7 @@
 atoi(*tzname);
 ; return 0; }
 EOF
-if { (eval echo configure:4295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_var_tzname=yes
 else
@@ -4317,10 +4318,10 @@
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:4321: checking for working const" >&5
+echo "configure:4322: checking for working const" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4324 "configure"
+#line 4325 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -4369,7 +4370,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4373: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -4394,7 +4395,7 @@
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:4398: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:4399: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 
 cat > conftestmake <<\EOF
@@ -4419,12 +4420,12 @@
 
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:4423: checking whether byte ordering is bigendian" >&5
+echo "configure:4424: 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 4428 "configure"
+#line 4429 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -4435,11 +4436,11 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4439: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4440: \"$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 4443 "configure"
+#line 4444 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -4450,7 +4451,7 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4454: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4455: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -4467,7 +4468,7 @@
 rm -f conftest*
 if test $ac_cv_c_bigendian = unknown; then
 cat > conftest.$ac_ext <<EOF
-#line 4471 "configure"
+#line 4472 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -4480,7 +4481,7 @@
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:4484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_c_bigendian=no
 else
@@ -4507,13 +4508,12 @@
 
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:4511: checking size of short" >&5
+echo "configure:4512: checking size of short" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4514 "configure"
+#line 4515 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -4556,7 +4556,6 @@
 #line 4557 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -4565,7 +4564,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -4587,13 +4586,12 @@
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:4591: checking size of long" >&5
+echo "configure:4590: checking size of long" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4594 "configure"
+#line 4593 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -4602,7 +4600,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -4624,13 +4622,12 @@
 
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:4628: checking size of long long" >&5
+echo "configure:4626: checking size of long long" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4631 "configure"
+#line 4629 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -4639,7 +4636,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4640: \"$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
@@ -4661,13 +4658,12 @@
 
 
 echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:4665: checking size of void *" >&5
+echo "configure:4662: checking size of void *" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4668 "configure"
+#line 4665 "configure"
 #include "confdefs.h"
 #include <stdio.h>
-#include <sys/types.h>
 main()
 {
   FILE *f=fopen("conftestval", "w");
@@ -4676,7 +4672,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4676: \"$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
@@ -4699,7 +4695,7 @@
 
 
 echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:4703: checking for long file names" >&5
+echo "configure:4699: 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:
@@ -4745,10 +4741,10 @@
 
 
 echo $ac_n "checking for sin""... $ac_c" 1>&6
-echo "configure:4749: checking for sin" >&5
+echo "configure:4745: checking for sin" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4752 "configure"
+#line 4748 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char sin(); below.  */
@@ -4771,7 +4767,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4775: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4771: \"$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
@@ -4789,12 +4785,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:4793: checking for sin in -lm" >&5
+echo "configure:4789: 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 4798 "configure"
+#line 4794 "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
@@ -4805,7 +4801,7 @@
 sin()
 ; return 0; }
 EOF
-if { (eval echo configure:4809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4805: \"$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
@@ -4849,14 +4845,14 @@
 
 
 cat > conftest.$ac_ext <<EOF
-#line 4853 "configure"
+#line 4849 "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:4860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4856: \"$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
@@ -4875,10 +4871,10 @@
 for ac_func in mkstemp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:4879: checking for $ac_func" >&5
+echo "configure:4875: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4882 "configure"
+#line 4878 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4901,7 +4897,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4901: \"$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
@@ -4930,14 +4926,14 @@
 
 
 echo "checking type of mail spool file locking" 1>&6
-echo "configure:4934: checking type of mail spool file locking" >&5
+echo "configure:4930: 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:4938: checking for $ac_func" >&5
+echo "configure:4934: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4941 "configure"
+#line 4937 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4960,7 +4956,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4960: \"$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
@@ -5042,12 +5038,12 @@
 case "$opsys" in decosf*)
   
 echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
-echo "configure:5046: checking for cma_open in -lpthreads" >&5
+echo "configure:5042: 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 5051 "configure"
+#line 5047 "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
@@ -5058,7 +5054,7 @@
 cma_open()
 ; return 0; }
 EOF
-if { (eval echo configure:5062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5058: \"$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
@@ -5095,7 +5091,7 @@
 
 
 echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
-echo "configure:5099: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:5095: 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;
@@ -5107,7 +5103,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:5111: checking for \"-z ignore\" linker flag" >&5
+echo "configure:5107: 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 ;;
@@ -5118,7 +5114,7 @@
 
 
 echo "checking "for specified window system"" 1>&6
-echo "configure:5122: checking "for specified window system"" >&5
+echo "configure:5118: checking "for specified window system"" >&5
 
 
 GNOME_CONFIG=no
@@ -5126,7 +5122,7 @@
 
 if test "$with_gnome" != "no"; then
    echo $ac_n "checking for GNOME configuration script""... $ac_c" 1>&6
-echo "configure:5130: checking for GNOME configuration script" >&5
+echo "configure:5126: checking for GNOME configuration script" >&5
    for possible in gnome-config
    do
       possible_version=`${possible} --version 2> /dev/null`
@@ -5157,7 +5153,7 @@
 
 if test "$with_gtk" != "no";then
    echo $ac_n "checking for GTK configuration script""... $ac_c" 1>&6
-echo "configure:5161: checking for GTK configuration script" >&5
+echo "configure:5157: checking for GTK configuration script" >&5
    for possible in gtk12-config gtk14-config gtk-config
    do
       possible_version=`${possible} --version 2> /dev/null`
@@ -5179,18 +5175,18 @@
 
 if test "${GTK_CONFIG}" != "no"; then
       echo $ac_n "checking gtk version""... $ac_c" 1>&6
-echo "configure:5183: checking gtk version" >&5
+echo "configure:5179: 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:5188: checking gtk libs" >&5
+echo "configure:5184: 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:5194: checking gtk cflags" >&5
+echo "configure:5190: checking gtk cflags" >&5
       GTK_CFLAGS=`${GTK_CONFIG} --cflags`
       if test "$GCC" = "yes"; then
       	GTK_CFLAGS="${GTK_CFLAGS} -Wno-shadow"
@@ -5200,19 +5196,19 @@
 
       
 echo $ac_n "checking for main in -lgdk_imlib""... $ac_c" 1>&6
-echo "configure:5204: checking for main in -lgdk_imlib" >&5
+echo "configure:5200: 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 5209 "configure"
+#line 5205 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5216: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5212: \"$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
@@ -5234,12 +5230,12 @@
 
       
 echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6
-echo "configure:5238: checking for Imlib_init in -lImlib" >&5
+echo "configure:5234: 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 5243 "configure"
+#line 5239 "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
@@ -5250,7 +5246,7 @@
 Imlib_init()
 ; return 0; }
 EOF
-if { (eval echo configure:5254: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5250: \"$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
@@ -5273,10 +5269,10 @@
       for ac_func in gdk_imlib_init
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5277: checking for $ac_func" >&5
+echo "configure:5273: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5280 "configure"
+#line 5276 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5299,7 +5295,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5299: \"$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
@@ -5365,15 +5361,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5369: checking for $ac_hdr" >&5
+echo "configure:5365: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5372 "configure"
+#line 5368 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5377: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5373: \"$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*
@@ -5404,19 +5400,19 @@
 
       
 echo $ac_n "checking for main in -lxml""... $ac_c" 1>&6
-echo "configure:5408: checking for main in -lxml" >&5
+echo "configure:5404: 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 5413 "configure"
+#line 5409 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5416: \"$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
@@ -5438,19 +5434,19 @@
 
       
 echo $ac_n "checking for main in -lglade""... $ac_c" 1>&6
-echo "configure:5442: checking for main in -lglade" >&5
+echo "configure:5438: 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 5447 "configure"
+#line 5443 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5450: \"$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
@@ -5472,19 +5468,19 @@
 
       
 echo $ac_n "checking for main in -lglade-gnome""... $ac_c" 1>&6
-echo "configure:5476: checking for main in -lglade-gnome" >&5
+echo "configure:5472: 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 5481 "configure"
+#line 5477 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5484: \"$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
@@ -5505,7 +5501,7 @@
 
 
       cat > conftest.$ac_ext <<EOF
-#line 5509 "configure"
+#line 5505 "configure"
 #include "confdefs.h"
 #include <glade/glade-xml.h>
 EOF
@@ -5564,7 +5560,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:5568: checking for X" >&5
+echo "configure:5564: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -5624,12 +5620,12 @@
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 5628 "configure"
+#line 5624 "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:5633: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5629: \"$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*
@@ -5698,14 +5694,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5702 "configure"
+#line 5698 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:5709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5705: \"$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.
@@ -5814,17 +5810,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:5818: checking whether -R must be followed by a space" >&5
+echo "configure:5814: 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 5821 "configure"
+#line 5817 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -5840,14 +5836,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 5844 "configure"
+#line 5840 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5847: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -5883,12 +5879,12 @@
 else
 
 echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:5887: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:5883: 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 5892 "configure"
+#line 5888 "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
@@ -5899,7 +5895,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5899: \"$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
@@ -5923,12 +5919,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:5927: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:5923: 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 5932 "configure"
+#line 5928 "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
@@ -5939,7 +5935,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5939: \"$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
@@ -5968,10 +5964,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:5972: checking for gethostbyname" >&5
+echo "configure:5968: checking for gethostbyname" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5975 "configure"
+#line 5971 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -5994,7 +5990,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5998: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5994: \"$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
@@ -6015,12 +6011,12 @@
     if test $ac_cv_func_gethostbyname = no; then
       
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:6019: checking for gethostbyname in -lnsl" >&5
+echo "configure:6015: 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 6024 "configure"
+#line 6020 "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
@@ -6031,7 +6027,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:6035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6031: \"$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
@@ -6061,10 +6057,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:6065: checking for connect" >&5
+echo "configure:6061: checking for connect" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6068 "configure"
+#line 6064 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -6087,7 +6083,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6087: \"$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
@@ -6110,12 +6106,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:6114: checking "$xe_msg_checking"" >&5
+echo "configure:6110: 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 6119 "configure"
+#line 6115 "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
@@ -6126,7 +6122,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:6130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6126: \"$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
@@ -6150,10 +6146,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:6154: checking for remove" >&5
+echo "configure:6150: checking for remove" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6157 "configure"
+#line 6153 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -6176,7 +6172,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6176: \"$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
@@ -6197,12 +6193,12 @@
     if test $ac_cv_func_remove = no; then
       
 echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:6201: checking for remove in -lposix" >&5
+echo "configure:6197: 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 6206 "configure"
+#line 6202 "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
@@ -6213,7 +6209,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:6217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6213: \"$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
@@ -6237,10 +6233,10 @@
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:6241: checking for shmat" >&5
+echo "configure:6237: checking for shmat" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6244 "configure"
+#line 6240 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -6263,7 +6259,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6263: \"$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
@@ -6284,12 +6280,12 @@
     if test $ac_cv_func_shmat = no; then
       
 echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:6288: checking for shmat in -lipc" >&5
+echo "configure:6284: 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 6293 "configure"
+#line 6289 "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
@@ -6300,7 +6296,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:6304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6300: \"$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
@@ -6336,12 +6332,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:6340: checking "$xe_msg_checking"" >&5
+echo "configure:6336: 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 6345 "configure"
+#line 6341 "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
@@ -6352,7 +6348,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:6356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6352: \"$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
@@ -6519,7 +6515,7 @@
 
 
     echo "checking for X defines extracted by xmkmf" 1>&6
-echo "configure:6523: checking for X defines extracted by xmkmf" >&5
+echo "configure:6519: checking for X defines extracted by xmkmf" >&5
   rm -fr conftestdir
   if mkdir conftestdir; then
     cd conftestdir
@@ -6568,15 +6564,15 @@
 
     ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6
-echo "configure:6572: checking for X11/Intrinsic.h" >&5
+echo "configure:6568: checking for X11/Intrinsic.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6575 "configure"
+#line 6571 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6580: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6576: \"$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*
@@ -6600,12 +6596,12 @@
 
       
 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:6604: checking for XOpenDisplay in -lX11" >&5
+echo "configure:6600: 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 6609 "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
@@ -6616,7 +6612,7 @@
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:6620: \"$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
@@ -6641,12 +6637,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:6645: checking "$xe_msg_checking"" >&5
+echo "configure:6641: 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 6650 "configure"
+#line 6646 "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
@@ -6657,7 +6653,7 @@
 XGetFontProperty()
 ; return 0; }
 EOF
-if { (eval echo configure:6661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6657: \"$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
@@ -6684,12 +6680,12 @@
 
     
 echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6
-echo "configure:6688: checking for XShapeSelectInput in -lXext" >&5
+echo "configure:6684: 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 6693 "configure"
+#line 6689 "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
@@ -6700,7 +6696,7 @@
 XShapeSelectInput()
 ; return 0; }
 EOF
-if { (eval echo configure:6704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6700: \"$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
@@ -6723,12 +6719,12 @@
 
     
 echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6
-echo "configure:6727: checking for XtOpenDisplay in -lXt" >&5
+echo "configure:6723: 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 6732 "configure"
+#line 6728 "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
@@ -6739,7 +6735,7 @@
 XtOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:6743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6739: \"$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
@@ -6762,14 +6758,14 @@
 
 
   echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6
-echo "configure:6766: checking the version of X11 being used" >&5
+echo "configure:6762: checking the version of X11 being used" >&5
   cat > conftest.$ac_ext <<EOF
-#line 6768 "configure"
+#line 6764 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
     int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; }
 EOF
-if { (eval echo configure:6773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:6769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ./conftest foobar; x11_release=$?
 else
@@ -6800,10 +6796,10 @@
   for ac_func in XConvertCase
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6804: checking for $ac_func" >&5
+echo "configure:6800: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6807 "configure"
+#line 6803 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6826,7 +6822,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6826: \"$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
@@ -6858,15 +6854,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6862: checking for $ac_hdr" >&5
+echo "configure:6858: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6865 "configure"
+#line 6861 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6870: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6866: \"$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*
@@ -6899,10 +6895,10 @@
     for ac_func in XRegisterIMInstantiateCallback
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6903: checking for $ac_func" >&5
+echo "configure:6899: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6906 "configure"
+#line 6902 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6925,7 +6921,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6925: \"$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
@@ -6953,9 +6949,9 @@
 done
 
   echo $ac_n "checking for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6
-echo "configure:6957: checking for standard XRegisterIMInstantiateCallback prototype" >&5
+echo "configure:6953: checking for standard XRegisterIMInstantiateCallback prototype" >&5
   cat > conftest.$ac_ext <<EOF
-#line 6959 "configure"
+#line 6955 "configure"
 #include "confdefs.h"
 
 #define NeedFunctionPrototypes 1
@@ -6967,7 +6963,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6971: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -6988,12 +6984,12 @@
 
     test -z "$with_xmu" && { 
 echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6
-echo "configure:6992: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
+echo "configure:6988: 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 6997 "configure"
+#line 6993 "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
@@ -7004,7 +7000,7 @@
 XmuReadBitmapDataFromFile()
 ; return 0; }
 EOF
-if { (eval echo configure:7008: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7004: \"$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
@@ -7043,19 +7039,19 @@
 
       
 echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:7047: checking for main in -lXbsd" >&5
+echo "configure:7043: 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 7052 "configure"
+#line 7048 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:7059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7055: \"$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
@@ -7092,22 +7088,22 @@
 fi 
 if test "$with_msw" != "no"; then
   echo "checking for MS-Windows" 1>&6
-echo "configure:7096: checking for MS-Windows" >&5
+echo "configure:7092: checking for MS-Windows" >&5
   
 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6
-echo "configure:7099: checking for main in -lgdi32" >&5
+echo "configure:7095: 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 7104 "configure"
+#line 7100 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:7111: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7107: \"$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
@@ -7158,12 +7154,12 @@
       test "$with_widgets"    != "no" && with_widgets=msw
     fi
         cat > conftest.$ac_ext <<EOF
-#line 7162 "configure"
+#line 7158 "configure"
 #include "confdefs.h"
 #include <fcntl.h>
     int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }
 EOF
-if { (eval echo configure:7167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7163: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_MSG_SELECT
@@ -7224,15 +7220,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:7228: checking for X11/extensions/shape.h" >&5
+echo "configure:7224: checking for X11/extensions/shape.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7231 "configure"
+#line 7227 "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:7236: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7232: \"$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*
@@ -7282,7 +7278,7 @@
 esac
 
 echo "checking for WM_COMMAND option" 1>&6
-echo "configure:7286: checking for WM_COMMAND option" >&5;
+echo "configure:7282: checking for WM_COMMAND option" >&5;
 if test "$with_wmcommand" != "no"; then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_WMCOMMAND
@@ -7297,15 +7293,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:7301: checking for X11/Xauth.h" >&5
+echo "configure:7297: checking for X11/Xauth.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7304 "configure"
+#line 7300 "configure"
 #include "confdefs.h"
 #include <X11/Xauth.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7309: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7305: \"$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*
@@ -7328,12 +7324,12 @@
  }
 test -z "$with_xauth" && { 
 echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6
-echo "configure:7332: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:7328: 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 7337 "configure"
+#line 7333 "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
@@ -7344,7 +7340,7 @@
 XauGetAuthByAddr()
 ; return 0; }
 EOF
-if { (eval echo configure:7348: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7344: \"$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
@@ -7389,15 +7385,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:7393: checking for ${dir}tt_c.h" >&5
+echo "configure:7389: checking for ${dir}tt_c.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7396 "configure"
+#line 7392 "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:7401: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7397: \"$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*
@@ -7433,12 +7429,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:7437: checking "$xe_msg_checking"" >&5
+echo "configure:7433: 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 7442 "configure"
+#line 7438 "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
@@ -7449,7 +7445,7 @@
 tt_message_create()
 ; return 0; }
 EOF
-if { (eval echo configure:7453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7449: \"$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
@@ -7503,15 +7499,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:7507: checking for Dt/Dt.h" >&5
+echo "configure:7503: checking for Dt/Dt.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7510 "configure"
+#line 7506 "configure"
 #include "confdefs.h"
 #include <Dt/Dt.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7515: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7511: \"$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*
@@ -7534,12 +7530,12 @@
  }
 test -z "$with_cde" && { 
 echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6
-echo "configure:7538: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:7534: 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 7543 "configure"
+#line 7539 "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
@@ -7550,7 +7546,7 @@
 DtDndDragStart()
 ; return 0; }
 EOF
-if { (eval echo configure:7554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7550: \"$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
@@ -7631,7 +7627,7 @@
 
 if test "$with_dragndrop" != "no" ; then
   echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6
-echo "configure:7635: checking if drag and drop API is needed" >&5
+echo "configure:7631: 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
@@ -7651,18 +7647,18 @@
 fi
 
 echo "checking for LDAP" 1>&6
-echo "configure:7655: checking for LDAP" >&5
+echo "configure:7651: 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:7658: checking for ldap.h" >&5
+echo "configure:7654: checking for ldap.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7661 "configure"
+#line 7657 "configure"
 #include "confdefs.h"
 #include <ldap.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7666: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7662: \"$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*
@@ -7685,15 +7681,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:7689: checking for lber.h" >&5
+echo "configure:7685: checking for lber.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7692 "configure"
+#line 7688 "configure"
 #include "confdefs.h"
 #include <lber.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7697: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7693: \"$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*
@@ -7717,12 +7713,12 @@
 if test "$with_ldap" != "no"; then
   
 echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6
-echo "configure:7721: checking for ldap_search in -lldap" >&5
+echo "configure:7717: 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 7726 "configure"
+#line 7722 "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
@@ -7733,7 +7729,7 @@
 ldap_search()
 ; return 0; }
 EOF
-if { (eval echo configure:7737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7733: \"$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
@@ -7758,12 +7754,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:7762: checking "$xe_msg_checking"" >&5
+echo "configure:7758: 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 7767 "configure"
+#line 7763 "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
@@ -7774,7 +7770,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7774: \"$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
@@ -7799,12 +7795,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:7803: checking "$xe_msg_checking"" >&5
+echo "configure:7799: 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 7808 "configure"
+#line 7804 "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
@@ -7815,7 +7811,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7815: \"$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
@@ -7840,12 +7836,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:7844: checking "$xe_msg_checking"" >&5
+echo "configure:7840: 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 7849 "configure"
+#line 7845 "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
@@ -7856,7 +7852,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7860: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7856: \"$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
@@ -7904,10 +7900,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:7908: checking for $ac_func" >&5
+echo "configure:7904: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7911 "configure"
+#line 7907 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7930,7 +7926,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7930: \"$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
@@ -7961,20 +7957,20 @@
 
 if test "$with_postgresql" != "no"; then
   echo "checking for PostgreSQL" 1>&6
-echo "configure:7965: checking for PostgreSQL" >&5
+echo "configure:7961: 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:7970: checking for ${header_dir}libpq-fe.h" >&5
+echo "configure:7966: checking for ${header_dir}libpq-fe.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7973 "configure"
+#line 7969 "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:7978: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7974: \"$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*
@@ -7998,12 +7994,12 @@
 
   test -n "$libpq_fe_h_file" && { 
 echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6
-echo "configure:8002: checking for PQconnectdb in -lpq" >&5
+echo "configure:7998: 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 8007 "configure"
+#line 8003 "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
@@ -8014,7 +8010,7 @@
 PQconnectdb()
 ; return 0; }
 EOF
-if { (eval echo configure:8018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8014: \"$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
@@ -8047,12 +8043,12 @@
 
     
 echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6
-echo "configure:8051: checking for PQconnectStart in -lpq" >&5
+echo "configure:8047: 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 8056 "configure"
+#line 8052 "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
@@ -8063,7 +8059,7 @@
 PQconnectStart()
 ; return 0; }
 EOF
-if { (eval echo configure:8067: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8063: \"$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
@@ -8108,7 +8104,7 @@
 
 if test "$window_system" != "none"; then
   echo "checking for graphics libraries" 1>&6
-echo "configure:8112: checking for graphics libraries" >&5
+echo "configure:8108: checking for graphics libraries" >&5
 
       libpath_xpm=
   incpath_xpm=
@@ -8134,10 +8130,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:8138: checking for Xpm - no older than 3.4f" >&5
+echo "configure:8134: checking for Xpm - no older than 3.4f" >&5
     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF
-#line 8141 "configure"
+#line 8137 "configure"
 #include "confdefs.h"
 #define XPM_NUMBERS
 #include <X11/xpm.h>
@@ -8146,7 +8142,7 @@
       XpmIncludeVersion != XpmLibraryVersion() ? 1 :
       XpmIncludeVersion < 30406 ? 2 : 0 ;}
 EOF
-if { (eval echo configure:8150: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:8146: \"$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
@@ -8190,17 +8186,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:8194: checking for \"FOR_MSW\" xpm" >&5
+echo "configure:8190: checking for \"FOR_MSW\" xpm" >&5
     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF
-#line 8197 "configure"
+#line 8193 "configure"
 #include "confdefs.h"
 
 int main() {
 XpmCreatePixmapFromData()
 ; return 0; }
 EOF
-if { (eval echo configure:8204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   xpm_for_msw=no
 else
@@ -8226,15 +8222,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:8230: checking for compface.h" >&5
+echo "configure:8226: checking for compface.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8233 "configure"
+#line 8229 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8234: \"$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*
@@ -8257,12 +8253,12 @@
  }
   test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:8261: checking for UnGenFace in -lcompface" >&5
+echo "configure:8257: 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 8266 "configure"
+#line 8262 "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 +8269,7 @@
 UnGenFace()
 ; 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:8273: \"$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
@@ -8322,12 +8318,12 @@
       if test "$with_png $with_tiff" != "no no"; then
     
 echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6
-echo "configure:8326: checking for inflate in -lc" >&5
+echo "configure:8322: 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 8331 "configure"
+#line 8327 "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
@@ -8338,7 +8334,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8342: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8338: \"$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
@@ -8357,12 +8353,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:8361: checking for inflate in -lz" >&5
+echo "configure:8357: 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 8366 "configure"
+#line 8362 "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
@@ -8373,7 +8369,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8373: \"$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
@@ -8392,12 +8388,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6
-echo "configure:8396: checking for inflate in -lgz" >&5
+echo "configure:8392: 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 8401 "configure"
+#line 8397 "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
@@ -8408,7 +8404,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8408: \"$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
@@ -8438,15 +8434,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:8442: checking for jpeglib.h" >&5
+echo "configure:8438: checking for jpeglib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8445 "configure"
+#line 8441 "configure"
 #include "confdefs.h"
 #include <jpeglib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8450: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8446: \"$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*
@@ -8469,12 +8465,12 @@
  }
   test -z "$with_jpeg" && { 
 echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
-echo "configure:8473: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:8469: 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 8478 "configure"
+#line 8474 "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
@@ -8485,7 +8481,7 @@
 jpeg_destroy_decompress()
 ; return 0; }
 EOF
-if { (eval echo configure:8489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8485: \"$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
@@ -8521,10 +8517,10 @@
 
     png_problem=""
   test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
-echo "configure:8525: checking for pow" >&5
+echo "configure:8521: checking for pow" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8528 "configure"
+#line 8524 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pow(); below.  */
@@ -8547,7 +8543,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8551: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8547: \"$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
@@ -8568,15 +8564,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:8572: checking for png.h" >&5
+echo "configure:8568: checking for png.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8575 "configure"
+#line 8571 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8580: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8576: \"$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*
@@ -8599,12 +8595,12 @@
  }
   test -z "$with_png" && { 
 echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:8603: checking for png_read_image in -lpng" >&5
+echo "configure:8599: 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 8608 "configure"
+#line 8604 "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
@@ -8615,7 +8611,7 @@
 png_read_image()
 ; return 0; }
 EOF
-if { (eval echo configure:8619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8615: \"$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
@@ -8638,10 +8634,10 @@
  }
   if test -z "$with_png"; then
     echo $ac_n "checking for workable png version information""... $ac_c" 1>&6
-echo "configure:8642: checking for workable png version information" >&5
+echo "configure:8638: checking for workable png version information" >&5
     xe_check_libs="-lpng -lz"
     cat > conftest.$ac_ext <<EOF
-#line 8645 "configure"
+#line 8641 "configure"
 #include "confdefs.h"
 #include <png.h>
     int main(int c, char **v) {
@@ -8649,7 +8645,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:8653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:8649: \"$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
@@ -8692,15 +8688,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:8696: checking for tiffio.h" >&5
+echo "configure:8692: checking for tiffio.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8699 "configure"
+#line 8695 "configure"
 #include "confdefs.h"
 #include <tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8704: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8700: \"$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*
@@ -8723,12 +8719,12 @@
  }
   test -z "$with_tiff" && { 
 echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8727: checking for TIFFClientOpen in -ltiff" >&5
+echo "configure:8723: 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 8732 "configure"
+#line 8728 "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
@@ -8739,7 +8735,7 @@
 TIFFClientOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:8743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8739: \"$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
@@ -8778,15 +8774,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:8782: checking for compface.h" >&5
+echo "configure:8778: checking for compface.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8785 "configure"
+#line 8781 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8786: \"$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*
@@ -8809,12 +8805,12 @@
  }
   test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:8813: checking for UnGenFace in -lcompface" >&5
+echo "configure:8809: 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 8818 "configure"
+#line 8814 "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
@@ -8825,7 +8821,7 @@
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:8829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8825: \"$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
@@ -8864,7 +8860,7 @@
 
 if test "$with_x11" = "yes"; then
   echo "checking for X11 graphics libraries" 1>&6
-echo "configure:8868: checking for X11 graphics libraries" >&5
+echo "configure:8864: checking for X11 graphics libraries" >&5
 fi
 
 case "$with_widgets" in
@@ -8874,7 +8870,7 @@
 
 if test "$with_x11" = "yes" -a "$detect_athena" = "yes" ; then
   echo "checking for the Athena widgets" 1>&6
-echo "configure:8878: checking for the Athena widgets" >&5
+echo "configure:8874: checking for the Athena widgets" >&5
 
     case "$with_athena" in
         "xaw" | "")	athena_variant=Xaw	athena_3d=no  ;;
@@ -8888,12 +8884,12 @@
     if test "$athena_3d" = "no"; then
     
 echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:8892: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
+echo "configure:8888: 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 8897 "configure"
+#line 8893 "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
@@ -8904,7 +8900,7 @@
 XawScrollbarSetThumb()
 ; return 0; }
 EOF
-if { (eval echo configure:8908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8904: \"$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
@@ -8920,12 +8916,12 @@
   echo "$ac_t""yes" 1>&6
           
 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:8924: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:8920: 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 8929 "configure"
+#line 8925 "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
@@ -8936,7 +8932,7 @@
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:8940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8936: \"$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
@@ -8967,12 +8963,12 @@
   else
         
 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:8971: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:8967: 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 8976 "configure"
+#line 8972 "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
@@ -8983,7 +8979,7 @@
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:8987: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8983: \"$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
@@ -9001,12 +8997,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for threeDClassRec in -lXaw""... $ac_c" 1>&6
-echo "configure:9005: checking for threeDClassRec in -lXaw" >&5
+echo "configure:9001: 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 9010 "configure"
+#line 9006 "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
@@ -9017,7 +9013,7 @@
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:9021: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9017: \"$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
@@ -9048,15 +9044,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:9052: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:9048: checking for X11/Xaw/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9055 "configure"
+#line 9051 "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:9060: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9056: \"$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*
@@ -9076,15 +9072,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:9080: checking for X11/Xaw/XawInit.h" >&5
+echo "configure:9076: checking for X11/Xaw/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9083 "configure"
+#line 9079 "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:9088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9084: \"$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*
@@ -9110,15 +9106,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:9114: checking for X11/$athena_variant/XawInit.h" >&5
+echo "configure:9110: checking for X11/$athena_variant/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9117 "configure"
+#line 9113 "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:9122: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9118: \"$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*
@@ -9135,15 +9131,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:9139: checking for X11/$athena_variant/ThreeD.h" >&5
+echo "configure:9135: checking for X11/$athena_variant/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9142 "configure"
+#line 9138 "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:9147: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9143: \"$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*
@@ -9171,15 +9167,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:9175: checking for $athena_variant/XawInit.h" >&5
+echo "configure:9171: checking for $athena_variant/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9178 "configure"
+#line 9174 "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:9183: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9179: \"$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*
@@ -9196,15 +9192,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:9200: checking for $athena_variant/ThreeD.h" >&5
+echo "configure:9196: checking for $athena_variant/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9203 "configure"
+#line 9199 "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:9208: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9204: \"$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*
@@ -9233,15 +9229,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:9237: checking for X11/Xaw3d/XawInit.h" >&5
+echo "configure:9233: checking for X11/Xaw3d/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9240 "configure"
+#line 9236 "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:9245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9241: \"$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*
@@ -9258,15 +9254,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:9262: checking for X11/Xaw3d/ThreeD.h" >&5
+echo "configure:9258: checking for X11/Xaw3d/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9265 "configure"
+#line 9261 "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:9270: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9266: \"$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*
@@ -9298,15 +9294,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:9302: checking for Xaw3d/XawInit.h" >&5
+echo "configure:9298: checking for Xaw3d/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9305 "configure"
+#line 9301 "configure"
 #include "confdefs.h"
 #include <Xaw3d/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9306: \"$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*
@@ -9323,15 +9319,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:9327: checking for Xaw3d/ThreeD.h" >&5
+echo "configure:9323: checking for Xaw3d/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9330 "configure"
+#line 9326 "configure"
 #include "confdefs.h"
 #include <Xaw3d/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9335: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9331: \"$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*
@@ -9363,15 +9359,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:9367: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:9363: checking for X11/Xaw/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9370 "configure"
+#line 9366 "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:9375: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9371: \"$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*
@@ -9410,15 +9406,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:9414: checking for Xm/Xm.h" >&5
+echo "configure:9410: checking for Xm/Xm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9417 "configure"
+#line 9413 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9418: \"$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*
@@ -9435,12 +9431,12 @@
   echo "$ac_t""yes" 1>&6
   
 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
-echo "configure:9439: checking for XmStringFree in -lXm" >&5
+echo "configure:9435: 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 9444 "configure"
+#line 9440 "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
@@ -9451,7 +9447,7 @@
 XmStringFree()
 ; return 0; }
 EOF
-if { (eval echo configure:9455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9451: \"$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
@@ -9480,9 +9476,9 @@
 
   if test "$have_motif" = "yes"; then
         echo $ac_n "checking for Lesstif""... $ac_c" 1>&6
-echo "configure:9484: checking for Lesstif" >&5
+echo "configure:9480: checking for Lesstif" >&5
     cat > conftest.$ac_ext <<EOF
-#line 9486 "configure"
+#line 9482 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 #ifdef LESSTIF_VERSION
@@ -9855,7 +9851,7 @@
 
 if test "$with_mule" = "yes" ; then
   echo "checking for Mule-related features" 1>&6
-echo "configure:9859: checking for Mule-related features" >&5
+echo "configure:9855: checking for Mule-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining MULE
 EOF
@@ -9869,15 +9865,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9873: checking for $ac_hdr" >&5
+echo "configure:9869: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9876 "configure"
+#line 9872 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9877: \"$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*
@@ -9908,12 +9904,12 @@
 
   
 echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
-echo "configure:9912: checking for strerror in -lintl" >&5
+echo "configure:9908: 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 9917 "configure"
+#line 9913 "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
@@ -9924,7 +9920,7 @@
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:9928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9924: \"$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
@@ -9957,18 +9953,18 @@
 
 
   echo "checking for Mule input methods" 1>&6
-echo "configure:9961: checking for Mule input methods" >&5
+echo "configure:9957: checking for Mule input methods" >&5
         case "$with_xim" in "" | "yes" )
     echo "checking for XIM" 1>&6
-echo "configure:9964: checking for XIM" >&5
+echo "configure:9960: checking for XIM" >&5
     
 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6
-echo "configure:9967: checking for XOpenIM in -lX11" >&5
+echo "configure:9963: 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 9972 "configure"
+#line 9968 "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
@@ -9979,7 +9975,7 @@
 XOpenIM()
 ; return 0; }
 EOF
-if { (eval echo configure:9983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9979: \"$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
@@ -10003,12 +9999,12 @@
         if test "$have_motif $have_lesstif" = "yes no"; then
       
 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:10007: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:10003: 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 10012 "configure"
+#line 10008 "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
@@ -10019,7 +10015,7 @@
 XmImMbLookupString()
 ; return 0; }
 EOF
-if { (eval echo configure:10023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10019: \"$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
@@ -10084,15 +10080,15 @@
 
     if test "$with_xfs" = "yes" ; then
     echo "checking for XFontSet" 1>&6
-echo "configure:10088: checking for XFontSet" >&5
+echo "configure:10084: checking for XFontSet" >&5
     
 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6
-echo "configure:10091: checking for XmbDrawString in -lX11" >&5
+echo "configure:10087: 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 10096 "configure"
+#line 10092 "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
@@ -10103,7 +10099,7 @@
 XmbDrawString()
 ; return 0; }
 EOF
-if { (eval echo configure:10107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10103: \"$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
@@ -10143,15 +10139,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:10147: checking for wnn/jllib.h" >&5
+echo "configure:10143: checking for wnn/jllib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10150 "configure"
+#line 10146 "configure"
 #include "confdefs.h"
 #include <wnn/jllib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10155: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10151: \"$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*
@@ -10174,15 +10170,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:10178: checking for wnn/commonhd.h" >&5
+echo "configure:10174: checking for wnn/commonhd.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10181 "configure"
+#line 10177 "configure"
 #include "confdefs.h"
 #include <wnn/commonhd.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10186: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10182: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -10207,10 +10203,10 @@
     for ac_func in crypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10211: checking for $ac_func" >&5
+echo "configure:10207: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10214 "configure"
+#line 10210 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10233,7 +10229,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10233: \"$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
@@ -10262,12 +10258,12 @@
 
     test "$ac_cv_func_crypt" != "yes" && { 
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:10266: checking for crypt in -lcrypt" >&5
+echo "configure:10262: 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 10271 "configure"
+#line 10267 "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
@@ -10278,7 +10274,7 @@
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:10282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10278: \"$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
@@ -10313,12 +10309,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:10317: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:10313: 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 10322 "configure"
+#line 10318 "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
@@ -10329,7 +10325,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10329: \"$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
@@ -10347,12 +10343,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:10351: checking for jl_dic_list_e in -lwnn4" >&5
+echo "configure:10347: 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 10356 "configure"
+#line 10352 "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
@@ -10363,7 +10359,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10367: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10363: \"$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
@@ -10381,12 +10377,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:10385: checking for jl_dic_list_e in -lwnn6" >&5
+echo "configure:10381: 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 10390 "configure"
+#line 10386 "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
@@ -10397,7 +10393,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10397: \"$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
@@ -10415,12 +10411,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:10419: checking for dic_list_e in -lwnn6_fromsrc" >&5
+echo "configure:10415: 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 10424 "configure"
+#line 10420 "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
@@ -10431,7 +10427,7 @@
 dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10431: \"$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
@@ -10476,12 +10472,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:10480: checking for jl_fi_dic_list in -l$libwnn" >&5
+echo "configure:10476: 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 10485 "configure"
+#line 10481 "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
@@ -10492,7 +10488,7 @@
 jl_fi_dic_list()
 ; return 0; }
 EOF
-if { (eval echo configure:10496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10492: \"$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
@@ -10527,15 +10523,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:10531: checking for canna/jrkanji.h" >&5
+echo "configure:10527: checking for canna/jrkanji.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10534 "configure"
+#line 10530 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10539: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10535: \"$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*
@@ -10562,15 +10558,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:10566: checking for canna/jrkanji.h" >&5
+echo "configure:10562: checking for canna/jrkanji.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10569 "configure"
+#line 10565 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10574: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10570: \"$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*
@@ -10598,15 +10594,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:10602: checking for canna/RK.h" >&5
+echo "configure:10598: checking for canna/RK.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10605 "configure"
+#line 10601 "configure"
 #include "confdefs.h"
 #include <canna/RK.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10610: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10606: \"$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*
@@ -10629,12 +10625,12 @@
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
-echo "configure:10633: checking for RkBgnBun in -lRKC" >&5
+echo "configure:10629: 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 10638 "configure"
+#line 10634 "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
@@ -10645,7 +10641,7 @@
 RkBgnBun()
 ; return 0; }
 EOF
-if { (eval echo configure:10649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10645: \"$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
@@ -10668,12 +10664,12 @@
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
-echo "configure:10672: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:10668: 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 10677 "configure"
+#line 10673 "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
@@ -10684,7 +10680,7 @@
 jrKanjiControl()
 ; return 0; }
 EOF
-if { (eval echo configure:10688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10684: \"$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
@@ -10730,12 +10726,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:10734: checking for layout_object_getvalue in -li18n" >&5
+echo "configure:10730: 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 10739 "configure"
+#line 10735 "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
@@ -10746,7 +10742,7 @@
 layout_object_getvalue()
 ; return 0; }
 EOF
-if { (eval echo configure:10750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10746: \"$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
@@ -10832,10 +10828,10 @@
 for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd link logb lrand48 matherr mkdir mktime perror poll random readlink rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror symlink tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10836: checking for $ac_func" >&5
+echo "configure:10832: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10839 "configure"
+#line 10835 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10858,7 +10854,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10858: \"$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
@@ -10890,10 +10886,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:10894: checking for $ac_func" >&5
+echo "configure:10890: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10897 "configure"
+#line 10893 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10916,7 +10912,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10916: \"$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
@@ -10945,10 +10941,10 @@
 
 
 echo $ac_n "checking for openpty""... $ac_c" 1>&6
-echo "configure:10949: checking for openpty" >&5
+echo "configure:10945: checking for openpty" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10952 "configure"
+#line 10948 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char openpty(); below.  */
@@ -10971,7 +10967,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10975: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10971: \"$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
@@ -10990,12 +10986,12 @@
 
   
 echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:10994: checking for openpty in -lutil" >&5
+echo "configure:10990: 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 10999 "configure"
+#line 10995 "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
@@ -11006,7 +11002,7 @@
 openpty()
 ; return 0; }
 EOF
-if { (eval echo configure:11010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11006: \"$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
@@ -11041,15 +11037,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11045: checking for $ac_hdr" >&5
+echo "configure:11041: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11048 "configure"
+#line 11044 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11053: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11049: \"$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*
@@ -11086,15 +11082,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11090: checking for $ac_hdr" >&5
+echo "configure:11086: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11093 "configure"
+#line 11089 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11094: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -11127,15 +11123,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11131: checking for $ac_hdr" >&5
+echo "configure:11127: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11134 "configure"
+#line 11130 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11135: \"$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*
@@ -11168,15 +11164,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11172: checking for $ac_hdr" >&5
+echo "configure:11168: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11175 "configure"
+#line 11171 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11180: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11176: \"$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*
@@ -11212,15 +11208,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11216: checking for $ac_hdr" >&5
+echo "configure:11212: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11219 "configure"
+#line 11215 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11224: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11220: \"$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*
@@ -11253,10 +11249,10 @@
   for ac_func in isastream
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11257: checking for $ac_func" >&5
+echo "configure:11253: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11260 "configure"
+#line 11256 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11279,7 +11275,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11283: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11279: \"$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
@@ -11310,15 +11306,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11314: checking for $ac_hdr" >&5
+echo "configure:11310: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11317 "configure"
+#line 11313 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11322: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11318: \"$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*
@@ -11351,10 +11347,10 @@
 for ac_func in getloadavg
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11355: checking for $ac_func" >&5
+echo "configure:11351: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11358 "configure"
+#line 11354 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11377,7 +11373,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11377: \"$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
@@ -11410,15 +11406,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11414: checking for $ac_hdr" >&5
+echo "configure:11410: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11417 "configure"
+#line 11413 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11422: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11418: \"$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*
@@ -11454,12 +11450,12 @@
 
     
 echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:11458: checking for kstat_open in -lkstat" >&5
+echo "configure:11454: 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 11463 "configure"
+#line 11459 "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
@@ -11470,7 +11466,7 @@
 kstat_open()
 ; return 0; }
 EOF
-if { (eval echo configure:11474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11470: \"$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
@@ -11505,15 +11501,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11509: checking for $ac_hdr" >&5
+echo "configure:11505: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11512 "configure"
+#line 11508 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11513: \"$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*
@@ -11545,12 +11541,12 @@
 
     
 echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:11549: checking for kvm_read in -lkvm" >&5
+echo "configure:11545: 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 11554 "configure"
+#line 11550 "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
@@ -11561,7 +11557,7 @@
 kvm_read()
 ; return 0; }
 EOF
-if { (eval echo configure:11565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11561: \"$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
@@ -11595,16 +11591,16 @@
 fi
 
 echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:11599: checking whether netdb declares h_errno" >&5
+echo "configure:11595: checking whether netdb declares h_errno" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11601 "configure"
+#line 11597 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 return h_errno;
 ; return 0; }
 EOF
-if { (eval echo configure:11608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11604: \"$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
@@ -11624,16 +11620,16 @@
 rm -f conftest*
 
 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:11628: checking for sigsetjmp" >&5
+echo "configure:11624: checking for sigsetjmp" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11630 "configure"
+#line 11626 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigjmp_buf bar; sigsetjmp (bar, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:11637: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11633: \"$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
@@ -11653,11 +11649,11 @@
 rm -f conftest*
 
 echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
-echo "configure:11657: checking whether localtime caches TZ" >&5
+echo "configure:11653: checking whether localtime caches TZ" >&5
 
 if test "$ac_cv_func_tzset" = "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 11661 "configure"
+#line 11657 "configure"
 #include "confdefs.h"
 #include <time.h>
 #if STDC_HEADERS
@@ -11692,7 +11688,7 @@
   exit (0);
 }
 EOF
-if { (eval echo configure:11696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:11692: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   emacs_cv_localtime_cache=no
 else
@@ -11722,9 +11718,9 @@
 
 if test "$HAVE_TIMEVAL" = "yes"; then
 echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6
-echo "configure:11726: checking whether gettimeofday accepts one or two arguments" >&5
+echo "configure:11722: checking whether gettimeofday accepts one or two arguments" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11728 "configure"
+#line 11724 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -11745,7 +11741,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11745: \"$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
@@ -11767,19 +11763,19 @@
 
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:11771: checking for inline" >&5
+echo "configure:11767: checking for inline" >&5
 
 ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 11776 "configure"
+#line 11772 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:11783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11779: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -11820,17 +11816,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:11824: checking for working alloca.h" >&5
+echo "configure:11820: checking for working alloca.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11827 "configure"
+#line 11823 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:11834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11830: \"$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
@@ -11854,10 +11850,10 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:11858: checking for alloca" >&5
+echo "configure:11854: checking for alloca" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11861 "configure"
+#line 11857 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -11885,7 +11881,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:11889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11885: \"$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
@@ -11924,10 +11920,10 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:11928: checking whether alloca needs Cray hooks" >&5
+echo "configure:11924: checking whether alloca needs Cray hooks" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11931 "configure"
+#line 11927 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -11951,10 +11947,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:11955: checking for $ac_func" >&5
+echo "configure:11951: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11958 "configure"
+#line 11954 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11977,7 +11973,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11981: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11977: \"$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
@@ -12007,10 +12003,10 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:12011: checking stack direction for C alloca" >&5
+echo "configure:12007: checking stack direction for C alloca" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12014 "configure"
+#line 12010 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -12029,7 +12025,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:12033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_c_stack_direction=1
 else
@@ -12058,10 +12054,10 @@
 fi
 
 echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:12062: checking for working strcoll" >&5
+echo "configure:12058: checking for working strcoll" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12065 "configure"
+#line 12061 "configure"
 #include "confdefs.h"
 #include <string.h>
 main ()
@@ -12071,7 +12067,7 @@
 	strcoll ("123", "456") >= 0);
 }
 EOF
-if { (eval echo configure:12075: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_strcoll_works=yes
 else
@@ -12099,10 +12095,10 @@
 for ac_func in getpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12103: checking for $ac_func" >&5
+echo "configure:12099: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12106 "configure"
+#line 12102 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -12125,7 +12121,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12129: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12125: \"$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
@@ -12153,10 +12149,10 @@
 done
 
 echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:12157: checking whether getpgrp takes no argument" >&5
+echo "configure:12153: checking whether getpgrp takes no argument" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12160 "configure"
+#line 12156 "configure"
 #include "confdefs.h"
 
 /*
@@ -12211,7 +12207,7 @@
 }
 
 EOF
-if { (eval echo configure:12215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_getpgrp_void=yes
 else
@@ -12238,10 +12234,10 @@
 
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:12242: checking for working mmap" >&5
+echo "configure:12238: checking for working mmap" >&5
 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 cat > conftest.$ac_ext <<EOF
-#line 12245 "configure"
+#line 12241 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <unistd.h>
@@ -12274,7 +12270,7 @@
   return 1;
 }
 EOF
-if { (eval echo configure:12278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   have_mmap=yes
 else
@@ -12303,9 +12299,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:12307: checking for M_MMAP_THRESHOLD" >&5
+echo "configure:12303: checking for M_MMAP_THRESHOLD" >&5
     cat > conftest.$ac_ext <<EOF
-#line 12309 "configure"
+#line 12305 "configure"
 #include "confdefs.h"
 #include <malloc.h>
 int main() {
@@ -12317,7 +12313,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12321: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12317: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   rel_alloc=no; echo "$ac_t""yes" 1>&6;
 else
@@ -12342,15 +12338,15 @@
 
 ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:12346: checking for termios.h" >&5
+echo "configure:12342: checking for termios.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12349 "configure"
+#line 12345 "configure"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12354: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12350: \"$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*
@@ -12393,15 +12389,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:12397: checking for termio.h" >&5
+echo "configure:12393: checking for termio.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12400 "configure"
+#line 12396 "configure"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12401: \"$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*
@@ -12433,10 +12429,10 @@
 
 
 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:12437: checking for socket" >&5
+echo "configure:12433: checking for socket" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12440 "configure"
+#line 12436 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -12459,7 +12455,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12459: \"$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
@@ -12474,15 +12470,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:12478: checking for netinet/in.h" >&5
+echo "configure:12474: checking for netinet/in.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12481 "configure"
+#line 12477 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12486: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12482: \"$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*
@@ -12499,15 +12495,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:12503: checking for arpa/inet.h" >&5
+echo "configure:12499: checking for arpa/inet.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12506 "configure"
+#line 12502 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12511: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12507: \"$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*
@@ -12532,9 +12528,9 @@
 }
 
       echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:12536: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:12532: checking "for sun_len member in struct sockaddr_un"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 12538 "configure"
+#line 12534 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12545,7 +12541,7 @@
 static struct sockaddr_un x; x.sun_len = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:12549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12545: \"$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
@@ -12563,9 +12559,9 @@
 fi
 rm -f conftest*
       echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6
-echo "configure:12567: checking "for ip_mreq struct in netinet/in.h"" >&5
+echo "configure:12563: checking "for ip_mreq struct in netinet/in.h"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 12569 "configure"
+#line 12565 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12575,7 +12571,7 @@
 static struct ip_mreq x;
 ; return 0; }
 EOF
-if { (eval echo configure:12579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12575: \"$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
@@ -12606,10 +12602,10 @@
 
 
 echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:12610: checking for msgget" >&5
+echo "configure:12606: checking for msgget" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12613 "configure"
+#line 12609 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char msgget(); below.  */
@@ -12632,7 +12628,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12636: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12632: \"$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
@@ -12647,15 +12643,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:12651: checking for sys/ipc.h" >&5
+echo "configure:12647: checking for sys/ipc.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12654 "configure"
+#line 12650 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12659: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12655: \"$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*
@@ -12672,15 +12668,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:12676: checking for sys/msg.h" >&5
+echo "configure:12672: checking for sys/msg.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12679 "configure"
+#line 12675 "configure"
 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12684: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12680: \"$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*
@@ -12718,15 +12714,15 @@
 
 ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:12722: checking for dirent.h" >&5
+echo "configure:12718: checking for dirent.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12725 "configure"
+#line 12721 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12730: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12726: \"$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*
@@ -12753,15 +12749,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:12757: checking for sys/dir.h" >&5
+echo "configure:12753: checking for sys/dir.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12760 "configure"
+#line 12756 "configure"
 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12765: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12761: \"$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*
@@ -12794,15 +12790,15 @@
 
 ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:12798: checking for nlist.h" >&5
+echo "configure:12794: checking for nlist.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12801 "configure"
+#line 12797 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12806: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12802: \"$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*
@@ -12832,22 +12828,22 @@
 
 
 echo "checking "for sound support"" 1>&6
-echo "configure:12836: checking "for sound support"" >&5
+echo "configure:12832: 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:12843: checking for multimedia/audio_device.h" >&5
+echo "configure:12839: checking for multimedia/audio_device.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12846 "configure"
+#line 12842 "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:12851: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12847: \"$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*
@@ -12895,12 +12891,12 @@
       if test -z "$native_sound_lib"; then
         
 echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:12899: checking for ALopenport in -laudio" >&5
+echo "configure:12895: 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 12904 "configure"
+#line 12900 "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
@@ -12911,7 +12907,7 @@
 ALopenport()
 ; return 0; }
 EOF
-if { (eval echo configure:12915: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12911: \"$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
@@ -12942,12 +12938,12 @@
       if test -z "$native_sound_lib"; then
 	
 echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:12946: checking for AOpenAudio in -lAlib" >&5
+echo "configure:12942: 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 12951 "configure"
+#line 12947 "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
@@ -12958,7 +12954,7 @@
 AOpenAudio()
 ; return 0; }
 EOF
-if { (eval echo configure:12962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12958: \"$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
@@ -13006,15 +13002,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:13010: checking for ${dir}/soundcard.h" >&5
+echo "configure:13006: checking for ${dir}/soundcard.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13013 "configure"
+#line 13009 "configure"
 #include "confdefs.h"
 #include <${dir}/soundcard.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13018: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13014: \"$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*
@@ -13068,15 +13064,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:13072: checking for audio/audiolib.h" >&5
+echo "configure:13068: checking for audio/audiolib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13075 "configure"
+#line 13071 "configure"
 #include "confdefs.h"
 #include <audio/audiolib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13080: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13076: \"$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*
@@ -13094,12 +13090,12 @@
   
     
 echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6
-echo "configure:13098: checking for AuOpenServer in -laudio" >&5
+echo "configure:13094: 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 13103 "configure"
+#line 13099 "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
@@ -13110,7 +13106,7 @@
 AuOpenServer()
 ; return 0; }
 EOF
-if { (eval echo configure:13114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13110: \"$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
@@ -13149,7 +13145,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 13153 "configure"
+#line 13149 "configure"
 #include "confdefs.h"
 #include <audio/Xtutil.h>
 EOF
@@ -13180,7 +13176,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:13184: checking for $ac_word" >&5
+echo "configure:13180: 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.
@@ -13209,10 +13205,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:13213: checking for esd_play_stream" >&5
+echo "configure:13209: checking for esd_play_stream" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13216 "configure"
+#line 13212 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char esd_play_stream(); below.  */
@@ -13235,7 +13231,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13239: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13235: \"$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
@@ -13286,7 +13282,7 @@
 
 if test "$with_tty" = "yes"  ; then
   echo "checking for TTY-related features" 1>&6
-echo "configure:13290: checking for TTY-related features" >&5
+echo "configure:13286: checking for TTY-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_TTY
 EOF
@@ -13299,12 +13295,12 @@
     if test -z "$with_ncurses"; then
     
 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:13303: checking for tgetent in -lncurses" >&5
+echo "configure:13299: 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 13308 "configure"
+#line 13304 "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
@@ -13315,7 +13311,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13315: \"$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
@@ -13348,15 +13344,15 @@
 
     ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:13352: checking for ncurses/curses.h" >&5
+echo "configure:13348: checking for ncurses/curses.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13355 "configure"
+#line 13351 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13360: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13356: \"$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*
@@ -13378,15 +13374,15 @@
 
     ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
-echo "configure:13382: checking for ncurses/term.h" >&5
+echo "configure:13378: checking for ncurses/term.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13385 "configure"
+#line 13381 "configure"
 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13390: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13386: \"$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*
@@ -13416,15 +13412,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:13420: checking for ncurses/curses.h" >&5
+echo "configure:13416: checking for ncurses/curses.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13423 "configure"
+#line 13419 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13424: \"$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*
@@ -13459,12 +13455,12 @@
 	for lib in curses termlib termcap; do
 	  
 echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:13463: checking for tgetent in -l$lib" >&5
+echo "configure:13459: 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 13468 "configure"
+#line 13464 "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
@@ -13475,7 +13471,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13475: \"$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
@@ -13506,12 +13502,12 @@
       else
 	
 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:13510: checking for tgetent in -lcurses" >&5
+echo "configure:13506: 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 13515 "configure"
+#line 13511 "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
@@ -13522,7 +13518,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13522: \"$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
@@ -13540,12 +13536,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:13544: checking for tgetent in -ltermcap" >&5
+echo "configure:13540: 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 13549 "configure"
+#line 13545 "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
@@ -13556,7 +13552,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13556: \"$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
@@ -13604,15 +13600,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:13608: checking for gpm.h" >&5
+echo "configure:13604: checking for gpm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13611 "configure"
+#line 13607 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13616: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13612: \"$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*
@@ -13635,12 +13631,12 @@
  }
   test -z "$with_gpm" && { 
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:13639: checking for Gpm_Open in -lgpm" >&5
+echo "configure:13635: 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 13644 "configure"
+#line 13640 "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
@@ -13651,7 +13647,7 @@
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:13655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13651: \"$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
@@ -13694,20 +13690,20 @@
 
 test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
   != "no no no" && echo "checking for database support" 1>&6
-echo "configure:13698: checking for database support" >&5
+echo "configure:13694: 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:13703: checking for ndbm.h" >&5
+echo "configure:13699: checking for ndbm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13706 "configure"
+#line 13702 "configure"
 #include "confdefs.h"
 #include <ndbm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13711: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13707: \"$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*
@@ -13737,12 +13733,12 @@
 if test "$with_database_gdbm" != "no"; then
   
 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:13741: checking for dbm_open in -lgdbm" >&5
+echo "configure:13737: 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 13746 "configure"
+#line 13742 "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
@@ -13753,7 +13749,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:13757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13753: \"$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
@@ -13781,10 +13777,10 @@
 
 if test "$with_database_dbm" != "no"; then
   echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:13785: checking for dbm_open" >&5
+echo "configure:13781: checking for dbm_open" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13788 "configure"
+#line 13784 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */
@@ -13807,7 +13803,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13807: \"$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
@@ -13826,12 +13822,12 @@
 
     
 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:13830: checking for dbm_open in -ldbm" >&5
+echo "configure:13826: 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 13835 "configure"
+#line 13831 "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
@@ -13842,7 +13838,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:13846: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13842: \"$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
@@ -13883,10 +13879,10 @@
 
 if test "$with_database_berkdb" != "no"; then
   echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
-echo "configure:13887: checking for Berkeley db.h" >&5
+echo "configure:13883: checking for Berkeley db.h" >&5
   for header in "db/db.h" "db.h"; do
     cat > conftest.$ac_ext <<EOF
-#line 13890 "configure"
+#line 13886 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13908,7 +13904,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13912: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   db_h_file="$header"; break
 else
@@ -13924,9 +13920,9 @@
 
   if test "$with_database_berkdb" != "no"; then
     echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6
-echo "configure:13928: checking for Berkeley DB version" >&5
+echo "configure:13924: checking for Berkeley DB version" >&5
     cat > conftest.$ac_ext <<EOF
-#line 13930 "configure"
+#line 13926 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 1
@@ -13938,7 +13934,7 @@
   egrep "yes" >/dev/null 2>&1; then
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 13942 "configure"
+#line 13938 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 2
@@ -13965,10 +13961,10 @@
 rm -f conftest*
 
     echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6
-echo "configure:13969: checking for $dbfunc" >&5
+echo "configure:13965: checking for $dbfunc" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13972 "configure"
+#line 13968 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $dbfunc(); below.  */
@@ -13991,7 +13987,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13991: \"$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
@@ -14010,12 +14006,12 @@
 
     
 echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
-echo "configure:14014: checking for $dbfunc in -ldb" >&5
+echo "configure:14010: 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 14019 "configure"
+#line 14015 "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
@@ -14026,7 +14022,7 @@
 $dbfunc()
 ; return 0; }
 EOF
-if { (eval echo configure:14030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14026: \"$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
@@ -14087,12 +14083,12 @@
 if test "$with_socks" = "yes"; then
   
 echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:14091: checking for SOCKSinit in -lsocks" >&5
+echo "configure:14087: 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 14096 "configure"
+#line 14092 "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
@@ -14103,7 +14099,7 @@
 SOCKSinit()
 ; return 0; }
 EOF
-if { (eval echo configure:14107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14103: \"$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
@@ -14158,22 +14154,22 @@
 
 if test "$with_modules" != "no"; then
   echo "checking for module support" 1>&6
-echo "configure:14162: checking for module support" >&5
+echo "configure:14158: 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:14169: checking for dlfcn.h" >&5
+echo "configure:14165: checking for dlfcn.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14172 "configure"
+#line 14168 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14177: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14173: \"$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*
@@ -14190,16 +14186,16 @@
   echo "$ac_t""yes" 1>&6
   
       echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6
-echo "configure:14194: checking for dlopen in -lc" >&5
+echo "configure:14190: checking for dlopen in -lc" >&5
       cat > conftest.$ac_ext <<EOF
-#line 14196 "configure"
+#line 14192 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int main() {
 	dlopen ("", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:14203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    have_dl=yes 
 else
@@ -14208,18 +14204,18 @@
   rm -rf conftest*
   
       echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:14212: checking for dlopen in -ldl" >&5
+echo "configure:14208: checking for dlopen in -ldl" >&5
       ac_save_LIBS="$LIBS"
       LIBS="-ldl $LIBS"
       cat > conftest.$ac_ext <<EOF
-#line 14216 "configure"
+#line 14212 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int main() {
 	dlopen ("", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:14223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    have_dl=yes 
 else
@@ -14248,12 +14244,12 @@
     else
       
 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:14252: checking for shl_load in -ldld" >&5
+echo "configure:14248: 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 14257 "configure"
+#line 14253 "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
@@ -14264,7 +14260,7 @@
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo configure:14268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14264: \"$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
@@ -14291,12 +14287,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
-echo "configure:14295: checking for dld_init in -ldld" >&5
+echo "configure:14291: 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 14300 "configure"
+#line 14296 "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
@@ -14307,7 +14303,7 @@
 dld_init()
 ; return 0; }
 EOF
-if { (eval echo configure:14311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14307: \"$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
@@ -14352,7 +14348,7 @@
 xealias=$internal_configuration
 
 echo "checking how to build dynamic libraries for ${xehost}" 1>&6
-echo "configure:14356: checking how to build dynamic libraries for ${xehost}" >&5
+echo "configure:14352: checking how to build dynamic libraries for ${xehost}" >&5
 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
 case "$xehost" in
 *-*-linux-gnu*) ;;
@@ -14380,9 +14376,9 @@
   XEGCC=yes
 else
   echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:14384: checking checking whether we are using GNU C" >&5
+echo "configure:14380: checking checking whether we are using GNU C" >&5
   cat > conftest.$ac_ext <<EOF
-#line 14386 "configure"
+#line 14382 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -14404,7 +14400,7 @@
 fi
 
 echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6
-echo "configure:14408: checking how to produce PIC code" >&5
+echo "configure:14404: checking how to produce PIC code" >&5
 wl=
 
 can_build_shared=yes
@@ -14505,18 +14501,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:14509: checking if PIC flag ${dll_cflags} really works" >&5
+echo "configure:14505: checking if PIC flag ${dll_cflags} really works" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS $dll_cflags -DPIC"
   cat > conftest.$ac_ext <<EOF
-#line 14513 "configure"
+#line 14509 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:14520: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14516: \"$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
@@ -14547,7 +14543,7 @@
 xldf=
 xcldf=
 echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6
-echo "configure:14551: checking if C compiler can produce shared libraries" >&5
+echo "configure:14547: checking if C compiler can produce shared libraries" >&5
 if test "$XEGCC" = yes; then
   xcldf="-shared"
   xldf="-shared"
@@ -14598,14 +14594,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 14602 "configure"
+#line 14598 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:14609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cc_produces_so=yes
 else
@@ -14630,7 +14626,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:14634: checking for ld used by GCC" >&5
+echo "configure:14630: checking for ld used by GCC" >&5
     ac_prog=`($CC -print-prog-name=ld) 2>&5`
     case "$ac_prog" in
     # Accept absolute paths.
@@ -14656,7 +14652,7 @@
     esac
   else
     echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:14660: checking for GNU ld" >&5
+echo "configure:14656: checking for GNU ld" >&5
   fi
 
   if test -z "$LTLD"; then
@@ -14694,7 +14690,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:14698: checking if the linker is GNU ld" >&5
+echo "configure:14694: 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
@@ -14722,7 +14718,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:14726: checking whether the linker supports shared libraries" >&5
+echo "configure:14722: checking whether the linker supports shared libraries" >&5
   dll_ld=$CC
   dll_ldflags=$LDFLAGS
   ld_shlibs=yes
@@ -14930,10 +14926,10 @@
     for ac_func in dlerror _dlerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14934: checking for $ac_func" >&5
+echo "configure:14930: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14937 "configure"
+#line 14933 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -14956,7 +14952,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14956: \"$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
@@ -14995,11 +14991,11 @@
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 14999 "configure"
+#line 14995 "configure"
 #include "confdefs.h"
 int main(int c,char *v[]){return 0;}
 EOF
-if { (eval echo configure:15003: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:14999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -15487,6 +15483,14 @@
 EOF
 }
 
+test "$use_kkcc"           = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining USE_KKCC
+EOF
+cat >> confdefs.h <<\EOF
+#define USE_KKCC 1
+EOF
+}
+
 test "$quick_build"        = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
     Defining QUICK_BUILD
 EOF
@@ -15768,6 +15772,7 @@
 test "$with_dnet" = yes && echo "  Compiling in support for DNET."
 test "$with_modules" = "yes" && echo "  Compiling in support for dynamic shared object modules."
 test "$use_union_type" = yes && echo "  Using the union type for Lisp_Objects."
+test "$use_kkcc" = yes && echo "  Using the new GC algorithms."
 test "$pdump" = yes && echo "  Using the new portable dumper."
 test "$debug" = yes && echo "  Compiling in support for extra debugging code."
 test "$usage_tracking" = yes && echo "  Compiling in support for active usage tracking (Sun internal)."
Index: configure.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.in,v
retrieving revision 1.179
retrieving revision 1.181
diff -u -u -r1.179 -r1.181
--- configure.in	2002/06/04 06:12:20	1.179
+++ configure.in	2002/07/16 08:26:46	1.181
@@ -506,6 +506,7 @@
 	with_netinstall | \
 	with_ipv6_cname | \
 	external_widget | \
+	use_kkcc	| \
 	verbose		| \
 	extra_verbose	| \
 	usage_tracking	| \
@@ -2396,6 +2397,7 @@
   inttypes.h dnl
   libgen.h dnl
   locale.h dnl
+  wchar.h dnl
   mach/mach.h dnl
   sys/param.h dnl
   sys/pstat.h dnl
@@ -4800,6 +4802,7 @@
 fi
 test "$GCC"                = "yes" && AC_DEFINE(USE_GCC)
 test "$external_widget"    = "yes" && AC_DEFINE(EXTERNAL_WIDGET)
+test "$use_kkcc"           = "yes" && AC_DEFINE(USE_KKCC)
 test "$quick_build"        = "yes" && AC_DEFINE(QUICK_BUILD)
 test "$with_purify"        = "yes" && AC_DEFINE(PURIFY)
 test "$with_quantify"      = "yes" && AC_DEFINE(QUANTIFY)
@@ -5024,6 +5027,7 @@
 test "$with_dnet" = yes && echo "  Compiling in support for DNET."
 test "$with_modules" = "yes" && echo "  Compiling in support for dynamic shared object modules."
 test "$use_union_type" = yes && echo "  Using the union type for Lisp_Objects."
+test "$use_kkcc" = yes && echo "  Using the new GC algorithms."
 test "$pdump" = yes && echo "  Using the new portable dumper."
 test "$debug" = yes && echo "  Compiling in support for extra debugging code."
 test "$usage_tracking" = yes && echo "  Compiling in support for active usage tracking (Sun internal)."
Index: configure.usage
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/configure.usage,v
retrieving revision 1.25
retrieving revision 1.27
diff -u -u -r1.25 -r1.27
--- configure.usage	2002/03/13 08:54:05	1.25
+++ configure.usage	2002/07/16 08:26:47	1.27
@@ -169,7 +169,7 @@
                         development environment.
 --with-socks            Compile with support for SOCKS (an Internet proxy).
 --with-dnet (*)         Compile with support for DECnet.
---with-modules          Compile in experimental support for dynamically
+--with-modules (*)      Compile in experimental support for dynamically
                         loaded libraries (Dynamic Shared Objects).
 --with-netinstall       Compile in support for installation over the internet.
                         Only functional on the MS Windows platforms.
@@ -258,6 +258,7 @@
                         int, for the fundamental Lisp_Object type; this
                         provides stricter type-checking.  Only works with
                         some systems and compilers.
+--use-kkcc              Enable the use of new GC algorithms. (EXPERIMENTAL)
 --with-quantify         Add support for performance debugging using Quantify.
 --with-purify           Add support for memory debugging using Purify.
 
Index: version.sh
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/version.sh,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -u -r1.177 -r1.178
--- version.sh	2002/07/02 16:05:01	1.177
+++ version.sh	2002/07/27 03:52:44	1.178
@@ -2,8 +2,8 @@
 emacs_is_beta=t
 emacs_major_version=21
 emacs_minor_version=5
-emacs_beta_version=7
-xemacs_codename="broccoflower"
+emacs_beta_version=8
+xemacs_codename="broccoli"
 emacs_kit_version=
 infodock_major_version=4
 infodock_minor_version=0
Index: etc/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.8
diff -u -u -r1.5 -r1.8
--- etc/ChangeLog	2002/07/02 15:00:50	1.5
+++ etc/ChangeLog	2002/07/27 03:52:48	1.8
@@ -1,3 +1,17 @@
+2002-07-27  Steve Youngs  <youngs@xemacs.org>
+
+	* XEmacs 21.5.8 "broccoli" is released.
+
+2002-07-21  Steve Youngs  <youngs@xemacs.org>
+
+	* package-index.LATEST.pgp: Update.
+
+	* package-index.LATEST.gpg: Ditto.
+
+2002-07-14  Adrian Aichner  <adrian@xemacs.org>
+
+	* xemacs-icon.xpm: It's XEmacs, not Xemacs.
+
 2002-07-02  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.7 "broccoflower" is released.
Index: etc/package-index.LATEST.gpg
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/package-index.LATEST.gpg,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- etc/package-index.LATEST.gpg	2002/03/30 04:46:47	1.4
+++ etc/package-index.LATEST.gpg	2002/07/21 04:51:07	1.5
@@ -4,6 +4,50 @@
 ;; Package Index file -- Do not edit manually.
 ;;;@@@
 (package-get-update-base-entry (quote
+(ess
+  (standards-version 1.1
+   version "1.02"
+   author-version "5.1.21"
+   date "2002-06-04"
+   build-date "2002-06-04"
+   maintainer "A.J. Rossini <rossini@xemacs.org>"
+   distribution xemacs
+   priority medium
+   category "standard"
+   dump nil
+   description "ESS: Emacs Speaks Statistics."
+   filename "ess-1.02-pkg.tar.gz"
+   md5sum "3eff981706623221b5af048dc8a00f17"
+   size 469304
+   provides (ess-batch ess-comp ess-cust ess-dump ess-emcs ess-font-lock ess-help ess-inf ess-iw32 ess-latex-mode ess-menu ess-mode ess-mous ess-noweb ess-site ess-sysdp ess-utils ess-vars ess essa-r essa-sas essd-arc essd-els essd-r essd-omg essd-r essd-s3 essd-s4 essd-sas essd-sp3 essd-sp4 essd-sp5 essd-sp6 essd-sta essd-vst essd-xls essddr essdsp6w essl-bug essl-lsp essl-omg essl-py essl-s essl-sas essl-sta make-regexp mouseme msdos noweb-font-lock-mode noweb-mode)
+   requires (xemacs-base mail-lib fsf-compat edit-utils)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(haskell-mode
+  (standards-version 1.1
+   version "1.03"
+   author-version "1.43"
+   date "2002-05-07"
+   build-date "2002-05-07"
+   maintainer "Ville Skyttä <ville.skytta@xemacs.org>"
+   distribution xemacs
+   priority low
+   category "standard"
+   dump nil
+   description "Haskell editing support."
+   filename "haskell-mode-1.03-pkg.tar.gz"
+   md5sum "c734831433d7330094064fe3959d94f1"
+   size 91983
+   provides (haskell-decl-scan haskell-doc haskell-font-lock haskell-indent haskell-mode haskell-simple-indent)
+   requires (dired mail-lib xemacs-base edit-utils)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
 (xslide
   (standards-version 1.1
    version "1.01"
@@ -28,19 +72,19 @@
 (package-get-update-base-entry (quote
 (liece
   (standards-version 1.1
-   version "1.02"
+   version "1.07"
    author-version "1.4.7"
-   date "2002-03-27"
-   build-date "2002-03-27"
+   date "2002-07-14"
+   build-date "2002-07-14"
    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
+   filename "liece-1.07-pkg.tar.gz"
+   md5sum "10a70f816b57757a6dc58b29f342881f"
+   size 197755
    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
@@ -50,19 +94,19 @@
 (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"
+   version "1.05"
+   author-version "1.05"
+   date "2002-05-07"
+   build-date "2002-05-07"
    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
+   filename "latin-unity-1.05-pkg.tar.gz"
+   md5sum "fc968dc2682d52ab37634e22028d8598"
+   size 86755
    provides (latin-unity latin-unity-tables latin-unity-utils)
    requires (mule-base mule-ucs leim fsf-compat)
    type regular
@@ -94,19 +138,19 @@
 (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"
+   version "1.08"
+   author-version "21.5b6"
+   date "2002-07-14"
+   build-date "2002-07-14"
    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
+   filename "ibuffer-1.08-pkg.tar.gz"
+   md5sum "e7203eeeca98a89c2bfe051d81c729de"
+   size 87113
    provides (ibuf-ext ibuf-macs ibuffer)
    requires (ibuffer xemacs-base)
    type regular
@@ -116,19 +160,19 @@
 (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"
+   version "1.66"
+   author-version "21.5b6"
+   date "2002-07-14"
+   build-date "2002-07-14"
    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
+   filename "xemacs-base-1.66-pkg.tar.gz"
+   md5sum "108cb98a37dd6270618b942e0fe97b48"
+   size 464634
    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
@@ -138,19 +182,19 @@
 (package-get-update-base-entry (quote
 (tramp
   (standards-version 1.1
-   version "1.04"
+   version "1.05"
    author-version "2002-02-18"
-   date "2002-03-25"
-   build-date "2002-03-26"
+   date "2002-04-24"
+   build-date "2002-04-24"
    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.04-pkg.tar.gz"
-   md5sum "76d676178f448ba174e74a964d1dbfaf"
-   size 135053
+   filename "tramp-1.05-pkg.tar.gz"
+   md5sum "a0c020f425b6344ea0c133dc26e7f689"
+   size 136196
    provides (tramp tramp-util tramp-vc trampcache)
    requires (tramp xemacs-base vc fsf-compat efs dired mail-lib gnus)
    type regular
@@ -160,20 +204,20 @@
 (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"
+   version "1.48"
+   author-version "21.5b6"
+   date "2002-06-27"
+   build-date "2002-06-27"
    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)
+   filename "text-modes-1.48-pkg.tar.gz"
+   md5sum "f2df17af03a7f47e3b2e7b970d0b9f0b"
+   size 345796
+   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 apache-mode po-mode css-mode)
    requires (ispell fsf-compat xemacs-base)
    type regular
 ))
@@ -182,19 +226,19 @@
 (package-get-update-base-entry (quote
 (pcl-cvs
   (standards-version 1.1
-   version "1.60"
+   version "1.63"
    author-version "R-2_9_9"
-   date "2002-03-25"
-   build-date "2002-03-25"
+   date "2002-06-04"
+   build-date "2002-06-04"
    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
+   filename "pcl-cvs-1.63-pkg.tar.gz"
+   md5sum "87b7a9ebd1aa6d24ee4c3c0ff914daad"
+   size 161146
    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
@@ -204,21 +248,21 @@
 (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"
+   version "1.47"
+   author-version "21.5b6"
+   date "2002-07-14"
+   build-date "2002-07-14"
    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)
+   filename "mail-lib-1.47-pkg.tar.gz"
+   md5sum "3cba556078ece30b7538ade56e138041"
+   size 186598
+   provides (base64 browse-url-xemacs browse-url highlight-headers mail-abbrevs mail-extr mail-utils mailheader netrc pop3 reporter rfc2104 rfc822 rmail rmail-mini rmailout sendmail smtpmail starttls)
+   requires (eterm xemacs-base fsf-compat sh-script)
    type regular
 ))
 ))
@@ -226,21 +270,21 @@
 (package-get-update-base-entry (quote
 (jde
   (standards-version 1.1
-   version "1.34"
+   version "1.35"
    author-version "2.2.8"
-   date "2002-03-28"
-   build-date "2002-03-28"
+   date "2002-05-09"
+   build-date "2002-05-10"
    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
+   filename "jde-1.35-pkg.tar.gz"
+   md5sum "b0289c057ce2a0d95c417409f5f17ba4"
+   size 1635420
    provides (jde)
-   requires (jde cc-mode semantic debug speedbar edit-utils eterm mail-lib xemacs-base xemacs-devel eieio elib sh-script)
+   requires (jde cc-mode semantic debug speedbar edit-utils eterm mail-lib xemacs-base xemacs-devel eieio elib sh-script fsf-compat)
    type regular
 ))
 ))
@@ -270,19 +314,19 @@
 (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"
+   version "1.89"
+   author-version "21.5b6"
+   date "2002-06-27"
+   build-date "2002-06-27"
    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
+   filename "edit-utils-1.89-pkg.tar.gz"
+   md5sum "b7d94a10cda4795bbb759e0ee88ae86e"
+   size 650996
    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
@@ -292,19 +336,19 @@
 (package-get-update-base-entry (quote
 (skk
   (standards-version 1.1
-   version "1.21"
+   version "1.22"
    author-version "10.62a"
-   date "2002-01-26"
-   build-date "2002-01-27"
+   date "2002-04-30"
+   build-date "2002-04-30"
    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
+   filename "skk-1.22-pkg.tar.gz"
+   md5sum "05457e10b156dbcc2e0f735d46d934a1"
+   size 1461781
    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
@@ -314,19 +358,19 @@
 (package-get-update-base-entry (quote
 (ps-print
   (standards-version 1.1
-   version "1.03"
+   version "1.04"
    author-version "6.5.6"
-   date "2002-02-01"
-   build-date "2002-02-13"
+   date "2002-04-24"
+   build-date "2002-04-24"
    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
+   filename "ps-print-1.04-pkg.tar.gz"
+   md5sum "e4c3f93b960454cf6dc559a0704fb084"
+   size 154281
    provides (lpr ps-bdf ps-mule ps-print)
    requires (text-modes)
    type regular
@@ -336,19 +380,19 @@
 (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"
+   version "1.07"
+   author-version "21.5b6"
+   date "2002-06-04"
+   build-date "2002-06-04"
    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
+   filename "sieve-1.07-pkg.tar.gz"
+   md5sum "d86e60ea1b6c552be2b6db7cca60e151"
+   size 23498
    provides (sieve sieve-mode sieve-manage)
    requires (xemacs-base mail-lib cc-mode)
    type regular
@@ -380,19 +424,19 @@
 (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"
+   version "1.04"
+   author-version "21.5b6"
+   date "2002-06-27"
+   build-date "2002-06-27"
    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
+   filename "clearcase-1.04-pkg.tar.gz"
+   md5sum "c60546db0605910ec57af7151a7fc9a7"
+   size 89274
    provides (clearcase)
    requires (dired fsf-compat mail-lib xemacs-base)
    type regular
@@ -402,19 +446,19 @@
 (package-get-update-base-entry (quote
 (dictionary
   (standards-version 1.1
-   version "1.08"
-   author-version "1.7"
-   date "2002-03-25"
-   build-date "2002-03-25"
+   version "1.11"
+   author-version "1.8"
+   date "2002-05-20"
+   build-date "2002-05-20"
    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.08-pkg.tar.gz"
-   md5sum "908bf76c8f0e5d5463ff1282ae66f9b8"
-   size 38956
+   filename "dictionary-1.11-pkg.tar.gz"
+   md5sum "6bead861baac049fb1807dd2e03a1475"
+   size 39886
    provides (dictionary connection link)
    requires (xemacs-base)
    type regular
@@ -424,19 +468,19 @@
 (package-get-update-base-entry (quote
 (build
   (standards-version 1.0
-   version "1.05"
-   author-version "21.5b4"
-   date "2002-01-07"
-   build-date "2002-01-14"
+   version "1.06"
+   author-version "2.00"
+   date "2002-07-20"
+   build-date "2002-07-20"
    maintainer "Adrian Aichner <adrian@xemacs.org>"
    distribution stable
    priority low
    category "standard"
    dump nil
    description "Build XEmacs from within (UNIX, Windows)."
-   filename "build-1.05-pkg.tar.gz"
-   md5sum "3d6158756a1990e92ff2ed77d6e39425"
-   size 31606
+   filename "build-1.06-pkg.tar.gz"
+   md5sum "2d0fb08caf67bb89759be4ac54b6a0fb"
+   size 39500
    provides (build)
    requires (xemacs-base pcl-cvs dired w3 prog-modes)
    type regular
@@ -446,21 +490,21 @@
 (package-get-update-base-entry (quote
 (xslt-process
   (standards-version 1.0
-   version "1.06"
+   version "1.10"
    author-version "1.2.1"
-   date "2002-01-15"
-   build-date "2002-01-15"
+   date "2002-07-14"
+   build-date "2002-07-14"
    maintainer "Ovidiu Predescu <ovidiu@xemacs.org>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "XSLT processing support."
-   filename "xslt-process-1.06-pkg.tar.gz"
-   md5sum "29c91cf906a685b3197bc4ab13d27735"
-   size 200263
+   filename "xslt-process-1.10-pkg.tar.gz"
+   md5sum "b6fedc8eb356d6e4277ff505324a2abe"
+   size 199744
    provides (xslt-process)
-   requires (jde cc-mode semantic debug speedbar edit-utils eterm mail-lib xemacs-base elib eieio sh-script)
+   requires (jde cc-mode semantic debug speedbar edit-utils eterm mail-lib xemacs-base elib eieio sh-script fsf-compat)
    type regular
 ))
 ))
@@ -534,19 +578,19 @@
 (package-get-update-base-entry (quote
 (lookup
   (standards-version 1.1
-   version "1.10"
+   version "1.12"
    author-version "1.0"
-   date "2002-03-25"
-   build-date "2002-03-25"
+   date "2002-06-27"
+   build-date "2002-06-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution mule
    priority high
    category "mule"
    dump nil
    description "MULE: Dictionary support"
-   filename "lookup-1.10-pkg.tar.gz"
-   md5sum "e3938ad866de0a22df8cc1042ddb62f3"
-   size 214515
+   filename "lookup-1.12-pkg.tar.gz"
+   md5sum "f07a3791e49f75c7f1504edb077a5560"
+   size 190864
    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
@@ -556,19 +600,19 @@
 (package-get-update-base-entry (quote
 (leim
   (standards-version 1.1
-   version "1.17"
-   author-version "21.1"
-   date "2000-11-08"
-   build-date "2001-01-15"
+   version "1.18"
+   author-version "21.5b5"
+   date "2002-04-24"
+   build-date "2002-04-24"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution mule
    priority medium
    category "mule"
    dump nil
    description "MULE: Quail.  All non-English and non-Japanese language support."
-   filename "leim-1.17-pkg.tar.gz"
-   md5sum "61d39ee096e39219651b01648a37ef2e"
-   size 1708067
+   filename "leim-1.18-pkg.tar.gz"
+   md5sum "b0467e2a3a93b46590bd2fe9bbf9675e"
+   size 1708615
    provides ()
    requires (mule-base fsf-compat xemacs-base)
    type regular
@@ -600,19 +644,19 @@
 (package-get-update-base-entry (quote
 (mule-base
   (standards-version 1.1
-   version "1.39"
-   author-version "21.5b1"
-   date "2001-05-23"
-   build-date "2001-06-14"
+   version "1.42"
+   author-version "21.5b6"
+   date "2002-06-27"
+   build-date "2002-06-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution mule
    priority high
    category "mule"
    dump nil
    description "MULE: Basic Mule support, required for building with Mule."
-   filename "mule-base-1.39-pkg.tar.gz"
-   md5sum "5686febbb08c950ead2b4d0b1707c09e"
-   size 443543
+   filename "mule-base-1.42-pkg.tar.gz"
+   md5sum "d521ca4256a8333db5dc686b9d719232"
+   size 443826
    provides (canna-leim canna char-table china-util cyril-util isearch-ext japan-util ccl can-n-egg mule-help)
    requires (fsf-compat xemacs-base apel)
    type regular
@@ -710,19 +754,19 @@
 (package-get-update-base-entry (quote
 (psgml
   (standards-version 1.1
-   version "1.27"
+   version "1.28"
    author-version "1.22"
-   date "2002-02-15"
-   build-date "2002-02-23"
+   date "2002-05-09"
+   build-date "2002-05-10"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "Validated HTML/SGML editing."
-   filename "psgml-1.27-pkg.tar.gz"
-   md5sum "e2ee0ca808175b7904e03865fb5e9f2f"
-   size 652565
+   filename "psgml-1.28-pkg.tar.gz"
+   md5sum "e559c5b88300e414654550806eab8c7a"
+   size 651867
    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
@@ -732,19 +776,19 @@
 (package-get-update-base-entry (quote
 (pc
   (standards-version 1.1
-   version "1.21"
-   author-version "21.5b4"
-   date "2002-01-10"
-   build-date "2002-01-14"
+   version "1.25"
+   author-version "21.5b6"
+   date "2002-06-04"
+   build-date "2002-06-04"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "PC style interface emulation."
-   filename "pc-1.21-pkg.tar.gz"
-   md5sum "5e4818857e3132288c7c1d069f2aa75e"
-   size 17095
+   filename "pc-1.25-pkg.tar.gz"
+   md5sum "03b7fcc55e1ce79a6017cdfa7fd49f3d"
+   size 17429
    provides (delbs fusion pc-select pending-del s-region)
    requires (xemacs-base)
    type regular
@@ -864,21 +908,21 @@
 (package-get-update-base-entry (quote
 (calc
   (standards-version 1.1
-   version "1.19"
+   version "1.23"
    author-version "2.02fX3"
-   date "2002-03-25"
-   build-date "2002-03-25"
+   date "2002-05-09"
+   build-date "2002-05-10"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Emacs calculator"
-   filename "calc-1.19-pkg.tar.gz"
-   md5sum "50adc786650be5b3c07f752a0e9481d3"
-   size 1614659
+   filename "calc-1.23-pkg.tar.gz"
+   md5sum "e66651dacc67325f6e6d033f80f2e989"
+   size 1615158
    provides (calc-ext calc-macs calc)
-   requires ()
+   requires (xemacs-base)
    type regular
 ))
 ))
@@ -974,19 +1018,19 @@
 (package-get-update-base-entry (quote
 (os-utils
   (standards-version 1.1
-   version "1.26"
-   author-version "21.5b4"
-   date "2002-01-13"
-   build-date "2002-01-14"
+   version "1.28"
+   author-version "21.5b6"
+   date "2002-05-10"
+   build-date "2002-05-10"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "Miscellaneous O/S utilities."
-   filename "os-utils-1.26-pkg.tar.gz"
-   md5sum "f347b3ea62543a6e637eaf73e6772c0a"
-   size 198764
+   filename "os-utils-1.28-pkg.tar.gz"
+   md5sum "57d2aa4e6f7d1ad321e1d1d84b2c458c"
+   size 200020
    provides (archive-mode background crypt++ crypt ftelnet inf-lisp jka-compr mchat rlogin ssh tar-mode telnet terminal uncompress)
    requires (xemacs-base)
    type single
@@ -996,19 +1040,19 @@
 (package-get-update-base-entry (quote
 (ilisp
   (standards-version 1.1
-   version "1.20"
-   author-version "5.11.1"
-   date "2002-01-13"
-   build-date "2002-01-14"
+   version "1.27"
+   author-version "5.12.0"
+   date "2002-06-27"
+   build-date "2002-06-27"
    maintainer "ilisp Maintainers <ilisp@cons.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Front-end for Inferior Lisp."
-   filename "ilisp-1.20-pkg.tar.gz"
-   md5sum "0ee4440213bb4cb3144af60300c3dbc9"
-   size 335386
+   filename "ilisp-1.27-pkg.tar.gz"
+   md5sum "a95a698b28301250971e8076d7ce89fd"
+   size 335702
    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
@@ -1062,19 +1106,19 @@
 (package-get-update-base-entry (quote
 (viper
   (standards-version 1.1
-   version "1.33"
+   version "1.34"
    author-version "3.09"
-   date "2002-03-25"
-   build-date "2002-03-26"
+   date "2002-04-24"
+   build-date "2002-04-24"
    maintainer "Michael Kifer <kifer@cs.sunysb.edu>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "VI emulation support."
-   filename "viper-1.33-pkg.tar.gz"
-   md5sum "68a659e67f5f9c533f76229ad3a9a1b5"
-   size 328311
+   filename "viper-1.34-pkg.tar.gz"
+   md5sum "c438c8c42dbedd5634c773623db5a4ff"
+   size 329580
    provides (viper-cmd viper-ex viper-init viper-keym viper-macs viper-mous viper-util viper)
    requires (xemacs-base)
    type regular
@@ -1216,19 +1260,19 @@
 (package-get-update-base-entry (quote
 (auctex
   (standards-version 1.1
-   version "1.30"
+   version "1.32"
    author-version "10.0g"
-   date "2002-03-25"
-   build-date "2002-03-25"
+   date "2002-06-27"
+   build-date "2002-06-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "Basic TeX/LaTeX support."
-   filename "auctex-1.30-pkg.tar.gz"
-   md5sum "52459679ad7e9fa4eb558c59d19e51c4"
-   size 385528
+   filename "auctex-1.32-pkg.tar.gz"
+   md5sum "7d532a5a3d673f89f01c9dd3ed75ac80"
+   size 385505
    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
@@ -1260,20 +1304,20 @@
 (package-get-update-base-entry (quote
 (vc
   (standards-version 1.1
-   version "1.30"
-   author-version "21.5b3"
-   date "2001-12-17"
-   build-date "2001-12-17"
+   version "1.33"
+   author-version "21.5b6"
+   date "2002-06-04"
+   build-date "2002-06-04"
    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.30-pkg.tar.gz"
-   md5sum "f62e070f0f5e04c8b9ee4ec7badaa787"
-   size 91668
-   provides (vc)
+   filename "vc-1.33-pkg.tar.gz"
+   md5sum "f3b8db930389eb6288af946398286ab6"
+   size 91716
+   provides (vc vc-hooks)
    requires (dired xemacs-base vc mail-lib ediff)
    type regular
 ))
@@ -1282,20 +1326,20 @@
 (package-get-update-base-entry (quote
 (vc-cc
   (standards-version 1.1
-   version "1.18"
-   author-version "21.5b3"
-   date "2001-12-10"
-   build-date "2001-12-10"
+   version "1.21"
+   author-version "21.5b6"
+   date "2002-06-04"
+   build-date "2002-06-04"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Version Control for ClearCase (UnFree) systems."
-   filename "vc-cc-1.18-pkg.tar.gz"
-   md5sum "6885bb091d1fd108a7ec4353a96016ec"
-   size 94520
-   provides (vc)
+   filename "vc-cc-1.21-pkg.tar.gz"
+   md5sum "eb7ad3f9407b32509fa95fa272476b7d"
+   size 94556
+   provides (vc-cc vc-cc-hooks)
    requires (dired xemacs-base)
    type regular
 ))
@@ -1304,19 +1348,19 @@
 (package-get-update-base-entry (quote
 (sh-script
   (standards-version 1.1
-   version "1.14"
+   version "1.15"
    author-version "2.0e"
-   date "2002-03-02"
-   build-date "2002-03-06"
+   date "2002-04-24"
+   build-date "2002-04-24"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Support for editing shell scripts."
-   filename "sh-script-1.14-pkg.tar.gz"
-   md5sum "c8b3614f5fc4696e552d7d76806ce032"
-   size 35380
+   filename "sh-script-1.15-pkg.tar.gz"
+   md5sum "72214e735ea0fda9147c051fbc3b6965"
+   size 36163
    provides (sh-script executable)
    requires (xemacs-base)
    type regular
@@ -1348,21 +1392,21 @@
 (package-get-update-base-entry (quote
 (prog-modes
   (standards-version 1.1
-   version "1.53"
-   author-version "21.5b5"
-   date "2002-03-25"
-   build-date "2002-03-25"
+   version "1.60"
+   author-version "21.5b6"
+   date "2002-07-14"
+   build-date "2002-07-14"
    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.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)
+   filename "prog-modes-1.60-pkg.tar.gz"
+   md5sum "74909e13093afae889e3f43a1879e51c"
+   size 985711
+   provides (autoconf-mode awk-mode c-mode cperl-mode cvs diff-mode eiffel-mode f90 fortran icon 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 rpm-spec-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 sh-script)
    type regular
 ))
 ))
@@ -1414,19 +1458,19 @@
 (package-get-update-base-entry (quote
 (ediff
   (standards-version 1.1
-   version "1.39"
+   version "1.41"
    author-version "2.75"
-   date "2002-03-25"
-   build-date "2002-03-25"
+   date "2002-04-30"
+   build-date "2002-04-30"
    maintainer "Michael Kifer <kifer@cs.sunysb.edu>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "Interface over GNU patch."
-   filename "ediff-1.39-pkg.tar.gz"
-   md5sum "d679f8d1a43dda8f51d6e6ba3cf24a35"
-   size 301259
+   filename "ediff-1.41-pkg.tar.gz"
+   md5sum "4a4b9435a99e5d1cb0ac2fc0843d92fa"
+   size 303663
    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
@@ -1436,20 +1480,20 @@
 (package-get-update-base-entry (quote
 (debug
   (standards-version 1.1
-   version "1.14"
-   author-version "21.2b42"
-   date "2000-11-07"
-   build-date "2001-01-27"
+   version "1.15"
+   author-version "21.5b6"
+   date "2002-05-01"
+   build-date "2002-05-01"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
-   category "prog"
+   category "standard"
    dump nil
    description "GUD, gdb, dbx debugging support."
-   filename "debug-1.14-pkg.tar.gz"
-   md5sum "20312f80900f1c99f3eeecddf75026ca"
-   size 103296
-   provides (dbx gdb-highlight gdb gdbsrc gud history)
+   filename "debug-1.15-pkg.tar.gz"
+   md5sum "2b44d4c660f4cda44d4a159b40a6f457"
+   size 107347
+   provides (dbx debug-toolbar gdb-highlight gdb gdbsrc gud history)
    requires (xemacs-base)
    type regular
 ))
@@ -1502,19 +1546,19 @@
 (package-get-update-base-entry (quote
 (cc-mode
   (standards-version 1.1
-   version "1.27"
+   version "1.28"
    author-version "5.28"
-   date "2002-01-13"
-   build-date "2002-01-14"
+   date "2002-05-09"
+   build-date "2002-05-10"
    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.27-pkg.tar.gz"
-   md5sum "40d0d6638b94ec0fe40f1b29df6d4efd"
-   size 262878
+   filename "cc-mode-1.28-pkg.tar.gz"
+   md5sum "d2c87709e503e11755c480f2aa50ea8c"
+   size 262921
    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
@@ -1634,19 +1678,19 @@
 (package-get-update-base-entry (quote
 (bbdb
   (standards-version 1.1
-   version "1.20"
+   version "1.21"
    author-version "2.34"
-   date "2002-03-25"
-   build-date "2002-03-25"
+   date "2002-06-27"
+   build-date "2002-06-27"
    maintainer "Ronan Waide <waider@waider.ie>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "The Big Brother Data Base"
-   filename "bbdb-1.20-pkg.tar.gz"
-   md5sum "f5f772c6e77a6d97f53a60acb5203bf7"
-   size 373721
+   filename "bbdb-1.21-pkg.tar.gz"
+   md5sum "8b1d6fe03d444a4977a358a431f1430e"
+   size 373823
    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
@@ -1700,19 +1744,19 @@
 (package-get-update-base-entry (quote
 (tm
   (standards-version 1.1
-   version "1.32"
-   author-version "21.5b5"
-   date "2002-03-27"
-   build-date "2002-03-27"
+   version "1.34"
+   author-version "21.5b6"
+   date "2002-06-27"
+   build-date "2002-06-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.32-pkg.tar.gz"
-   md5sum "f4b825c093897e785ef3dc06c9e263a2"
-   size 189142
+   filename "tm-1.34-pkg.tar.gz"
+   md5sum "80c9bf5cf48f9ba61b1b6395751c44e4"
+   size 189067
    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
@@ -1722,19 +1766,19 @@
 (package-get-update-base-entry (quote
 (gnus
   (standards-version 1.1
-   version "1.59"
+   version "1.62"
    author-version "5.8.8"
-   date "2002-03-25"
-   build-date "2002-03-25"
+   date "2002-06-27"
+   build-date "2002-06-27"
    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.59-pkg.tar.gz"
-   md5sum "3dfb92934e1723f88a6cab69f2c97be1"
-   size 2350665
+   filename "gnus-1.62-pkg.tar.gz"
+   md5sum "b84bb02eab349e7c36b84d5f6bd5f194"
+   size 2356932
    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
@@ -1832,19 +1876,19 @@
 (package-get-update-base-entry (quote
 (gnats
   (standards-version 1.1
-   version "1.14"
+   version "1.15"
    author-version "3.101"
-   date "2002-03-25"
-   build-date "2002-03-25"
+   date "2002-06-27"
+   build-date "2002-06-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority high
    category "standard"
    dump nil
    description "XEmacs bug reports."
-   filename "gnats-1.14-pkg.tar.gz"
-   md5sum "f5bcbcdb6ec241c9f22a29105b1debc9"
-   size 189561
+   filename "gnats-1.15-pkg.tar.gz"
+   md5sum "9503a79e2e396eb13151aec7eadf561b"
+   size 189524
    provides (gnats gnats-admin send-pr)
    requires (mail-lib xemacs-base)
    type regular
@@ -1854,19 +1898,19 @@
 (package-get-update-base-entry (quote
 (footnote
   (standards-version 1.1
-   version "1.14"
+   version "1.15"
    author-version "0.18x"
-   date "2002-02-12"
-   build-date "2002-02-13"
+   date "2002-04-24"
+   build-date "2002-04-24"
    maintainer "SL Baur <steve@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Footnoting in mail message editing modes."
-   filename "footnote-1.14-pkg.tar.gz"
-   md5sum "0052618f7875e79c20f2024e985d39fb"
-   size 21817
+   filename "footnote-1.15-pkg.tar.gz"
+   md5sum "1cbe1e587881611006d9a8fc82be3be1"
+   size 21917
    provides (footnote-cyrillic footnote-greek footnote-han footnote-hebrew footnote-kana footnote)
    requires (mail-lib xemacs-base)
    type regular
@@ -1898,19 +1942,19 @@
 (package-get-update-base-entry (quote
 (net-utils
   (standards-version 1.1
-   version "1.24"
-   author-version "21.5b4"
-   date "2002-02-23"
-   build-date "2002-02-23"
+   version "1.27"
+   author-version "21.5b6"
+   date "2002-06-27"
+   build-date "2002-06-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Miscellaneous Networking Utilities."
-   filename "net-utils-1.24-pkg.tar.gz"
-   md5sum "316b8f852ea625d89535b75028de1c1c"
-   size 119981
+   filename "net-utils-1.27-pkg.tar.gz"
+   md5sum "45563ca39defd1328c9dabd933d9a0f5"
+   size 120333
    provides (ilisp-browse-cltl2 xemacsbug feedmail metamail net-utils rcompile shadowfile webjump webster-www)
    requires (w3 efs mail-lib xemacs-base)
    type single
@@ -1920,19 +1964,19 @@
 (package-get-update-base-entry (quote
 (w3
   (standards-version 1.1
-   version "1.22"
+   version "1.25"
    author-version "4.0pre46"
-   date "2002-03-25"
-   build-date "2002-03-26"
+   date "2002-06-27"
+   build-date "2002-06-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority high
    category "standard"
    dump nil
    description "A Web browser."
-   filename "w3-1.22-pkg.tar.gz"
-   md5sum "1ac52ca40fd12b250e5a639f6549f652"
-   size 689366
+   filename "w3-1.25-pkg.tar.gz"
+   md5sum "5eef9e6136c651a922d5cc341c8c7b56"
+   size 689340
    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
@@ -1942,19 +1986,19 @@
 (package-get-update-base-entry (quote
 (vm
   (standards-version 1.1
-   version "7.03"
-   author-version "7.03"
-   date "2002-03-25"
-   build-date "2002-03-26"
+   version "7.07"
+   author-version "7.07"
+   date "2002-06-08"
+   build-date "2002-06-08"
    maintainer "Kyle Jones <kyle_jones@wonderworks.com>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "An Emacs mailer."
-   filename "vm-7.03-pkg.tar.gz"
-   md5sum "ad490c8dacf885a28f897d93382d250b"
-   size 714118
+   filename "vm-7.07-pkg.tar.gz"
+   md5sum "ab2c67c7cda2fe8739a1fef49cfc0fc5"
+   size 718569
    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
@@ -2008,19 +2052,19 @@
 (package-get-update-base-entry (quote
 (xemacs-devel
   (standards-version 1.1
-   version "1.43"
-   author-version "21.5b4"
-   date "2002-03-04"
-   build-date "2002-03-06"
+   version "1.47"
+   author-version "21.5b6"
+   date "2002-07-14"
+   build-date "2002-07-14"
    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.43-pkg.tar.gz"
-   md5sum "ddbfe9135401490d5f3c2d8fd4f5ff24"
-   size 179426
+   filename "xemacs-devel-1.47-pkg.tar.gz"
+   md5sum "0386b19a469f684dd97e67fe5ce15a99"
+   size 228197
    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
@@ -2118,19 +2162,19 @@
 (package-get-update-base-entry (quote
 (apel
   (standards-version 1.1
-   version "1.21"
+   version "1.24"
    author-version "10.2"
-   date "2002-03-25"
-   build-date "2002-03-25"
+   date "2002-07-14"
+   build-date "2002-07-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority high
    category "standard"
    dump nil
    description "A Portable Emacs Library.  Used by XEmacs MIME support."
-   filename "apel-1.21-pkg.tar.gz"
-   md5sum "cf0e8f72176963be1a0c0a55d70dae82"
-   size 107681
+   filename "apel-1.24-pkg.tar.gz"
+   md5sum "107adb4ad0190fbd20beccff9c4e9acf"
+   size 108059
    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
@@ -2140,20 +2184,20 @@
 (package-get-update-base-entry (quote
 (efs
   (standards-version 1.0
-   version "1.28"
-   author-version "1.20pre2"
-   date "2002-03-25"
-   build-date "2002-03-25"
+   version "1.29"
+   author-version "1.20"
+   date "2002-04-24"
+   build-date "2002-04-24"
    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.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)
+   filename "efs-1.29-pkg.tar.gz"
+   md5sum "8c2c6c00cfbdc5f8d64ad54ddfb731df"
+   size 371905
+   provides (efs)
    requires (xemacs-base dired)
    type regular
 ))
@@ -2162,19 +2206,19 @@
 (package-get-update-base-entry (quote
 (dired
   (standards-version 1.0
-   version "1.11"
+   version "1.12"
    author-version "7.10"
-   date "2001-06-03"
-   build-date "2001-06-14"
+   date "2002-04-24"
+   build-date "2002-04-24"
    maintainer "Mike Sperber <sperber@informatik.uni-tuebingen.de>"
    distribution stable
    priority medium
    category "standard"
    dump nil
    description "Manage file systems."
-   filename "dired-1.11-pkg.tar.gz"
-   md5sum "0b44f0635a1d08189db83e8558cfe8e0"
-   size 193695
+   filename "dired-1.12-pkg.tar.gz"
+   md5sum "be9971fc8b39136a495a1a06110bc964"
+   size 195581
    provides (diff dired)
    requires (xemacs-base prog-modes)
    type regular
@@ -2183,10 +2227,10 @@
 ;;;@@@
 ;; Package Index file ends here
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.0.6 (GNU/Linux)
+Version: GnuPG v1.0.7 (GNU/Linux)
 Comment: The XEmacs Development Team
 
-iD8DBQE8onXYjNKQaxDVycURAlViAJ9z/KrcyJ8Psojz5kcsVRpUEXTMLACfSK7k
-CcvmBv4n8/MEg449j+o9cEI=
-=1p1H
+iD8DBQE9OJK0jNKQaxDVycURAkMoAJ0WlQCnejfjX9xCIgVNfTIuvVY6jgCgiy9L
+H10A7mDW78w/Ck4KApEHxvs=
+=YYE8
 -----END PGP SIGNATURE-----
Index: etc/package-index.LATEST.pgp
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/package-index.LATEST.pgp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -u -r1.11 -r1.12
--- etc/package-index.LATEST.pgp	2002/03/30 04:46:48	1.11
+++ etc/package-index.LATEST.pgp	2002/07/21 04:51:07	1.12
@@ -1,6 +1,50 @@
 ;; Package Index file -- Do not edit manually.
 ;;;@@@
 (package-get-update-base-entry (quote
+(ess
+  (standards-version 1.1
+   version "1.02"
+   author-version "5.1.21"
+   date "2002-06-04"
+   build-date "2002-06-04"
+   maintainer "A.J. Rossini <rossini@xemacs.org>"
+   distribution xemacs
+   priority medium
+   category "standard"
+   dump nil
+   description "ESS: Emacs Speaks Statistics."
+   filename "ess-1.02-pkg.tar.gz"
+   md5sum "3eff981706623221b5af048dc8a00f17"
+   size 469304
+   provides (ess-batch ess-comp ess-cust ess-dump ess-emcs ess-font-lock ess-help ess-inf ess-iw32 ess-latex-mode ess-menu ess-mode ess-mous ess-noweb ess-site ess-sysdp ess-utils ess-vars ess essa-r essa-sas essd-arc essd-els essd-r essd-omg essd-r essd-s3 essd-s4 essd-sas essd-sp3 essd-sp4 essd-sp5 essd-sp6 essd-sta essd-vst essd-xls essddr essdsp6w essl-bug essl-lsp essl-omg essl-py essl-s essl-sas essl-sta make-regexp mouseme msdos noweb-font-lock-mode noweb-mode)
+   requires (xemacs-base mail-lib fsf-compat edit-utils)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
+(haskell-mode
+  (standards-version 1.1
+   version "1.03"
+   author-version "1.43"
+   date "2002-05-07"
+   build-date "2002-05-07"
+   maintainer "Ville Skyttä <ville.skytta@xemacs.org>"
+   distribution xemacs
+   priority low
+   category "standard"
+   dump nil
+   description "Haskell editing support."
+   filename "haskell-mode-1.03-pkg.tar.gz"
+   md5sum "c734831433d7330094064fe3959d94f1"
+   size 91983
+   provides (haskell-decl-scan haskell-doc haskell-font-lock haskell-indent haskell-mode haskell-simple-indent)
+   requires (dired mail-lib xemacs-base edit-utils)
+   type regular
+))
+))
+;;;@@@
+(package-get-update-base-entry (quote
 (xslide
   (standards-version 1.1
    version "1.01"
@@ -25,19 +69,19 @@
 (package-get-update-base-entry (quote
 (liece
   (standards-version 1.1
-   version "1.02"
+   version "1.07"
    author-version "1.4.7"
-   date "2002-03-27"
-   build-date "2002-03-27"
+   date "2002-07-14"
+   build-date "2002-07-14"
    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
+   filename "liece-1.07-pkg.tar.gz"
+   md5sum "10a70f816b57757a6dc58b29f342881f"
+   size 197755
    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
@@ -47,19 +91,19 @@
 (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"
+   version "1.05"
+   author-version "1.05"
+   date "2002-05-07"
+   build-date "2002-05-07"
    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
+   filename "latin-unity-1.05-pkg.tar.gz"
+   md5sum "fc968dc2682d52ab37634e22028d8598"
+   size 86755
    provides (latin-unity latin-unity-tables latin-unity-utils)
    requires (mule-base mule-ucs leim fsf-compat)
    type regular
@@ -91,19 +135,19 @@
 (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"
+   version "1.08"
+   author-version "21.5b6"
+   date "2002-07-14"
+   build-date "2002-07-14"
    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
+   filename "ibuffer-1.08-pkg.tar.gz"
+   md5sum "e7203eeeca98a89c2bfe051d81c729de"
+   size 87113
    provides (ibuf-ext ibuf-macs ibuffer)
    requires (ibuffer xemacs-base)
    type regular
@@ -113,19 +157,19 @@
 (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"
+   version "1.66"
+   author-version "21.5b6"
+   date "2002-07-14"
+   build-date "2002-07-14"
    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
+   filename "xemacs-base-1.66-pkg.tar.gz"
+   md5sum "108cb98a37dd6270618b942e0fe97b48"
+   size 464634
    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
@@ -135,19 +179,19 @@
 (package-get-update-base-entry (quote
 (tramp
   (standards-version 1.1
-   version "1.04"
+   version "1.05"
    author-version "2002-02-18"
-   date "2002-03-25"
-   build-date "2002-03-26"
+   date "2002-04-24"
+   build-date "2002-04-24"
    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.04-pkg.tar.gz"
-   md5sum "76d676178f448ba174e74a964d1dbfaf"
-   size 135053
+   filename "tramp-1.05-pkg.tar.gz"
+   md5sum "a0c020f425b6344ea0c133dc26e7f689"
+   size 136196
    provides (tramp tramp-util tramp-vc trampcache)
    requires (tramp xemacs-base vc fsf-compat efs dired mail-lib gnus)
    type regular
@@ -157,20 +201,20 @@
 (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"
+   version "1.48"
+   author-version "21.5b6"
+   date "2002-06-27"
+   build-date "2002-06-27"
    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)
+   filename "text-modes-1.48-pkg.tar.gz"
+   md5sum "f2df17af03a7f47e3b2e7b970d0b9f0b"
+   size 345796
+   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 apache-mode po-mode css-mode)
    requires (ispell fsf-compat xemacs-base)
    type regular
 ))
@@ -179,19 +223,19 @@
 (package-get-update-base-entry (quote
 (pcl-cvs
   (standards-version 1.1
-   version "1.60"
+   version "1.63"
    author-version "R-2_9_9"
-   date "2002-03-25"
-   build-date "2002-03-25"
+   date "2002-06-04"
+   build-date "2002-06-04"
    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
+   filename "pcl-cvs-1.63-pkg.tar.gz"
+   md5sum "87b7a9ebd1aa6d24ee4c3c0ff914daad"
+   size 161146
    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
@@ -201,21 +245,21 @@
 (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"
+   version "1.47"
+   author-version "21.5b6"
+   date "2002-07-14"
+   build-date "2002-07-14"
    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)
+   filename "mail-lib-1.47-pkg.tar.gz"
+   md5sum "3cba556078ece30b7538ade56e138041"
+   size 186598
+   provides (base64 browse-url-xemacs browse-url highlight-headers mail-abbrevs mail-extr mail-utils mailheader netrc pop3 reporter rfc2104 rfc822 rmail rmail-mini rmailout sendmail smtpmail starttls)
+   requires (eterm xemacs-base fsf-compat sh-script)
    type regular
 ))
 ))
@@ -223,21 +267,21 @@
 (package-get-update-base-entry (quote
 (jde
   (standards-version 1.1
-   version "1.34"
+   version "1.35"
    author-version "2.2.8"
-   date "2002-03-28"
-   build-date "2002-03-28"
+   date "2002-05-09"
+   build-date "2002-05-10"
    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
+   filename "jde-1.35-pkg.tar.gz"
+   md5sum "b0289c057ce2a0d95c417409f5f17ba4"
+   size 1635420
    provides (jde)
-   requires (jde cc-mode semantic debug speedbar edit-utils eterm mail-lib xemacs-base xemacs-devel eieio elib sh-script)
+   requires (jde cc-mode semantic debug speedbar edit-utils eterm mail-lib xemacs-base xemacs-devel eieio elib sh-script fsf-compat)
    type regular
 ))
 ))
@@ -267,19 +311,19 @@
 (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"
+   version "1.89"
+   author-version "21.5b6"
+   date "2002-06-27"
+   build-date "2002-06-27"
    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
+   filename "edit-utils-1.89-pkg.tar.gz"
+   md5sum "b7d94a10cda4795bbb759e0ee88ae86e"
+   size 650996
    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
@@ -289,19 +333,19 @@
 (package-get-update-base-entry (quote
 (skk
   (standards-version 1.1
-   version "1.21"
+   version "1.22"
    author-version "10.62a"
-   date "2002-01-26"
-   build-date "2002-01-27"
+   date "2002-04-30"
+   build-date "2002-04-30"
    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
+   filename "skk-1.22-pkg.tar.gz"
+   md5sum "05457e10b156dbcc2e0f735d46d934a1"
+   size 1461781
    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
@@ -311,19 +355,19 @@
 (package-get-update-base-entry (quote
 (ps-print
   (standards-version 1.1
-   version "1.03"
+   version "1.04"
    author-version "6.5.6"
-   date "2002-02-01"
-   build-date "2002-02-13"
+   date "2002-04-24"
+   build-date "2002-04-24"
    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
+   filename "ps-print-1.04-pkg.tar.gz"
+   md5sum "e4c3f93b960454cf6dc559a0704fb084"
+   size 154281
    provides (lpr ps-bdf ps-mule ps-print)
    requires (text-modes)
    type regular
@@ -333,19 +377,19 @@
 (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"
+   version "1.07"
+   author-version "21.5b6"
+   date "2002-06-04"
+   build-date "2002-06-04"
    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
+   filename "sieve-1.07-pkg.tar.gz"
+   md5sum "d86e60ea1b6c552be2b6db7cca60e151"
+   size 23498
    provides (sieve sieve-mode sieve-manage)
    requires (xemacs-base mail-lib cc-mode)
    type regular
@@ -377,19 +421,19 @@
 (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"
+   version "1.04"
+   author-version "21.5b6"
+   date "2002-06-27"
+   build-date "2002-06-27"
    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
+   filename "clearcase-1.04-pkg.tar.gz"
+   md5sum "c60546db0605910ec57af7151a7fc9a7"
+   size 89274
    provides (clearcase)
    requires (dired fsf-compat mail-lib xemacs-base)
    type regular
@@ -399,19 +443,19 @@
 (package-get-update-base-entry (quote
 (dictionary
   (standards-version 1.1
-   version "1.08"
-   author-version "1.7"
-   date "2002-03-25"
-   build-date "2002-03-25"
+   version "1.11"
+   author-version "1.8"
+   date "2002-05-20"
+   build-date "2002-05-20"
    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.08-pkg.tar.gz"
-   md5sum "908bf76c8f0e5d5463ff1282ae66f9b8"
-   size 38956
+   filename "dictionary-1.11-pkg.tar.gz"
+   md5sum "6bead861baac049fb1807dd2e03a1475"
+   size 39886
    provides (dictionary connection link)
    requires (xemacs-base)
    type regular
@@ -421,19 +465,19 @@
 (package-get-update-base-entry (quote
 (build
   (standards-version 1.0
-   version "1.05"
-   author-version "21.5b4"
-   date "2002-01-07"
-   build-date "2002-01-14"
+   version "1.06"
+   author-version "2.00"
+   date "2002-07-20"
+   build-date "2002-07-20"
    maintainer "Adrian Aichner <adrian@xemacs.org>"
    distribution stable
    priority low
    category "standard"
    dump nil
    description "Build XEmacs from within (UNIX, Windows)."
-   filename "build-1.05-pkg.tar.gz"
-   md5sum "3d6158756a1990e92ff2ed77d6e39425"
-   size 31606
+   filename "build-1.06-pkg.tar.gz"
+   md5sum "2d0fb08caf67bb89759be4ac54b6a0fb"
+   size 39500
    provides (build)
    requires (xemacs-base pcl-cvs dired w3 prog-modes)
    type regular
@@ -443,21 +487,21 @@
 (package-get-update-base-entry (quote
 (xslt-process
   (standards-version 1.0
-   version "1.06"
+   version "1.10"
    author-version "1.2.1"
-   date "2002-01-15"
-   build-date "2002-01-15"
+   date "2002-07-14"
+   build-date "2002-07-14"
    maintainer "Ovidiu Predescu <ovidiu@xemacs.org>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "XSLT processing support."
-   filename "xslt-process-1.06-pkg.tar.gz"
-   md5sum "29c91cf906a685b3197bc4ab13d27735"
-   size 200263
+   filename "xslt-process-1.10-pkg.tar.gz"
+   md5sum "b6fedc8eb356d6e4277ff505324a2abe"
+   size 199744
    provides (xslt-process)
-   requires (jde cc-mode semantic debug speedbar edit-utils eterm mail-lib xemacs-base elib eieio sh-script)
+   requires (jde cc-mode semantic debug speedbar edit-utils eterm mail-lib xemacs-base elib eieio sh-script fsf-compat)
    type regular
 ))
 ))
@@ -531,19 +575,19 @@
 (package-get-update-base-entry (quote
 (lookup
   (standards-version 1.1
-   version "1.10"
+   version "1.12"
    author-version "1.0"
-   date "2002-03-25"
-   build-date "2002-03-25"
+   date "2002-06-27"
+   build-date "2002-06-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution mule
    priority high
    category "mule"
    dump nil
    description "MULE: Dictionary support"
-   filename "lookup-1.10-pkg.tar.gz"
-   md5sum "e3938ad866de0a22df8cc1042ddb62f3"
-   size 214515
+   filename "lookup-1.12-pkg.tar.gz"
+   md5sum "f07a3791e49f75c7f1504edb077a5560"
+   size 190864
    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
@@ -553,19 +597,19 @@
 (package-get-update-base-entry (quote
 (leim
   (standards-version 1.1
-   version "1.17"
-   author-version "21.1"
-   date "2000-11-08"
-   build-date "2001-01-15"
+   version "1.18"
+   author-version "21.5b5"
+   date "2002-04-24"
+   build-date "2002-04-24"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution mule
    priority medium
    category "mule"
    dump nil
    description "MULE: Quail.  All non-English and non-Japanese language support."
-   filename "leim-1.17-pkg.tar.gz"
-   md5sum "61d39ee096e39219651b01648a37ef2e"
-   size 1708067
+   filename "leim-1.18-pkg.tar.gz"
+   md5sum "b0467e2a3a93b46590bd2fe9bbf9675e"
+   size 1708615
    provides ()
    requires (mule-base fsf-compat xemacs-base)
    type regular
@@ -597,19 +641,19 @@
 (package-get-update-base-entry (quote
 (mule-base
   (standards-version 1.1
-   version "1.39"
-   author-version "21.5b1"
-   date "2001-05-23"
-   build-date "2001-06-14"
+   version "1.42"
+   author-version "21.5b6"
+   date "2002-06-27"
+   build-date "2002-06-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution mule
    priority high
    category "mule"
    dump nil
    description "MULE: Basic Mule support, required for building with Mule."
-   filename "mule-base-1.39-pkg.tar.gz"
-   md5sum "5686febbb08c950ead2b4d0b1707c09e"
-   size 443543
+   filename "mule-base-1.42-pkg.tar.gz"
+   md5sum "d521ca4256a8333db5dc686b9d719232"
+   size 443826
    provides (canna-leim canna char-table china-util cyril-util isearch-ext japan-util ccl can-n-egg mule-help)
    requires (fsf-compat xemacs-base apel)
    type regular
@@ -707,19 +751,19 @@
 (package-get-update-base-entry (quote
 (psgml
   (standards-version 1.1
-   version "1.27"
+   version "1.28"
    author-version "1.22"
-   date "2002-02-15"
-   build-date "2002-02-23"
+   date "2002-05-09"
+   build-date "2002-05-10"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "Validated HTML/SGML editing."
-   filename "psgml-1.27-pkg.tar.gz"
-   md5sum "e2ee0ca808175b7904e03865fb5e9f2f"
-   size 652565
+   filename "psgml-1.28-pkg.tar.gz"
+   md5sum "e559c5b88300e414654550806eab8c7a"
+   size 651867
    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
@@ -729,19 +773,19 @@
 (package-get-update-base-entry (quote
 (pc
   (standards-version 1.1
-   version "1.21"
-   author-version "21.5b4"
-   date "2002-01-10"
-   build-date "2002-01-14"
+   version "1.25"
+   author-version "21.5b6"
+   date "2002-06-04"
+   build-date "2002-06-04"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "PC style interface emulation."
-   filename "pc-1.21-pkg.tar.gz"
-   md5sum "5e4818857e3132288c7c1d069f2aa75e"
-   size 17095
+   filename "pc-1.25-pkg.tar.gz"
+   md5sum "03b7fcc55e1ce79a6017cdfa7fd49f3d"
+   size 17429
    provides (delbs fusion pc-select pending-del s-region)
    requires (xemacs-base)
    type regular
@@ -861,21 +905,21 @@
 (package-get-update-base-entry (quote
 (calc
   (standards-version 1.1
-   version "1.19"
+   version "1.23"
    author-version "2.02fX3"
-   date "2002-03-25"
-   build-date "2002-03-25"
+   date "2002-05-09"
+   build-date "2002-05-10"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Emacs calculator"
-   filename "calc-1.19-pkg.tar.gz"
-   md5sum "50adc786650be5b3c07f752a0e9481d3"
-   size 1614659
+   filename "calc-1.23-pkg.tar.gz"
+   md5sum "e66651dacc67325f6e6d033f80f2e989"
+   size 1615158
    provides (calc-ext calc-macs calc)
-   requires ()
+   requires (xemacs-base)
    type regular
 ))
 ))
@@ -971,19 +1015,19 @@
 (package-get-update-base-entry (quote
 (os-utils
   (standards-version 1.1
-   version "1.26"
-   author-version "21.5b4"
-   date "2002-01-13"
-   build-date "2002-01-14"
+   version "1.28"
+   author-version "21.5b6"
+   date "2002-05-10"
+   build-date "2002-05-10"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "Miscellaneous O/S utilities."
-   filename "os-utils-1.26-pkg.tar.gz"
-   md5sum "f347b3ea62543a6e637eaf73e6772c0a"
-   size 198764
+   filename "os-utils-1.28-pkg.tar.gz"
+   md5sum "57d2aa4e6f7d1ad321e1d1d84b2c458c"
+   size 200020
    provides (archive-mode background crypt++ crypt ftelnet inf-lisp jka-compr mchat rlogin ssh tar-mode telnet terminal uncompress)
    requires (xemacs-base)
    type single
@@ -993,19 +1037,19 @@
 (package-get-update-base-entry (quote
 (ilisp
   (standards-version 1.1
-   version "1.20"
-   author-version "5.11.1"
-   date "2002-01-13"
-   build-date "2002-01-14"
+   version "1.27"
+   author-version "5.12.0"
+   date "2002-06-27"
+   build-date "2002-06-27"
    maintainer "ilisp Maintainers <ilisp@cons.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Front-end for Inferior Lisp."
-   filename "ilisp-1.20-pkg.tar.gz"
-   md5sum "0ee4440213bb4cb3144af60300c3dbc9"
-   size 335386
+   filename "ilisp-1.27-pkg.tar.gz"
+   md5sum "a95a698b28301250971e8076d7ce89fd"
+   size 335702
    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
@@ -1059,19 +1103,19 @@
 (package-get-update-base-entry (quote
 (viper
   (standards-version 1.1
-   version "1.33"
+   version "1.34"
    author-version "3.09"
-   date "2002-03-25"
-   build-date "2002-03-26"
+   date "2002-04-24"
+   build-date "2002-04-24"
    maintainer "Michael Kifer <kifer@cs.sunysb.edu>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "VI emulation support."
-   filename "viper-1.33-pkg.tar.gz"
-   md5sum "68a659e67f5f9c533f76229ad3a9a1b5"
-   size 328311
+   filename "viper-1.34-pkg.tar.gz"
+   md5sum "c438c8c42dbedd5634c773623db5a4ff"
+   size 329580
    provides (viper-cmd viper-ex viper-init viper-keym viper-macs viper-mous viper-util viper)
    requires (xemacs-base)
    type regular
@@ -1213,19 +1257,19 @@
 (package-get-update-base-entry (quote
 (auctex
   (standards-version 1.1
-   version "1.30"
+   version "1.32"
    author-version "10.0g"
-   date "2002-03-25"
-   build-date "2002-03-25"
+   date "2002-06-27"
+   build-date "2002-06-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "Basic TeX/LaTeX support."
-   filename "auctex-1.30-pkg.tar.gz"
-   md5sum "52459679ad7e9fa4eb558c59d19e51c4"
-   size 385528
+   filename "auctex-1.32-pkg.tar.gz"
+   md5sum "7d532a5a3d673f89f01c9dd3ed75ac80"
+   size 385505
    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
@@ -1257,20 +1301,20 @@
 (package-get-update-base-entry (quote
 (vc
   (standards-version 1.1
-   version "1.30"
-   author-version "21.5b3"
-   date "2001-12-17"
-   build-date "2001-12-17"
+   version "1.33"
+   author-version "21.5b6"
+   date "2002-06-04"
+   build-date "2002-06-04"
    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.30-pkg.tar.gz"
-   md5sum "f62e070f0f5e04c8b9ee4ec7badaa787"
-   size 91668
-   provides (vc)
+   filename "vc-1.33-pkg.tar.gz"
+   md5sum "f3b8db930389eb6288af946398286ab6"
+   size 91716
+   provides (vc vc-hooks)
    requires (dired xemacs-base vc mail-lib ediff)
    type regular
 ))
@@ -1279,20 +1323,20 @@
 (package-get-update-base-entry (quote
 (vc-cc
   (standards-version 1.1
-   version "1.18"
-   author-version "21.5b3"
-   date "2001-12-10"
-   build-date "2001-12-10"
+   version "1.21"
+   author-version "21.5b6"
+   date "2002-06-04"
+   build-date "2002-06-04"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Version Control for ClearCase (UnFree) systems."
-   filename "vc-cc-1.18-pkg.tar.gz"
-   md5sum "6885bb091d1fd108a7ec4353a96016ec"
-   size 94520
-   provides (vc)
+   filename "vc-cc-1.21-pkg.tar.gz"
+   md5sum "eb7ad3f9407b32509fa95fa272476b7d"
+   size 94556
+   provides (vc-cc vc-cc-hooks)
    requires (dired xemacs-base)
    type regular
 ))
@@ -1301,19 +1345,19 @@
 (package-get-update-base-entry (quote
 (sh-script
   (standards-version 1.1
-   version "1.14"
+   version "1.15"
    author-version "2.0e"
-   date "2002-03-02"
-   build-date "2002-03-06"
+   date "2002-04-24"
+   build-date "2002-04-24"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Support for editing shell scripts."
-   filename "sh-script-1.14-pkg.tar.gz"
-   md5sum "c8b3614f5fc4696e552d7d76806ce032"
-   size 35380
+   filename "sh-script-1.15-pkg.tar.gz"
+   md5sum "72214e735ea0fda9147c051fbc3b6965"
+   size 36163
    provides (sh-script executable)
    requires (xemacs-base)
    type regular
@@ -1345,21 +1389,21 @@
 (package-get-update-base-entry (quote
 (prog-modes
   (standards-version 1.1
-   version "1.53"
-   author-version "21.5b5"
-   date "2002-03-25"
-   build-date "2002-03-25"
+   version "1.60"
+   author-version "21.5b6"
+   date "2002-07-14"
+   build-date "2002-07-14"
    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.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)
+   filename "prog-modes-1.60-pkg.tar.gz"
+   md5sum "74909e13093afae889e3f43a1879e51c"
+   size 985711
+   provides (autoconf-mode awk-mode c-mode cperl-mode cvs diff-mode eiffel-mode f90 fortran icon 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 rpm-spec-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 sh-script)
    type regular
 ))
 ))
@@ -1411,19 +1455,19 @@
 (package-get-update-base-entry (quote
 (ediff
   (standards-version 1.1
-   version "1.39"
+   version "1.41"
    author-version "2.75"
-   date "2002-03-25"
-   build-date "2002-03-25"
+   date "2002-04-30"
+   build-date "2002-04-30"
    maintainer "Michael Kifer <kifer@cs.sunysb.edu>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "Interface over GNU patch."
-   filename "ediff-1.39-pkg.tar.gz"
-   md5sum "d679f8d1a43dda8f51d6e6ba3cf24a35"
-   size 301259
+   filename "ediff-1.41-pkg.tar.gz"
+   md5sum "4a4b9435a99e5d1cb0ac2fc0843d92fa"
+   size 303663
    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
@@ -1433,20 +1477,20 @@
 (package-get-update-base-entry (quote
 (debug
   (standards-version 1.1
-   version "1.14"
-   author-version "21.2b42"
-   date "2000-11-07"
-   build-date "2001-01-27"
+   version "1.15"
+   author-version "21.5b6"
+   date "2002-05-01"
+   build-date "2002-05-01"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
-   category "prog"
+   category "standard"
    dump nil
    description "GUD, gdb, dbx debugging support."
-   filename "debug-1.14-pkg.tar.gz"
-   md5sum "20312f80900f1c99f3eeecddf75026ca"
-   size 103296
-   provides (dbx gdb-highlight gdb gdbsrc gud history)
+   filename "debug-1.15-pkg.tar.gz"
+   md5sum "2b44d4c660f4cda44d4a159b40a6f457"
+   size 107347
+   provides (dbx debug-toolbar gdb-highlight gdb gdbsrc gud history)
    requires (xemacs-base)
    type regular
 ))
@@ -1499,19 +1543,19 @@
 (package-get-update-base-entry (quote
 (cc-mode
   (standards-version 1.1
-   version "1.27"
+   version "1.28"
    author-version "5.28"
-   date "2002-01-13"
-   build-date "2002-01-14"
+   date "2002-05-09"
+   build-date "2002-05-10"
    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.27-pkg.tar.gz"
-   md5sum "40d0d6638b94ec0fe40f1b29df6d4efd"
-   size 262878
+   filename "cc-mode-1.28-pkg.tar.gz"
+   md5sum "d2c87709e503e11755c480f2aa50ea8c"
+   size 262921
    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
@@ -1631,19 +1675,19 @@
 (package-get-update-base-entry (quote
 (bbdb
   (standards-version 1.1
-   version "1.20"
+   version "1.21"
    author-version "2.34"
-   date "2002-03-25"
-   build-date "2002-03-25"
+   date "2002-06-27"
+   build-date "2002-06-27"
    maintainer "Ronan Waide <waider@waider.ie>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "The Big Brother Data Base"
-   filename "bbdb-1.20-pkg.tar.gz"
-   md5sum "f5f772c6e77a6d97f53a60acb5203bf7"
-   size 373721
+   filename "bbdb-1.21-pkg.tar.gz"
+   md5sum "8b1d6fe03d444a4977a358a431f1430e"
+   size 373823
    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
@@ -1697,19 +1741,19 @@
 (package-get-update-base-entry (quote
 (tm
   (standards-version 1.1
-   version "1.32"
-   author-version "21.5b5"
-   date "2002-03-27"
-   build-date "2002-03-27"
+   version "1.34"
+   author-version "21.5b6"
+   date "2002-06-27"
+   build-date "2002-06-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.32-pkg.tar.gz"
-   md5sum "f4b825c093897e785ef3dc06c9e263a2"
-   size 189142
+   filename "tm-1.34-pkg.tar.gz"
+   md5sum "80c9bf5cf48f9ba61b1b6395751c44e4"
+   size 189067
    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
@@ -1719,19 +1763,19 @@
 (package-get-update-base-entry (quote
 (gnus
   (standards-version 1.1
-   version "1.59"
+   version "1.62"
    author-version "5.8.8"
-   date "2002-03-25"
-   build-date "2002-03-25"
+   date "2002-06-27"
+   build-date "2002-06-27"
    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.59-pkg.tar.gz"
-   md5sum "3dfb92934e1723f88a6cab69f2c97be1"
-   size 2350665
+   filename "gnus-1.62-pkg.tar.gz"
+   md5sum "b84bb02eab349e7c36b84d5f6bd5f194"
+   size 2356932
    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
@@ -1829,19 +1873,19 @@
 (package-get-update-base-entry (quote
 (gnats
   (standards-version 1.1
-   version "1.14"
+   version "1.15"
    author-version "3.101"
-   date "2002-03-25"
-   build-date "2002-03-25"
+   date "2002-06-27"
+   build-date "2002-06-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority high
    category "standard"
    dump nil
    description "XEmacs bug reports."
-   filename "gnats-1.14-pkg.tar.gz"
-   md5sum "f5bcbcdb6ec241c9f22a29105b1debc9"
-   size 189561
+   filename "gnats-1.15-pkg.tar.gz"
+   md5sum "9503a79e2e396eb13151aec7eadf561b"
+   size 189524
    provides (gnats gnats-admin send-pr)
    requires (mail-lib xemacs-base)
    type regular
@@ -1851,19 +1895,19 @@
 (package-get-update-base-entry (quote
 (footnote
   (standards-version 1.1
-   version "1.14"
+   version "1.15"
    author-version "0.18x"
-   date "2002-02-12"
-   build-date "2002-02-13"
+   date "2002-04-24"
+   build-date "2002-04-24"
    maintainer "SL Baur <steve@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Footnoting in mail message editing modes."
-   filename "footnote-1.14-pkg.tar.gz"
-   md5sum "0052618f7875e79c20f2024e985d39fb"
-   size 21817
+   filename "footnote-1.15-pkg.tar.gz"
+   md5sum "1cbe1e587881611006d9a8fc82be3be1"
+   size 21917
    provides (footnote-cyrillic footnote-greek footnote-han footnote-hebrew footnote-kana footnote)
    requires (mail-lib xemacs-base)
    type regular
@@ -1895,19 +1939,19 @@
 (package-get-update-base-entry (quote
 (net-utils
   (standards-version 1.1
-   version "1.24"
-   author-version "21.5b4"
-   date "2002-02-23"
-   build-date "2002-02-23"
+   version "1.27"
+   author-version "21.5b6"
+   date "2002-06-27"
+   build-date "2002-06-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority low
    category "standard"
    dump nil
    description "Miscellaneous Networking Utilities."
-   filename "net-utils-1.24-pkg.tar.gz"
-   md5sum "316b8f852ea625d89535b75028de1c1c"
-   size 119981
+   filename "net-utils-1.27-pkg.tar.gz"
+   md5sum "45563ca39defd1328c9dabd933d9a0f5"
+   size 120333
    provides (ilisp-browse-cltl2 xemacsbug feedmail metamail net-utils rcompile shadowfile webjump webster-www)
    requires (w3 efs mail-lib xemacs-base)
    type single
@@ -1917,19 +1961,19 @@
 (package-get-update-base-entry (quote
 (w3
   (standards-version 1.1
-   version "1.22"
+   version "1.25"
    author-version "4.0pre46"
-   date "2002-03-25"
-   build-date "2002-03-26"
+   date "2002-06-27"
+   build-date "2002-06-27"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority high
    category "standard"
    dump nil
    description "A Web browser."
-   filename "w3-1.22-pkg.tar.gz"
-   md5sum "1ac52ca40fd12b250e5a639f6549f652"
-   size 689366
+   filename "w3-1.25-pkg.tar.gz"
+   md5sum "5eef9e6136c651a922d5cc341c8c7b56"
+   size 689340
    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
@@ -1939,19 +1983,19 @@
 (package-get-update-base-entry (quote
 (vm
   (standards-version 1.1
-   version "7.03"
-   author-version "7.03"
-   date "2002-03-25"
-   build-date "2002-03-26"
+   version "7.07"
+   author-version "7.07"
+   date "2002-06-08"
+   build-date "2002-06-08"
    maintainer "Kyle Jones <kyle_jones@wonderworks.com>"
    distribution xemacs
    priority medium
    category "standard"
    dump nil
    description "An Emacs mailer."
-   filename "vm-7.03-pkg.tar.gz"
-   md5sum "ad490c8dacf885a28f897d93382d250b"
-   size 714118
+   filename "vm-7.07-pkg.tar.gz"
+   md5sum "ab2c67c7cda2fe8739a1fef49cfc0fc5"
+   size 718569
    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
@@ -2005,19 +2049,19 @@
 (package-get-update-base-entry (quote
 (xemacs-devel
   (standards-version 1.1
-   version "1.43"
-   author-version "21.5b4"
-   date "2002-03-04"
-   build-date "2002-03-06"
+   version "1.47"
+   author-version "21.5b6"
+   date "2002-07-14"
+   build-date "2002-07-14"
    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.43-pkg.tar.gz"
-   md5sum "ddbfe9135401490d5f3c2d8fd4f5ff24"
-   size 179426
+   filename "xemacs-devel-1.47-pkg.tar.gz"
+   md5sum "0386b19a469f684dd97e67fe5ce15a99"
+   size 228197
    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
@@ -2115,19 +2159,19 @@
 (package-get-update-base-entry (quote
 (apel
   (standards-version 1.1
-   version "1.21"
+   version "1.24"
    author-version "10.2"
-   date "2002-03-25"
-   build-date "2002-03-25"
+   date "2002-07-14"
+   build-date "2002-07-15"
    maintainer "XEmacs Development Team <xemacs-beta@xemacs.org>"
    distribution xemacs
    priority high
    category "standard"
    dump nil
    description "A Portable Emacs Library.  Used by XEmacs MIME support."
-   filename "apel-1.21-pkg.tar.gz"
-   md5sum "cf0e8f72176963be1a0c0a55d70dae82"
-   size 107681
+   filename "apel-1.24-pkg.tar.gz"
+   md5sum "107adb4ad0190fbd20beccff9c4e9acf"
+   size 108059
    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
@@ -2137,20 +2181,20 @@
 (package-get-update-base-entry (quote
 (efs
   (standards-version 1.0
-   version "1.28"
-   author-version "1.20pre2"
-   date "2002-03-25"
-   build-date "2002-03-25"
+   version "1.29"
+   author-version "1.20"
+   date "2002-04-24"
+   build-date "2002-04-24"
    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.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)
+   filename "efs-1.29-pkg.tar.gz"
+   md5sum "8c2c6c00cfbdc5f8d64ad54ddfb731df"
+   size 371905
+   provides (efs)
    requires (xemacs-base dired)
    type regular
 ))
@@ -2159,19 +2203,19 @@
 (package-get-update-base-entry (quote
 (dired
   (standards-version 1.0
-   version "1.11"
+   version "1.12"
    author-version "7.10"
-   date "2001-06-03"
-   build-date "2001-06-14"
+   date "2002-04-24"
+   build-date "2002-04-24"
    maintainer "Mike Sperber <sperber@informatik.uni-tuebingen.de>"
    distribution stable
    priority medium
    category "standard"
    dump nil
    description "Manage file systems."
-   filename "dired-1.11-pkg.tar.gz"
-   md5sum "0b44f0635a1d08189db83e8558cfe8e0"
-   size 193695
+   filename "dired-1.12-pkg.tar.gz"
+   md5sum "be9971fc8b39136a495a1a06110bc964"
+   size 195581
    provides (diff dired)
    requires (xemacs-base prog-modes)
    type regular
Index: etc/xemacs-icon.xpm
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/etc/xemacs-icon.xpm,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -u -r1.1.1.1 -r1.2
--- etc/xemacs-icon.xpm	1996/12/18 22:42:18	1.1.1.1
+++ etc/xemacs-icon.xpm	2002/07/14 14:23:43	1.2
@@ -1,5 +1,5 @@
 /* XPM */
-static char *Xemacs48_xpm[] = {
+static char *XEmacs48_xpm[] = {
 /* width height ncolors chars_per_pixel */
 "48 48 12 1",
 /* colors */
Index: lib-src/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/ChangeLog,v
retrieving revision 1.142
retrieving revision 1.145
diff -u -u -r1.142 -r1.145
--- lib-src/ChangeLog	2002/07/02 15:00:53	1.142
+++ lib-src/ChangeLog	2002/07/27 03:52:50	1.145
@@ -1,3 +1,28 @@
+2002-07-27  Steve Youngs  <youngs@xemacs.org>
+
+	* XEmacs 21.5.8 "broccoli" is released.
+
+2002-07-15  Jerry James  <james@xemacs.org>
+
+	* make-docfile.c: Change whitespace and organization to reduce the
+	size of the diff against FSF Emacs sources and synch to Emacs 21.2.
+	Remove unused DO_REALLOC.
+	Mark XEmacs changes and additions more clearly.
+	Reintroduce previously deleted Emacs code inside #if 0 ... #endif.
+	* make-docfile.c (next_extra_elc): Replace goto with do-while.
+	* make-docfile.c (main): Put XEmacs-only args in one place.
+	* make-docfile.c (write_c_args): Change buff to buf to match
+	Emacs.  Replace pointer arithmetic with simpler array syntax.
+	* make-docfile.c (scan_c_file): Note that DEFSIMPLE and DEFPRED no
+	longer exist.  Correct the "name too long" test (off by one).
+	Die with message if a DEFUN has no docstring instead of hanging.
+	* make-docfile.c (scan_lisp_file): Introduce while loops used in
+	Emacs sources to skip consecutive blank lines.
+
+2002-07-14  Adrian Aichner  <adrian@xemacs.org>
+
+	* etags.c: It's XEmacs, not Xemacs.
+
 2002-07-02  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.7 "broccoflower" is released.
@@ -272,7 +297,7 @@
 2001-01-30  Francesco Potorti`  <pot@gnu.org>
 
 	* etags.c: [WIN32-NATIVE]: #undef MSDOS, #undef WINDOWSNT and
-	#define it for the sake of Xemacs.
+	#define it for the sake of XEmacs.
 	[WINDOWSNT]: #undef HAVE_NTGUI even if built without
 	HAVE_CONFIG_H.  This change only affects a standalone etags.
 	[WINDOWSNT]: #undef DOS_NT and #define it even if built with
Index: lib-src/etags.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/etags.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -u -r1.29 -r1.30
--- lib-src/etags.c	2002/03/13 08:51:58	1.29
+++ lib-src/etags.c	2002/07/14 14:23:46	1.30
@@ -73,7 +73,7 @@
 # define _GNU_SOURCE 1		/* enables some compiler checks on GNU */
 #endif
 
-/* WIN32_NATIVE is for Xemacs.
+/* WIN32_NATIVE is for XEmacs.
    MSDOS, WINDOWSNT, DOS_NT are for Emacs. */
 #ifdef WIN32_NATIVE
 # undef MSDOS
Index: lib-src/make-docfile.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lib-src/make-docfile.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -u -r1.11 -r1.12
--- lib-src/make-docfile.c	2002/05/28 08:44:26	1.11
+++ lib-src/make-docfile.c	2002/07/23 08:34:59	1.12
@@ -1,70 +1,74 @@
 /* Generate doc-string file for XEmacs from source files.
-   Copyright (C) 1985, 1986, 1992, 1993, 1994 Free Software Foundation, Inc.
+   Copyright (C) 1985, 86, 92, 93, 94, 97, 1999, 2000, 2001
+   Free Software Foundation, Inc.
    Copyright (C) 1995 Board of Trustees, University of Illinois.
    Copyright (C) 1998, 1999 J. Kean Johnston.
    Copyright (C) 2001, 2002 Ben Wing.
-   
-   This file is part of XEmacs.
-   
-   XEmacs is free software; you can redistribute it and/or modify it
-   under the terms of the GNU General Public License as published by the
-   Free Software Foundation; either version 2, or (at your option) any
-   later version.
-   
-   XEmacs is distributed in the hope that it will be useful, but WITHOUT
-   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-   for more details.
-   
-   You should have received a copy of the GNU General Public License
-   along with XEmacs; see the file COPYING.  If not, write to
-   the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-   Boston, MA 02111-1307, USA.  */
 
-/* Synched up with: FSF 19.30. */
+This file is part of XEmacs.
 
+XEmacs is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+XEmacs is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with XEmacs; see the file COPYING.  If not, write to
+the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+/* Synched up with: FSF 21.2. */
+
 /* The arguments given to this program are all the C and Lisp source files
-   of XEmacs.  .elc and .el and .c files are allowed.
-   A .o or .obj file can also be specified; the .c file it was made from is
-   used.  This helps the makefile pass the correct list of files.
-   
-   The results, which go to standard output or to a file
-   specified with -a or -o (-a to append, -o to start from nothing),
-   are entries containing function or variable names and their documentation.
-   Each entry starts with a ^_ character.
-   Then comes F for a function or V for a variable.
-   Then comes the function or variable name, terminated with a newline.
-   Then comes the documentation for that function or variable.
-   
-   Added 19.15/20.1:  `-i site-packages' allow installer to dump extra packages
-   without modifying Makefiles, etc.
+ of XEmacs.  .elc and .el and .c files are allowed.
+ A .o or .obj file can also be specified; the .c file it was made from is used.
+ This helps the makefile pass the correct list of files.
+
+ The results, which go to standard output or to a file
+ specified with -a or -o (-a to append, -o to start from nothing),
+ are entries containing function or variable names and their documentation.
+ Each entry starts with a ^_ character.
+ Then comes F for a function or V for a variable.
+ Then comes the function or variable name, terminated with a newline.
+ Then comes the documentation for that function or variable.
+
+ Added 19.15/20.1:  `-i site-packages' allow installer to dump extra packages
+ without modifying Makefiles, etc.
  */
 
 #include <config.h>
+#include <sysfile.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
 
-#include "../src/sysfile.h"
+/* XEmacs addition */
+#define C_IDENTIFIER_CHAR_P(c)			\
+ (('A' <= c && c <= 'Z') ||			\
+  ('a' <= c && c <= 'z') ||			\
+  ('0' <= c && c <= '9') ||			\
+  (c == '_'))
 
-/* From src/lisp.h */
-#define DO_REALLOC(basevar, sizevar, needed_size, type)	do {	\
-  size_t do_realloc_needed_size = (needed_size);		\
-  if ((sizevar) < do_realloc_needed_size)			\
-    {								\
-      if ((sizevar) < 32)					\
-	(sizevar) = 32;						\
-      while ((sizevar) < do_realloc_needed_size)		\
-	(sizevar) *= 2;						\
-      XREALLOC_ARRAY (basevar, type, (sizevar));		\
-    }								\
-} while (0)
+static int scan_file (const char *filename);
+static int read_c_string (FILE *, int, int);
+static void write_c_args (FILE *out, const char *func, char *buf, int minargs,
+			  int maxargs);
+static int scan_c_file (const char *filename, const char *mode);
+static void skip_white (FILE *);
+static void read_lisp_symbol (FILE *, char *);
+static int scan_lisp_file (const char *filename, const char *mode);
 
 /* Stdio stream for output to the DOC file.  */
 static FILE *outfile;
 
+/* XEmacs addition */
 enum
 {
   el_file,
@@ -72,25 +76,10 @@
   c_file
 } Current_file_type;
 
-static int scan_file (const char *filename);
-static int read_c_string (FILE *, int, int);
-static void write_c_args (FILE *out, const char *func, char *buf, int minargs,
-			  int maxargs);
-static int scan_c_file (const char *filename, const char *mode);
-static void skip_white (FILE *);
-static void read_lisp_symbol (FILE *, char *);
-static int scan_lisp_file (const char *filename, const char *mode);
-
-#define C_IDENTIFIER_CHAR_P(c) \
- (('A' <= c && c <= 'Z') || \
-  ('a' <= c && c <= 'z') || \
-  ('0' <= c && c <= '9') || \
-  (c == '_'))
-
 /* Name this program was invoked with.  */
 char *progname;
 
-/* Set to 1 if this was invoked by ellcc */
+/* XEmacs addition: set to 1 if this was invoked by ellcc */
 int ellcc = 0;
 
 /* Print error message.  `s1' is printf control string, `s2' is arg for it. */
@@ -123,6 +112,7 @@
   return result;
 }
 
+/* XEmacs addition */
 static char *
 next_extra_elc (char *extra_elcs)
 {
@@ -143,19 +133,18 @@
       fgets (line_buf, BUFSIZ, fp);
     }
 
- again:
-  if (!fgets (line_buf, BUFSIZ, fp))
-    {
-      fclose (fp);
-      fp = NULL;
-      return NULL;
-    }
-  line_buf[0] = '\0';
-  if (strlen (p) <= 2 || strlen (p) >= (BUFSIZ - 5))
+  do
     {
+      if (!fgets (line_buf, BUFSIZ, fp))
+	{
+	  fclose (fp);
+	  fp = NULL;
+	  return NULL;
+	}
+      line_buf[0] = '\0';
       /* reject too short or too long lines */
-      goto again;
-    }
+    } while (strlen (p) <= 2 || strlen (p) >= (BUFSIZ - 5));
+
   p[strlen (p) - 2] = '\0';
   strcat (p, ".elc");
 
@@ -169,7 +158,7 @@
   int i;
   int err_count = 0;
   int first_infile;
-  char *extra_elcs = NULL;
+  char *extra_elcs = NULL;	/* XEmacs addition */
 
   progname = argv[0];
 
@@ -193,18 +182,19 @@
       outfile = fopen (argv[i + 1], APPEND_BINARY);
       i += 2;
     }
-  if (argc > i + 1 && !strcmp (argv[i], "-E"))
-    {
-      outfile = fopen (argv[i + 1], APPEND_BINARY);
-      i += 2;
-      ellcc = 1;
-    }
   if (argc > i + 1 && !strcmp (argv[i], "-d"))
     {
       chdir (argv[i + 1]);
       i += 2;
     }
 
+  /* Additional command line arguments for XEmacs */
+  if (argc > i + 1 && !strcmp (argv[i], "-E"))
+    {
+      outfile = fopen (argv[i + 1], APPEND_BINARY);
+      i += 2;
+      ellcc = 1;
+    }
   if (argc > (i + 1) && !strcmp (argv[i], "-i"))
     {
       extra_elcs = argv[i + 1];
@@ -214,13 +204,15 @@
   if (outfile == 0)
     fatal ("No output file specified", "");
 
+  /* XEmacs addition */
   if (ellcc)
     fprintf (outfile, "{\n");
 
   first_infile = i;
-
   for (; i < argc; i++)
     {
+      /* XEmacs addition: the "if" clause is new; the "else" clause is the
+	 original FSF Emacs code */
       if (argv[i][0] == '@')
 	{
 	  /* Allow a file containing files to process, for use w/MS Windows
@@ -240,17 +232,16 @@
       else
 	{
 	  int j;
-
 	  /* Don't process one file twice.  */
 	  for (j = first_infile; j < i; j++)
 	    if (! strcmp (argv[i], argv[j]))
 	      break;
 	  if (j == i)
-	    /* err_count seems to be {mis,un}used */
 	    err_count += scan_file (argv[i]);
 	}
     }
 
+  /* XEmacs addition */
   if (extra_elcs)
     {
       char *p;
@@ -262,6 +253,8 @@
   putc ('\n', outfile);
   if (ellcc)
     fprintf (outfile, "}\n\n");
+  /* End XEmacs addition */
+
 #ifndef VMS
   exit (err_count > 0);
 #endif /* VMS */
@@ -275,6 +268,8 @@
 scan_file (const char *filename)
 {
   int len = strlen (filename);
+
+  /* XEmacs change: test ellcc and set Current_file_type in each case */
   if (ellcc == 0 && len > 4 && !strcmp (filename + len - 4, ".elc"))
     {
       Current_file_type = elc_file;
@@ -291,7 +286,8 @@
       return scan_c_file (filename, READ_TEXT);
     }
 }
-
+
+/* XEmacs addition: ISO 2022 handling */
 static int
 getc_skipping_iso2022 (FILE *file)
 {
@@ -380,7 +376,7 @@
 char buf[128];
 
 /* Skip a C string from INFILE,
-   and return the character that follows the closing ".
+ and return the character that follows the closing ".
  If printflag is positive, output string contents to outfile.
  If it is negative, store contents in buf.
  Convert escape sequences \n and \t to newline and tab;
@@ -392,13 +388,14 @@
 {
   register int prevc = 0, c = 0;
   char *p = buf;
-  int start = -1;
+  int start = -1;	/* XEmacs addition */
 
   MDGET;
   while (c != EOF)
     {
       while ((c_docstring || c != '"' || non_ascii_p) && c != EOF)
 	{
+	  /* XEmacs addition: the first two "if" clauses are new */
 	  if (c == '*' && !non_ascii_p)
 	    {
 	      int cc = getc (infile);
@@ -432,6 +429,7 @@
 	      else if (printflag < 0)
 		*p++ = '\n';
 	    }
+	  /* End XEmacs addition */
 
 	  if (c == '\\' && !non_ascii_p)
 	    {
@@ -447,6 +445,9 @@
 	      if (c == 't')
 		c = '\t';
 	    }
+
+	  /* XEmacs change: the "if" clause is new; the "else" clause is
+	     mostly the original FSF Emacs code */
 	  if (c == '\n')
 	    start = 1;
 	  else
@@ -463,7 +464,7 @@
 	    }
 	  MDGET;
 	}
-      /* look for continuation of string */
+      /* XEmacs change: look for continuation of string */
       if (Current_file_type == c_file)
 	{
 	  do
@@ -483,10 +484,10 @@
 	}
       MDGET;
     }
-  
+
   if (printflag < 0)
     *p = 0;
-  
+
   return c;
 }
 
@@ -494,8 +495,7 @@
    MINARGS and MAXARGS are the minimum and maximum number of arguments.  */
 
 static void
-write_c_args (FILE *out, const char *func, char *buff, int minargs,
-	      int maxargs)
+write_c_args (FILE *out, const char *func, char *buf, int minargs, int maxargs)
 {
   register char *p;
   int in_ident = 0;
@@ -514,20 +514,20 @@
   fprintf (out, "arguments: (");
 #endif
 
-  if (*buff == '(')
-    ++buff;
+  if (*buf == '(')
+    ++buf;
 
-  for (p = buff; *p; p++)
+  for (p = buf; *p; p++)
     {
       char c = *p;
       int ident_start = 0;
 
-      /* Add support for ANSI prototypes. Hop over
+      /* XEmacs addition: add support for ANSI prototypes.  Hop over
 	 "Lisp_Object" string (the only C type allowed in DEFUNs) */
       static char lo[] = "Lisp_Object";
       if ((C_IDENTIFIER_CHAR_P (c) != in_ident) && !in_ident &&
 	  (strncmp (p, lo, sizeof (lo) - 1) == 0) &&
-	  isspace ((unsigned char) (* (p + sizeof (lo) - 1))))
+	  isspace ((unsigned char) p[sizeof (lo) - 1]))
 	{
 	  p += (sizeof (lo) - 1);
 	  while (isspace ((unsigned char) (*p)))
@@ -559,11 +559,29 @@
 	}
 
       /* Print the C argument list as it would appear in lisp:
-	 print underscores as hyphens, and print commas as spaces.
-	 Collapse adjacent spaces into one. */
-      if (c == '_') c = '-';
-      if (c == ',') c = ' ';
+	 print underscores as hyphens, and print commas and newlines
+	 as spaces.  Collapse adjacent spaces into one.  */
+      if (c == '_')
+	c = '-';
+      else if (c == ',' || c == '\n')
+	c = ' ';
 
+#if 0
+      /* In C code, `default' is a reserved word, so we spell it
+	 `defalt'; unmangle that here.  */
+      if (ident_start
+	  && strncmp (p, "defalt", 6) == 0
+	  && ! (('A' <= p[6] && p[6] <= 'Z')
+		|| ('a' <= p[6] && p[6] <= 'z')
+		|| ('0' <= p[6] && p[6] <= '9')
+		|| p[6] == '_'))
+	{
+	  fprintf (out, "DEFAULT");
+	  p += 5;
+	  in_ident = 0;
+	  just_spaced = 0;
+	}
+#endif
       /* If the C argument name ends with `_', change it to ' ',
 	 to allow use of C reserved words or global symbols as Lisp args. */
       if (c == '-' && ! C_IDENTIFIER_CHAR_P (p[1]))
@@ -571,7 +589,7 @@
 	  in_ident = 0;
 	  just_spaced = 0;
 	}
-      else if (c != ' ' || ! just_spaced)
+      else if (c != ' ' || !just_spaced)
 	{
 	  if (c >= 'a' && c <= 'z')
 	    /* Upcase the letter.  */
@@ -584,14 +602,16 @@
       need_space = 0;
 #endif
     }
+  /* XEmacs addition */
   if (!ellcc)
-    putc ('\n', out);		/* XEmacs addition */
+    putc ('\n', out);
 }
 
 /* Read through a c file.  If a .o or .obj file is named,
    the corresponding .c file is read instead.
    Looks for DEFUN constructs such as are defined in ../src/lisp.h.
-   Accepts any word starting DEF... so it finds DEFSIMPLE and DEFPRED.  */
+   Accepts any word starting DEF... so it finds DEFSIMPLE and DEFPRED ...
+   which don't exist anymore! */
 
 static int
 scan_c_file (const char *filename, const char *mode)
@@ -606,14 +626,15 @@
   int l = strlen (filename);
   char f[PATH_MAX];
 
-  if (l > (int) sizeof (f))
+  /* XEmacs change: different method for checking filename extension */
+  if (l > PATH_MAX - 1)
     {
 #ifdef ENAMETOOLONG
       errno = ENAMETOOLONG;
 #else
       errno = EINVAL;
 #endif
-      return (0);
+      return 0;
     }
 
   strcpy (f, filename);
@@ -630,6 +651,11 @@
       return 0;
     }
 
+#if 0
+  /* Reset extension to be able to detect duplicate files. */
+  filename[strlen (filename) - 1] = extension;
+#endif
+
   c = '\n';
   while (!feof (infile))
     {
@@ -685,7 +711,7 @@
 	  c = getc (infile);
 	  defunflag = (c == 'U');
 	  defvarflag = 0;
-	  c = getc (infile);
+	  c = getc (infile);	/* XEmacs addition */
 	}
       else continue;
 
@@ -707,7 +733,7 @@
 	commas = 2;
       else if (defvarflag)
 	commas = 1;
-      else			/* For DEFSIMPLE and DEFPRED */
+      else  /* For DEFSIMPLE and DEFPRED ... which now don't exist! */
 	commas = 2;
 
       while (commas)
@@ -719,14 +745,13 @@
 		{
 		  do
 		    c = getc (infile);
-		  while (c == ' ' || c == '\n' || c == '\t')
-		    ;
+		  while (c == ' ' || c == '\n' || c == '\t');
 		  if (c < 0)
 		    goto eof;
 		  ungetc (c, infile);
 		  if (commas == 2) /* pick up minargs */
 		    fscanf (infile, "%d", &minargs);
-		  else		/* pick up maxargs */
+		  else /* pick up maxargs */
 		    if (c == 'M' || c == 'U') /* MANY || UNEVALLED */
 		      maxargs = -1;
 		    else
@@ -741,12 +766,15 @@
 	c = getc (infile);
       if (c == '"')
 	c = read_c_string (infile, 0, 0);
+      /* XEmacs change */
       if (defunflag | defvarflag)
 	{
 	  while (c != '/')
 	    {
 	      if (c < 0)
 		goto eof;
+	      if (defunflag && c == '(')
+		fatal ("Missing doc string for DEFUN %s\n", buf);
 	      c = getc (infile);
 	    }
 	  c = getc (infile);
@@ -763,13 +791,17 @@
 	    }
 	  c = getc (infile);
 	}
+      /* End XEmacs change */
       while (c == ' ' || c == '\n' || c == '\t')
 	c = getc (infile);
+      /* XEmacs addition */
       if (defunflag | defvarflag)
 	ungetc (c, infile);
+      /* End XEmacs addition */
 
       if (defunflag || defvarflag || c == '"')
 	{
+	  /* XEmacs change: the original code is in the "else" clause */
 	  if (ellcc)
 	    fprintf (outfile, "  CDOC%s(\"%s\", \"\\\n",
 		     defvarflag ? "SYM" : "SUBR", buf);
@@ -779,7 +811,7 @@
 	      putc (defvarflag ? 'V' : 'F', outfile);
 	      fprintf (outfile, "%s\n", buf);
 	    }
-	  c = read_c_string (infile, 1, (defunflag || defvarflag));
+	  c = read_c_string (infile, 1, defunflag || defvarflag);
 
 	  /* If this is a defun, find the arguments and print them.  If
 	     this function takes MANY or UNEVALLED args, then the C source
@@ -830,29 +862,34 @@
 }
 
 /* Read a file of Lisp code, compiled or interpreted.
-   Looks for
-   (defun NAME ARGS DOCSTRING ...)
-   (defmacro NAME ARGS DOCSTRING ...)
-   (autoload (quote NAME) FILE DOCSTRING ...)
-   (defvar NAME VALUE DOCSTRING)
-   (defconst NAME VALUE DOCSTRING)
-   (fset (quote NAME) (make-byte-code ... DOCSTRING ...))
-   (fset (quote NAME) #[... DOCSTRING ...])
-   (defalias (quote NAME) #[... DOCSTRING ...])
-   starting in column zero.
-   (quote NAME) may appear as 'NAME as well.
+ Looks for
+  (defun NAME ARGS DOCSTRING ...)
+  (defmacro NAME ARGS DOCSTRING ...)
+  (defsubst NAME ARGS DOCSTRING ...)
+  (autoload (quote NAME) FILE DOCSTRING ...)
+  (defvar NAME VALUE DOCSTRING)
+  (defconst NAME VALUE DOCSTRING)
+  (fset (quote NAME) (make-byte-code ... DOCSTRING ...))
+  (fset (quote NAME) #[... DOCSTRING ...])
+  (defalias (quote NAME) #[... DOCSTRING ...])
+  (custom-declare-variable (quote NAME) VALUE DOCSTRING ...)
+ starting in column zero.
+ (quote NAME) may appear as 'NAME as well.
 
  We also look for #@LENGTH CONTENTS^_ at the beginning of the line.
  When we find that, we save it for the following defining-form,
  and we use that instead of reading a doc string within that defining-form.
 
- For defun, defmacro, and autoload, we know how to skip over the arglist.
- For defvar, defconst, and fset we skip to the docstring with a kludgy
+ For defvar, defconst, and fset we skip to the docstring with a kludgy 
  formatting convention: all docstrings must appear on the same line as the
- initial open-paren (the one in column zero) and must contain a backslash
- and a double-quote immediately after the initial double-quote.  No newlines
+ initial open-paren (the one in column zero) and must contain a backslash 
+ and a newline immediately after the initial double-quote.  No newlines
  must appear between the beginning of the form and the first double-quote.
- The only source file that must follow this convention is loaddefs.el; aside
+ For defun, defmacro, and autoload, we know how to skip over the
+ arglist, but the doc string must still have a backslash and newline
+ immediately after the double quote. 
+ The only source files that must follow this convention are preloaded
+ uncompiled ones like loaddefs.el and bindings.el; aside
  from that, it is always the .elc file that we look at, and they are no
  problem because byte-compiler output follows this convention.
  The NAME and DOCSTRING are output.
@@ -909,7 +946,7 @@
   if (infile == NULL)
     {
       perror (filename);
-      return 0;			/* No error */
+      return 0;				/* No error */
     }
 
   c = '\n';
@@ -918,12 +955,15 @@
       char buffer[BUFSIZ];
       char type;
 
+      /* If not at end of line, skip till we get to one.  */
       if (c != '\n')
 	{
 	  c = getc_skipping_iso2022 (infile);
 	  continue;
 	}
-      c = getc_skipping_iso2022 (infile);
+      /* Skip the line break.  */
+      while (c == '\n')
+	c = getc_skipping_iso2022 (infile);
       /* Detect a dynamic doc string and save it for the next expression.  */
       if (c == '#')
 	{
@@ -956,14 +996,12 @@
 		 That is needed in the .elc file
 		 but it is redundant in DOC.  So get rid of it here.  */
 	      saved_string[length - 1] = 0;
-	      /* Skip the newline.  */
-	      c = getc_skipping_iso2022 (infile);
+	      /* Skip the line break.  */
+	      while (c == '\n')
+		c = getc_skipping_iso2022 (infile);
+	      /* Skip the following line.  */
 	      while (c != '\n')
-		{
-		  c = getc_skipping_iso2022 (infile);
-		  if (c < 0)
-		    continue;
-		}
+		c = getc_skipping_iso2022 (infile);
 	    }
 	  continue;
 	}
@@ -973,8 +1011,9 @@
 
       read_lisp_symbol (infile, buffer);
 
-      if (! strcmp (buffer, "defun") ||
-	  ! strcmp (buffer, "defmacro"))
+      if (! strcmp (buffer, "defun")
+	  || ! strcmp (buffer, "defmacro")
+	  || ! strcmp (buffer, "defsubst"))
 	{
 	  type = 'F';
 	  read_lisp_symbol (infile, buffer);
@@ -982,7 +1021,7 @@
 	  /* Skip the arguments: either "nil" or a list in parens */
 
 	  c = getc_skipping_iso2022 (infile);
-	  if (c == 'n')		/* nil */
+	  if (c == 'n') /* nil */
 	    {
 	      if ((c = getc_skipping_iso2022 (infile)) != 'i' ||
 		  (c = getc_skipping_iso2022 (infile)) != 'l')
@@ -1009,7 +1048,7 @@
 
 	  /* If the next three characters aren't `dquote bslash newline'
 	     then we're not reading a docstring.
-	     */
+	   */
 	  if ((c = getc_skipping_iso2022 (infile)) != '"' ||
 	      (c = getc_skipping_iso2022 (infile)) != '\\' ||
 	      (c = getc_skipping_iso2022 (infile)) != '\n')
@@ -1022,8 +1061,8 @@
 	    }
 	}
 
-      else if (! strcmp (buffer, "defvar") ||
-	       ! strcmp (buffer, "defconst"))
+      else if (! strcmp (buffer, "defvar")
+	       || ! strcmp (buffer, "defconst"))
 	{
 	  char c1 = 0, c2 = 0;
 	  type = 'V';
@@ -1032,15 +1071,73 @@
 	  if (saved_string == 0)
 	    {
 
-	      /* Skip until the first newline; remember the two previous
-                 chars. */
+	      /* Skip until the end of line; remember two previous chars.  */
 	      while (c != '\n' && c >= 0)
 		{
 		  c2 = c1;
 		  c1 = c;
 		  c = getc_skipping_iso2022 (infile);
 		}
+	  
+	      /* If two previous characters were " and \,
+		 this is a doc string.  Otherwise, there is none.  */
+	      if (c2 != '"' || c1 != '\\')
+		{
+#ifdef DEBUG
+		  fprintf (stderr, "## non-docstring in %s (%s)\n",
+			   buffer, filename);
+#endif
+		  continue;
+		}
+	    }
+	}
+
+      else if (! strcmp (buffer, "custom-declare-variable"))
+	{
+	  char c1 = 0, c2 = 0;
+	  type = 'V';
 
+	  c = getc (infile);
+	  if (c == '\'')
+	    read_lisp_symbol (infile, buffer);
+	  else
+	    {
+	      if (c != '(')
+		{
+		  fprintf (stderr,
+			   "## unparsable name in custom-declare-variable in %s\n",
+			   filename);
+		  continue;
+		}
+	      read_lisp_symbol (infile, buffer);
+	      if (strcmp (buffer, "quote"))
+		{
+		  fprintf (stderr,
+			   "## unparsable name in custom-declare-variable in %s\n",
+			   filename);
+		  continue;
+		}
+	      read_lisp_symbol (infile, buffer);
+	      c = getc (infile);
+	      if (c != ')')
+		{
+		  fprintf (stderr,
+			   "## unparsable quoted name in custom-declare-variable in %s\n",
+			   filename);
+		  continue;
+		}
+	    }
+
+	  if (saved_string == 0)
+	    {
+	      /* Skip to end of line; remember the two previous chars.  */
+	      while (c != '\n' && c >= 0)
+		{
+		  c2 = c1;
+		  c1 = c;
+		  c = getc_skipping_iso2022 (infile);
+		}
+	  
 	      /* If two previous characters were " and \,
 		 this is a doc string.  Otherwise, there is none.  */
 	      if (c2 != '"' || c1 != '\\')
@@ -1090,15 +1187,14 @@
 
 	  if (saved_string == 0)
 	    {
-	      /* Skip until the first newline; remember the two previous
-                 chars. */
+	      /* Skip to end of line; remember the two previous chars.  */
 	      while (c != '\n' && c >= 0)
 		{
 		  c2 = c1;
 		  c1 = c;
 		  c = getc_skipping_iso2022 (infile);
 		}
-
+	  
 	      /* If two previous characters were " and \,
 		 this is a doc string.  Otherwise, there is none.  */
 	      if (c2 != '"' || c1 != '\\')
@@ -1171,8 +1267,8 @@
 	}
 
 #if 0				/* causes crash */
-      else if (! strcmp (buffer, "if") ||
-	       ! strcmp (buffer, "byte-code"))
+      else if (! strcmp (buffer, "if")
+	       || ! strcmp (buffer, "byte-code"))
 	;
 #endif
 
@@ -1188,9 +1284,10 @@
       /* At this point, we should either use the previous
 	 dynamic doc string in saved_string
 	 or gobble a doc string from the input file.
-	 
+
 	 In the latter case, the opening quote (and leading
 	 backslash-newline) have already been read.  */
+
       putc ('\n', outfile);	/* XEmacs addition */
       putc (037, outfile);
       putc (type, outfile);
Index: lisp/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.410
retrieving revision 1.422
diff -u -u -r1.410 -r1.422
--- lisp/ChangeLog	2002/07/02 15:00:54	1.410
+++ lisp/ChangeLog	2002/07/27 03:52:51	1.422
@@ -1,3 +1,113 @@
+2002-07-27  Steve Youngs  <youngs@xemacs.org>
+
+	* XEmacs 21.5.8 "broccoli" is released.
+
+2002-06-04  John H Palmieri  <palmieri@math.washington.edu>
+
+	* gutter-items.el (buffers-tab-omit-function): Default value is
+	now `buffers-tab-omit-some-buffers'.
+	* gutter-items.el (buffers-tab-omit-list): New customizable
+	variable, specifying which buffers to omit from buffers tab.
+	* gutter-items.el (buffers-tab-omit-some-buffers): New function
+	which uses buffers-tab-omit-list.
+
+2002-07-21  John Paul Wallington  <jpw@xemacs.org>
+
+	* process.el (substitute-env-vars): New function; sync with 
+	GNU Emacs 21.1.50.
+	(setenv): Add optional arg SUBSTITUTE-ENV-VARS; sync with
+	GNU Emacs 21.1.50.
+
+2002-07-17  Steve Youngs  <youngs@xemacs.org>
+
+	* package-get.el (package-get-update-base-from-buffer): Re-write
+	so it doesn't rely on the APEL package.
+
+2002-07-16  Didier Verna  <didier@xemacs.org>
+
+	* subr.el (replace-in-string): fix case fold bug introduced by
+	"2000-07-30  Ben Wing  <ben@xemacs.org>": honor the value of
+	case-fold-search in temporary buffers.
+
+2002-07-01  Mike Alexander  <mta@arbortext.com>
+
+	* code-process.el (call-process-region): Don't delete the process
+	output if start equals end
+
+2002-07-14  Mike Alexander  <mta@arbortext.com>
+
+	* process.el (shell-command-on-region): Don't delete the region
+	before giving it to call-process-region
+
+2002-07-14  Adrian Aichner  <adrian@xemacs.org>
+
+	* ChangeLog: It's XEmacs, not Xemacs.
+
+2001-07-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mule/kinsoku.el (kinsoku-bol-p): Work with ascii and non-ascii
+	mixed text.
+	(kinsoku-eol-p): Ditto.
+
+2001-07-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mule/kinsoku.el (kinsoku-ascii-eol, kinsoku-gb-bol,
+	kinsoku-gb-eol, kinsoku-big5-bol, kinsoku-big5-eol): Assign
+	characters as the category `s' or `e' correctly.
+
+2002-06-26  John Paul Wallington  <jpw@shootybangbang.com>
+
+	* derived.el (define-derived-mode): Put `derived-mode-parent'
+	property on child.
+	(derived-mode-p): New function; sync with GNU Emacs 21.
+
+2002-06-16  Andy Piper  <andy@xemacs.org>
+
+	* menubar-items.el (default-menubar): enable windows printing on
+	cygwin as well as native.
+
+2002-06-12  Andy Piper  <andy@xemacs.org>
+
+	* printer.el (generic-print-buffer): catch all errors so that the
+	print device can be cleared in all scenarios.
+	(Printer-clear-device): make sure clearing the printer allows it
+	to be used again immediately.
+	(generic-print-region): make sure the default printer face is
+	black-on-white.
+
+2002-04-23  Jerry James  <james@xemacs.org>
+
+	* window-xemacs.el (display-buffer-function): Change doc to
+	reflect new arg.
+	* window-xemacs.el (pre-display-buffer-function): Ditto.
+	* window-xemacs.el (display-buffer): New arg, shrink-to-fit.  If
+	non-nil, make the new window just big enough for its contents.
+	* frame.el (get-frame-for-buffer): Accept new arg, due to above.
+	* frame.el (show-temp-buffer-in-current-frame): Remove broken
+	temp-buffer-shrink-to-fit code.  Tell display-buffer instead.
+
+2002-06-06  Andy Piper  <andy@xemacs.org>
+
+	* gutter-items.el (buffers-tab-filter-functions): fix typo.
+
+2002-06-06  Andy Piper  <andy@xemacs.org>
+
+	* custom.el (custom-theme-set-variables): sync :set-after from FSF.
+	(defcustom): ditto.
+	(custom-handle-keyword): ditto.
+
+2002-06-04  John H Palmieri  <palmieri@math.washington.edu>
+
+	* gutter-items.el (buffers-tab-selection-function): fix
+	documentation, make obsolete.
+	* gutter-items.el (buffers-tab-filter-functions): change default
+	value (but not default behavior), reword documentation.
+
+2002-06-27  Olivier Galibert  <galibert@pobox.com>
+
+	* behavior.el (enabled-behavior-list): Sort the lists for the
+	assert comparison.
+
 2002-07-02  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.7 "broccoflower" is released.
@@ -39,7 +149,7 @@
 
 	* mule/mule-msw-init-late.el:
 	Specify charset->windows-registry conversion.
-	
+
 	* mule/mule-x-init.el:
 	* mule/mule-x-init.el (x-use-halfwidth-roman-font):
 	* mule/mule-x-init.el (init-mule-x-win):
@@ -51,7 +161,7 @@
 	* cl-macs.el (defmacro*):
 	* cl-macs.el (destructuring-bind):
 	Document better.
-	
+
 	* font-lock.el (lisp-font-lock-keywords-1):
 	Move Lisp function regexp to lisp-mode.el.
 
@@ -61,12 +171,12 @@
 	* lisp-mode.el (lisp-indent-function):
 	* lisp-mode.el (lisp-indent-quoteform): New.
 	Various indentation fixes:
-	
+
 	Handle flet functions better.
 	Handle argument lists in defuns and flets.
 	Handle quoted lists, e.g. property lists -- don't indent like
 	function calls.  Distinguish between lambdas and other lists.
-	
+
 	* lisp-mode.el (save-selected-device): Handle this form.
 
 	* faces.el:
@@ -156,12 +266,12 @@
 	written code).  This also means that we need to work with font
 	names at all times and not font instances, because a font instance
 	is essentially a truenamed font.
-	
+
 	-- Total rewrite of extremely junky code in msw-faces.el.  Work
 	with names as well as font instances, and return names; stop
 	truenaming when canonicalizing and frobbing; fix handling of the
 	combined style field, i.e. weight/slant (also fixed in font.el).
-	
+
 	-- Totally rewrite the frobbing functions in faces.el.  This time,
 	we frob all the instantiators rather than just computing a single
 	instance value and working backwards.  That way, e.g., `bold' will
@@ -193,10 +303,10 @@
 	-- Correct weight names in font.el.
 
 	-- Lots more font fixups in objects*.c.
-	
+
 	* Printer.el (generic-print-region):
 	Warning fix.
-	
+
 	* specifier.el:
 	* specifier.el (map-specifier):
 	* specifier.el (modify-specifier-instances):
@@ -218,7 +328,7 @@
 	* subr.el (argument-in-range-p): New.
 	* subr.el (check-argument-range): New.
 	New functions.
-	
+
 
 2002-06-04  Andy Piper  <andy@xemacs.org>
 
@@ -287,7 +397,7 @@
 2001-11-30  Jan Vroonhof  <jan@xemacs.org>
 
 	* font.el (font-window-system-mappings): Add mapping for Gtk
-	(assume identical to X)	
+	(assume identical to X)
 
 2001-11-30  Jan Vroonhof  <jan@xemacs.org>
 
@@ -369,7 +479,7 @@
 	misunderstood the basic point of this function, which is work in
 	*columns* not chars.  i dumped ours and copied the version from
 	FSF 21.1.  Also added truncate-string-with-continuation-dots,
-	since this idiom is used often.  
+	since this idiom is used often.
 
 2002-04-07  William M. Perry  <wmperry@gnu.org>
 
@@ -414,7 +524,7 @@
 	* code-init.el (coding-system-variable-default-value):
 	Don't use CRLF conversion by default on process output.  CMD.EXE and
 	friends work both ways but Cygwin programs don't like the CRs.
-	
+
 	* code-process.el:
 	* code-process.el (process-coding-system-alist):
 	* code-process.el (call-process):
@@ -447,7 +557,7 @@
 
 	open-multicast-group now does similar coding-system frobbing to
 	open-network-stream.
-	
+
 	* dumped-lisp.el (preloaded-file-list):
 	* faces.el (init-global-faces):
 	* msw-faces.el (mswindows-init-global-faces): New.
@@ -467,7 +577,7 @@
 	* files.el (Recover-session-files-from-auto-save-list-file): New.
 	Recover-session improvements: Only show session files where some
 	files can actually be recovered, and show in chronological order.
-	
+
 	* subr.el:
 	* subr.el (truncate-string-to-width):
 	* subr.el (BUG): New.
@@ -477,7 +587,7 @@
 	As promised to rms, the functionality in
 	truncate-string-with-continuation-dots has been merged into
 	truncate-string-to-width.  Change callers in menubar-items.el.
-	
+
 	* select.el:
 	* select.el (copy-primary-selection):
 	* select.el (kill-primary-selection):
@@ -501,7 +611,7 @@
 	Save customized values MUCH faster by keeping often used lambdas
 	in cache `custom-save-resets-mapper-alist' instead of building them
 	on the fly in `custom-save-resets'.
-	
+
 	* cus-edit.el (custom-save-pretty-print): New variable
 	(custom-save-variable-p): New function
 	(custom-save-variable-internal): New function
@@ -519,7 +629,7 @@
 	multiple-choice question, automatically choosing a dialog box or
 	minibuffer representation as necessary.  Generalized version of
 	yes-or-no-p, y-or-n-p.
-	
+
 	* files.el:
 	* files.el (recover-file-diff-program): New.
 	* files.el (recover-file-diff-arguments): New.
@@ -529,7 +639,7 @@
 	autosave. (Converts/deconverts escape-quoted as necessary.  No more
 	complaints from you, Mr. Turnbull!) One known problem: when a dialog
 	is used, it's modal, so you can't scroll the diff.  Will fix soon.
-	
+
 	* lisp-mode.el (lisp-fill-paragraph):
 	If we're filling a string, don't treat semicolon as a comment,
 	which would give very unfriendly results.
@@ -551,7 +661,7 @@
 
 	* menubar-items.el (default-menubar):
 	Add option corresponding to kill-word-into-kill-ring.
-	
+
 2002-05-09  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	This patch is based on Jerry James's patch and analysis.
@@ -571,7 +681,7 @@
 
 	* files.el (revert-buffer):
 	Andy's patch from 21.4.  Fix evil nasty problems with revert-buffer.
-	
+
 	* menubar-items.el (default-menubar):
 	Add Append to Register to Rectangles/Register menu.
 
@@ -731,7 +841,7 @@
 
 	* lisp-mode.el (construct-lisp-mode-menu):
 	Rearrange and add items for macro expanding.
-	
+
 	* menubar-items.el (menu-split-long-menu):
 	* menubar-items.el (menu-sort-menu):
 	Document connection between these two functions.
@@ -751,7 +861,7 @@
 	* mule/english.el (ascii-right-to-left):
 	Define this charset now, since a bug was fixed that formerly
 	prevented it.
-	
+
 	* mule/ethio-util.el (ethio-fidel-to-java-buffer):
 	* mule/ethio-util.el (ethio-java-to-fidel-buffer):
 	Fix compile errors involving Unicode `characters', which should be
@@ -788,7 +898,7 @@
 	down.  Extend mouse-track{,adjust,insert,delete-and-insert} this
 	way.  Move mouse-track-do-rectangle to meta-button2; not nearly so
 	useful (and doesn't really work correctly currently).
-	
+
 	* auto-save.el:
 	* auto-save.el (make-auto-save-file-name):
 	* auto-save.el (recover-all-files):
@@ -829,7 +939,7 @@
 	catching all errors and displaying a warning, including a
 	backtrace showing where the error occurred.  Modify various files
 	to use this.
-	
+
 	Show all warnings in the echo area (in a format convenient for
 	this) as well as the Warnings buffer.  Change the interpretation
 	of display-warning-minimum-level so that warnings below this level
@@ -843,13 +953,13 @@
 	various files consistent with the new definitions.
 
 	Mark all warnings with extents.
- 	
+
 	* startup.el (load-init-file):
 	Modify so that a backtrace is seen when an error occurs.
-	
+
 	* help.el (view-warnings): New.
 	New function for viewing warnings buffer.
-	
+
 	* help.el:
 	* help.el (print-recent-messages):
 	* simple.el:
@@ -857,12 +967,12 @@
 	Integrate show-message-log with view-lossage.  Add option to
 	view-lossage to view only the messages.  Clear message first so
 	latest message is seen.
-	
+
 	* menubar-items.el:
 	* menubar-items.el (default-menubar):
 	* menubar-items.el (bookmark-menu-filter): Removed.
 	Various rearrangements and fixes.
-	
+
 	* msw-faces.el:
 	* msw-faces.el (gui-element):
 	* msw-faces.el (mswindows-init-device-faces):
@@ -892,7 +1002,7 @@
 	* mule\mule-category.el (with-category-table): New.
 	Start implementing a category API compatible with FSF.  Not there yet.
 	We need improvements to char-tables.
-	
+
 	* mule\mule-charset.el:
 	* mule\mule-charset.el ((translation-table): New.
 	* mule\mule-charset.el (make-translation-table): New.
@@ -956,7 +1066,7 @@
 	* mule\lao.el (?):
 	* mule\lao.el (lao):
 	Convert stuff to XEmacs-style.
-	
+
 	* mule\thai-xtis.el:
 	* mule\thai-xtis.el (thai-xtis):
 	* mule\thai-xtis.el (?x): New.
@@ -977,7 +1087,7 @@
 	* dumped-lisp.el (preloaded-file-list):
 	Load the remaining languages -- lao, indian, devanagari, tibetan.
 	Load new file mule-msw-init-late.
-	
+
 	* unicode.el (load-unicode-tables):
 	* unicode.el (init-unicode-at-startup):
 	Load the new tables for Ethiopic, Vietnamese, and other languages
@@ -1047,14 +1157,14 @@
 	* autoload.el (generate-autoload-cookie):
 	* autoload.el (defun*):
 	Support defun*, defmacro*.
-	
+
 	* mule/mule-composite.el: New file, from FSF.
 	* mule/mule-composite-stub.el: New file, stubs for nonexistent
 	composition funs/vars.
 	* mule/viet-chars.el: Deleted, moved into vietnamese.el.
 	* dumped-lisp.el (preloaded-file-list):
 	Account for these changes.
-	
+
 	* font.el (mswindows-font-create-object):
 	* mouse.el (mouse-begin-drag-n-drop):
 	* msw-font-menu.el (mswindows-font-regexp):
@@ -1108,7 +1218,7 @@
 	* behavior-defs.el (func-menu):
 	* behavior-defs.el (filladapt):
 	fix errors with require.
-	
+
 	* bytecomp-runtime.el:
 	* bytecomp-runtime.el (with-boundp):
 	* bytecomp-runtime.el (if-boundp):
@@ -1127,7 +1237,7 @@
 
 	* cus-edit.el (custom-save-variables):
 	pretty-print values.
-	
+
 	* dump-paths.el:
 	* dump-paths.el (startup-setup-paths): New.
 	* find-paths.el:
@@ -1149,7 +1259,7 @@
 	* lisp-mode.el (while):
 	indent macrolet and labels correctly.  update comments about
 	lisp-indent-function.  flet already handled in cl.
-	
+
 	* apropos.el (apropos-safe-documentation):
 	* auto-save.el (make-auto-save-file-name):
 	* buff-menu.el (default-list-buffers-identification):
@@ -1219,7 +1329,7 @@
 	* toolbar.el (default-toolbar-position): but I tested it! typo fix.
 
 2002-03-05  Mats Lidell  <matsl@contactor.se>
- 
+
  	* help-nomule.el (tutorial-supported-languages): Added Swedish
  	tutorial. Sorted languages.
 
@@ -1313,15 +1423,15 @@
 
 2001-12-27  David A. Panariti  <davep@who.net>
 
-	* hyper-apropos.el (hyper-apropos-find-variable): 
+	* hyper-apropos.el (hyper-apropos-find-variable):
 	Added this function based on hyper-apropos-find-function.
 
-	* hyper-apropos.el (hyper-apropos-help-map): 
+	* hyper-apropos.el (hyper-apropos-help-map):
 	Added binding of "v" to hyper-apropos-find-variable.
 
 2001-12-27  John Paul Wallington  <jpw@shootybangbang.com>
 
-	* obsolete.el (interactive-form): new compatibility alias for 
+	* obsolete.el (interactive-form): new compatibility alias for
 	function-interactive.
 
 2001-12-26  Adrian Aichner  <adrian@xemacs.org>
@@ -1337,11 +1447,11 @@
 
 2001-12-18  John Paul Wallington  <jpw@shootybangbang.com>
 
-	* gnuserv.el: 
+	* gnuserv.el:
 	(gnuserv-mode-line-string): new customizable variable
 	(gnuserv-minor-mode): make variable buffer-local
 	* isearch-mode.el:
-	(isearch-mode-line-string): new customizable variable	
+	(isearch-mode-line-string): new customizable variable
 
 2001-12-16  Andy Piper  <andy@xemacs.org>
 
@@ -1359,13 +1469,13 @@
 
 	* gui.el (gui-button-face): Ditto.
 
-	* faces.el (text-cursor): 
-	(highlight): 
-	(zmacs-region): 
-	(list-mode-item-selected): 
-	(primary-selection): 
-	(secondary-selection): 
-	(isearch): 
+	* faces.el (text-cursor):
+	(highlight):
+	(zmacs-region):
+	(list-mode-item-selected):
+	(primary-selection):
+	(secondary-selection):
+	(isearch):
 	(isearch-secondary): Condense old window-system specific settings
 	into one specifier using the 'win default' tags.
 
@@ -1390,7 +1500,7 @@
 2001-11-30  Jan Vroonhof  <jan@xemacs.org>
 
 	* font.el (font-window-system-mappings): Add mapping for Gtk
-	(assume identical to X)	
+	(assume identical to X)
 
 2001-11-30  Jan Vroonhof  <jan@xemacs.org>
 
@@ -1427,7 +1537,7 @@
 
 2002-03-26  John Paul Wallington  <jpw@xemacs.org>
 
-	* obsolete.el (assq-delete-all): New compatibility alias for 
+	* obsolete.el (assq-delete-all): New compatibility alias for
 	remassq.
 
 2002-01-09  Simon Josefsson  <jas@extundo.com>
@@ -1450,7 +1560,7 @@
 	"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.
 
@@ -1474,7 +1584,7 @@
 
 2001-12-27  John Paul Wallington  <jpw@shootybangbang.com>
 
-	* obsolete.el (interactive-form): new compatibility alias for 
+	* obsolete.el (interactive-form): new compatibility alias for
 	function-interactive.
 
 2001-11-29  Adrian Aichner  <adrian@xemacs.org>
@@ -1520,7 +1630,7 @@
 
 	* dialog-gtk.el (popup-builtin-question-dialog):
 	Conform to API in gui.c.
-	
+
 2001-11-12  Andy Piper  <andy@xemacs.org>
 
 	* cus-edit.el (custom-save-face-internal): make sure we save
@@ -1562,8 +1672,8 @@
 
 2001-11-29  John Paul Wallington <jpw@shootybangbang.com>
 
-	* gtk-faces.el (gtk-init-device-faces): Replaced device locale 
-	argument in set-face-background/foreground forms with 
+	* gtk-faces.el (gtk-init-device-faces): Replaced device locale
+	argument in set-face-background/foreground forms with
 	'(default gtk) tag set to make the faces customizable, as
 	suggested by Jan Vroonhof.
 
@@ -1601,7 +1711,7 @@
 
 2001-12-04  John Paul Wallington  <jpw@shootybangbang.com>
 
-	* paragraphs.el (mark-paragraph): synched with FSF; 
+	* paragraphs.el (mark-paragraph): synched with FSF;
         added optional argument.
 
 2001-12-03  Didier Verna  <didier@xemacs.org>
@@ -11667,7 +11777,7 @@
 
 	* faces.el: Most face initialization moved out of
 	  init-other-random-faces to the top level so that the
-	  initialization happens before Xemacs is dumped.  Much
+	  initialization happens before XEmacs is dumped.  Much
 	  of the fascist "face-differs-from-default-p or FROB!"
 	  code has been retired in favor of letting the user do
 	  what they want to do.  Face initialization code changed
Index: lisp/behavior.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/behavior.el,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- lisp/behavior.el	2002/03/31 08:27:23	1.2
+++ lisp/behavior.el	2002/07/02 19:09:31	1.3
@@ -59,7 +59,8 @@
 		 (disable-behavior b t))
 	       (dolist (b enable-list)
 		 (enable-behavior b t))
-	       (assert (equal enabled-behavior-list val)))))
+	       (assert (equal (sort (copy-sequence enabled-behavior-list) 'string-lessp)
+			      (sort (copy-sequence val) 'string-lessp))))))
   :type '(repeat (symbol :tag "Behavior"))
   :group 'behaviors)
 
Index: lisp/code-process.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/code-process.el,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -u -r1.10 -r1.11
--- lisp/code-process.el	2002/05/31 07:14:52	1.10
+++ lisp/code-process.el	2002/07/14 23:09:40	1.11
@@ -175,7 +175,9 @@
 	(e (and deletep (copy-marker end))))
     (apply #'call-process program (list (current-buffer) start end)
 	   buffer displayp args)
-    (if deletep (delete-region s e))))
+    ; If start and end were the same originally, s will be beyond e now
+    (if (and deletep (> e s))
+	(delete-region s e))))
 
 (defun start-process (name buffer program &rest program-args)
   "Start a program in a subprocess.  Return the process object for it.
Index: lisp/custom.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/custom.el,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -u -r1.8 -r1.9
--- lisp/custom.el	2002/03/13 08:52:04	1.8
+++ lisp/custom.el	2002/07/06 05:48:15	1.9
@@ -194,6 +194,11 @@
 :require VALUE should be a feature symbol.  Each feature will be
         required after initialization, of the user have saved this
         option.
+:version VALUE should be a string specifying that the variable was
+        first introduced, or its default value was changed, in Emacs
+        version VERSION.
+:set-after VARIABLE specifies that SYMBOL should be set after VARIABLE when
+	both have been customized.
 
 Read the section about customization in the Emacs Lisp manual for more
 information."
@@ -330,17 +335,38 @@
   "For customization option SYMBOL, handle KEYWORD with VALUE.
 Fourth argument TYPE is the custom option type."
   (cond ((eq keyword :group)
-         (custom-add-to-group value symbol type))
-        ((eq keyword :version)
-         (custom-add-version symbol value))
-        ((eq keyword :link)
-         (custom-add-link symbol value))
-        ((eq keyword :load)
-         (custom-add-load symbol value))
-        ((eq keyword :tag)
-         (put symbol 'custom-tag value))
-        (t
-         (signal 'error (list "Unknown keyword" keyword)))))
+	 (custom-add-to-group value symbol type))
+	((eq keyword :version)
+	 (custom-add-version symbol value))
+	((eq keyword :link)
+	 (custom-add-link symbol value))
+	((eq keyword :load)
+	 (custom-add-load symbol value))
+	((eq keyword :tag)
+	 (put symbol 'custom-tag value))
+ 	((eq keyword :set-after)
+	 (custom-add-dependencies symbol value))
+	(t
+	 (signal 'error (list "Unknown keyword" keyword)))))
+
+(defun custom-add-dependencies (symbol value)
+  "To the custom option SYMBOL, add dependencies specified by VALUE.
+VALUE should be a list of symbols.  For each symbol in that list,
+this specifies that SYMBOL should be set after the specified symbol, if
+both appear in constructs like `custom-set-variables'."
+  (unless (listp value)
+    (error "Invalid custom dependency `%s'" value))
+  (let* ((deps (get symbol 'custom-dependencies))
+	 (new-deps deps))
+    (while value
+      (let ((dep (car value)))
+	(unless (symbolp dep)
+	  (error "Invalid custom dependency `%s'" dep))
+	(unless (memq dep new-deps)
+	  (setq new-deps (cons dep new-deps)))
+	(setq value (cdr value))))
+    (unless (eq deps new-deps)
+      (put symbol 'custom-dependencies new-deps))))
 
 (defun custom-add-option (symbol option)
   "To the variable SYMBOL add OPTION.
@@ -466,6 +492,27 @@
 
 See `custom-set-variables' for a description of the arguments ARGS."
   (custom-check-theme theme)
+  (setq args
+	(sort args
+	      (lambda (a1 a2)
+		(let* ((sym1 (car a1))
+		       (sym2 (car a2))
+		       (1-then-2 (memq sym1 (get sym2 'custom-dependencies)))
+		       (2-then-1 (memq sym2 (get sym1 'custom-dependencies))))
+		  (cond ((and 1-then-2 2-then-1)
+			 (error "Circular custom dependency between `%s' and `%s'"
+				sym1 sym2))
+			(1-then-2 t)
+			(2-then-1 nil)
+			;; Put symbols with :require last.  The macro
+			;; define-minor-mode generates a defcustom
+			;; with a :require and a :set, where the
+			;; setter function calls the mode function.
+			;; Putting symbols with :require last ensures
+			;; that the mode function will see other
+			;; customized values rather than default
+			;; values.
+			(t (nth 3 a2)))))))
   (let ((immediate (get theme 'theme-immediate)))
     (while args * etc/custom/example-themes/example-theme.el:
       (let ((entry (car args)))
Index: lisp/derived.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/derived.el,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- lisp/derived.el	2001/06/10 10:42:22	1.5
+++ lisp/derived.el	2002/07/08 08:21:52	1.6
@@ -148,6 +148,7 @@
 
   `(progn 
        (derived-mode-init-mode-variables (quote ,child))
+       (put (quote ,child) 'derived-mode-parent (quote ,parent))
        (defun ,child ()
 	 ,docstring
 	 (interactive)
@@ -186,6 +187,17 @@
   (while (get mode 'derived-mode-parent)
     (setq mode (get mode 'derived-mode-parent)))
   mode)
+
+;; PUBLIC: find if the current mode derives from another.
+;; from GNU Emacs 21 subr.el
+
+(defun derived-mode-p (&rest modes)
+  "Non-nil if the current major mode is derived from one of MODES.
+Uses the `derived-mode-parent' property of the symbol to trace backwards."
+  (let ((parent major-mode))
+    (while (and (not (memq parent modes))
+		(setq parent (get parent 'derived-mode-parent))))
+    parent))
 
 
 ;; Inline functions to construct various names from a mode name.
Index: lisp/frame.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/frame.el,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -u -r1.19 -r1.20
--- lisp/frame.el	2002/03/13 08:52:05	1.19
+++ lisp/frame.el	2002/07/06 05:48:15	1.20
@@ -1027,7 +1027,8 @@
 ;; The pre-display-buffer-function is called for effect, so this needs to
 ;; actually select the frame it wants.  Fdisplay_buffer() takes notice of
 ;; changes to the selected frame.
-(defun get-frame-for-buffer (buffer &optional not-this-window-p on-frame)
+(defun get-frame-for-buffer (buffer &optional not-this-window-p on-frame
+				    shrink-to-fit)
   "Select and return a frame in which to display BUFFER.
 Normally, the buffer will simply be displayed in the selected frame.
 But if the symbol naming the major-mode of the buffer has a 'frame-name
@@ -1106,20 +1107,13 @@
 that would otherwise be introduced by the `pre-display-buffer-function', which
 is normally set to `get-frame-for-buffer' (which see)."
   (let ((pre-display-buffer-function nil)) ; turn it off, whatever it is
-    (let ((window (display-buffer buffer)))
+    (let ((window (display-buffer buffer nil nil temp-buffer-shrink-to-fit)))
       (if (not (eq (last-nonminibuf-frame) (window-frame window)))
 	  ;; only the pre-display-buffer-function should ever do this.
 	  (error "display-buffer switched frames on its own!!"))
       (setq minibuffer-scroll-window window)
       (set-window-start window 1) ; obeys narrowing
       (set-window-point window 1)
-      (when temp-buffer-shrink-to-fit
-        (let* ((temp-window-size (round (* temp-buffer-max-height
-                                           (frame-height (window-frame window)))))
-               (size (window-displayed-height window)))
-          (when (< size temp-window-size)
-            (enlarge-window (- temp-window-size size) nil window)))
-        (shrink-window-if-larger-than-buffer window))
       nil)))
 
 (setq pre-display-buffer-function 'get-frame-for-buffer)
Index: lisp/gutter-items.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/gutter-items.el,v
retrieving revision 1.5
retrieving revision 1.7
diff -u -u -r1.5 -r1.7
--- lisp/gutter-items.el	2002/06/04 06:04:19	1.5
+++ lisp/gutter-items.el	2002/07/24 04:46:29	1.7
@@ -49,6 +49,255 @@
 (defvar gutter-buffers-tab-orientation 'top
   "Where the buffers tab currently is. Do not set this.")
 
+(defcustom buffers-tab-max-size 6
+  "*Maximum number of entries which may appear on the \"Buffers\" tab.
+If this is 10, then only the ten most-recently-selected buffers will be
+shown.  If this is nil, then all buffers will be shown.  Setting this to
+a large number or nil will slow down tab responsiveness."
+  :type '(choice (const :tag "Show all" nil)
+		 (integer 6))
+  :group 'buffers-tab)
+
+(defcustom buffers-tab-switch-to-buffer-function 'buffers-tab-switch-to-buffer
+  "*The function to call to select a buffer from the buffers tab.
+`switch-to-buffer' is a good choice, as is `pop-to-buffer'."
+  :type '(radio (function-item switch-to-buffer)
+		(function-item pop-to-buffer)
+		(function :tag "Other"))
+  :group 'buffers-tab)
+
+(defcustom buffers-tab-omit-function 'buffers-tab-omit-some-buffers
+  "*If non-nil, a function specifying the buffers to omit from the buffers tab.
+This is passed a buffer and should return non-nil if the buffer should be
+omitted.  The default value `buffers-tab-omit-some-buffers' omits
+buffers based on the value of `buffers-tab-omit-list'."
+  :type '(choice (const :tag "None" nil)
+  		 function)
+  :group 'buffers-tab)
+  
+(defcustom buffers-tab-omit-list '("\\` ")
+  "*A list of types of buffers to omit from the buffers tab.
+This is only used if `buffers-tab-omit-function' is set to
+`buffers-tab-omit-some-buffers', its default value."
+  :type '(checklist
+	  :greedy t
+	  :format "%{Omit List%}: \n%v"
+	  (const
+	   :tag "Invisible buffers (those whose names start with a space) "
+	   "\\` ")
+	  (const
+	   :tag "Help buffers "
+	   "\\`\\*Help")
+	  (const
+	   :tag "Customize buffers "
+	   "\\`\\*Customize")
+	  (const
+	   :tag "`special' buffers (those whose names start with *) "
+	   "\\`\\*")
+	  (const
+	   :tag "`special' buffers other than *scratch*"
+	   "\\`\\*\\([^s]\\|s[^c]\\|sc[^r]\\|scr[^a]\\|scra[^t]\\|scrat[^c]\\|scratc[^h]\\|scratch[^*]\\|scratch\\*.+\\)"))
+  :group 'buffers-tab)
+
+(defvar buffers-tab-selection-function 'select-buffers-tab-buffers-by-mode
+  "*If non-nil, a function specifying the buffers to select in the
+buffers tab.  This is passed two buffers and should return non-nil if
+the first buffer should be selected.  The default value
+`select-buffers-tab-buffers-by-mode' groups buffers by major mode and
+by `buffers-tab-grouping-regexp'.")
+
+(make-obsolete-variable buffers-tab-selection-function
+			"Set `buffers-tab-filter-functions' instead.")
+
+(defcustom buffers-tab-filter-functions (list 'select-buffers-tab-buffers-by-mode)
+  "*If non-nil, a list of functions specifying the buffers to include
+in the buffers tab, depending on the context.
+Each function in the list is passed two buffers, the buffer to
+potentially select and the context buffer, and should return non-nil
+if the first buffer should be selected.  The default value groups
+buffers by major mode and by `buffers-tab-grouping-regexp'."
+
+  :type '(repeat function)
+  :group 'buffers-tab)
+
+(defcustom buffers-tab-sort-function nil
+  "*If non-nil, a function specifying the buffers to select from the
+buffers tab.  This is passed the buffer list and returns the list in the
+order desired for the tab widget.  The default value `nil' leaves the
+list in `buffer-list' order (usual most-recently-selected-first)."
+
+  :type '(choice (const :tag "None" nil)
+		 function)
+  :group 'buffers-tab)
+
+(make-face 'buffers-tab "Face for displaying the buffers tab.")
+(set-face-parent 'buffers-tab 'modeline)
+
+(defcustom buffers-tab-face 'buffers-tab
+  "*Face to use for displaying the buffers tab."
+  :type 'face
+  :group 'buffers-tab)
+
+(defcustom buffers-tab-grouping-regexp 
+  '("^\\(gnus-\\|message-mode\\|mime/viewer-mode\\)"
+    "^\\(emacs-lisp-\\|lisp-\\)")
+  "*If non-nil, a list of regular expressions for buffer grouping.
+Each regular expression is applied to the current major-mode symbol
+name and mode-name, if it matches then any other buffers that match
+the same regular expression be added to the current group."
+  :type '(choice (const :tag "None" nil)
+		 sexp)
+  :group 'buffers-tab)
+
+(defcustom buffers-tab-format-buffer-line-function 'format-buffers-tab-line
+  "*The function to call to return a string to represent a buffer in the
+buffers tab.  The function is passed a buffer and should return a
+string.  The default value `format-buffers-tab-line' just returns the
+name of the buffer, optionally truncated to
+`buffers-tab-max-buffer-line-length'.  Also check out
+`slow-format-buffers-menu-line' which returns a whole bunch of info
+about a buffer."
+  :type 'function
+  :group 'buffers-tab)
+
+(defvar buffers-tab-default-buffer-line-length
+  (make-specifier-and-init 'generic '((global ((default) . 25))) t)
+  "*Maximum length of text which may appear in a \"Buffers\" tab.
+This is a specifier, use set-specifier to modify it.")
+
+(defcustom buffers-tab-max-buffer-line-length 
+  (specifier-instance buffers-tab-default-buffer-line-length)
+  "*Maximum length of text which may appear in a \"Buffers\" tab.
+Buffer names over this length will be truncated with elipses.
+If this is 0, then the full buffer name will be shown."
+  :type '(choice (const :tag "Show all" 0)
+		 (integer 25))
+  :group 'buffers-tab
+  :set #'(lambda (var val)
+	   (set-specifier buffers-tab-default-buffer-line-length val)
+	   (setq buffers-tab-max-buffer-line-length val)))
+
+(defun buffers-tab-switch-to-buffer (buffer)
+  "For use as a value for `buffers-tab-switch-to-buffer-function'."
+  (unless (eq (window-buffer) buffer)
+    ;; this used to add the norecord flag to both calls below.
+    ;; this is bogus because it is a pervasive assumption in XEmacs
+    ;; that the current buffer is at the front of the buffers list.
+    ;; for example, select an item and then do M-C-l
+    ;; (switch-to-other-buffer).  Things get way confused.
+    (if (> (length (windows-of-buffer buffer)) 0)
+	(select-window (car (windows-of-buffer buffer)))
+      (switch-to-buffer buffer))))
+
+(defun select-buffers-tab-buffers-by-mode (buffer-to-select buf1)
+  "For use as a value of `buffers-tab-selection-function'.
+This selects buffers by major mode `buffers-tab-grouping-regexp'."
+  (let ((mode1 (symbol-name (symbol-value-in-buffer 'major-mode buf1)))
+	(mode2 (symbol-name (symbol-value-in-buffer 'major-mode 
+						    buffer-to-select)))
+	(modenm1 (symbol-value-in-buffer 'mode-name buf1))
+	(modenm2 (symbol-value-in-buffer 'mode-name buffer-to-select)))
+    (cond ((or (eq mode1 mode2)
+	       (eq modenm1 modenm2)
+	       (and (string-match "^[^-]+-" mode1)
+		    (string-match
+		     (concat "^" (regexp-quote 
+				  (substring mode1 0 (match-end 0))))
+		     mode2))
+	       (and buffers-tab-grouping-regexp
+		    (find-if #'(lambda (x)
+				 (or
+				  (and (string-match x mode1)
+				       (string-match x mode2))
+				  (and (string-match x modenm1)
+				       (string-match x modenm2))))
+			     buffers-tab-grouping-regexp)))
+	   t)
+	  (t nil))))
+
+(defun format-buffers-tab-line (buffer)
+  "For use as a value of `buffers-tab-format-buffer-line-function'.
+This just returns the buffer's name, optionally truncated."
+  (let ((len (specifier-instance buffers-tab-default-buffer-line-length)))
+    (if (and (> len 0)
+	     (> (length (buffer-name buffer)) len))
+	(if (string-match ".*<.>$" (buffer-name buffer))
+	    (concat (substring (buffer-name buffer) 
+			       0 (- len 6)) "..."
+			       (substring (buffer-name buffer) -3))
+	  (concat (substring (buffer-name buffer)
+			     0 (- len 3)) "..."))
+      (buffer-name buffer))))
+
+(defsubst build-buffers-tab-internal (buffers)
+  (let ((selected t))
+    (mapcar
+     #'(lambda (buffer)
+	 (prog1
+	     (vector 
+	      (funcall buffers-tab-format-buffer-line-function
+		       buffer)
+	      (list buffers-tab-switch-to-buffer-function
+		    (buffer-name buffer))
+	      :selected selected)
+	   (when selected (setq selected nil))))
+     buffers)))
+
+;;; #### SJT would like this function to have a sort function list. I
+;;; don't see how this could work given that sorting is not
+;;; cumulative --andyp.
+(defun buffers-tab-items (&optional in-deletion frame force-selection)
+  "Return a list of tab instantiators based on the current buffers list.
+This function is used as the tab filter for the top-level buffers
+\"Buffers\" tab.  It dynamically creates a list of tab instantiators
+to use as the contents of the tab.  The contents and order of the list
+is controlled by `buffers-tab-filter-functions' which by default
+groups buffers according to major mode and removes invisible buffers.
+You can control how many buffers will be shown by setting
+`buffers-tab-max-size'.  You can control the text of the tab items by
+redefining the function `format-buffers-menu-line'."
+  (save-match-data
+    ;; NB it is too late if we run the omit function as part of the
+    ;; filter functions because we need to know which buffer is the
+    ;; context buffer before they get run.
+    (let* ((buffers (delete-if 
+		     buffers-tab-omit-function (buffer-list frame)))
+	   (first-buf (car buffers)))
+      ;; maybe force the selected window
+      (when (and force-selection
+		 (not in-deletion)
+		 (not (eq first-buf (window-buffer (selected-window frame)))))
+	(setq buffers (cons (window-buffer (selected-window frame))
+			    (delq first-buf buffers))))
+      ;; if we're in deletion ignore the current buffer
+      (when in-deletion 
+	(setq buffers (delq (current-buffer) buffers))
+	(setq first-buf (car buffers)))
+      ;; filter buffers
+      (when buffers-tab-filter-functions
+	(setq buffers
+	      (delete-if 
+	       #'null 
+	       (mapcar #'(lambda (buf)
+			   (let ((tmp-buf buf))
+			     (mapc #'(lambda (fun)
+				       (unless (funcall fun buf first-buf)
+					 (setq tmp-buf nil)))
+				   buffers-tab-filter-functions)
+			     tmp-buf))
+		       buffers))))
+      ;; maybe shorten list of buffers
+      (and (integerp buffers-tab-max-size)
+	   (> buffers-tab-max-size 1)
+	   (> (length buffers) buffers-tab-max-size)
+	   (setcdr (nthcdr (1- buffers-tab-max-size) buffers) nil))
+      ;; sort buffers in group (default is most-recently-selected)
+      (when buffers-tab-sort-function
+	(setq buffers (funcall buffers-tab-sort-function buffers)))
+      ;; convert list of buffers to list of structures used by tab widget
+      (setq buffers (build-buffers-tab-internal buffers))
+      buffers)))
+
 (defun add-tab-to-gutter ()
   "Put a tab control in the gutter area to hold the most recent buffers."
   (setq gutter-buffers-tab-orientation (default-gutter-position))
@@ -437,6 +686,13 @@
       (let ((str (apply 'format fmt args)))
 	(display-progress-feedback label str value)
 	str))))
+
+(defun buffers-tab-omit-some-buffers (buf)
+  "For use as a value of `buffers-tab-omit-function'.
+Omit buffers based on the value of `buffers-tab-omit-list', which
+see."
+  (let ((regexp (mapconcat 'concat buffers-tab-omit-list "\\|")))
+    (not (null (string-match regexp (buffer-name buf))))))
 
 (provide 'gutter-items)
 ;;; gutter-items.el ends here.
Index: lisp/menubar-items.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/menubar-items.el,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -u -r1.36 -r1.37
--- lisp/menubar-items.el	2002/05/23 11:46:10	1.36
+++ lisp/menubar-items.el	2002/07/06 05:48:15	1.37
@@ -277,7 +277,7 @@
       ["Save %_As..." write-file]
       ["Save So%_me Buffers" save-some-buffers]
       "-----"
-      ,@(if (eq system-type 'windows-nt)
+      ,@(if (valid-specifier-tag-p 'msprinter)
 	  '(["Page Set%_up..." generic-page-setup]))
       ["%_Print" generic-print-buffer
        :active (or (valid-specifier-tag-p 'msprinter)
@@ -286,7 +286,7 @@
        :suffix (if (region-active-p) "Selection..."
 		 (if put-buffer-names-in-file-menu (concat (buffer-name) "...")
 		   "..."))]
-      ,@(unless (eq system-type 'windows-nt)
+      ,@(unless (valid-specifier-tag-p 'msprinter)
 	  '(["Prett%_y-Print" ps-print-buffer-with-faces
 	     :active (fboundp 'ps-print-buffer-with-faces)
 	     :suffix (if put-buffer-names-in-file-menu (buffer-name) "")]))
Index: lisp/package-get.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/package-get.el,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -u -r1.52 -r1.53
--- lisp/package-get.el	2002/05/02 14:35:32	1.52
+++ lisp/package-get.el	2002/07/17 06:13:39	1.53
@@ -441,23 +441,29 @@
       (setq package-get-continue-update-base t)
       (if package-get-require-signed-base-updates 
 	  (if package-entries-are-signed
-	      (progn
-		(setq package-get-continue-update-base nil)
-		(autoload 'mc-setversion "mc-setversion")
-		(with-fboundp 'mc-setversion
-		  (if-boundp 'exec-suffix-list
-		      (or
-		       (cond ((locate-file "gpg" exec-path exec-suffix-list)
-			      (mc-setversion "gpg"))
-			     ((locate-file "pgpe" exec-path exec-suffix-list)
-			      (mc-setversion "5.0"))
-			     ((locate-file "pgp" exec-path exec-suffix-list)
-			      (mc-setversion "2.6")))
-		       (error "Can't find a suitable pgp executable"))
-		    (error 'unimplemented "`apel' package unavailable")))
-		(autoload 'mc-verify "mc-toplev")
-		(declare-fboundp (mc-verify))
-		(setq package-get-continue-update-base t))
+	      (if (featurep 'mailcrypt-autoloads)
+		  (progn
+		    (setq package-get-continue-update-base nil)
+		    (autoload 'mc-setversion "mc-setversion")
+		    (cond ((locate-file "gpg" exec-path
+					'("" ".btm" ".bat" ".cmd" ".exe" ".com")
+					'executable)
+			   (mc-setversion "gpg"))
+			  ((locate-file "pgpe" exec-path
+					'("" ".btm" ".bat" ".cmd" ".exe" ".com")
+					'executable)
+			   (mc-setversion "5.0"))
+			  ((locate-file "pgp" exec-path
+					'("" ".btm" ".bat" ".cmd" ".exe" ".com")
+					'executable)
+			   (mc-setversion "2.6"))
+			  (t
+			   (error 'search-failed 
+				  "Can't find a suitable PGP executable")))
+		    (autoload 'mc-verify "mc-toplev")
+		    (declare-fboundp (mc-verify))
+		    (setq package-get-continue-update-base t))
+		(error 'unimplemented "`mailcrypt' package unavailable"))
 	    (if (yes-or-no-p
 		 "Package Index is not PGP signed.  Continue anyway? ")
 		(setq package-get-continue-update-base t)
Index: lisp/printer.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/printer.el,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -u -r1.15 -r1.16
--- lisp/printer.el	2002/06/20 21:18:04	1.15
+++ lisp/printer.el	2002/07/06 05:48:15	1.16
@@ -76,6 +76,9 @@
 				   (make-device 'msprinter printer-name))))
 
 (defun Printer-clear-device ()
+  ;; relying on GC to delete the device is too error-prone since there
+  ;; only can be one anyway.
+  (and printer-current-device (delete-device printer-current-device))
   (setq printer-current-device nil))
 
 (defcustom printer-page-header '((face bold date) nil (face bold buffer-name))
@@ -256,29 +259,30 @@
 
 If BUFFER is nil or omitted, the current buffer is used."
   (interactive (list nil (not current-prefix-arg)))
-  (let* ((print-region (and (interactive-p) (region-active-p)))
-	 (start (if print-region (region-beginning) (point-min buffer)))
-	 (end (if print-region (region-end) (point-max buffer))))
-    (if (or (not (valid-specifier-tag-p 'msprinter))
-	    (not display-print-dialog))
-	(generic-print-region start end buffer)
-      (let* ((d (Printer-get-device))
-	     (props (condition-case err
-			(make-dialog-box 'print :device d
+  (condition-case err
+      (let* ((print-region (and (interactive-p) (region-active-p)))
+	     (start (if print-region (region-beginning) (point-min buffer)))
+	     (end (if print-region (region-end) (point-max buffer))))
+	(if (or (not (valid-specifier-tag-p 'msprinter))
+		(not display-print-dialog))
+	    (generic-print-region start end buffer)
+	  (let* ((d (Printer-get-device))
+		 (props (make-dialog-box 'print :device d
 					 :allow-selection print-region
 					 :selected-page-button
-					 (if print-region 'selection 'all))
-		      (error
-		       (Printer-clear-device)
-		       (signal (car err) (cdr err))))))
-	(and props
-	     (let ((really-print-region
-		    (eq (plist-get props 'selected-page-button) 'selection)))
-	       (generic-print-region (if really-print-region start
-				       (point-min buffer))
-				     (if really-print-region end
-				       (point-max buffer))
-				     buffer d props)))))))
+					 (if print-region 'selection 'all))))
+	    (and props
+		 (let ((really-print-region
+			(eq (plist-get props 'selected-page-button) 'selection)))
+		   (generic-print-region (if really-print-region start
+					   (point-min buffer))
+					 (if really-print-region end
+					   (point-max buffer))
+					 buffer d props))))))
+    (error
+     ;; Make sure we catch all errors thrown from the native code.
+     (Printer-clear-device)
+     (signal (car err) (cdr err)))))
 
 (defun generic-print-region (start end &optional buffer print-device props)
   "Print region using a printing method appropriate to the O.S. being run.
@@ -338,7 +342,9 @@
 					 minibuffer none
 					 modeline-shadow-thickness 0
 					 vertical-scrollbar-visible-p nil
-					 horizontal-scrollbar-visible-p nil))
+					 horizontal-scrollbar-visible-p nil
+					 [default foreground] "black"
+					 [default background] "white"))
 				d))
 		       (let* ((w (frame-root-window f))
 			      (vertdpi
@@ -358,7 +364,7 @@
 					     ))))
 			      header-window
 			      footer-window)
-
+			   
 			 (when printer-page-header
 			   (let ((window-min-height 2))
 			     (setq header-window w)
@@ -366,7 +372,7 @@
 			   (setq header-buffer
 				 (generate-new-buffer " *header*"))
 			   (set-window-buffer header-window header-buffer))
-
+			   
 			 (when printer-page-footer
 			   (let ((window-min-height 2))
 			     (setq footer-window
@@ -374,9 +380,9 @@
 			   (setq footer-buffer
 				 (generate-new-buffer " *footer*"))
 			   (set-window-buffer footer-window footer-buffer))
-
+			   
 			 (setf (Print-context-window context) w)
-
+			   
 			 (let ((last-end 0) ; bufpos at end of previous page
 			       reached-end ; t if we've reached the end of the
 					; text we're printing
Index: lisp/process.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/process.el,v
retrieving revision 1.15
retrieving revision 1.17
diff -u -u -r1.15 -r1.17
--- lisp/process.el	2002/06/03 12:23:56	1.15
+++ lisp/process.el	2002/07/23 08:35:05	1.17
@@ -436,7 +436,7 @@
 	      ;; then replace that region with the output.
 	      (progn (setq buffer-read-only nil)
 		     (delete-region (max start end) (point-max))
-		     (delete-region (point-min) (max start end))
+		     (delete-region (point-min) (min start end))
 		     (setq exit-status
 			   (call-process-region (point-min) (point-max)
 						shell-file-name t t nil
@@ -535,11 +535,40 @@
 ;; History list for VALUE argument to setenv.
 (defvar setenv-history nil)
 
-(defun setenv (variable &optional value unset)
+(defun substitute-env-vars (string)
+  "Substitute environment variables referred to in STRING.
+`$FOO' where FOO is an environment variable name means to substitute
+the value of that variable.  The variable name should be terminated
+with a character not a letter, digit or underscore; otherwise, enclose
+the entire variable name in braces.  Use `$$' to insert a single
+dollar sign."
+  (let ((start 0))
+    (while (string-match
+	    ;; XEmacs change - FSF use their rx macro to generate this regexp
+	    "\\(?:\\$\\(\\(?:[a-zA-Z0-9_]\\)+\\)\\)\\|\\(?:\\${\\(\\(?:.\\|\n\\)*?\\)}\\)\\|\\$\\$"
+	    string start)
+      (cond ((match-beginning 1)
+	     (let ((value (getenv (match-string 1 string))))
+	       (setq string (replace-match (or value "") t t string)
+		     start (+ (match-beginning 0) (length value)))))
+	    ((match-beginning 2)
+	     (let ((value (getenv (match-string 2 string))))
+	       (setq string (replace-match (or value "") t t string)
+		     start (+ (match-beginning 0) (length value)))))
+	    (t
+	     (setq string (replace-match "$" t t string)
+		   start (+ (match-beginning 0) 1)))))
+    string))
+
+(defun setenv (variable &optional value unset substitute-env-vars)
   "Set the value of the environment variable named VARIABLE to VALUE.
 VARIABLE should be a string.  VALUE is optional; if not provided or is
 `nil', the environment variable VARIABLE will be removed.  
 
+UNSET, if non-nil, means to remove VARIABLE from the environment.
+SUBSTITUTE-ENV-VARS, if non-nil, means to substitute environment
+variables in VALUE using `substitute-env-vars'.
+
 Interactively, a prefix argument means to unset the variable.
 Interactively, the current value (if any) of the variable
 appears at the front of the history list when you type in the new value.
@@ -553,7 +582,10 @@
        (list var (read-from-minibuffer (format "Set %s to value: " var)
 				       nil nil nil 'setenv-history
 				       (getenv var))))))
-  (if unset (setq value nil))
+  (if unset 
+      (setq value nil)
+    (if substitute-env-vars
+	(setq value (substitute-env-vars value))))
   (if (string-match "=" variable)
       (error "Environment variable name `%s' contains `='" variable)
     (let ((pattern (concat "\\`" (regexp-quote (concat variable "="))))
Index: lisp/subr.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/subr.el,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -u -r1.26 -r1.27
--- lisp/subr.el	2002/06/26 00:11:16	1.26
+++ lisp/subr.el	2002/07/16 08:18:36	1.27
@@ -193,27 +193,27 @@
 	  (null function))		;function is nil, then
       nil				;Do nothing.
     (flet ((hook-remove
-	    (function hook-value)
-	    (flet ((hook-test
-		    (fn hel)
-		    (or (equal fn hel)
-			(and (symbolp hel)
-			     (equal fn
-				    (get hel 'one-shot-hook-fun))))))
-	      (if (and (consp hook-value)
-		       (not (functionp hook-value)))
-		  (if (member* function hook-value :test 'hook-test)
-		      (setq hook-value
-			    (delete* function (copy-sequence hook-value)
-				     :test 'hook-test)))
-		(if (equal hook-value function)
-		    (setq hook-value nil)))
-	      hook-value)))
+	     (function hook-value)
+	     (flet ((hook-test
+		      (fn hel)
+		      (or (equal fn hel)
+			  (and (symbolp hel)
+			       (equal fn
+				      (get hel 'one-shot-hook-fun))))))
+	       (if (and (consp hook-value)
+		     (not (functionp hook-value)))
+		   (if (member* function hook-value :test 'hook-test)
+		     (setq hook-value
+			   (delete* function (copy-sequence hook-value)
+				    :test 'hook-test)))
+		 (if (equal hook-value function)
+		   (setq hook-value nil)))
+	       hook-value)))
       (if (or local
-	      ;; Detect the case where make-local-variable was used on a hook
-	      ;; and do what we used to do.
-	      (and (local-variable-p hook (current-buffer))
-		   (not (memq t (symbol-value hook)))))
+	    ;; Detect the case where make-local-variable was used on a hook
+	    ;; and do what we used to do.
+	    (and (local-variable-p hook (current-buffer))
+		 (not (memq t (symbol-value hook)))))
 	  (set hook (hook-remove function (symbol-value hook)))
 	(set-default hook (hook-remove function (default-value hook)))))))
 
@@ -401,18 +401,20 @@
   (check-argument-type 'stringp str)
   (check-argument-type 'stringp newtext)
   (if (> (length str) 50)
-      (with-temp-buffer
-	(insert str)
-	(goto-char 1)
+      (let ((cfs case-fold-search))
+	(with-temp-buffer
+	  (setq case-fold-search cfs)
+	  (insert str)
+	  (goto-char 1)
 	  (while (re-search-forward regexp nil t)
 	    (replace-match newtext t literal))
-	  (buffer-string))
-  (let ((start 0) newstr)
-    (while (string-match regexp str start)
-      (setq newstr (replace-match newtext t literal str)
-	    start (+ (match-end 0) (- (length newstr) (length str)))
-	    str newstr))
-    str)))
+	  (buffer-string)))
+    (let ((start 0) newstr)
+      (while (string-match regexp str start)
+	(setq newstr (replace-match newtext t literal str)
+	      start (+ (match-end 0) (- (length newstr) (length str)))
+	      str newstr))
+      str)))
 
 (defun split-string (string &optional pattern)
   "Return a list of substrings of STRING which are separated by PATTERN.
@@ -464,8 +466,8 @@
 The value returned is the value of the last form in BODY.
 See also `with-temp-buffer'."
   `(save-current-buffer
-    (set-buffer ,buffer)
-    ,@body))
+     (set-buffer ,buffer)
+     ,@body))
 
 (defmacro with-temp-file (filename &rest forms)
   "Create a new buffer, evaluate FORMS there, and write the buffer to FILENAME.
@@ -672,7 +674,7 @@
 	       ;; width.  the padding computed will get us exactly up to
 	       ;; the shorted width, which is right -- it just gets added
 	       ;; to the right of the ellipses.
-	     (setq end-column (- end-column (string-width ellipses)))))
+	       (setq end-column (- end-column (string-width ellipses)))))
 
 	;; find the index of END-COLUMN; bail out if end of string reached.
 	(condition-case nil
@@ -967,12 +969,12 @@
 `args-out-of-range' error if the returned value is out of range."
   (if (symbolp argument)
       `(if (not (argument-in-range-p ,argument ,min ,max))
-	(setq ,argument
-	      (args-out-of-range ,argument ,min ,max)))
+	   (setq ,argument
+		 (args-out-of-range ,argument ,min ,max)))
     (let ((newsym (gensym)))
       `(let ((,newsym ,argument))
-	(if (not (argument-in-range-p ,newsym ,min ,max))
-	    (signal-error 'args-out-of-range ,newsym ,min ,max))))))
+	 (if (not (argument-in-range-p ,newsym ,min ,max))
+	     (signal-error 'args-out-of-range ,newsym ,min ,max))))))
 
 (defun signal-error (error-symbol data)
   "Signal a non-continuable error.  Args are ERROR-SYMBOL, and associated DATA.
@@ -1158,11 +1160,12 @@
 (if (not (fboundp 'define-abbrev-table))
     (progn
       (setq abbrev-table-name-list '())
-      (fset 'define-abbrev-table (function (lambda (name defs)
-                                   ;; These are fixed-up when abbrev.el loads.
-                                   (setq abbrev-table-name-list
-                                         (cons (cons name defs)
-                                               abbrev-table-name-list)))))))
+      (fset 'define-abbrev-table
+	    (function (lambda (name defs)
+			;; These are fixed-up when abbrev.el loads.
+			(setq abbrev-table-name-list
+			      (cons (cons name defs)
+				    abbrev-table-name-list)))))))
 
 ;;; `functionp' has been moved into C.
 
@@ -1270,7 +1273,7 @@
 ; alternate names (not obsolete)
 (if (not (fboundp 'mod)) (define-function 'mod '%))
 (define-function 'move-marker 'set-marker)
-(define-function 'beep 'ding)  ; preserve lingual purity
+(define-function 'beep 'ding)		; preserve lingual purity
 (define-function 'indent-to-column 'indent-to)
 (define-function 'backward-delete-char 'delete-backward-char)
 (define-function 'search-forward-regexp (symbol-function 're-search-forward))
Index: lisp/window-xemacs.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/window-xemacs.el,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -u -r1.10 -r1.11
--- lisp/window-xemacs.el	2001/04/12 18:21:39	1.10
+++ lisp/window-xemacs.el	2002/07/06 05:48:15	1.11
@@ -216,11 +216,11 @@
 
 (defvar display-buffer-function nil
   "If non-nil, function to call to handle `display-buffer'.
-It will receive three args: the same as those to `display-buffer'.")
+It will receive four args: the same as those to `display-buffer'.")
 
 (defvar pre-display-buffer-function nil
   "If non-nil, function that will be called from `display-buffer'
-as the first action.  It will receive three args: the same as those
+as the first action.  It will receive four args: the same as those
 to `display-buffer'.
 This function may be used to select an appropriate frame for the buffer,
 for example.  See also the variable `display-buffer-function', which may
@@ -352,7 +352,8 @@
 ;; Can you believe that all of this crap was formerly in C?
 ;; Praise Jesus that it's not there any more.
 
-(defun display-buffer (buffer &optional not-this-window-p override-frame)
+(defun display-buffer (buffer &optional not-this-window-p override-frame
+			      shrink-to-fit)
   "Make BUFFER appear in some window on the current frame, but don't select it.
 BUFFER can be a buffer or a buffer name.
 If BUFFER is shown already in some window in the current frame,
@@ -365,6 +366,9 @@
 If OVERRIDE-FRAME is non-nil, display on that frame instead of
 the current frame (or the dedicated frame).
 
+If SHRINK-TO-FIT is non-nil and splitting the window is appropriate, give
+the new buffer less than half the space if it is small enough to fit.
+
 If `pop-up-windows' is non-nil, always use the
 current frame and create a new window regardless of whether the
 buffer has a dedicated frame, and regardless of whether
@@ -390,7 +394,8 @@
 		   (if pre-display-buffer-function
 		       (funcall pre-display-buffer-function buffer
 				not-this-window-p
-				override-frame)))
+				override-frame
+				shrink-to-fit)))
 
 	     ;; Give the user the ability to completely reimplement
 	     ;; this function via the `display-buffer-function'.
@@ -398,7 +403,8 @@
 		 (throw 'done
 			(funcall display-buffer-function buffer
 				 not-this-window-p
-				 override-frame)))
+				 override-frame
+				 shrink-to-fit)))
 
 	     ;; If the buffer has a dedicated frame, that takes
 	     ;; precedence over the current frame, and over what the
@@ -615,7 +621,9 @@
 						    (window-height window))
 						 2)
 					      (window-height upper))
-					   nil upper)))))
+					   nil upper))
+		       (if shrink-to-fit
+			   (shrink-window-if-larger-than-buffer window)))))
 
 	       (setq window (get-lru-window target-frame)))
 
Index: lisp/mule/kinsoku.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/mule/kinsoku.el,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- lisp/mule/kinsoku.el	2002/03/13 08:52:16	1.6
+++ lisp/mule/kinsoku.el	2002/07/09 09:37:01	1.7
@@ -172,7 +172,7 @@
 ;; kinsoku ascii
 (loop for char in (string-to-list kinsoku-ascii-bol)
       do (modify-category-entry char ?s))
-(loop for char in kinsoku-ascii-eol
+(loop for char in (string-to-list kinsoku-ascii-eol)
       do (modify-category-entry char ?e))
 ;; kinsoku-jis
 (loop for char in (string-to-list kinsoku-jis-bol)
@@ -180,14 +180,14 @@
 (loop for char in (string-to-list kinsoku-jis-eol)
       do (modify-category-entry char ?e))
 ;; kinsoku-gb
-(loop for char in kinsoku-gb-bol
+(loop for char in (string-to-list kinsoku-gb-bol)
       do (modify-category-entry char ?s))
-(loop for char in kinsoku-gb-eol
+(loop for char in (string-to-list kinsoku-gb-eol)
       do (modify-category-entry char ?e))
 ;; kinsoku-big5
-(loop for char in kinsoku-big5-bol
+(loop for char in (string-to-list kinsoku-big5-bol)
       do (modify-category-entry char ?s))
-(loop for char in kinsoku-big5-eol
+(loop for char in (string-to-list kinsoku-big5-eol)
       do (modify-category-entry char ?e))
 
 (defun kinsoku-bol-p ()
@@ -195,14 +195,21 @@
 Uses category \'s\' to check.
 point$B$G2~9T$9$k$H9TF,6XB'$K?($l$k$+$I$&$+$r$+$($9!#(B
 $B9TF,6XB'J8;z$O(B\'s\'$B$N(Bcategory$B$G;XDj$9$k!#(B"
-  (let ((ch (char-after)))
-    (if (and ch
+  (let ((before (char-before))
+	(after (char-after)))
+    (if (and after
 	     (or
-	      (and kinsoku-ascii (char-in-category-p ch ?a))
-	      (and kinsoku-jis (char-in-category-p ch ?j))
-	      (and kinsoku-gb (char-in-category-p ch ?c))
-	      (and kinsoku-big5 (char-in-category-p ch ?t))))
-	(char-in-category-p ch ?s)
+	      (and kinsoku-ascii (char-in-category-p after ?a))
+	      (and kinsoku-jis (or (char-in-category-p after ?j)
+				   (and before
+					(char-in-category-p before ?j))))
+	      (and kinsoku-gb (or (char-in-category-p after ?c)
+				  (and before
+				       (char-in-category-p before ?c))))
+	      (and kinsoku-big5 (or (char-in-category-p after ?t)
+				    (and before
+					 (char-in-category-p before ?t))))))
+	(char-in-category-p after ?s)
       nil)))
 
 (defun kinsoku-eol-p ()
@@ -210,14 +217,21 @@
 Uses category \'e\' to check.
 point$B$G2~9T$9$k$H9TKv6XB'$K?($l$k$+$I$&$+$r$+$($9!#(B
 $B9TKv6XB'J8;z$O(B\'s\'$B$N(Bcategory$B$G;XDj$9$k!#(B"
-  (let ((ch (char-before)))
-    (if (and ch
+  (let ((before (char-before))
+	(after (char-after)))
+    (if (and before
 	     (or
-	      (and kinsoku-ascii (char-in-category-p ch ?a))
-	      (and kinsoku-jis (char-in-category-p ch ?j))
-	      (and kinsoku-gb (char-in-category-p ch ?c))
-	      (and kinsoku-big5 (char-in-category-p ch ?t))))
-	(char-in-category-p ch ?e)
+	      (and kinsoku-ascii (char-in-category-p before ?a))
+	      (and kinsoku-jis (or (char-in-category-p before ?j)
+				   (and after
+					(char-in-category-p after ?j))))
+	      (and kinsoku-gb (or (char-in-category-p before ?c)
+				  (and after
+				       (char-in-category-p after ?c))))
+	      (and kinsoku-big5 (or (char-in-category-p before ?t)
+				    (and after
+					 (char-in-category-p after ?t))))))
+	(char-in-category-p before ?e)
       nil)))
 
 (defvar kinsoku-extend-limit nil
Index: lwlib/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/ChangeLog,v
retrieving revision 1.39
retrieving revision 1.41
diff -u -u -r1.39 -r1.41
--- lwlib/ChangeLog	2002/07/02 15:00:56	1.39
+++ lwlib/ChangeLog	2002/07/27 03:52:53	1.41
@@ -1,3 +1,15 @@
+2002-07-27  Steve Youngs  <youngs@xemacs.org>
+
+	* XEmacs 21.5.8 "broccoli" is released.
+
+2002-06-07  Andy Piper  <andy@xemacs.org>
+
+	* lwlib-Xm.c: (xm_safe_update_label): new function. Call
+	xm_update_label if the class is appropriate.
+	(make_menu_in_widget): use it.
+	(update_one_menu_entry): ditto.
+	(xm_update_one_widget): ditto.
+
 2002-07-02  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.7 "broccoflower" is released.
Index: lwlib/lwlib-Xm.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/lwlib-Xm.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -u -r1.15 -r1.16
--- lwlib/lwlib-Xm.c	2002/04/05 10:37:31	1.15
+++ lwlib/lwlib-Xm.c	2002/07/06 05:48:18	1.16
@@ -301,6 +301,14 @@
     XmStringFree (val_string);
 }
 
+static void
+xm_safe_update_label (widget_instance* instance, Widget widget, widget_value* val)
+{
+  /* Don't clobber non-labels. */
+  if (XtIsSubclass (widget, xmLabelWidgetClass))
+    xm_update_label (instance, widget, val);
+}
+
 #endif /* defined (LWLIB_DIALOGS_MOTIF) || defined (LWLIB_MENUBARS_MOTIF) */
 
 /* update of list */
@@ -540,7 +548,7 @@
 	  XtSetArg (al [ac], XmNsubMenuId, menu); ac++;
 	  button = XmCreateCascadeButton (widget, cur->name, al, ac);
 
-	  xm_update_label (instance, button, cur);
+	  xm_safe_update_label (instance, button, cur);
 
 	  XtAddCallback (button, XmNcascadingCallback, xm_pull_down_callback,
 			 (XtPointer)instance);
@@ -561,7 +569,7 @@
 	  else
 	    button = XmCreatePushButtonGadget (widget, cur->name, al, ac);
 
-	  xm_update_label (instance, button, cur);
+	  xm_safe_update_label (instance, button, cur);
 
 	  /* don't add a callback to a simple label */
 	  if (cur->type == TOGGLE_TYPE || cur->type == RADIO_TYPE)
@@ -615,7 +623,8 @@
   /* update the menu button as a label. */
   if (val->change >= VISIBLE_CHANGE)
     {
-      xm_update_label (instance, widget, val);
+      xm_safe_update_label (instance, widget, val);
+
       if (XtClass (widget) == xmToggleButtonWidgetClass
 	  || XtClass (widget) == xmToggleButtonGadgetClass)
 	{
@@ -829,8 +838,7 @@
 
 #if defined (LWLIB_DIALOGS_MOTIF) || defined (LWLIB_MENUBARS_MOTIF) || defined (LWLIB_WIDGETS_MOTIF)
   /* Common to all label like widgets */
-  if (XtIsSubclass (widget, xmLabelWidgetClass))
-    xm_update_label (instance, widget, val);
+  xm_safe_update_label (instance, widget, val);
 #endif
   class = XtClass (widget);
   /* Class specific things */
Index: man/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/ChangeLog,v
retrieving revision 1.175
retrieving revision 1.179
diff -u -u -r1.175 -r1.179
--- man/ChangeLog	2002/07/02 15:00:58	1.175
+++ man/ChangeLog	2002/07/27 03:52:55	1.179
@@ -1,3 +1,50 @@
+2002-07-27  Steve Youngs  <youngs@xemacs.org>
+
+	* XEmacs 21.5.8 "broccoli" is released.
+
+2002-07-13  Adrian Aichner  <adrian@xemacs.org>
+
+	* xemacs/packages.texi (Installing Packages): Fix reference to
+	EFS.
+
+2002-07-06  Adrian Aichner  <adrian@xemacs.org>
+
+	* new-users-guide/custom1.texi (Customizing key Bindings): Fix
+	improper use of indef. art. "a".
+
+2002-07-06  Adrian Aichner  <adrian@xemacs.org>
+
+	* lispref/commands.texi (Peeking and Discarding): Ditto.
+	* lispref/customize.texi (Type Keywords): Ditto.
+	* lispref/dragndrop.texi (Drop Interface): Ditto.
+
+2002-07-06  Adrian Aichner  <adrian@xemacs.org>
+
+	* termcap.texi (Clearing): Ditto.
+	* widget.texi (User Interface): Ditto.
+	* widget.texi (Basic Types): Ditto.
+	* widget.texi (group): Ditto.
+
+2002-07-05  Adrian Aichner  <adrian@xemacs.org>
+
+	* xemacs/menus.texi (Edit Menu): Typo fixes for incorrect use of
+	indef. art. "an".
+
+2002-07-05  Adrian Aichner  <adrian@xemacs.org>
+
+	* lispref/control.texi (Processing of Errors): Ditto.
+	* lispref/mule.texi (ISO 2022): Ditto.
+	* lispref/packaging.texi (Package Terminology): Ditto.
+	* lispref/text.texi (Transformations): Ditto.
+
+2002-07-05  Adrian Aichner  <adrian@xemacs.org>
+
+	* termcap.texi (Naming): Ditto.
+	* texinfo.texi (itemize): Ditto.
+	* texinfo.texi (Tips): Ditto.
+	* widget.texi (Introduction): Ditto.
+	* widget.texi (group): Ditto.
+
 2002-07-02  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.7 "broccoflower" is released.
@@ -2348,7 +2395,7 @@
 
 	* lispref/dragndrop.texi: only small changes
 
-1998-05-15  Christian Nyb,Ax(B <chr@mediascience.no>
+1998-05-15  Christian Nybø <chr@mediascience.no>
 
 	* xemacs/killing.texi: Properly document `zap-to-char'.
 
Index: man/termcap.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/termcap.texi,v
retrieving revision 1.3
retrieving revision 1.5
diff -u -u -r1.3 -r1.5
--- man/termcap.texi	1999/05/13 12:19:40	1.3
+++ man/termcap.texi	2002/07/06 18:56:24	1.5
@@ -1147,7 +1147,7 @@
 does not touch (@pxref{Status Line}).
 
 Some terminals have a special line that is used only as a status line.
-For these terminals, there is no need for an @samp{-s} variant; the
+For these terminals, there is no need for a @samp{-s} variant; the
 status line commands should be defined by default.  On other
 terminals, enabling a status line means removing one screen line from
 ordinary use and reducing the effective screen height.  For these
@@ -1920,7 +1920,7 @@
 
 Clear to end of line (@samp{ce}) is extremely important in programs that
 maintain an updating display.  Nearly all display terminals support this
-operation, so it is acceptable for a an application program to refuse to
+operation, so it is acceptable for an application program to refuse to
 work if @samp{ce} is not present.  However, if you do not want this
 limitation, you can accomplish clearing to end of line by outputting spaces
 until you reach the right margin.  In order to do this, you must know the
Index: man/texinfo.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/texinfo.texi,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -u -r1.15 -r1.16
--- man/texinfo.texi	2001/04/13 09:11:29	1.15
+++ man/texinfo.texi	2002/07/05 20:35:47	1.16
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
-@c $Id: texinfo.texi,v 1.15 2001/04/13 09:11:29 michaels Exp $
+@c $Id: texinfo.texi,v 1.16 2002/07/05 20:35:47 adrian Exp $
 @c %**start of header
 
 @c All text is ignored before the setfilename.
@@ -7789,7 +7789,7 @@
 very brief, these blank lines make the list look better.@refill
 
 Here is an example of the use of @code{@@itemize}, followed by the
-output it produces.  Note that @code{@@bullet} produces an @samp{*} in
+output it produces.  Note that @code{@@bullet} produces a @samp{*} in
 Info and a round dot in @TeX{}.@refill
 
 @example
@@ -14919,7 +14919,7 @@
 @end example
 
 @noindent
-since @samp{au} does @emph{not} serve as an  abbreviation for
+since @samp{au} does @emph{not} serve as an abbreviation for
 @samp{author.} (with a period following the word).
 
 @subsubheading Introducing New Terms
Index: man/widget.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/widget.texi,v
retrieving revision 1.35
retrieving revision 1.37
diff -u -u -r1.35 -r1.37
--- man/widget.texi	2002/03/19 22:48:03	1.35
+++ man/widget.texi	2002/07/06 18:56:24	1.37
@@ -69,7 +69,7 @@
 A simple constant widget intended to be used in the @code{menu-choice} and
 @code{radio-button-choice} widgets. 
 @item choice-item
-An button item only intended for use in choices.  When invoked, the user
+A button item only intended for use in choices.  When invoked, the user
 will be asked to select another option from the choice widget.
 @item toggle
 A simple @samp{on}/@samp{off} switch.
@@ -130,11 +130,11 @@
 @comment  node-name,  next,  previous,  up
 @section User Interface
 
-A form consist of read only text for documentation and some fields,
-where each the fields contain two parts, as tag and a value.  The tags
-are used to identify the fields, so the documentation can refer to the
-foo field, meaning the field tagged with @samp{Foo}. Here is an example
-form:
+A form consists of read only text for documentation and some fields,
+where each of the fields contains two parts, a tag and a value.  The
+tags are used to identify the fields, so the documentation can refer to
+the foo field, meaning the field tagged with @samp{Foo}. Here is an
+example form:
 
 @example
 Here is some documentation.
@@ -226,7 +226,7 @@
 field.  Option fields are created by the @code{menu-choice} widget.  In
 the example, @samp{@b{Choose}} is an option field tag.
 @item The @samp{@b{[INS]}} and @samp{@b{[DEL]}} buttons.
-Activating these will insert or delete elements from a editable list.
+Activating these will insert or delete elements from an editable list.
 The list is created by the @code{editable-list} widget. 
 @item Embedded Buttons.
 The @samp{@b{_other work_}} is an example of an embedded
@@ -593,7 +593,7 @@
 
 @item :parent
 The parent of a nested widget (e.g. a @code{menu-choice} item or an
-element of a @code{editable-list} widget).
+element of an @code{editable-list} widget).
 
 @item :sibling-args
 This keyword is only used for members of a @code{radio-button-choice} or
@@ -1031,7 +1031,7 @@
 @comment  node-name,  next,  previous,  up
 @subsection The @code{group} Widget
 
-This widget simply group other widget together.
+This widget simply groups other widgets together.
 
 Syntax:
 
Index: man/lispref/commands.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/lispref/commands.texi,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -u -r1.10 -r1.11
--- man/lispref/commands.texi	2001/04/12 18:22:11	1.10
+++ man/lispref/commands.texi	2002/07/06 18:56:28	1.11
@@ -1755,7 +1755,7 @@
 input.  The events are used in the order they appear in the list, and
 removed one by one as they are used.
 
-The variable is needed because in some cases a function reads a event
+The variable is needed because in some cases a function reads an event
 and then decides not to use it.  Storing the event in this variable
 causes it to be processed normally, by the command loop or by the
 functions to read command input.
Index: man/lispref/control.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/lispref/control.texi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- man/lispref/control.texi	2001/04/12 18:22:11	1.2
+++ man/lispref/control.texi	2002/07/05 20:35:52	1.3
@@ -922,7 +922,7 @@
 This function displays @var{error-object} on @var{stream}.
 @var{error-object} is a cons of error type, a symbol, and error
 arguments, a list.  If the error type symbol of one of its error
-condition superclasses has an @code{display-error} property, that
+condition superclasses has a @code{display-error} property, that
 function is invoked for printing the actual error message.  Otherwise,
 the error is printed as @samp{Error: arg1, arg2, ...}.
 @end defun
Index: man/lispref/customize.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/lispref/customize.texi,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- man/lispref/customize.texi	2002/03/14 11:50:16	1.3
+++ man/lispref/customize.texi	2002/07/06 18:56:28	1.4
@@ -740,7 +740,7 @@
 
 @item :parent
 The parent of a nested widget (e.g. a @code{menu-choice} item or an
-element of a @code{editable-list} widget).
+element of an @code{editable-list} widget).
 
 @item :sibling-args
 This keyword is only used for members of a @code{radio-button-choice} or
Index: man/lispref/dragndrop.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/lispref/dragndrop.texi,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- man/lispref/dragndrop.texi	2001/04/12 18:22:12	1.6
+++ man/lispref/dragndrop.texi	2002/07/06 18:56:29	1.7
@@ -100,7 +100,7 @@
 @cindex drop
 @cindex Drop API
 
-For each activated low-level protocol, a internal routine will catch
+For each activated low-level protocol, an internal routine will catch
 incoming drops and convert them to a dragdrop-drop type
 misc-user-event.
 
Index: man/lispref/mule.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/lispref/mule.texi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- man/lispref/mule.texi	2002/03/14 11:50:16	1.5
+++ man/lispref/mule.texi	2002/07/05 20:35:52	1.6
@@ -801,7 +801,7 @@
 the data stream) or locking (effective until the next designation or
 locking) control sequences.  An encoding conformant to ISO 2022 is
 typically defined by designating the initial contents of the G0-G3
-registers, specifying an 7 or 8 bit environment, and specifying whether
+registers, specifying a 7 or 8 bit environment, and specifying whether
 further designations will be recognized.
 
   Some examples of character sets and the registered final characters
Index: man/lispref/packaging.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/lispref/packaging.texi,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -u -r1.7 -r1.8
--- man/lispref/packaging.texi	2002/06/03 10:10:12	1.7
+++ man/lispref/packaging.texi	2002/07/05 20:35:52	1.8
@@ -462,7 +462,7 @@
 
 @item Single-File Packages
 @cindex single-file package
-A single-file package is an collection of thematically related but
+A single-file package is a collection of thematically related but
 otherwise independent Lisp libraries.  These libraries are bundled
 together for convenience of the maintainers.  Usually individual
 libraries may be deleted at will without any loss of functionality of
Index: man/lispref/text.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/lispref/text.texi,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- man/lispref/text.texi	2001/04/12 18:22:21	1.3
+++ man/lispref/text.texi	2002/07/05 20:35:52	1.4
@@ -2761,7 +2761,7 @@
 Examples of algorithms thus provided are MD5 and base64 support.
 
 MD5 is an algorithm for calculating message digests, as described in
-rfc1321.  Given a message of arbitrary length, MD5 produces an 128-bit
+rfc1321.  Given a message of arbitrary length, MD5 produces a 128-bit
 ``fingerprint'' (``message digest'') corresponding to that message.  It
 is considered computationally infeasible to produce two messages having
 the same MD5 digest, or to produce a message having a prespecified
Index: man/new-users-guide/custom1.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/new-users-guide/custom1.texi,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -u -r1.3 -r1.4
--- man/new-users-guide/custom1.texi	2001/04/12 18:22:24	1.3
+++ man/new-users-guide/custom1.texi	2002/07/06 18:56:31	1.4
@@ -78,7 +78,7 @@
 @noindent
 You might want to have this statement in your @file{init.el} file because
 its easy to hit this command by mistake and it could be annoying to exit
-Emacs unintentionally. There is a @b{Exit Emacs} option in the @b{File
+Emacs unintentionally. There is an @b{Exit Emacs} option in the @b{File
 menu} which you might want to use instead. To make a particular key
 undefined you can also use:
 
Index: man/xemacs/menus.texi
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/man/xemacs/menus.texi,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- man/xemacs/menus.texi	2001/04/12 18:22:28	1.4
+++ man/xemacs/menus.texi	2002/07/05 20:35:55	1.5
@@ -223,7 +223,7 @@
 @c  **** zmacs-regions is on by default these days - jwz
 @c
 @c Note: By default, you can use the @b{Edit} menu items on the region between
-@c point an the mark as well as regions selected with the mouse. To change
+@c point and the mark as well as regions selected with the mouse. To change
 @c this behavior, set the variable @code{zmacs-regions} to
 @c @code{t}. @xref{Active Regions} for more information.
 
Index: modules/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/modules/ChangeLog,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- modules/ChangeLog	2002/07/02 15:00:59	1.5
+++ modules/ChangeLog	2002/07/27 03:52:59	1.6
@@ -1,3 +1,7 @@
+2002-07-27  Steve Youngs  <youngs@xemacs.org>
+
+	* XEmacs 21.5.8 "broccoli" is released.
+
 2002-07-02  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.7 "broccoflower" is released.
Index: netinstall/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/netinstall/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -u -r1.20 -r1.21
--- netinstall/ChangeLog	2002/07/02 15:01:01	1.20
+++ netinstall/ChangeLog	2002/07/27 03:53:00	1.21
@@ -1,3 +1,7 @@
+2002-07-27  Steve Youngs  <youngs@xemacs.org>
+
+	* XEmacs 21.5.8 "broccoli" is released.
+
 2002-07-02  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.7 "broccoflower" is released.
@@ -455,6 +459,6 @@
 
 	* all: port from cygwin setup.
 
-%%% $Id: ChangeLog,v 1.20 2002/07/02 15:01:01 stephent Exp $
-$Revision: 1.20 $
+%%% $Id: ChangeLog,v 1.21 2002/07/27 03:53:00 youngs Exp $
+$Revision: 1.21 $
 
Index: nt/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/ChangeLog,v
retrieving revision 1.136
retrieving revision 1.139
diff -u -u -r1.136 -r1.139
--- nt/ChangeLog	2002/07/02 15:01:03	1.136
+++ nt/ChangeLog	2002/07/27 03:53:01	1.139
@@ -1,3 +1,15 @@
+2002-07-27  Steve Youngs  <youngs@xemacs.org>
+
+	* XEmacs 21.5.8 "broccoli" is released.
+
+2002-07-08  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* README: Reference GNU Emacs 21.x.
+
+2002-07-05  Jonathan Harris  <jonathan@xemacs.org>
+
+	* README: Document Visual Studio .NET setup
+
 2002-07-02  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.7 "broccoflower" is released.
Index: nt/README
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/README,v
retrieving revision 1.21
retrieving revision 1.23
diff -u -u -r1.21 -r1.23
--- nt/README	2002/05/06 14:14:36	1.21
+++ nt/README	2002/07/10 06:27:42	1.23
@@ -1,13 +1,14 @@
-Building and Installing XEmacs on Windows 95/98/NT/2000    -*- mode:outline -*-
+Building and Installing XEmacs on Windows 95/98/NT/2000/XP -*- mode:outline -*-
 
 			     David Hobley
 			     Marc Paquette
 			    Jonathan Harris
 			       Ben Wing
 
-This is a port of XEmacs to Windows 95/98/NT/2000.  If you are looking for a
-port of GNU Emacs, see http://www.cs.washington.edu/homes/voelker/ntemacs.html.
-NT 4.0 or later is required for building on Windows NT.  Note that the
+This is a port of XEmacs to Windows 95/98/NT/2000/XP.  If you are looking for a
+port of GNU Emacs, get the latest release of the 21.x series from gnu.org.
+(At the time of writing, GNU Emacs does not support images but does support
+Mule.)  NT 4.0 or later is required for building on Windows NT.  Note that the
 developers typically use NT 4.0 and Windows 2000, and there may possibly be
 problems under Windows 95/98.  If so, please report them to
 xemacs-nt@xemacs.org; we are committed to maintaining compatibility with all
@@ -16,20 +17,24 @@
 * Required tools and sources
 ============================
 
-1.  You will need Visual C++ V6.0 or later to compile everything.
+1.  You will need Visual C++ V6.0, Visual Studio .NET or later to compile
+    everything.
 
     Note that Visual C++ assumes that the environment variables INCLUDE and
     LIB are set to specify the location of the includes and libraries.
     Your PATH environment variable also needs to include the Visual Studio
     vc\bin and sharedide\bin directories.
 
-    Visual C++ V5.0 and later install a batch file called vcvars32.bat in
+    Visual C++ V6.0 installs a batch file called vcvars32.bat in
     c:\Program Files\Microsoft Visual Studio\VC98\bin\ (or wherever you
     installed it) that you can run before building to set up all of these
     environment variables.  Alternatively, you can choose at setup time to
     have these environment variables automatically set up in the registry,
     which is generally a good idea.
 
+    Visual Studio .NET calls this batch file vsvars32.bat and installs it in
+    $Installdir\Common7\Tools, but doesn't offer at install time to
+    automatically set these environment variables up in the registry.
 
 2.  Grab the latest XEmacs source from
 
@@ -238,13 +243,13 @@
     You may want to create a shortcut to the file from your Desktop or
     Start Menu.
 
-4.  To build using MS Developer Studio, you can use the workspace file
+4.  To build using MS Visual Studio, you can use the workspace file
     `nt/xemacs.dsw'. This was prepared for Visual C++ 6.0. If you have a
     different version and neither file works, just open up `nt/xemacs.mak'
-    from within MS Developer Studio and it will offer to wrap this Makefile
-    in a workspace file, from which you can build. Assuming you want to run
-    from the build directory (which you will want to do if you are planning
-    on doing any development work on XEmacs), use the following settings in
+    from within Visual Studio and it will offer to wrap this Makefile in a
+    workspace file, from which you can build. Assuming you want to run from
+    the build directory (which you will want to do if you are planning on
+    doing any development work on XEmacs), use the following settings in
     Project/Settings...:
 
     Under the General tab:
Index: nt/installer/Wise/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/nt/installer/Wise/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -u -r1.9 -r1.10
--- nt/installer/Wise/ChangeLog	2002/07/02 15:01:05	1.9
+++ nt/installer/Wise/ChangeLog	2002/07/27 03:53:04	1.10
@@ -1,3 +1,7 @@
+2002-07-27  Steve Youngs  <youngs@xemacs.org>
+
+	* XEmacs 21.5.8 "broccoli" is released.
+
 2002-07-02  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.7 "broccoflower" is released.
Index: src/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ChangeLog,v
retrieving revision 1.464
retrieving revision 1.480
diff -u -u -r1.464 -r1.480
--- src/ChangeLog	2002/07/02 15:01:06	1.464
+++ src/ChangeLog	2002/07/27 03:53:05	1.480
@@ -1,3 +1,209 @@
+2002-07-27  Steve Youngs  <youngs@xemacs.org>
+
+	* XEmacs 21.5.8 "broccoli" is released.
+
+2002-07-25  Steve Youngs  <youngs@xemacs.org>
+
+	* process-unix.c (child_setup):
+	(unix_create_process):
+	Revert Mike's patch of 2002-07-20.
+
+2002-07-20  Mike Sperber <mike@xemacs.org>
+
+	* eval.c (run_post_gc_hook): Use more correct flags when running
+	post-gc-hook.
+
+2002-07-20  Mike Sperber <mike@xemacs.org>
+
+	* process-unix.c (child_setup): Don't try to close file
+	descriptors for chid process once again---it's already being done
+	in close_process_descs.
+	(unix_create_process): Call begin_dont_check_for_quit to inhibit
+	unwanted interaction (and thus breaking of X event synchronicity)
+	in the child.
+
+2002-07-15  Jerry James  <james@xemacs.org>
+
+	* lisp.h: Make Qdll_error visible globally.
+	* symbols.c (check_sane_subr): Revert 2002-06-26 change.
+	Check only if !initialized.
+	* symbols.c (check_module_subr): Add parameter.  Duplicate
+	check_sane_subr checks, but signal an error instead of asserting.
+	* symbols.c (defsubr): Use check_module_subr parameter.
+	* symbols.c (defsubr_macro): Ditto.
+
+2002-07-09  Mike Sperber <mike@xemacs.org>
+
+	* config.h.in: Add USE_KKCC variable to enable upcoming new GC
+	algorithms.
+
+2002-07-14  Mike Alexander  <mta@arbortext.com>
+
+	* event-msw.c (mswindows_need_event): Don't wait for a new message
+	if the queue is not empty.  Suggested by Paul Moore.
+
+2002-07-08  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* lisp.h: Declare Fcdr_safe to be callable from C.
+
+2002-07-08  Hrvoje Niksic  <hniksic@xemacs.org>
+
+	* eval.c (Ffunctionp): Return nil for autoloaded macros and
+	keymaps.
+
+2002-07-08  Daiki Ueno  <daiki@xemacs.org>
+
+	* glyphs-x.c (x_unmap_subwindow): Deal with the substantial windows.
+	(x_map_subwindow): Likewise.
+
+2002-07-08  Mike Sperber <mike@xemacs.org>
+
+	* text.h: Only include wchar.h if we have it; define wcslen
+	prototype if we don't.
+
+	* config.h.in: Add stub for HAVE_WCHAR_H.
+
+	* sysdep.c (wcslen): Added definition for systems which don't have
+	it.
+
+2002-07-08  Mike Sperber <mike@xemacs.org>
+
+	* process.c (Fstart_process_internal): Do error checking before we
+	fork off the child, so the child can't muck with the state of the
+	parent.
+
+2002-07-08  Mike Sperber <mike@xemacs.org>
+
+	* ralloc.c (init_ralloc): Allocate properly for pdump.
+
+	* emacs.c (main_1): Revert init_ralloc patch in favor of an
+	easier-to-understand solution.
+
+2002-07-05  David Bush  <David.Bush@intel.com>
+
+	* console-msw-impl.h (struct Lisp_Devmode): Lisp_Devmode is typedef'ed
+	in console-msw.h, don't do it again with the structure definition
+
+2002-06-26  Jerry James  <james@xemacs.org>
+
+	* symbols.c (check_sane_subr): Let the symbol be bound if it is an
+	autoload cookie.
+
+2002-06-24  Andy Piper  <andy@xemacs.org>
+
+	* toolbar-x.c (console_type_create_toolbar_x): declare
+	x_clear_frame_toolbars.
+	* toolbar-gtk.c (console_type_create_toolbar_gtk): ditto.
+	* toolbar-common.h (common_clear_frame_toolbars): ditto.
+
+	* toolbar-common.c (COMMON_OUTPUT_BUTTONS_LOOP): output button if
+	whole toolbar was cleared.
+
+	* toolbar-msw.c (mswindows_clear_frame_toolbars): new
+	function. Split out from mswindows_output_frame_toolbars.
+	(mswindows_output_frame_toolbars): move clear pieces to
+	mswindows_output_frame_toolbars.
+
+	* toolbar-common.c (common_clear_frame_toolbars): new function. Split
+	out from gtk_output_frame_toolbars.
+	(common_output_frame_toolbars): move clear pieces to
+	gtk_clear_frame_toolbars.
+
+	* console-impl.h (struct console_methods): add
+	clear_frame_toolbars_method.
+
+	* redisplay.c (redisplay_frame): call
+	update_frame_toolbars_geometry and re-order update_frame_toolbars.
+
+	* toolbar.h: declare update_frame_toolbars_geometry.
+
+	* toolbar.c (update_frame_toolbars_geometry): new function. Split
+	out from update_frame_toolbars.  Call clear_frame_toolbars.
+	(update_frame_toolbars): only output, do not change geometry.
+
+	* redisplay.c: add frame_layout_changed.
+
+	* redisplay.h: add frame_layout_changed.
+	(CLASS_RESET_CHANGED_FLAGS): set it.
+	(GLOBAL_RESET_CHANGED_FLAGS): ditto.
+	(CLASS_REDISPLAY_FLAGS_CHANGEDP): test it.
+	(GLOBAL_REDISPLAY_FLAGS_CHANGEDP): ditto.
+
+	* device-impl.h (struct device): add frame_layout_changed.
+	(MARK_DEVICE_FRAME_LAYOUT_CHANGED): new.
+
+	* frame-impl.h (struct frame): add frame_layout_changed.
+	(MARK_FRAME_LAYOUT_CHANGED): new.
+
+2002-07-02  Paul Moore  <gustav@morpheus.demon.co.uk>
+
+	* console-msw.h:
+	* device-msw.c:
+	* device-msw.c (mswindows_init_dde):
+	* device-msw.c (mswindows_delete_device):
+	  Initialise extra DDE strings for remote execution, and change
+	  DDE initialisation to send ADVISE and REQUEST notifications.
+	
+	* emacs.c (main_1):
+	  Add symbols of event_mswindows.
+	
+	* event-msw.c:
+	* event-msw.c (mswindows_dde_callback):
+	* event-msw.c (reinit_vars_of_event_mswindows):
+	* event-msw.c (vars_of_event_mswindows):
+	* event-msw.c (syms_of_event_mswindows):
+	  Add DDE support for remote execution.
+
+2002-06-12  Andy Piper  <andy@xemacs.org>
+
+	* glyphs.c (query_string_geometry): check the string.
+
+	* glyphs-widget.c (widget_logical_unit_height): cope with nil
+	widget names.
+
+2002-06-12  Andy Piper  <andy@xemacs.org>
+
+	* frame-msw.c (msprinter_init_frame_3): calculate the frame size
+	for printing on accurately.
+
+2002-06-09  Rick Rankin <rick_rankin@yahoo.com>
+
+	* event-msw.c (mswindows_wnd_proc): Add a handler for the
+	WM_ACTIVATE message. Make sure that the frame is visible if the
+	window is visible. This seemss to fix the problem where XEmacs
+	appears to freeze after switching desktops with certain virtual
+	window managers.
+	(debug_output_mswin_message): Added code to output message
+	parameters for WM_WINDOWPOSCHANGED, 
+	WM_WINDOWPOSCHANGING, WM_MOVE, and WM_SIZE messages.
+
+2002-07-05  Jonathan Harris  <jonathan@xemacs.org>
+
+	* emacs.c (main_1): Conditionalise calls to
+	syms_of_dired_mswindows() and vars_of_dired_mswindows() on
+	WIN32_NATIVE instead of redundant HAVE_MSW_C_DIRED
+	
+2002-07-03  Mike Sperber <mike@xemacs.org>
+
+	* emacs.c (main_1): We need to call init_ralloc twice for PDUMP,
+	otherwice ralloc won't do anything for us.
+
+2002-07-01  Mike Sperber <mike@xemacs.org>
+
+	* process-unix.c (unix_send_process): Mark coding_outstream as
+	non-open upon SIGPIPE.
+
+	* event-stream.c (execute_internal_event): Reinstate code to
+	deactivate a dead network connection that got lost during the
+	stdout/stderr separation.
+
+	* event-stream.c (Fnext_event): Reorder switch cases to something
+	that makes sense.
+
+2002-06-27  Olivier Galibert  <galibert@pobox.com>
+
+	* input-method-motif.c: Fix the #includes.
+
 2002-07-02  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.7 "broccoflower" is released.
Index: src/config.h.in
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/config.h.in,v
retrieving revision 1.74
retrieving revision 1.76
diff -u -u -r1.74 -r1.76
--- src/config.h.in	2002/06/20 21:18:22	1.74
+++ src/config.h.in	2002/07/16 08:27:11	1.76
@@ -242,6 +242,7 @@
 #undef HAVE_INTTYPES_H
 #undef HAVE_LIBGEN_H
 #undef HAVE_LOCALE_H
+#undef HAVE_WCHAR_H
 #undef HAVE_MACH_MACH_H
 #undef HAVE_SYS_PARAM_H
 #undef HAVE_SYS_PSTAT_H
@@ -625,6 +626,9 @@
    seem to require this, probably because something with the int
    definitions isn't right with 64-bit systems.  */
 #undef USE_UNION_TYPE
+
+/* If defined, use experimental pdump-based GC algorithms. */
+#undef USE_KKCC
 
 /* Enable special GNU Make features in the Makefiles. */
 #undef USE_GNU_MAKE
Index: src/console-impl.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console-impl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- src/console-impl.h	2002/06/20 21:18:23	1.1
+++ src/console-impl.h	2002/07/06 21:05:52	1.2
@@ -261,6 +261,7 @@
 #ifdef HAVE_TOOLBARS
   /* toolbar methods */
   void (*output_frame_toolbars_method) (struct frame *);
+  void (*clear_frame_toolbars_method) (struct frame *);
   void (*initialize_frame_toolbars_method) (struct frame *);
   void (*free_frame_toolbars_method) (struct frame *);
   void (*output_toolbar_button_method) (struct frame *, Lisp_Object);
Index: src/console-msw-impl.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console-msw-impl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- src/console-msw-impl.h	2002/06/20 21:18:23	1.1
+++ src/console-msw-impl.h	2002/07/06 05:48:20	1.2
@@ -55,7 +55,7 @@
  * Printer settings, aka devmode
  */
 
-typedef struct Lisp_Devmode
+struct Lisp_Devmode
 {
   struct lcrecord_header header;
 
@@ -70,7 +70,7 @@
      if not selected */
   Lisp_Object device;
 
-} Lisp_Devmode;
+};
 
 #define DEVMODE_SIZE(dm) ((dm)->dmSize + (dm)->dmDriverExtra)
 #define XDEVMODE_SIZE(x) ((x)->devmode ? DEVMODE_SIZE((x)->devmode) : 0)
Index: src/console-msw.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/console-msw.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -u -r1.40 -r1.41
--- src/console-msw.h	2002/06/20 21:18:23	1.40
+++ src/console-msw.h	2002/07/06 05:48:21	1.41
@@ -101,10 +101,17 @@
 int mswindows_is_dialog_msg (MSG *msg);
 
 /* win32 DDE management library */
-#define MSWINDOWS_DDE_ITEM_OPEN "Open" /* WARNING: uses of this need XETEXT */
+
+/* WARNING: uses of these constants need XETEXT */
+#define MSWINDOWS_DDE_ITEM_OPEN "Open"
+#define MSWINDOWS_DDE_TOPIC_EVAL "Eval"
+#define MSWINDOWS_DDE_ITEM_RESULT "Result"
+
 extern DWORD mswindows_dde_mlid;
 extern HSZ mswindows_dde_service;
 extern HSZ mswindows_dde_topic_system;
+extern HSZ mswindows_dde_topic_eval;
+extern HSZ mswindows_dde_item_result;
 extern HSZ mswindows_dde_item_open;
 HDDEDATA CALLBACK mswindows_dde_callback (UINT uType, UINT uFmt, HCONV hconv,
 					  HSZ hszTopic, HSZ hszItem,
Index: src/device-impl.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/device-impl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- src/device-impl.h	2002/06/20 21:18:25	1.1
+++ src/device-impl.h	2002/07/06 21:05:52	1.2
@@ -88,6 +88,8 @@
   unsigned int extents_changed :1;
   unsigned int faces_changed :1;
   unsigned int frame_changed :1;
+  unsigned int frame_layout_changed :1;	/* The layout of frame
+					   elements has changed. */
   unsigned int glyphs_changed :1;
   unsigned int subwindows_changed :1;
   unsigned int subwindows_state_changed :1;
@@ -321,6 +323,9 @@
 
 #define MARK_DEVICE_FRAME_CHANGED(d)			\
   ((void) (frame_changed = (d)->frame_changed = 1))
+
+#define MARK_DEVICE_FRAME_LAYOUT_CHANGED(d)			\
+  ((void) (frame_layout_changed = (d)->frame_layout_changed = 1))
 
 #define MARK_DEVICE_WINDOWS_CHANGED(d)			\
   ((void) (windows_changed = (d)->windows_changed = 1))
Index: src/device-msw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/device-msw.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -u -r1.46 -r1.47
--- src/device-msw.c	2002/06/20 21:18:25	1.46
+++ src/device-msw.c	2002/07/06 05:48:21	1.47
@@ -55,6 +55,8 @@
 int mswindows_dde_enable;
 HSZ mswindows_dde_service;
 HSZ mswindows_dde_topic_system;
+HSZ mswindows_dde_topic_eval;
+HSZ mswindows_dde_item_result;
 HSZ mswindows_dde_item_open;
 #endif
 
@@ -174,8 +176,8 @@
   mswindows_dde_mlid = 0;
   mswindows_dde_enable = 0;
   qxeDdeInitialize (&mswindows_dde_mlid, (PFNCALLBACK)mswindows_dde_callback,
-		    APPCMD_FILTERINITS|CBF_FAIL_SELFCONNECTIONS|CBF_FAIL_ADVISES|
-		    CBF_FAIL_POKES|CBF_FAIL_REQUESTS|CBF_SKIP_ALLNOTIFICATIONS,
+		    APPCMD_FILTERINITS|CBF_FAIL_SELFCONNECTIONS|
+		    CBF_FAIL_POKES|CBF_SKIP_ALLNOTIFICATIONS,
 		    0);
   
   mswindows_dde_service =
@@ -184,12 +186,22 @@
 			      XEUNICODE_P ? CP_WINUNICODE : CP_WINANSI);
   /* The following strings we Unicode-ize ourselves:
      -- SZDDESYS_TOPIC is system-provided
+     -- MSWINDOWS_DDE_TOPIC_EVAL is defined by us
+     -- MSWINDOWS_DDE_ITEM_RESULT is defined by us
      -- MSWINDOWS_DDE_ITEM_OPEN is used in internal-format comparisons
   */
   mswindows_dde_topic_system =
     qxeDdeCreateStringHandle (mswindows_dde_mlid,
 			      XETEXT (SZDDESYS_TOPIC),
 			      XEUNICODE_P ? CP_WINUNICODE : CP_WINANSI);
+  mswindows_dde_topic_eval =
+    qxeDdeCreateStringHandle (mswindows_dde_mlid,
+			      XETEXT (MSWINDOWS_DDE_TOPIC_EVAL),
+			      XEUNICODE_P ? CP_WINUNICODE : CP_WINANSI);
+  mswindows_dde_item_result =
+    qxeDdeCreateStringHandle (mswindows_dde_mlid,
+			      XETEXT (MSWINDOWS_DDE_ITEM_RESULT),
+			      XEUNICODE_P ? CP_WINUNICODE : CP_WINANSI);
   mswindows_dde_item_open =
     qxeDdeCreateStringHandle (mswindows_dde_mlid,
 			      XETEXT (MSWINDOWS_DDE_ITEM_OPEN),
@@ -229,8 +241,10 @@
 {
 #ifdef HAVE_DRAGNDROP
   DdeNameService (mswindows_dde_mlid, 0L, 0L, DNS_UNREGISTER);
+  DdeFreeStringHandle (mswindows_dde_mlid, mswindows_dde_item_result);
   DdeFreeStringHandle (mswindows_dde_mlid, mswindows_dde_item_open);
   DdeFreeStringHandle (mswindows_dde_mlid, mswindows_dde_topic_system);
+  DdeFreeStringHandle (mswindows_dde_mlid, mswindows_dde_topic_eval);
   DdeFreeStringHandle (mswindows_dde_mlid, mswindows_dde_service);
   DdeUninitialize (mswindows_dde_mlid);
 
Index: src/emacs.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/emacs.c,v
retrieving revision 1.123
retrieving revision 1.127
diff -u -u -r1.123 -r1.127
--- src/emacs.c	2002/06/20 21:18:27	1.123
+++ src/emacs.c	2002/07/09 11:55:35	1.127
@@ -1342,6 +1342,7 @@
 #ifdef HAVE_MS_WINDOWS
       syms_of_console_mswindows ();
       syms_of_device_mswindows ();
+      syms_of_event_mswindows ();
 #ifdef HAVE_DIALOGS
       syms_of_dialog_mswindows ();
 #endif
@@ -1359,10 +1360,8 @@
       syms_of_scrollbar_mswindows ();
 #endif
 #endif	/* HAVE_MS_WINDOWS */
-#ifdef HAVE_MSW_C_DIRED
-      syms_of_dired_mswindows ();
-#endif
 #ifdef WIN32_NATIVE
+      syms_of_dired_mswindows ();
       syms_of_nt ();
 #endif
 #if defined (WIN32_NATIVE) || defined (CYGWIN)
@@ -1769,6 +1768,7 @@
       vars_of_module ();
 #endif
 #ifdef WIN32_NATIVE
+      vars_of_dired_mswindows ();
       vars_of_nt ();
 #endif
       vars_of_objects ();
@@ -1872,9 +1872,6 @@
 #endif
 #ifdef HAVE_MENUBARS
       vars_of_menubar_mswindows ();
-#endif
-#ifdef HAVE_MSW_C_DIRED
-      vars_of_dired_mswindows ();
 #endif
 #ifdef HAVE_DIALOGS
       vars_of_dialog_mswindows ();
Index: src/eval.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/eval.c,v
retrieving revision 1.57
retrieving revision 1.59
diff -u -u -r1.57 -r1.59
--- src/eval.c	2002/06/28 14:21:41	1.57
+++ src/eval.c	2002/07/23 08:35:10	1.59
@@ -3829,13 +3829,18 @@
   if (SYMBOLP (object))
     object = indirect_function (object, 0);
 
-  return
-    (SUBRP (object) ||
-     COMPILED_FUNCTIONP (object) ||
-     (CONSP (object) &&
-      (EQ (XCAR (object), Qlambda) ||
-       EQ (XCAR (object), Qautoload))))
-    ? Qt : Qnil;
+  if (COMPILED_FUNCTIONP (object) || SUBRP (object))
+    return Qt;
+  if (CONSP (object))
+    {
+      Lisp_Object car = XCAR (object);
+      if (EQ (car, Qlambda))
+	return Qt;
+      if (EQ (car, Qautoload)
+	  && NILP (Fcar_safe (Fcdr_safe (Fcdr_safe (Fcdr_safe (XCDR (object)))))))
+	return Qt;
+    }
+  return Qnil;
 }
 
 static Lisp_Object
@@ -5532,7 +5537,7 @@
     ("Error in post-gc-hook",
      2, args,
      RUN_HOOKS_TO_COMPLETION,
-     INHIBIT_EXISTING_PERMANENT_DISPLAY_OBJECT_DELETION);
+     INHIBIT_QUIT | NO_INHIBIT_ERRORS);
 }
 
 /************************************************************************/
Index: src/event-msw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/event-msw.c,v
retrieving revision 1.81
retrieving revision 1.83
diff -u -u -r1.81 -r1.83
--- src/event-msw.c	2002/06/20 21:18:29	1.81
+++ src/event-msw.c	2002/07/14 23:20:36	1.83
@@ -1622,10 +1622,24 @@
 
       __try
 	{
-	  active = MsgWaitForMultipleObjects (mswindows_waitable_count,
-					      mswindows_waitable_handles,
-					      FALSE, badly_p ? INFINITE : 0,
-					      what_events);
+	  /* This fixes a long outstanding bug, where XEmacs would occasionally
+	   * not redraw its window (or process other events) until "something
+	   * happened" - usually the mouse moving over a frame.
+	   *
+	   * The problem is that MsgWaitForMultipleObjects only checks to see
+	   * if NEW messages have been placed into the thread queue. So we
+	   * specifically check to see if the queue is empty (using PeekMessage
+	   * with the PM_NOREMOVE flag) before we wait.
+	   */
+	  MSG msg;
+	  if (what_events == QS_ALLINPUT && badly_p &&
+	      qxePeekMessage (&msg, 0, 0, 0, PM_NOREMOVE))
+	    active = WAIT_OBJECT_0 + mswindows_waitable_count;
+	  else
+	    active = MsgWaitForMultipleObjects (mswindows_waitable_count,
+						mswindows_waitable_handles,
+						FALSE, badly_p ? INFINITE : 0,
+						what_events);
 	}
       __except (GetExceptionCode () == EXCEPTION_BREAKPOINT ?
 		EXCEPTION_CONTINUE_EXECUTION :
@@ -1733,6 +1747,191 @@
 #ifdef HAVE_DRAGNDROP
 extern int mswindows_dde_enable;
 
+EXFUN(Fread_from_string, 3);
+
+/* The following variables are used to maintain consistency of result and
+ * error reporting to the client.
+ * The basic protocol is to Execute a lisp form, and then Request one or
+ * more of the following items: Status (1 = OK, 0 = Error), Result, or Error.
+ * When the lisp form is queued, the dde_eval_pending flag is set to 1,
+ * to indicate that the items are not yet available. The dde_eval_pending
+ * flag is set to 0 when the evaluation is complete. Requests for the result
+ * items will block while the dde_eval_pending flag is 1, to avoid clients
+ * getting inconsistent results.
+ */
+static int dde_eval_pending;
+static Lisp_Object dde_eval_result;
+static Lisp_Object dde_eval_error;
+
+static Lisp_Object
+dde_error (Lisp_Object err, Lisp_Object obj)
+{
+  dde_eval_error = err;
+  return Qnil;
+}
+
+/* Read lisp forms from a string. Evaluate the forms as if they were
+ * wrapped in a progn form. Return the result of the form.
+ */
+static Lisp_Object
+dde_eval_string (Lisp_Object str)
+{
+  struct gcpro gcpro1, gcpro2;
+  Lisp_Object args[3];
+  Lisp_Object obj;
+
+  /* Heavy handed GCPROing, on the principle of it's better to be safe than
+   * sorry...
+   */
+  args[0] = Qnil;
+  args[1] = Qnil;
+  args[2] = Qnil;
+  GCPRO2 (args[0], str);
+  gcpro1.nvars = 3;
+
+  /* Wrap the user supplied string in string "(progn ...)".
+   * We can now just read-from-string a single form. If we
+   * get an error, or finish before the end of the string,
+   * we know the original string had syntax errors.
+   */
+  args[0] = build_string ("(progn ");
+  args[1] = str;
+  args[2] = build_string (")");
+  str = Fconcat (3, args);
+
+  obj = Fread_from_string (str, Qnil, Qnil);
+  UNGCPRO;
+
+  /* The following doesn't check that the length fits in an EMACS_INT.
+   * This won't be a problem in reality...?
+   *
+   * If the read didn't get to the end of the string, we have a syntax
+   * error in the string supplied by the user.
+   */
+  if (XINT (XCDR (obj)) != XSTRING_LENGTH (str))
+    return Qnil;
+
+  GCPRO1 (obj);
+  obj = Feval (XCAR (obj));
+
+  RETURN_UNGCPRO(obj);
+}
+
+/* Evaluate the supplied string as a sequence of Lisp forms, wrapped in
+ * a progn. Catch any evaluation errors. Set the evaluation status and
+ * result variables.
+ */
+static void
+dde_eval (Lisp_Object str)
+{
+  dde_eval_error = Qnil;
+  dde_eval_result = condition_case_1 (Qt, dde_eval_string, str,
+				      dde_error, Qnil);
+  dde_eval_pending = 0;
+
+  /* Re-enable callbacks in case the client is waiting on a request */
+  DdeEnableCallback (mswindows_dde_mlid, NULL, EC_ENABLEALL);
+
+  /* Post advise notifications on the result item */
+  DdePostAdvise (mswindows_dde_mlid, mswindows_dde_topic_eval,
+		 mswindows_dde_item_result);
+}
+
+/* A list of DDE advise tokens. Each token is an uninterned symbol,
+ * whose value is the DDE string handle for its name (stored as a float,
+ * as a Lisp int cannot hold a full C int).
+ * The token's 'dde-data property is used to store data for a dde-advise.
+ */
+Lisp_Object Vdde_advise_items;
+
+/* The symbol 'HSZ */
+Lisp_Object QHSZ;
+
+DEFUN("dde-alloc-advise-item", Fdde_alloc_advise_item, 0, 1, 0, /*
+Allocate an advise item, and return its token.
+*/
+      (name))
+{
+  Lisp_Object token;
+  Extbyte *str;
+  HSZ hsz;
+  struct gcpro gcpro1, gcpro2;
+
+  if (!NILP (name))
+    CHECK_STRING (name);
+  else
+    {
+      static int num = 0;
+      char buf[20];
+      sprintf (buf, "Tok%d", num);
+      ++num;
+      name = build_string (buf);
+    }
+
+  token = Qnil;
+  GCPRO2 (name, token);
+  token = Fmake_symbol (name);
+  TO_EXTERNAL_FORMAT (LISP_STRING, name, C_STRING_ALLOCA, str,
+		      Qmswindows_tstr);
+  hsz = qxeDdeCreateStringHandle (mswindows_dde_mlid, str,
+				  XEUNICODE_P ? CP_WINUNICODE : CP_WINANSI);
+
+  Fput(token, QHSZ, make_float ((int)hsz));
+  Vdde_advise_items = Fcons (token, Vdde_advise_items);
+
+  RETURN_UNGCPRO(token);
+}
+
+DEFUN("dde-free-advise-item", Fdde_free_advise_item, 1, 1, 0, /*
+Free the resources associated with advise item ITEM.
+
+Frees all resources allocated to allow clients to set up advise loops
+on ITEM. It is assumed that no active advise loops remain. However, no
+problems should arise if they do - it's just that we won't ever send any
+notifications again.
+
+If the user does not free an advise item, resources will be leaked.
+*/
+      (item))
+{
+  HSZ hsz;
+  Lisp_Object val;
+
+  CHECK_SYMBOL (item);
+  val = Fget (item, QHSZ, Qnil);
+  if (!FLOATP (val))
+    return Qnil;
+  hsz = (HSZ)(int)XFLOAT_DATA (val);
+  DdeFreeStringHandle (mswindows_dde_mlid, hsz);
+  Vdde_advise_items = delq_no_quit (item, Vdde_advise_items);
+  return Qnil;
+}
+
+DEFUN("dde-advise", Fdde_advise, 2, 2, 0, /*
+Post a DDE advise for ITEM with associated data DATA.
+
+Records the value DATA for sending back to clients waiting for
+notifications on DDE item ITEM in the system topic, and posts
+the advise transaction.
+
+ITEM must be an advise token allocated using dde-alloc-advise-item.
+*/
+      (item, data))
+{
+  HSZ hsz;
+  Lisp_Object val;
+
+  CHECK_SYMBOL (item);
+  val = Fget (item, QHSZ, Qnil);
+  if (!FLOATP (val))
+    return Qnil;
+  hsz = (HSZ)(int)XFLOAT_DATA (val);
+
+  Fset (item, data);
+  DdePostAdvise (mswindows_dde_mlid, mswindows_dde_topic_eval, hsz);
+  return Qnil;
+}
+
 HDDEDATA CALLBACK
 mswindows_dde_callback (UINT uType, UINT uFmt, HCONV hconv,
 			HSZ hszTopic, HSZ hszItem, HDDEDATA hdata,
@@ -1741,31 +1940,172 @@
   switch (uType)
     {
     case XTYP_CONNECT:
-      if (!DdeCmpStringHandles (hszTopic, mswindows_dde_topic_system))
+      if (!DdeCmpStringHandles (hszTopic, mswindows_dde_topic_system)
+          || !DdeCmpStringHandles (hszTopic, mswindows_dde_topic_eval))
 	return (HDDEDATA) TRUE;
       return (HDDEDATA) FALSE;
 
     case XTYP_WILDCONNECT:
       {
-	/* We only support one {service,topic} pair */
-	HSZPAIR pairs[2] =
+	/* We support two {service,topic} pairs */
+	HSZPAIR pairs[3] =
 	{
-	  { mswindows_dde_service, mswindows_dde_topic_system }, { 0, 0 } };
-
-	if (!(hszItem 
-	      || DdeCmpStringHandles (hszItem, mswindows_dde_service)) &&
-	    !(hszTopic
-	      || DdeCmpStringHandles (hszTopic, mswindows_dde_topic_system)))
+	  { mswindows_dde_service, mswindows_dde_topic_system },
+	  { mswindows_dde_service, mswindows_dde_topic_eval },
+	  { 0, 0 }
+	};
+
+	if ((!hszItem
+	     || !DdeCmpStringHandles (hszItem, mswindows_dde_service)) &&
+	    (!hszTopic
+	     || !DdeCmpStringHandles (hszTopic, mswindows_dde_topic_system)
+	     || !DdeCmpStringHandles (hszTopic, mswindows_dde_topic_eval)))
 	  return (DdeCreateDataHandle (mswindows_dde_mlid, (LPBYTE) pairs,
 				       sizeof (pairs), 0L, 0, uFmt, 0));
       }
       return (HDDEDATA) NULL;
 
+    case XTYP_ADVSTART:
+      if (!mswindows_dde_enable)
+	return (HDDEDATA) FALSE;
+
+      /* We only support advise loops on the eval topic for text data */
+      if (!DdeCmpStringHandles (hszTopic, mswindows_dde_topic_eval)
+	  && (uFmt == CF_TEXT || uFmt == CF_UNICODETEXT))
+	{
+	  /* Only allocated items or Result, are allowed */
+	  if (!DdeCmpStringHandles (hszItem, mswindows_dde_item_result))
+	    return (HDDEDATA) TRUE;
+
+	  {
+	    EXTERNAL_LIST_LOOP_2 (elt, Vdde_advise_items)
+	      {
+		Lisp_Object val;
+		HSZ hsz;
+		if (!SYMBOLP (elt))
+		  continue;
+		val = Fget (elt, QHSZ, Qnil);
+		if (!FLOATP (val))
+		  continue;
+		hsz = (HSZ) (int) XFLOAT_DATA (val);
+		if (!DdeCmpStringHandles (hszItem, hsz))
+		  return (HDDEDATA) TRUE;
+	      }
+	  }
+	}
+      return (HDDEDATA) FALSE;
+
+      /* Both advise requests and normal requests work the same */
+    case XTYP_ADVREQ:
+    case XTYP_REQUEST:
+      if (!mswindows_dde_enable)
+	return (HDDEDATA) NULL;
+
+      if (DdeCmpStringHandles (hszTopic, mswindows_dde_topic_eval) != 0)
+	return (HDDEDATA) NULL;
+
+      /* If this is a normal request and we're in the middle of
+       * an Execute, block until the Execute completes.
+       */
+      if (dde_eval_pending && uType == XTYP_REQUEST)
+	return (HDDEDATA) CBR_BLOCK;
+
+      /* We can only support requests for ANSI or Unicode text */
+      if (uFmt != CF_TEXT && uFmt != CF_UNICODETEXT)
+	return (HDDEDATA) NULL;
+
+      {
+	Lisp_Object args[2];
+	struct gcpro gcpro1;
+	Lisp_Object res;
+	Extbyte *result;
+	DWORD bytes;
+
+	args[0] = Qnil;
+	args[1] = Qnil;
+	GCPRO1 (args[0]);
+	gcpro1.nvars = 2;
+
+
+	if (!DdeCmpStringHandles (hszItem, mswindows_dde_item_result))
+	  {
+	    if (NILP (dde_eval_error))
+	      {
+		args[0] = build_string ("OK: %s");
+		args[1] = dde_eval_result;
+	      }
+	    else
+	      {
+		args[0] = build_string ("ERR: %s");
+		args[1] = dde_eval_error;
+	      }
+	  }
+	else
+	  {
+	    EXTERNAL_LIST_LOOP_2 (elt, Vdde_advise_items)
+	      {
+		Lisp_Object val;
+		HSZ hsz;
+		if (!SYMBOLP (elt))
+		  continue;
+		val = Fget (elt, QHSZ, Qnil);
+		if (!FLOATP (val))
+		  continue;
+		hsz = (HSZ) (int) XFLOAT_DATA (val);
+		if (!DdeCmpStringHandles (hszItem, hsz))
+		  args[1] = Fsymbol_value (elt);
+	      }
+	    args[0] = build_string ("%s");
+	  }
+
+	res = Fformat (2, args);
+	UNGCPRO;
+
+	bytes = (uFmt == CF_TEXT ? 1 : 2) * (XSTRING_LENGTH (res) + 1);
+	TO_EXTERNAL_FORMAT (LISP_STRING, res,
+			    C_STRING_ALLOCA, result,
+			    uFmt == CF_TEXT ? Qmswindows_multibyte
+			    : Qmswindows_unicode);
+
+	/* If we cannot create the data handle, this passes the null
+	 * return back to the client, which signals an error as we wish.
+	 */
+	return DdeCreateDataHandle (mswindows_dde_mlid, (LPBYTE)result,
+				    bytes, 0L, hszItem, uFmt, 0);
+      }
+
     case XTYP_EXECUTE:
       if (!mswindows_dde_enable)
 	return (HDDEDATA) DDE_FBUSY;
+
+      if (!DdeCmpStringHandles (hszTopic, mswindows_dde_topic_eval))
+	{
+	  DWORD len;
+	  LPBYTE extcmd;
+	  Lisp_Object tmp;
 
-      if (!DdeCmpStringHandles (hszTopic, mswindows_dde_topic_system))
+	  /* Grab a pointer to the raw data supplied */
+	  extcmd = DdeAccessData (hdata, &len);
+
+	  TO_INTERNAL_FORMAT (DATA, (extcmd, len),
+			      LISP_STRING, tmp,
+			      Qmswindows_tstr);
+
+	  /* Release and free the data handle */
+	  DdeUnaccessData (hdata);
+	  DdeFreeDataHandle (hdata);
+
+	  /* Set a flag to say that the evaluation isn't yet complete,
+	   * enqueue the evaluation, send a dummy event to trigger the
+	   * event loop (I've no idea why this is needed, but it works...)
+	   * and return success to the client.
+	   */
+	  dde_eval_pending = 1;
+	  enqueue_magic_eval_event (dde_eval, tmp);
+	  mswindows_enqueue_magic_event (NULL, XM_BUMPQUEUE);
+	  return (HDDEDATA) DDE_FACK;
+	}
+      else if (!DdeCmpStringHandles (hszTopic, mswindows_dde_topic_system))
 	{
 	  DWORD len = DdeGetData (hdata, NULL, 0, 0);
 	  LPBYTE extcmd = (LPBYTE) ALLOCA (len + 1);
@@ -1786,7 +2126,6 @@
 
 	  /* Check syntax & that it's an [Open("foo")] command, which we
 	   * treat like a file drop */
-	  /* #### Ought to be generalised and accept some other commands */
 	  if (*cmd == '[')
 	    cmd++;
 	  if (qxestrncasecmp_c (cmd, MSWINDOWS_DDE_ITEM_OPEN,
@@ -2966,6 +3305,70 @@
       mswindows_handle_paint (XFRAME (mswindows_find_frame (hwnd)));
       break;
 
+    case WM_ACTIVATE:
+      {
+        /*
+         * If we receive a WM_ACTIVATE message that indicates that our frame
+         * is being activated, make sure that the frame is marked visible
+         * if the window itself is visible. This seems to fix the problem
+         * where XEmacs appears to lock-up after switching desktops with
+         * some virtual window managers.
+         */
+        int state = (int)(short) LOWORD(wParam);
+#ifdef DEBUG_XEMACS
+        if (debug_mswindows_events)
+          stderr_out("state = %d\n", state);
+#endif /* DEBUG_XEMACS */
+        if (state == WA_ACTIVE || state == WA_CLICKACTIVE)
+          {
+#ifdef DEBUG_XEMACS
+            if (debug_mswindows_events)
+              stderr_out("  activating\n");
+#endif /* DEBUG_XEMACS */
+            
+            fobj = mswindows_find_frame (hwnd);
+            frame = XFRAME (fobj);
+            if (IsWindowVisible (hwnd))
+              {
+#ifdef DEBUG_XEMACS
+                if (debug_mswindows_events)
+                  stderr_out("  window is visible\n");
+#endif /* DEBUG_XEMACS */
+                if (!FRAME_VISIBLE_P (frame))
+                  {
+#ifdef DEBUG_XEMACS
+                    if (debug_mswindows_events)
+                      stderr_out("  frame is not visible\n");
+#endif /* DEBUG_XEMACS */
+                    /*
+                     * It seems that we have to enqueue the XM_MAPFRAME event
+                     * prior to setting the frame visible so that
+                     * suspend-or-iconify-emacs works properly.
+                     */
+                    mswindows_enqueue_magic_event (hwnd, XM_MAPFRAME);
+                    FRAME_VISIBLE_P (frame) = 1;
+                    FRAME_ICONIFIED_P (frame) = 0;
+                  }
+#ifdef DEBUG_XEMACS
+                else
+                  {
+                    if (debug_mswindows_events)
+                      stderr_out("  frame is visible\n");
+                  }
+#endif /* DEBUG_XEMACS */
+              }
+#ifdef DEBUG_XEMACS
+            else
+              {     
+                if (debug_mswindows_events)
+                  stderr_out("  window is not visible\n");
+              }
+#endif /* DEBUG_XEMACS */
+          }
+	return qxeDefWindowProc (hwnd, message_, wParam, lParam);
+      }
+      break;
+      
     case WM_WINDOWPOSCHANGED:
       /* This is sent before WM_SIZE; in fact, the processing of this
 	 by DefWindowProc() sends WM_SIZE.  But WM_SIZE is not sent when
@@ -3075,13 +3478,14 @@
 		}
 	      else
 		{
-		  if (!msframe->sizing && !FRAME_VISIBLE_P (frame)) {
-		    mswindows_enqueue_magic_event (hwnd, XM_MAPFRAME);
-		    /* APA: Now that the magic XM_MAPFRAME event has
-		     * been sent we can mark the frame as visible (just
-		     * like 21.1 did). */
-		    FRAME_VISIBLE_P (frame) = 1;
-		  }
+		  if (!msframe->sizing && !FRAME_VISIBLE_P (frame))
+                    {
+                      mswindows_enqueue_magic_event (hwnd, XM_MAPFRAME);
+                      /* APA: Now that the magic XM_MAPFRAME event has
+                       * been sent we can mark the frame as visible (just
+                       * like 21.1 did). */
+                      FRAME_VISIBLE_P (frame) = 1;
+                    }
 
 		  if (!msframe->sizing || mswindows_dynamic_frame_resize)
 		    redisplay ();
@@ -4725,6 +5129,25 @@
       stderr_out (" wparam=%d lparam=%d hwnd=%x frame: ",
 		  wParam, (int) lParam, (unsigned int) hwnd);
       debug_print (frame);
+      if (message_ == WM_WINDOWPOSCHANGED ||
+          message_ == WM_WINDOWPOSCHANGING)
+        {
+          WINDOWPOS *wp = (WINDOWPOS *) lParam;
+          stderr_out("  WINDOWPOS: x=%d, y=%d, h=%d, w=%d\n",
+                     wp->x, wp->y, wp->cx, wp->cy);
+        }
+      else if (message_ == WM_MOVE)
+        {
+          int x = (int)(short) LOWORD(lParam);   /* horizontal position */
+          int y = (int)(short) HIWORD(lParam);   /* vertical position */
+          stderr_out("  MOVE: x=%d, y=%d\n", x, y);
+        }
+      else if (message_ == WM_SIZE)
+        {
+          int w = (int)(short) LOWORD(lParam);   /* width */
+          int h = (int)(short) HIWORD(lParam);   /* height */
+          stderr_out("  SIZE: w=%d, h=%d\n", w, h);
+        }
     }
   else
     stderr_out ("\n");
@@ -4762,6 +5185,8 @@
   mswindows_event_stream->delete_io_streams_cb = emacs_mswindows_delete_io_streams;
   mswindows_event_stream->current_event_timestamp_cb =
     emacs_mswindows_current_event_timestamp;
+
+  dde_eval_pending = 0;
 }
 
 void
@@ -4781,6 +5206,28 @@
 
   mswindows_error_caught_in_modal_loop = 0;
 
+#ifdef HAVE_DRAGNDROP
+  Fprovide (Qdde);
+
+  DEFVAR_LISP ("dde-advise-items", &Vdde_advise_items /*
+A list of allocated DDE advise items.
+Each item is an uninterned symbol, created using dde-alloc-advise-item.
+
+The symbol's value is the data which is returned to the DDE client when
+a request for the item is made (or a dde-advise call is made).
+
+The symbol also has a 'HSZ property, which holds the DDE string handle
+for the item, as a float. This is for internal use only, and should not
+be modified.
+*/ );
+  Vdde_advise_items = Qnil;
+  
+  dde_eval_result = Qnil;
+  staticpro (&dde_eval_result);
+  dde_eval_error = Qnil;
+  staticpro (&dde_eval_error);
+#endif
+
 #ifdef DEBUG_XEMACS
   DEFVAR_INT ("debug-mswindows-events", &debug_mswindows_events /*
 If non-zero, display debug information about Windows messages that XEmacs sees.
@@ -4853,6 +5300,12 @@
 void
 syms_of_event_mswindows (void)
 {
+#ifdef HAVE_DRAGNDROP
+  DEFSYMBOL(QHSZ);
+  DEFSUBR(Fdde_alloc_advise_item);
+  DEFSUBR(Fdde_free_advise_item);
+  DEFSUBR(Fdde_advise);
+#endif
 }
 
 void
Index: src/event-stream.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/event-stream.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -u -r1.69 -r1.70
--- src/event-stream.c	2002/06/20 21:18:29	1.69
+++ src/event-stream.c	2002/07/03 07:18:41	1.70
@@ -2315,8 +2315,6 @@
 
   switch (XEVENT_TYPE (event))
     {
-    default:
-      goto RETURN;
     case button_release_event:
     case misc_user_event:
       /* don't echo menu accelerator keys */
@@ -2326,6 +2324,8 @@
       goto STORE_AND_EXECUTE_KEY;
     case key_press_event:         /* any key input can trigger autosave */
       break;
+    default:
+      goto RETURN;
     }
 
   /* temporarily reenable quit checking here, because we could get stuck */
@@ -3104,6 +3104,19 @@
 		   to enable that check, and we do so now. */
 		kick_status_notify ();
 	      }
+	    else
+	      {
+		/* Deactivate network connection */
+		Lisp_Object status = Fprocess_status (p);
+		if (EQ (status, Qopen)
+		    /* In case somebody changes the theory of whether to
+		       return open as opposed to run for network connection
+		       "processes"... */
+		    || EQ (status, Qrun))
+		  update_process_status (p, Qexit, 256, 0);
+		deactivate_process (p);
+		status_notify ();
+	      }
 	    
 	    /* We must call status_notify here to allow the
 	       event_stream->unselect_process_cb to be run if appropriate.
@@ -3117,8 +3130,8 @@
 	       status_notify() will be called on return to top-level.
 	    */
 	    status_notify ();
-	    return;
 	  }
+	return;
       }
 
     case timeout_event:
Index: src/frame-impl.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/frame-impl.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- src/frame-impl.h	2002/07/02 12:32:37	1.2
+++ src/frame-impl.h	2002/07/06 21:05:52	1.3
@@ -172,6 +172,8 @@
   unsigned int extents_changed :1;
   unsigned int faces_changed :1;
   unsigned int frame_changed :1;
+  unsigned int frame_layout_changed :1;	/* The layout of frame
+ 					   elements has changed. */
   unsigned int subwindows_changed :1;
   unsigned int subwindows_state_changed :1;
   unsigned int glyphs_changed :1;
@@ -396,6 +398,19 @@
     }							\
   else							\
     frame_changed = 1;					\
+} while (0)
+
+#define MARK_FRAME_LAYOUT_CHANGED(f) do {		\
+  struct frame *mfc_f = (f);				\
+  mfc_f->frame_layout_changed = 1;			\
+  mfc_f->modiff++;					\
+  if (!NILP (mfc_f->device))				\
+    {							\
+      struct device *mfc_d = XDEVICE (mfc_f->device);	\
+      MARK_DEVICE_FRAME_LAYOUT_CHANGED (mfc_d);		\
+    }							\
+  else							\
+    frame_layout_changed = 1;				\
 } while (0)
 
 #define MARK_FRAME_WINDOWS_CHANGED(f) do {		\
Index: src/frame-msw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/frame-msw.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -u -r1.46 -r1.47
--- src/frame-msw.c	2002/06/20 21:18:32	1.46
+++ src/frame-msw.c	2002/07/06 05:48:21	1.47
@@ -840,52 +840,52 @@
 {
   DOCINFOW di;
   struct device *device = XDEVICE (FRAME_DEVICE (f));
-  HDC hdc;
   int frame_left, frame_top, frame_width, frame_height;
-
+  
   /* DC might be recreated in msprinter_apply_devmode,
      so do not initialize until now */
-  hdc = DEVICE_MSPRINTER_HDC (device);
+  HDC hdc = DEVICE_MSPRINTER_HDC (device);
+  int logpixelsx = GetDeviceCaps (hdc, LOGPIXELSX);
+  int logpixelsy = GetDeviceCaps (hdc, LOGPIXELSY);
+  int physicaloffsetx = GetDeviceCaps (hdc, PHYSICALOFFSETX);
+  int physicaloffsety = GetDeviceCaps (hdc, PHYSICALOFFSETY);
+  int physicalheight = GetDeviceCaps (hdc, PHYSICALHEIGHT);
+  int physicalwidth = GetDeviceCaps (hdc, PHYSICALWIDTH);
 
-  /* Compute geometry properties */
-  frame_left = (MulDiv (GetDeviceCaps (hdc, LOGPIXELSX),
-			FRAME_MSPRINTER_LEFT_MARGIN (f), 1440)
-		- GetDeviceCaps (hdc, PHYSICALOFFSETX));
-  
+  /* Compute geometry properties.
+     Conversion is from TWIPS -> inches -> pixels. */
+  frame_left = MulDiv (logpixelsx, FRAME_MSPRINTER_LEFT_MARGIN(f), 1440)
+    - physicaloffsetx;
+
   if (FRAME_MSPRINTER_CHARWIDTH (f) > 0)
     {
       char_to_real_pixel_size (f, FRAME_MSPRINTER_CHARWIDTH (f), 0,
 			       &frame_width, NULL);
-      FRAME_MSPRINTER_RIGHT_MARGIN (f) = 
-	MulDiv (GetDeviceCaps (hdc, PHYSICALWIDTH)
-		- (frame_left + frame_width), 1440,
-		GetDeviceCaps (hdc, LOGPIXELSX));
+      FRAME_MSPRINTER_RIGHT_MARGIN(f) =
+	MulDiv (physicalwidth - (frame_left + frame_width), 1440,
+		logpixelsx);
     }
   else
-    frame_width = (GetDeviceCaps (hdc, PHYSICALWIDTH)
-		   - frame_left
-		   - MulDiv (GetDeviceCaps (hdc, LOGPIXELSX),
-			     FRAME_MSPRINTER_RIGHT_MARGIN (f), 1440));
+    frame_width = physicalwidth - frame_left
+      - MulDiv (logpixelsx, FRAME_MSPRINTER_RIGHT_MARGIN(f), 1440)
+      - physicaloffsetx;
 
-  frame_top = (MulDiv (GetDeviceCaps (hdc, LOGPIXELSY),
-		       FRAME_MSPRINTER_TOP_MARGIN (f), 1440)
-	       - GetDeviceCaps (hdc, PHYSICALOFFSETY));
+  frame_top = MulDiv (logpixelsy, FRAME_MSPRINTER_TOP_MARGIN(f), 1440)
+    - physicaloffsety;
 
   if (FRAME_MSPRINTER_CHARHEIGHT (f) > 0)
     {
       char_to_real_pixel_size (f, 0, FRAME_MSPRINTER_CHARHEIGHT (f),
 			       NULL, &frame_height);
 
-      FRAME_MSPRINTER_BOTTOM_MARGIN (f) = 
-	MulDiv (GetDeviceCaps (hdc, PHYSICALHEIGHT)
-		- (frame_top + frame_height), 1440,
-		GetDeviceCaps (hdc, LOGPIXELSY));
+      FRAME_MSPRINTER_BOTTOM_MARGIN(f) =
+	MulDiv (physicalheight - (frame_top + frame_height), 1440,
+		logpixelsy);
     }
   else
-    frame_height = (GetDeviceCaps (hdc, PHYSICALHEIGHT)
-		    - frame_top
-		    - MulDiv (GetDeviceCaps (hdc, LOGPIXELSY),
-			      FRAME_MSPRINTER_BOTTOM_MARGIN (f), 1440));
+    frame_height = physicalheight - frame_top
+      - MulDiv (logpixelsy, FRAME_MSPRINTER_BOTTOM_MARGIN(f), 1440)
+      - physicaloffsety;
 
   /* Geometry sanity checks */
   if (!frame_pixsize_valid_p (f, frame_width, frame_height))
Index: src/general-slots.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/general-slots.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -u -r1.9 -r1.10
--- src/general-slots.h	2002/06/04 06:05:10	1.9
+++ src/general-slots.h	2002/07/06 05:48:21	1.10
@@ -90,6 +90,7 @@
 SYMBOL (Qcurrent);
 SYMBOL (Qcursor);
 SYMBOL (Qdata);
+SYMBOL (Qdde);
 SYMBOL (Qdead);
 SYMBOL (Qdebug);
 SYMBOL (Qdefault);
Index: src/glyphs-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs-x.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -u -r1.68 -r1.69
--- src/glyphs-x.c	2002/06/20 21:18:34	1.68
+++ src/glyphs-x.c	2002/07/10 03:54:45	1.69
@@ -2028,6 +2028,9 @@
       XUnmapWindow
 	(IMAGE_INSTANCE_X_SUBWINDOW_DISPLAY (p),
 	 IMAGE_INSTANCE_X_CLIPWINDOW (p));
+      XUnmapSubwindows
+	(IMAGE_INSTANCE_X_SUBWINDOW_DISPLAY (p),
+	 IMAGE_INSTANCE_X_CLIPWINDOW (p));
     }
   else				/* must be a widget */
     {
@@ -2057,8 +2060,12 @@
       XMoveWindow (IMAGE_INSTANCE_X_SUBWINDOW_DISPLAY (p),
 		   subwindow, -dga->xoffset, -dga->yoffset);
       if (!IMAGE_INSTANCE_SUBWINDOW_DISPLAYEDP (p))
-	XMapWindow (IMAGE_INSTANCE_X_SUBWINDOW_DISPLAY (p),
-		    IMAGE_INSTANCE_X_CLIPWINDOW (p));
+	{
+	  XMapWindow (IMAGE_INSTANCE_X_SUBWINDOW_DISPLAY (p),
+		      IMAGE_INSTANCE_X_CLIPWINDOW (p));
+	  XMapSubwindows (IMAGE_INSTANCE_X_SUBWINDOW_DISPLAY (p),
+			  IMAGE_INSTANCE_X_CLIPWINDOW (p));
+	}
     }
   else				/* must be a widget */
     {
Index: src/glyphs.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/glyphs.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -u -r1.40 -r1.41
--- src/glyphs.c	2002/06/20 21:18:34	1.40
+++ src/glyphs.c	2002/07/06 05:48:22	1.41
@@ -2285,6 +2285,8 @@
   struct face_cachel *cachel;
   Lisp_Object frame = DOMAIN_FRAME (domain);
 
+  CHECK_STRING (string);
+
   /* Compute height */
   if (height)
     {
Index: src/gutter.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/gutter.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -u -r1.11 -r1.12
--- src/gutter.c	2002/06/20 21:18:35	1.11
+++ src/gutter.c	2002/07/06 21:05:52	1.12
@@ -588,6 +588,7 @@
       pixel_to_char_size (f, FRAME_PIXWIDTH (f), FRAME_PIXHEIGHT (f),
 			  &width, &height);
       change_frame_size (f, height, width, 0);
+      MARK_FRAME_LAYOUT_CHANGED (f);
     }
 
   /* Mark sizes as up-to-date. */
@@ -597,7 +598,9 @@
 void
 update_frame_gutter_geometry (struct frame *f)
 {
-  if (f->gutter_changed || f->windows_structure_changed)
+  if (f->gutter_changed 
+      || f->frame_layout_changed 
+      || f->windows_structure_changed)
     {
       enum gutter_pos pos;
 
@@ -619,7 +622,7 @@
       f->gutter_changed || f->glyphs_changed ||
       f->size_changed || f->subwindows_changed ||
       f->windows_changed || f->windows_structure_changed ||
-      f->extents_changed)
+      f->extents_changed || f->frame_layout_changed)
     {
       enum gutter_pos pos;
 
Index: src/input-method-motif.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/input-method-motif.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -u -r1.13 -r1.14
--- src/input-method-motif.c	2002/03/13 08:52:48	1.13
+++ src/input-method-motif.c	2002/07/02 19:09:27	1.14
@@ -26,7 +26,8 @@
 #include <config.h>
 #include <X11/Xlocale.h>        /* More portable than <locale.h> ? */
 #include "lisp.h"
-#include "console-x.h"
+#include "frame-impl.h"
+#include "console-x-impl.h"
 #include "device.h"
 #include "frame.h"
 #include "EmacsFrame.h"
Index: src/lisp.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/lisp.h,v
retrieving revision 1.82
retrieving revision 1.84
diff -u -u -r1.82 -r1.84
--- src/lisp.h	2002/06/28 14:24:08	1.82
+++ src/lisp.h	2002/07/23 08:35:11	1.84
@@ -3506,6 +3506,7 @@
 EXFUN (Fcar, 1);
 EXFUN (Fcar_safe, 1);
 EXFUN (Fcdr, 1);
+EXFUN (Fcdr_safe, 1);
 EXFUN (Fgeq, MANY);
 EXFUN (Fgtr, MANY);
 EXFUN (Findirect_function, 1);
@@ -4966,7 +4967,7 @@
 extern Lisp_Object Qconversion_error, Qcurrent_menubar;
 extern Lisp_Object Qcyclic_variable_indirection, Qdefun, Qdevice_live_p, Qdim;
 extern Lisp_Object Qdirection, Qdisabled, Qdisabled_command_hook;
-extern Lisp_Object Qdisplay_table, Qdomain_error, Qediting_error;
+extern Lisp_Object Qdisplay_table, Qdll_error, Qdomain_error, Qediting_error;
 extern Lisp_Object Qend_of_buffer, Qend_of_file, Qend_open, Qerror;
 extern Lisp_Object Qerror_conditions, Qerror_lacks_explanatory_string;
 extern Lisp_Object Qerror_message, Qevent_live_p, Qexit, Qextent_live_p;
Index: src/process-unix.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/process-unix.c,v
retrieving revision 1.43
retrieving revision 1.46
diff -u -u -r1.43 -r1.46
--- src/process-unix.c	2002/06/05 09:56:49	1.43
+++ src/process-unix.c	2002/07/25 00:23:46	1.46
@@ -1559,12 +1559,13 @@
       /* #### There is controversy over whether this might cause fd leakage */
       /*      my tests say no. -slb */
       XLSTREAM (p->pipe_outstream)->flags &= ~LSTREAM_FL_IS_OPEN;
+      XLSTREAM (p->coding_outstream)->flags &= ~LSTREAM_FL_IS_OPEN;
       p->status_symbol = Qexit;
       p->exit_code = 256; /* #### SIGPIPE ??? */
       p->core_dumped = 0;
       p->tick++;
       process_tick++;
-      deactivate_process (*((Lisp_Object *) (&vol_proc)));
+      deactivate_process (vol_proc);
       invalid_operation ("SIGPIPE raised on process; closed it", p->name);
     }
 
Index: src/process.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/process.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -u -r1.59 -r1.60
--- src/process.c	2002/06/05 09:56:51	1.59
+++ src/process.c	2002/07/09 11:56:04	1.60
@@ -694,6 +694,7 @@
   Lisp_Object buffer, stderr_buffer, name, program, process, current_dir;
   int separate_stderr;
   Lisp_Object tem;
+  int i;
   int speccount = specpdl_depth ();
   struct gcpro gcpro1, gcpro2, gcpro3;
 
@@ -730,6 +731,8 @@
 
   CHECK_STRING (name);
   CHECK_STRING (program);
+  for (i = 3; i < nargs; ++i)
+    CHECK_STRING (args[i]);
 
   /* Make sure that the child will be able to chdir to the current
      buffer's current directory, or its unhandled equivalent. [[ We
Index: src/ralloc.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/ralloc.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -u -r1.14 -r1.15
--- src/ralloc.c	2001/06/10 10:42:33	1.14
+++ src/ralloc.c	2002/07/09 11:55:36	1.15
@@ -2022,6 +2022,10 @@
   if (r_alloc_initialized > 1)
     return;	/* used to return 1 */
 
+#ifdef PDUMP
+  /* Under pdump, we need to activate ralloc on the first go. */
+  ++r_alloc_initialized;
+#endif
   if (++r_alloc_initialized == 1)
     return;	/* used to return 1 */
 
Index: src/redisplay.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -u -r1.80 -r1.81
--- src/redisplay.c	2002/06/20 21:18:43	1.80
+++ src/redisplay.c	2002/07/06 21:05:53	1.81
@@ -436,6 +436,10 @@
 int toolbar_changed;
 int toolbar_changed_set;
 
+/* Nonzero if some frame has changed the layout of internal elements
+   (gutters or toolbars). */
+int frame_layout_changed;
+
 /* non-nil if any gutter has changed */
 int gutter_changed;
 int gutter_changed_set;
@@ -6571,8 +6575,13 @@
   update_frame_menubars (f);
 #endif /* HAVE_MENUBARS */
 #ifdef HAVE_TOOLBARS
-  /* Update the toolbars. */
-  update_frame_toolbars (f);
+  /* Update the toolbars geometry. We don't update the toolbars
+     themselves at this point since the space they are trying to
+     occupy may currently by occupied by gutter elements. Instead we
+     update the geometry, then update the gutter geometry, then update
+     the gutters - which will cause mapped windows to be repositioned
+     - and finally update the toolbars. */
+  update_frame_toolbars_geometry (f);
 #endif /* HAVE_TOOLBARS */
   /* Gutter update proper has to be done inside display when no frame
      size changes can occur, thus we separately update the gutter
@@ -6651,6 +6660,14 @@
   MAYBE_DEVMETH (d, frame_output_end, (f));
 
   update_frame_title (f);
+
+#ifdef HAVE_TOOLBARS
+  /* Finally update the toolbars. It seems its possible to get in a
+     cycle between updating the gutter and the toolbars. Basically we
+     want to end up with both being up-to-date and this doesn't seem
+     possible in a single pass. */
+  update_frame_toolbars (f);
+#endif /* HAVE_TOOLBARS */
 
   CLASS_RESET_CHANGED_FLAGS (f);
   f->window_face_cache_reset = 0;
Index: src/redisplay.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/redisplay.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -u -r1.16 -r1.17
--- src/redisplay.h	2002/06/20 21:18:43	1.16
+++ src/redisplay.h	2002/07/06 21:05:54	1.17
@@ -479,6 +479,10 @@
 /* Nonzero if some device has signaled that it wants to change size. */
 extern int asynch_device_change_pending;
 
+/* Nonzero if some frame has changed the layout of internal elements
+   (gutters or toolbars). */
+extern int frame_layout_changed;
+
 /* Nonzero if any toolbar has changed. */
 extern int toolbar_changed;
 extern int toolbar_changed_set;
@@ -549,6 +553,7 @@
   (p)->extents_changed = 0;			\
   (p)->faces_changed = 0;			\
   (p)->frame_changed = 0;			\
+  (p)->frame_layout_changed = 0;		\
   (p)->icon_changed = 0;			\
   (p)->menubar_changed = 0;			\
   (p)->modeline_changed = 0;			\
@@ -567,6 +572,7 @@
   clip_changed = 0;				\
   extents_changed = 0;				\
   frame_changed = 0;				\
+  frame_layout_changed = 0;			\
   icon_changed = 0;				\
   menubar_changed = 0;				\
   modeline_changed = 0;				\
@@ -586,6 +592,7 @@
     (p)->extents_changed ||			\
     (p)->faces_changed ||			\
     (p)->frame_changed ||			\
+    (p)->frame_layout_changed ||		\
     (p)->icon_changed ||			\
     (p)->menubar_changed ||			\
     (p)->modeline_changed ||			\
@@ -605,6 +612,7 @@
     extents_changed ||				\
     faces_changed ||				\
     frame_changed ||				\
+    frame_layout_changed ||			\
     icon_changed ||				\
     menubar_changed ||				\
     modeline_changed ||				\
Index: src/sheap.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/sheap.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -u -r1.17 -r1.18
--- src/sheap.c	2002/05/28 08:45:01	1.17
+++ src/sheap.c	2002/07/06 05:48:22	1.18
@@ -27,7 +27,7 @@
 #include <sheap-adjust.h>
 
 #define STATIC_HEAP_BASE	0x800000
-#define STATIC_HEAP_SLOP	0x40000
+#define STATIC_HEAP_SLOP	0xf0000
 #define STATIC_HEAP_SIZE \
 (STATIC_HEAP_BASE + SHEAP_ADJUSTMENT + STATIC_HEAP_SLOP)
 #define BLOCKSIZE	(1<<12)
@@ -106,7 +106,7 @@
 }
 
 static void
-sheap_adjust_h ()
+sheap_adjust_h (long adjust)
 {
   FILE *stream = retry_fopen ("sheap-adjust.h", "w");
 
@@ -117,8 +117,7 @@
   fprintf (stream,
 	   "/*\tDo not edit this file!\n"
 	   "\tAutomatically generated by XEmacs */\n"
-	   "# define SHEAP_ADJUSTMENT (%d)\n",
-	   ((static_heap_ptr - static_heap_buffer) - STATIC_HEAP_BASE));
+	   "# define SHEAP_ADJUSTMENT (%ld)\n", adjust);
   retry_fclose (stream);
 }
 
@@ -128,17 +127,20 @@
 {
   int rc = 0;
 
-  Bytecount lost = (STATIC_HEAP_BASE + STATIC_HEAP_SLOP + SHEAP_ADJUSTMENT)
+  Bytecount lost = STATIC_HEAP_SIZE
     - (static_heap_ptr - static_heap_buffer);
   char buf[200];
-  sprintf (buf, "Static heap usage: %ld of %ld",
+  sprintf (buf, "Static heap usage: %ld of %ld, slop is %ld",
                (long) (static_heap_ptr - static_heap_buffer),
-	   (long) (STATIC_HEAP_BASE + STATIC_HEAP_SLOP + SHEAP_ADJUSTMENT));
+	   (long) (STATIC_HEAP_SIZE),
+	   (long) STATIC_HEAP_SLOP);
 
   if (lost > STATIC_HEAP_SLOP) {
     sprintf (buf + strlen (buf), " -- %ldk wasted", (long)(lost/1024));
     if (die_if_pure_storage_exceeded) {
-      sheap_adjust_h();
+      sheap_adjust_h(STATIC_HEAP_SLOP - lost);
+      sprintf (buf + strlen (buf), " -- reset to %ldk", 
+	       (long) (STATIC_HEAP_SIZE + STATIC_HEAP_SLOP - lost));
       rc = -1;
     }
     message ("%s", buf);
Index: src/symbols.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/symbols.c,v
retrieving revision 1.37
retrieving revision 1.39
diff -u -u -r1.37 -r1.39
--- src/symbols.c	2002/06/20 21:18:46	1.37
+++ src/symbols.c	2002/07/23 08:35:11	1.39
@@ -3358,22 +3358,24 @@
 }
 
 #ifdef DEBUG_XEMACS
-/* Check that nobody spazzed writing a DEFUN. */
+/* Check that nobody spazzed writing a builtin (non-module) DEFUN. */
 static void
 check_sane_subr (Lisp_Subr *subr, Lisp_Object sym)
 {
-  assert (subr->min_args >= 0);
-  assert (subr->min_args <= SUBR_MAX_ARGS);
+  if (!initialized) {
+    assert (subr->min_args >= 0);
+    assert (subr->min_args <= SUBR_MAX_ARGS);
+
+    if (subr->max_args != MANY &&
+	subr->max_args != UNEVALLED)
+      {
+	/* Need to fix lisp.h and eval.c if SUBR_MAX_ARGS too small */
+	assert (subr->max_args <= SUBR_MAX_ARGS);
+	assert (subr->min_args <= subr->max_args);
+      }
 
-  if (subr->max_args != MANY &&
-      subr->max_args != UNEVALLED)
-    {
-      /* Need to fix lisp.h and eval.c if SUBR_MAX_ARGS too small */
-      assert (subr->max_args <= SUBR_MAX_ARGS);
-      assert (subr->min_args <= subr->max_args);
-    }
-
-  assert (UNBOUNDP (XSYMBOL (sym)->function));
+    assert (UNBOUNDP (XSYMBOL (sym)->function));
+  }
 }
 #else
 #define check_sane_subr(subr, sym) /* nothing */
@@ -3404,17 +3406,43 @@
  * FIXME: Should newsubr be staticpro()'ed? I don't think so but I need
  * a guru to check.
  */
-#define check_module_subr()						\
-do {									\
-  if (initialized) {							\
-    Lisp_Subr *newsubr = (Lisp_Subr *) xmalloc (sizeof (Lisp_Subr));	\
-    memcpy (newsubr, subr, sizeof (Lisp_Subr));				\
-    subr->doc = (const char *)newsubr;					\
-    subr = newsubr;							\
-  }									\
+#define check_module_subr(subr)						      \
+do {									      \
+  if (initialized) {							      \
+    Lisp_Subr *newsubr;							      \
+    Lisp_Object f;							      \
+									      \
+    if (subr->min_args < 0)						      \
+      signal_ferror (Qdll_error, "%s min_args (%hd) too small",		      \
+		     subr_name (subr), subr->min_args);			      \
+    if (subr->min_args > SUBR_MAX_ARGS)					      \
+      signal_ferror (Qdll_error, "%s min_args (%hd) too big (max = %d)",      \
+		     subr_name (subr), subr->min_args, SUBR_MAX_ARGS);	      \
+									      \
+    if (subr->max_args != MANY &&					      \
+	subr->max_args != UNEVALLED)					      \
+      {									      \
+	/* Need to fix lisp.h and eval.c if SUBR_MAX_ARGS too small */	      \
+	if (subr->max_args > SUBR_MAX_ARGS)				      \
+	  signal_ferror (Qdll_error, "%s max_args (%hd) too big (max = %d)",  \
+			 subr_name (subr), subr->max_args, SUBR_MAX_ARGS);    \
+	if (subr->min_args > subr->max_args)				      \
+	  signal_ferror (Qdll_error, "%s min_args (%hd) > max_args (%hd)",    \
+			 subr_name (subr), subr->min_args, subr->max_args);   \
+      }									      \
+									      \
+    f = XSYMBOL (sym)->function;					      \
+    if (!UNBOUNDP (f) && (!CONSP (f) || !EQ (XCAR (f), Qautoload)))	      \
+      signal_ferror (Qdll_error, "Attempt to redefine %s", subr_name (subr)); \
+									      \
+    newsubr = (Lisp_Subr *) xmalloc (sizeof (Lisp_Subr));		      \
+    memcpy (newsubr, subr, sizeof (Lisp_Subr));				      \
+    subr->doc = (const char *)newsubr;					      \
+    subr = newsubr;							      \
+  }									      \
 } while (0)
 #else /* ! HAVE_SHLIB */
-#define check_module_subr()
+#define check_module_subr(subr)
 #endif
 
 void
@@ -3424,7 +3452,7 @@
   Lisp_Object fun;
 
   check_sane_subr (subr, sym);
-  check_module_subr ();
+  check_module_subr (subr);
 
   fun = wrap_subr (subr);
   XSYMBOL (sym)->function = fun;
@@ -3438,7 +3466,7 @@
   Lisp_Object fun;
 
   check_sane_subr (subr, sym);
-  check_module_subr();
+  check_module_subr (subr);
 
   fun = wrap_subr (subr);
   XSYMBOL (sym)->function = Fcons (Qmacro, fun);
Index: src/sysdep.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/sysdep.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -u -r1.63 -r1.64
--- src/sysdep.c	2002/06/20 21:18:47	1.63
+++ src/sysdep.c	2002/07/09 11:58:12	1.64
@@ -3328,6 +3328,23 @@
   return ctime_static;
 }
 
+/************************************************************************/
+/*                  Emulation of missing functions from wchar.h         */
+/************************************************************************/
+
+#ifndef HAVE_WCHAR_H
+size_t
+wcslen(const wchar_t *s)
+{
+  const wchar_t *p = s;
+
+  while (*p++)
+    ;
+  
+  return p - s;
+}
+#endif
+
 
 /************************************************************************/
 /*                  Emulations of missing system calls                  */
Index: src/text.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/text.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -u -r1.10 -r1.11
--- src/text.h	2002/06/05 09:57:24	1.10
+++ src/text.h	2002/07/09 11:58:12	1.11
@@ -33,7 +33,11 @@
 #ifndef INCLUDED_text_h_
 #define INCLUDED_text_h_
 
+#ifdef HAVE_WCHAR_H
 #include <wchar.h>
+#else
+size_t wcslen(const wchar_t *);
+#endif
 
 /* ---------------------------------------------------------------------- */
 /*                     Super-basic character properties                   */
Index: src/toolbar-common.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/toolbar-common.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -u -r1.8 -r1.9
--- src/toolbar-common.c	2002/06/20 21:18:48	1.8
+++ src/toolbar-common.c	2002/07/06 21:05:55	1.9
@@ -396,7 +396,8 @@
 	    || tb->y != y						\
 	    || tb->width != width					\
 	    || tb->height != height					\
-	    || tb->dirty)						\
+	    || tb->dirty						\
+	    || f->clear) /* This is clearly necessary. */		\
 	  {								\
 	    if (width && height)					\
 	      {								\
@@ -612,22 +613,33 @@
 
   if (FRAME_REAL_TOP_TOOLBAR_VISIBLE (f))
     common_output_toolbar (f, TOP_TOOLBAR);
-  else if (f->top_toolbar_was_visible)
-    common_clear_toolbar (f, TOP_TOOLBAR, 0);
 
   if (FRAME_REAL_BOTTOM_TOOLBAR_VISIBLE (f))
     common_output_toolbar (f, BOTTOM_TOOLBAR);
-  else if (f->bottom_toolbar_was_visible)
-    common_clear_toolbar (f, BOTTOM_TOOLBAR, 0);
 
   if (FRAME_REAL_LEFT_TOOLBAR_VISIBLE (f))
     common_output_toolbar (f, LEFT_TOOLBAR);
-  else if (f->left_toolbar_was_visible)
-    common_clear_toolbar (f, LEFT_TOOLBAR, 0);
 
   if (FRAME_REAL_RIGHT_TOOLBAR_VISIBLE (f))
     common_output_toolbar (f, RIGHT_TOOLBAR);
-  else if (f->right_toolbar_was_visible)
+}
+
+void
+common_clear_frame_toolbars (struct frame *f)
+{
+  __INTERNAL_APPROPRIATENESS_CHECK(f);
+
+  if (f->top_toolbar_was_visible
+      && !FRAME_REAL_TOP_TOOLBAR_VISIBLE (f))
+    common_clear_toolbar (f, TOP_TOOLBAR, 0);
+  if (f->bottom_toolbar_was_visible
+      && !FRAME_REAL_BOTTOM_TOOLBAR_VISIBLE (f))
+    common_clear_toolbar (f, BOTTOM_TOOLBAR, 0);
+  if (f->left_toolbar_was_visible 
+      && !FRAME_REAL_LEFT_TOOLBAR_VISIBLE (f))
+    common_clear_toolbar (f, LEFT_TOOLBAR, 0);
+  if (f->right_toolbar_was_visible 
+       && !FRAME_REAL_RIGHT_TOOLBAR_VISIBLE (f))
     common_clear_toolbar (f, RIGHT_TOOLBAR, 0);
 }
 
Index: src/toolbar-common.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/toolbar-common.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- src/toolbar-common.h	2001/12/23 01:11:00	1.1
+++ src/toolbar-common.h	2002/07/06 21:05:56	1.2
@@ -16,5 +16,6 @@
 					    int width, int height);
 extern void common_redraw_frame_toolbars (struct frame *f);
 extern void common_output_toolbar_button (struct frame *f, Lisp_Object button);
+extern void common_clear_frame_toolbars (struct frame *f);
 
 #endif /* __TOOLBAR_COMMON_H__ */
Index: src/toolbar-gtk.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/toolbar-gtk.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -u -r1.5 -r1.6
--- src/toolbar-gtk.c	2002/06/20 21:18:48	1.5
+++ src/toolbar-gtk.c	2002/07/06 21:05:56	1.6
@@ -40,6 +40,7 @@
 #define gtk_output_toolbar_button common_output_toolbar_button
 #define gtk_redraw_exposed_toolbars common_redraw_exposed_toolbars
 #define gtk_redraw_frame_toolbars common_redraw_frame_toolbars
+#define gtk_clear_frame_toolbars common_clear_frame_toolbars
 
 
 static void
@@ -63,6 +64,7 @@
 console_type_create_toolbar_gtk (void)
 {
   CONSOLE_HAS_METHOD (gtk, output_frame_toolbars);
+  CONSOLE_HAS_METHOD (gtk, clear_frame_toolbars);
   CONSOLE_HAS_METHOD (gtk, initialize_frame_toolbars);
   CONSOLE_HAS_METHOD (gtk, free_frame_toolbars);
   CONSOLE_HAS_METHOD (gtk, output_toolbar_button);
Index: src/toolbar-msw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/toolbar-msw.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -u -r1.19 -r1.20
--- src/toolbar-msw.c	2002/06/20 21:18:48	1.19
+++ src/toolbar-msw.c	2002/07/06 21:05:57	1.20
@@ -22,7 +22,7 @@
 the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.  */
 
-/* This implementation by Andy Piper <andyp@parallax.co.uk>, with bits
+/* This implementation by Andy Piper <andy@xemacs.org>, with bits
    borrowed from toolbar-x.c */
 
 /* Synched up with: Not in FSF. */
@@ -550,22 +550,30 @@
 
   if (FRAME_REAL_TOP_TOOLBAR_VISIBLE (f))
     mswindows_output_toolbar (f, TOP_TOOLBAR);
-  else if (f->top_toolbar_was_visible)
-    mswindows_clear_toolbar (f, TOP_TOOLBAR, 0);
-
   if (FRAME_REAL_BOTTOM_TOOLBAR_VISIBLE (f))
     mswindows_output_toolbar (f, BOTTOM_TOOLBAR);
-  else if (f->bottom_toolbar_was_visible)
-    mswindows_clear_toolbar (f, BOTTOM_TOOLBAR, 0);
-
   if (FRAME_REAL_LEFT_TOOLBAR_VISIBLE (f))
     mswindows_output_toolbar (f, LEFT_TOOLBAR);
-  else if (f->left_toolbar_was_visible)
-    mswindows_clear_toolbar (f, LEFT_TOOLBAR, 0);
-
   if (FRAME_REAL_RIGHT_TOOLBAR_VISIBLE (f))
     mswindows_output_toolbar (f, RIGHT_TOOLBAR);
-  else if (f->right_toolbar_was_visible)
+}
+
+static void
+mswindows_clear_frame_toolbars (struct frame *f)
+{
+  assert (FRAME_MSWINDOWS_P (f));
+
+  if (f->top_toolbar_was_visible
+      && !FRAME_REAL_TOP_TOOLBAR_VISIBLE (f))
+    mswindows_clear_toolbar (f, TOP_TOOLBAR, 0);
+  if (f->bottom_toolbar_was_visible
+      && !FRAME_REAL_BOTTOM_TOOLBAR_VISIBLE (f))
+    mswindows_clear_toolbar (f, BOTTOM_TOOLBAR, 0);
+  if (f->left_toolbar_was_visible 
+      && !FRAME_REAL_LEFT_TOOLBAR_VISIBLE (f))
+    mswindows_clear_toolbar (f, LEFT_TOOLBAR, 0);
+  if (f->right_toolbar_was_visible 
+      && !FRAME_REAL_RIGHT_TOOLBAR_VISIBLE (f))
     mswindows_clear_toolbar (f, RIGHT_TOOLBAR, 0);
 }
 
@@ -640,6 +648,7 @@
 console_type_create_toolbar_mswindows (void)
 {
   CONSOLE_HAS_METHOD (mswindows, output_frame_toolbars);
+  CONSOLE_HAS_METHOD (mswindows, clear_frame_toolbars);
   CONSOLE_HAS_METHOD (mswindows, initialize_frame_toolbars);
   CONSOLE_HAS_METHOD (mswindows, free_frame_toolbars);
   CONSOLE_HAS_METHOD (mswindows, redraw_exposed_toolbars);
Index: src/toolbar-x.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/toolbar-x.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -u -r1.16 -r1.17
--- src/toolbar-x.c	2002/06/20 21:18:48	1.16
+++ src/toolbar-x.c	2002/07/06 21:05:57	1.17
@@ -50,6 +50,7 @@
 #define x_output_toolbar_button common_output_toolbar_button
 #define x_redraw_exposed_toolbars common_redraw_exposed_toolbars
 #define x_redraw_frame_toolbars common_redraw_frame_toolbars
+#define x_clear_frame_toolbars common_clear_frame_toolbars
 
 static void
 x_initialize_frame_toolbars (struct frame *f)
@@ -77,6 +78,7 @@
 console_type_create_toolbar_x (void)
 {
   CONSOLE_HAS_METHOD (x, output_frame_toolbars);
+  CONSOLE_HAS_METHOD (x, clear_frame_toolbars);
   CONSOLE_HAS_METHOD (x, initialize_frame_toolbars);
   CONSOLE_HAS_METHOD (x, free_frame_toolbars);
   CONSOLE_HAS_METHOD (x, output_toolbar_button);
Index: src/toolbar.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/toolbar.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -u -r1.26 -r1.27
--- src/toolbar.c	2002/06/20 21:18:48	1.26
+++ src/toolbar.c	2002/07/06 21:05:58	1.27
@@ -714,13 +714,26 @@
   set_frame_toolbar (f, RIGHT_TOOLBAR);
 }
 
+/* Update the toolbar geometry separately from actually displaying the
+   toolbar. This is necessary because both the gutter and the toolbar
+   are competing for redisplay cycles and, unfortunately, gutter
+   updates happen late in the game. Firstly they are done inside of
+   redisplay proper and secondly subcontrols may not get moved until
+   the next screen refresh. Only after subcontrols have been moved to
+   their final destinations can we be certain of updating the
+   toolbar. Under X this probably is exacerbated by the toolbar button
+   dirty flags which prevent updates happening when they possibly
+   should. */
 void
-update_frame_toolbars (struct frame *f)
+update_frame_toolbars_geometry (struct frame *f)
 {
   struct device *d = XDEVICE (f->device);
 
   if (DEVICE_SUPPORTS_TOOLBARS_P (d)
-      && (f->toolbar_changed || f->frame_changed || f->clear))
+      && (f->toolbar_changed 
+	  || f->frame_layout_changed
+	  || f->frame_changed
+	  || f->clear))
     {
       int pos;
 
@@ -740,18 +753,39 @@
 	    pixel_to_char_size (f, FRAME_PIXWIDTH (f), FRAME_PIXHEIGHT (f),
 				&width, &height);
 	    change_frame_size (f, height, width, 0);
+	    MARK_FRAME_LAYOUT_CHANGED (f);
 	    break;
 	  }
 
-      for (pos = 0; pos < 4; pos++)
+      for (pos = 0; pos < 4; pos++) {
 	f->current_toolbar_size[pos] = FRAME_REAL_TOOLBAR_SIZE (f, pos);
+      }
 
       /* Removed the check for the minibuffer here.  We handle this
 	 more correctly now by consistently using
 	 FRAME_LAST_NONMINIBUF_WINDOW instead of FRAME_SELECTED_WINDOW
 	 throughout the toolbar code. */
       compute_frame_toolbars_data (f);
+      
+      /* Clear the previous toolbar locations. If we do it later
+	 (after redisplay) we end up clearing what we have just
+	 displayed. */
+      MAYBE_DEVMETH (d, clear_frame_toolbars, (f));
+    }
+}
 
+/* Actually redisplay the toolbar buttons. */
+void
+update_frame_toolbars (struct frame *f)
+{
+  struct device *d = XDEVICE (f->device);
+
+  if (DEVICE_SUPPORTS_TOOLBARS_P (d)
+      && (f->toolbar_changed 
+	  || f->frame_layout_changed
+	  || f->frame_changed 
+	  || f->clear))
+    {
       DEVMETH (d, output_frame_toolbars, (f));
     }
 
Index: src/toolbar.h
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/src/toolbar.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -u -r1.12 -r1.13
--- src/toolbar.h	2002/03/29 04:48:43	1.12
+++ src/toolbar.h	2002/07/06 21:05:58	1.13
@@ -99,6 +99,7 @@
 extern Lisp_Object Vtoolbar_size[4];
 extern Lisp_Object Vtoolbar_border_width[4];
 void update_frame_toolbars (struct frame *f);
+void update_frame_toolbars_geometry (struct frame *f);
 void init_frame_toolbars (struct frame *f);
 void init_device_toolbars (struct device *d);
 void init_global_toolbars (struct device *d);
Index: tests/ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.19
diff -u -u -r1.17 -r1.19
--- tests/ChangeLog	2002/07/02 15:01:09	1.17
+++ tests/ChangeLog	2002/07/27 03:53:09	1.19
@@ -1,3 +1,12 @@
+2002-07-27  Steve Youngs  <youngs@xemacs.org>
+
+	* XEmacs 21.5.8 "broccoli" is released.
+
+2002-07-20  Mike Sperber <mike@xemacs.org>
+
+	* automated/test-harness.el (test-harness-read-from-buffer): Fix
+	incorrect call of `princ'.
+
 2002-07-02  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.5.7 "broccoflower" is released.
Index: tests/automated/test-harness.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/tests/automated/test-harness.el,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -u -r1.4 -r1.5
--- tests/automated/test-harness.el	2002/06/04 06:05:53	1.4
+++ tests/automated/test-harness.el	2002/07/20 15:22:46	1.5
@@ -100,7 +100,7 @@
 	  (setq body (cons (read buffer) body)))
       (end-of-file nil)
       (error
-       (princ "Unexpected error %S reading forms from buffer\n" error-info)))
+       (princ (format "Unexpected error %S reading forms from buffer\n" error-info))))
     `(lambda ()
        (defvar passes)
        (defvar assertion-failures)