# This is a patch for xemacs-21.2.46 to update it to xemacs-21.5.0
# 
# To apply this patch:
# STEP 1: Chdir to the source directory.
# STEP 2: Run the 'applypatch' program with this patch file as input.
#
# If you do not have 'applypatch', it is part of the 'makepatch' package
# that you can fetch from the Comprehensive Perl Archive Network:
# http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz
# In the above URL, 'x' should be 2 or higher.
#
# To apply this patch without the use of 'applypatch':
# STEP 1: Chdir to the source directory.
# If you have a decent Bourne-type shell:
# STEP 2: Run the shell with this file as input.
# If you don't have such a shell, you may need to manually create/delete
# the files as shown below.
# STEP 3: Run the 'patch' program with this file as input.
#
# These are the commands needed to create/delete files/directories:
#
rm -f 'src/dump-id.h'
rm -f 'lib-src/aixcc.lex'
touch 'etc/ONEWS'
chmod 0644 'etc/ONEWS'
touch 'lisp/mule/latin.el'
chmod 0644 'lisp/mule/latin.el'
touch 'tests/automated/extent-tests.el'
chmod 0644 'tests/automated/extent-tests.el'
#
# This command terminates the shell and need not be executed manually.
exit
#
#### End of Preamble ####

#### Patch data follows ####
diff --text -u 'xemacs-21.2.46/CHANGES-beta' 'xemacs-21.5.0/CHANGES-beta'
Index: ./CHANGES-beta
--- ./CHANGES-beta	Mon Mar 19 15:16:17 2001
+++ ./CHANGES-beta	Wed Apr 18 15:57:58 2001
@@ -1,3 +1,6 @@
+to 21.5.0 "alfalfa"
+-- Switch to new beta series
+
 to 21.2.46 "Urania"
 -- GTK code has been merged as an experimental display type -- William Perry
 
diff --text -u 'xemacs-21.2.46/ChangeLog' 'xemacs-21.5.0/ChangeLog'
Index: ./ChangeLog
--- ./ChangeLog	Wed Mar 21 16:12:39 2001
+++ ./ChangeLog	Wed Apr 18 15:56:45 2001
@@ -1,3 +1,60 @@
+2001-04-18  Martin Buchholz  <martin@xemacs.org>
+
+	* XEmacs 21.5.0 "alfalfa" is released.
+
+2001-03-26  Paul Stodghill  <stodghil@cs.cornell.edu>
+
+	* configure.in: Don't #define __STDC__ in confdefs.h
+
+2001-03-30  Ben Wing  <ben@xemacs.org>
+
+	* etc\sample.init.el:
+	* etc\sample.init.el (Init-kill-entire-line):
+	* etc\sample.init.el (describe-foo-at-point):
+	* etc\sample.init.el (kill-current-buffer):
+	* etc\sample.init.el (kill-current-buffer-and-window):
+	* etc\sample.init.el (grep-c-files): Removed.
+	* etc\sample.init.el (grep-all-files-history): New.
+	* etc\sample.init.el (grep-all-files-omitted-expressions): New.
+	* etc\sample.init.el (grep-all-files-omitted-directories): New.
+	* etc\sample.init.el (construct-grep-all-files-command): New.
+	* etc\sample.init.el (grep-all-files-in-current-directory): New.
+	* etc\sample.init.el (grep-lisp-files): Removed.
+	* etc\sample.init.el (grep-all-files-in-current-directory-and-below): New.
+	* etc\sample.init.el (clear-select):
+	* etc\sample.init.el ((control kp-add)):
+	* etc\sample.init.el (pause):
+	* etc\sample.init.el ((eq system-type 'windows-nt)):
+
+	Add documentation for defined functions.  Change grep functions to
+	be more generally useful.  Document more specifically what the
+	`menu-force' setting actually does -- what commands are overridden
+	and how to access them.
+
+2001-03-30  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* configure.usage:  Document --with-file-coding.
+
+	* etc/OXYMORONS: Add 2 oxymorons, clean up numbering, close RFC.
+
+	* etc/NEWS: Fix typo.
+	
+	* configure.in:
+	* configure:
+	Fix typo, add -Wsign-compare if GCC, run autoconf.
+
+2001-03-23  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* etc/gnuserv.1 (UNIX_DOMAIN_SOCKETS: 
+	* PROBLEMS (Problems with running XEmacs):
+	Document TMPDIR lossage in gnuserv/gnuclient.
+
+2001-03-06  Ben Wing  <ben@xemacs.org>
+
+	* etc\sample.init.el:
+	* etc\sample.init.el (Init-kill-entire-line): New.
+	Fix to take into account the removed kill-whole-line changes.
+
 2001-03-21  Martin Buchholz <martin@xemacs.org>
 
 	* XEmacs 21.2.46 "Urania" is released.
diff --text -u 'xemacs-21.2.46/PROBLEMS' 'xemacs-21.5.0/PROBLEMS'
Index: ./PROBLEMS
--- ./PROBLEMS	Fri Jan 19 00:48:51 2001
+++ ./PROBLEMS	Fri Apr 13 03:20:32 2001
@@ -2,7 +2,7 @@
 
 This file describes various problems that have been encountered
 in compiling, installing and running XEmacs.  It has been updated for
-XEmacs 21.0.
+XEmacs 21.4.
 
 This file is rather large, but we have tried to sort the entries by
 their respective relevance for XEmacs, but may have not succeeded
@@ -611,6 +611,14 @@
 * Problems with running XEmacs
 ==============================
 ** General
+*** gnuserv is running, some clients can connect, but others cannot.
+
+The code in gnuslib.c respects the value of TMPDIR.  If the server and
+the client have different values in their environment, you lose.
+One program known to set TMPDIR and manifest this problem is exmh.
+You can defeat the use of TMPDIR by unsetting USE_TMPDIR at the top of
+gnuserv.h at build time.
+
 *** C-z just refreshes the screen instead of suspending Emacs.
 
 You are probably using a shell that doesn't support job control, even
diff --text -u 'xemacs-21.2.46/configure' 'xemacs-21.5.0/configure'
Index: ./configure
--- ./configure	Wed Mar 21 16:05:13 2001
+++ ./configure	Wed Apr 18 15:59:16 2001
@@ -2758,6 +2758,7 @@
 if test "$cflags_specified" = "no"; then
       if   test "$GCC" = "yes"; then
     CFLAGS="-g -O3 -Wall -Wno-switch -Winline -Wmissing-prototypes -Wshadow"
+        CFLAGS="$CFLAGS -Wsign-compare"
             test "$have_glibc" != "yes" && CFLAGS="$CFLAGS -Wpointer-arith"
               elif test "$__SUNPRO_C" = "yes"; then
     case "$opsys" in
@@ -2774,7 +2775,7 @@
 
 if test "$GCC" = "yes"; then
 echo $ac_n "checking for buggy gcc versions""... $ac_c" 1>&6
-echo "configure:2778: checking for buggy gcc versions" >&5
+echo "configure:2779: 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.*)
@@ -2897,7 +2898,7 @@
  fi
 
 echo $ac_n "checking for dynodump""... $ac_c" 1>&6
-echo "configure:2901: checking for dynodump" >&5
+echo "configure:2902: checking for dynodump" >&5
 if test "$unexec" != "unexsol2.o"; then
   echo "$ac_t""no" 1>&6
 else
@@ -2935,12 +2936,12 @@
   done
   
 echo $ac_n "checking for terminateAndUnload in -lC""... $ac_c" 1>&6
-echo "configure:2939: checking for terminateAndUnload in -lC" >&5
+echo "configure:2940: 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 2944 "configure"
+#line 2945 "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
@@ -2951,7 +2952,7 @@
 terminateAndUnload()
 ; return 0; }
 EOF
-if { (eval echo configure:2955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2956: \"$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
@@ -3059,7 +3060,7 @@
 
 if test "$add_runtime_path" = "yes"; then
       echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6
-echo "configure:3063: checking "for runtime libraries flag"" >&5
+echo "configure:3064: checking "for runtime libraries flag"" >&5
   case "$opsys" in
     sol2 ) dash_r="-R" ;;
     decosf* | linux* | irix*) dash_r="-rpath " ;;
@@ -3081,14 +3082,14 @@
   done
 fi
         cat > conftest.$ac_ext <<EOF
-#line 3085 "configure"
+#line 3086 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   dash_r="$try_dash_r"
 else
@@ -3189,10 +3190,10 @@
 fi
 after_morecore_hook_exists=yes
 echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6
-echo "configure:3193: checking for malloc_set_state" >&5
+echo "configure:3194: checking for malloc_set_state" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3196 "configure"
+#line 3197 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char malloc_set_state(); below.  */
@@ -3215,7 +3216,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3220: \"$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
@@ -3235,16 +3236,16 @@
 fi
 
 echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6
-echo "configure:3239: checking whether __after_morecore_hook exists" >&5
+echo "configure:3240: checking whether __after_morecore_hook exists" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3241 "configure"
+#line 3242 "configure"
 #include "confdefs.h"
 extern void (* __after_morecore_hook)();
 int main() {
 __after_morecore_hook = 0
 ; return 0; }
 EOF
-if { (eval echo configure:3248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3249: \"$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
@@ -3300,7 +3301,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:3304: checking for $ac_word" >&5
+echo "configure:3305: checking for $ac_word" >&5
 
 if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -3355,7 +3356,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:3359: checking for a BSD compatible install" >&5
+echo "configure:3360: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 
   IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
@@ -3409,7 +3410,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:3413: checking for $ac_word" >&5
+echo "configure:3414: checking for $ac_word" >&5
 
 if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
@@ -3441,15 +3442,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3445: checking for $ac_hdr" >&5
+echo "configure:3446: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3448 "configure"
+#line 3449 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3453: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3454: \"$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*
@@ -3479,10 +3480,10 @@
 done
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3483: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:3484: checking for sys/wait.h that is POSIX.1 compatible" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3486 "configure"
+#line 3487 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -3498,7 +3499,7 @@
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:3502: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3503: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -3522,10 +3523,10 @@
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3526: checking for ANSI C header files" >&5
+echo "configure:3527: checking for ANSI C header files" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3529 "configure"
+#line 3530 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3533,7 +3534,7 @@
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3537: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3538: \"$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*
@@ -3550,7 +3551,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 3554 "configure"
+#line 3555 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -3568,7 +3569,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 3572 "configure"
+#line 3573 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3586,7 +3587,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 3590 "configure"
+#line 3591 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3597,7 +3598,7 @@
 exit (0); }
 
 EOF
-if { (eval echo configure:3601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:3602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -3623,10 +3624,10 @@
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3627: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3628: checking whether time.h and sys/time.h may both be included" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3630 "configure"
+#line 3631 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -3635,7 +3636,7 @@
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:3639: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3640: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -3659,10 +3660,10 @@
 fi
 
 echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:3663: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+echo "configure:3664: checking for sys_siglist declaration in signal.h or unistd.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3666 "configure"
+#line 3667 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3674,7 +3675,7 @@
 char *msg = *(sys_siglist + 1);
 ; return 0; }
 EOF
-if { (eval echo configure:3678: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3679: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_decl_sys_siglist=yes
 else
@@ -3700,9 +3701,9 @@
 
 
 echo $ac_n "checking for utime""... $ac_c" 1>&6
-echo "configure:3704: checking for utime" >&5
+echo "configure:3705: checking for utime" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3706 "configure"
+#line 3707 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <utime.h>
@@ -3710,7 +3711,7 @@
 struct utimbuf x; x.actime = x.modtime = 0; utime ("/", &x);
 ; return 0; }
 EOF
-if { (eval echo configure:3714: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3715: \"$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
@@ -3729,10 +3730,10 @@
       for ac_func in utimes
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3733: checking for $ac_func" >&5
+echo "configure:3734: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3736 "configure"
+#line 3737 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3755,7 +3756,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3759: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3760: \"$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
@@ -3787,10 +3788,10 @@
 
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3791: checking return type of signal handlers" >&5
+echo "configure:3792: checking return type of signal handlers" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3794 "configure"
+#line 3795 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3807,7 +3808,7 @@
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:3811: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3812: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -3829,10 +3830,10 @@
 
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3833: checking for size_t" >&5
+echo "configure:3834: checking for size_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3836 "configure"
+#line 3837 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3863,10 +3864,10 @@
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:3867: checking for pid_t" >&5
+echo "configure:3868: checking for pid_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3870 "configure"
+#line 3871 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3897,10 +3898,10 @@
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:3901: checking for uid_t in sys/types.h" >&5
+echo "configure:3902: checking for uid_t in sys/types.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3904 "configure"
+#line 3905 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -3936,10 +3937,10 @@
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:3940: checking for mode_t" >&5
+echo "configure:3941: checking for mode_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3943 "configure"
+#line 3944 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3970,10 +3971,10 @@
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:3974: checking for off_t" >&5
+echo "configure:3975: checking for off_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3977 "configure"
+#line 3978 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4004,10 +4005,10 @@
 fi
 
 echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
-echo "configure:4008: checking for ssize_t" >&5
+echo "configure:4009: checking for ssize_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4011 "configure"
+#line 4012 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4039,9 +4040,9 @@
 
 
 echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
-echo "configure:4043: checking for socklen_t" >&5
+echo "configure:4044: checking for socklen_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4045 "configure"
+#line 4046 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 socklen_t x;
@@ -4050,7 +4051,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4054: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -4059,7 +4060,7 @@
   rm -rf conftest*
   
 cat > conftest.$ac_ext <<EOF
-#line 4063 "configure"
+#line 4064 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 int accept (int, struct sockaddr *, size_t *);
@@ -4068,7 +4069,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4073: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 echo "$ac_t""size_t" 1>&6
@@ -4100,9 +4101,9 @@
 rm -f conftest*
 
 echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
-echo "configure:4104: checking for struct timeval" >&5
+echo "configure:4105: checking for struct timeval" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4106 "configure"
+#line 4107 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -4118,7 +4119,7 @@
 static struct timeval x; x.tv_sec = x.tv_usec;
 ; return 0; }
 EOF
-if { (eval echo configure:4122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
   HAVE_TIMEVAL=yes
@@ -4140,10 +4141,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:4144: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:4145: checking whether struct tm is in sys/time.h or time.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4147 "configure"
+#line 4148 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -4151,7 +4152,7 @@
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:4155: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
 else
@@ -4175,10 +4176,10 @@
 fi
 
 echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:4179: checking for tm_zone in struct tm" >&5
+echo "configure:4180: checking for tm_zone in struct tm" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4182 "configure"
+#line 4183 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
@@ -4186,7 +4187,7 @@
 struct tm tm; tm.tm_zone;
 ; return 0; }
 EOF
-if { (eval echo configure:4190: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4191: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm_zone=yes
 else
@@ -4209,10 +4210,10 @@
 
 else
   echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:4213: checking for tzname" >&5
+echo "configure:4214: checking for tzname" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4216 "configure"
+#line 4217 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
@@ -4222,7 +4223,7 @@
 atoi(*tzname);
 ; return 0; }
 EOF
-if { (eval echo configure:4226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_var_tzname=yes
 else
@@ -4248,10 +4249,10 @@
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:4252: checking for working const" >&5
+echo "configure:4253: checking for working const" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4255 "configure"
+#line 4256 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -4300,7 +4301,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4304: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4305: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -4325,7 +4326,7 @@
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:4329: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:4330: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 
 cat > conftestmake <<\EOF
@@ -4350,12 +4351,12 @@
 
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:4354: checking whether byte ordering is bigendian" >&5
+echo "configure:4355: 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 4359 "configure"
+#line 4360 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -4366,11 +4367,11 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4370: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4371: \"$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 4374 "configure"
+#line 4375 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -4381,7 +4382,7 @@
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4385: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4386: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -4398,7 +4399,7 @@
 rm -f conftest*
 if test $ac_cv_c_bigendian = unknown; then
 cat > conftest.$ac_ext <<EOF
-#line 4402 "configure"
+#line 4403 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -4411,7 +4412,7 @@
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:4415: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4416: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_c_bigendian=no
 else
@@ -4438,10 +4439,10 @@
 
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:4442: checking size of short" >&5
+echo "configure:4443: checking size of short" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4445 "configure"
+#line 4446 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4452,7 +4453,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -4480,10 +4481,10 @@
   exit 1
 fi
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:4484: checking size of int" >&5
+echo "configure:4485: checking size of int" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4487 "configure"
+#line 4488 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4494,7 +4495,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -4516,10 +4517,10 @@
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:4520: checking size of long" >&5
+echo "configure:4521: checking size of long" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4523 "configure"
+#line 4524 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4530,7 +4531,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -4552,10 +4553,10 @@
 
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:4556: checking size of long long" >&5
+echo "configure:4557: checking size of long long" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4559 "configure"
+#line 4560 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4566,7 +4567,7 @@
   exit(0);
 }
 EOF
-if { (eval echo configure:4570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4571: \"$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
@@ -4588,10 +4589,10 @@
 
 
 echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:4592: checking size of void *" >&5
+echo "configure:4593: checking size of void *" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4595 "configure"
+#line 4596 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 main()
@@ -4602,7 +4603,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:4607: \"$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
@@ -4625,7 +4626,7 @@
 
 
 echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:4629: checking for long file names" >&5
+echo "configure:4630: 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:
@@ -4671,10 +4672,10 @@
 
 
 echo $ac_n "checking for sin""... $ac_c" 1>&6
-echo "configure:4675: checking for sin" >&5
+echo "configure:4676: checking for sin" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4678 "configure"
+#line 4679 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char sin(); below.  */
@@ -4697,7 +4698,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4702: \"$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
@@ -4715,12 +4716,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:4719: checking for sin in -lm" >&5
+echo "configure:4720: 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 4724 "configure"
+#line 4725 "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
@@ -4731,7 +4732,7 @@
 sin()
 ; return 0; }
 EOF
-if { (eval echo configure:4735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4736: \"$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
@@ -4775,14 +4776,14 @@
 
 
 cat > conftest.$ac_ext <<EOF
-#line 4779 "configure"
+#line 4780 "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:4786: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4787: \"$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
@@ -4799,14 +4800,14 @@
 rm -f conftest*
 
 echo "checking type of mail spool file locking" 1>&6
-echo "configure:4803: checking type of mail spool file locking" >&5
+echo "configure:4804: 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:4807: checking for $ac_func" >&5
+echo "configure:4808: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4810 "configure"
+#line 4811 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4829,7 +4830,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4834: \"$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
@@ -4911,12 +4912,12 @@
 case "$opsys" in decosf*)
   
 echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
-echo "configure:4915: checking for cma_open in -lpthreads" >&5
+echo "configure:4916: 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 4920 "configure"
+#line 4921 "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
@@ -4927,7 +4928,7 @@
 cma_open()
 ; return 0; }
 EOF
-if { (eval echo configure:4931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4932: \"$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
@@ -4963,7 +4964,7 @@
 esac
 
 echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
-echo "configure:4967: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:4968: 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;
@@ -4975,7 +4976,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:4979: checking for \"-z ignore\" linker flag" >&5
+echo "configure:4980: 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 ;;
@@ -4986,7 +4987,7 @@
 
 
 echo "checking "for specified window system"" 1>&6
-echo "configure:4990: checking "for specified window system"" >&5
+echo "configure:4991: checking "for specified window system"" >&5
 
 
 GNOME_CONFIG=no
@@ -4994,7 +4995,7 @@
 
 if test "$with_gnome" != "no"; then
    echo $ac_n "checking for GNOME configuration script""... $ac_c" 1>&6
-echo "configure:4998: checking for GNOME configuration script" >&5
+echo "configure:4999: checking for GNOME configuration script" >&5
    for possible in gnome-config
    do
       possible_version=`${possible} --version 2> /dev/null`
@@ -5025,7 +5026,7 @@
 
 if test "$with_gtk" != "no";then
    echo $ac_n "checking for GTK configuration script""... $ac_c" 1>&6
-echo "configure:5029: checking for GTK configuration script" >&5
+echo "configure:5030: checking for GTK configuration script" >&5
    for possible in gtk12-config gtk14-config gtk-config
    do
       possible_version=`${possible} --version 2> /dev/null`
@@ -5047,37 +5048,37 @@
 
 if test "${GTK_CONFIG}" != "no"; then
       echo $ac_n "checking gtk version""... $ac_c" 1>&6
-echo "configure:5051: checking gtk version" >&5
+echo "configure:5052: 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:5056: checking gtk libs" >&5
+echo "configure:5057: 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:5062: checking gtk cflags" >&5
+echo "configure:5063: checking gtk cflags" >&5
       GTK_CFLAGS=`${GTK_CONFIG} --cflags`
       c_switch_gtk="$c_switch_gtk ${GTK_CFLAGS}" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"${GTK_CFLAGS}\" to \$c_switch_gtk"; fi
       echo "$ac_t""${GTK_CFLAGS}" 1>&6
 
       
 echo $ac_n "checking for main in -lgdk_imlib""... $ac_c" 1>&6
-echo "configure:5069: checking for main in -lgdk_imlib" >&5
+echo "configure:5070: 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 5074 "configure"
+#line 5075 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5082: \"$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
@@ -5099,12 +5100,12 @@
 
       
 echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6
-echo "configure:5103: checking for Imlib_init in -lImlib" >&5
+echo "configure:5104: 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 5108 "configure"
+#line 5109 "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
@@ -5115,7 +5116,7 @@
 Imlib_init()
 ; return 0; }
 EOF
-if { (eval echo configure:5119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5120: \"$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
@@ -5138,10 +5139,10 @@
       for ac_func in gdk_imlib_init
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5142: checking for $ac_func" >&5
+echo "configure:5143: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5145 "configure"
+#line 5146 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5164,7 +5165,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5169: \"$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
@@ -5241,15 +5242,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5245: checking for $ac_hdr" >&5
+echo "configure:5246: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5248 "configure"
+#line 5249 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5254: \"$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*
@@ -5280,19 +5281,19 @@
 
       
 echo $ac_n "checking for main in -lxml""... $ac_c" 1>&6
-echo "configure:5284: checking for main in -lxml" >&5
+echo "configure:5285: 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 5289 "configure"
+#line 5290 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5297: \"$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
@@ -5314,19 +5315,19 @@
 
       
 echo $ac_n "checking for main in -lglade""... $ac_c" 1>&6
-echo "configure:5318: checking for main in -lglade" >&5
+echo "configure:5319: 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 5323 "configure"
+#line 5324 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5331: \"$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
@@ -5348,19 +5349,19 @@
 
       
 echo $ac_n "checking for main in -lglade-gnome""... $ac_c" 1>&6
-echo "configure:5352: checking for main in -lglade-gnome" >&5
+echo "configure:5353: 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 5357 "configure"
+#line 5358 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5365: \"$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
@@ -5381,7 +5382,7 @@
 
 
       cat > conftest.$ac_ext <<EOF
-#line 5385 "configure"
+#line 5386 "configure"
 #include "confdefs.h"
 #include <glade/glade-xml.h>
 EOF
@@ -5439,7 +5440,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:5443: checking for X" >&5
+echo "configure:5444: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -5499,12 +5500,12 @@
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 5503 "configure"
+#line 5504 "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:5508: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5509: \"$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*
@@ -5573,14 +5574,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5577 "configure"
+#line 5578 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:5584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5585: \"$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.
@@ -5689,17 +5690,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:5693: checking whether -R must be followed by a space" >&5
+echo "configure:5694: 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 5696 "configure"
+#line 5697 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -5715,14 +5716,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 5719 "configure"
+#line 5720 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -5758,12 +5759,12 @@
 else
 
 echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:5762: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:5763: 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 5767 "configure"
+#line 5768 "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
@@ -5774,7 +5775,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5779: \"$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
@@ -5798,12 +5799,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:5802: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:5803: 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 5807 "configure"
+#line 5808 "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
@@ -5814,7 +5815,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5819: \"$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
@@ -5843,10 +5844,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:5847: checking for gethostbyname" >&5
+echo "configure:5848: checking for gethostbyname" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5850 "configure"
+#line 5851 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -5869,7 +5870,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5874: \"$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
@@ -5890,12 +5891,12 @@
     if test $ac_cv_func_gethostbyname = no; then
       
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:5894: checking for gethostbyname in -lnsl" >&5
+echo "configure:5895: 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 5899 "configure"
+#line 5900 "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
@@ -5906,7 +5907,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:5910: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5911: \"$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
@@ -5936,10 +5937,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:5940: checking for connect" >&5
+echo "configure:5941: checking for connect" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5943 "configure"
+#line 5944 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -5962,7 +5963,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5967: \"$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
@@ -5985,12 +5986,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:5989: checking "$xe_msg_checking"" >&5
+echo "configure:5990: 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 5994 "configure"
+#line 5995 "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
@@ -6001,7 +6002,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:6005: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6006: \"$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
@@ -6025,10 +6026,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:6029: checking for remove" >&5
+echo "configure:6030: checking for remove" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6032 "configure"
+#line 6033 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -6051,7 +6052,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6056: \"$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
@@ -6072,12 +6073,12 @@
     if test $ac_cv_func_remove = no; then
       
 echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:6076: checking for remove in -lposix" >&5
+echo "configure:6077: 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 6081 "configure"
+#line 6082 "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
@@ -6088,7 +6089,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:6092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6093: \"$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
@@ -6112,10 +6113,10 @@
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:6116: checking for shmat" >&5
+echo "configure:6117: checking for shmat" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6119 "configure"
+#line 6120 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -6138,7 +6139,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6143: \"$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
@@ -6159,12 +6160,12 @@
     if test $ac_cv_func_shmat = no; then
       
 echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:6163: checking for shmat in -lipc" >&5
+echo "configure:6164: 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 6168 "configure"
+#line 6169 "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
@@ -6175,7 +6176,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:6179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6180: \"$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
@@ -6211,12 +6212,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:6215: checking "$xe_msg_checking"" >&5
+echo "configure:6216: 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 6220 "configure"
+#line 6221 "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
@@ -6227,7 +6228,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:6231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6232: \"$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
@@ -6394,7 +6395,7 @@
 
 
     echo "checking for X defines extracted by xmkmf" 1>&6
-echo "configure:6398: checking for X defines extracted by xmkmf" >&5
+echo "configure:6399: checking for X defines extracted by xmkmf" >&5
   rm -fr conftestdir
   if mkdir conftestdir; then
     cd conftestdir
@@ -6409,7 +6410,9 @@
     cd ..
     rm -fr conftestdir
     for word in $xmkmf_defines; do
-      case "$word" in -D* )
+      case "$word" in 
+      -D__STDC__*) ;;
+      -D* )
 	sym=`echo '' $word | sed -e 's:^ *-D::' -e 's:=.*::'`
 	case "$word" in
 	  -D*=* ) val=`echo '' $word | sed -e 's:^.*=::'` ;;
@@ -6441,15 +6444,15 @@
 
     ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6
-echo "configure:6445: checking for X11/Intrinsic.h" >&5
+echo "configure:6448: checking for X11/Intrinsic.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6448 "configure"
+#line 6451 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6453: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6456: \"$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*
@@ -6473,12 +6476,12 @@
 
       
 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:6477: checking for XOpenDisplay in -lX11" >&5
+echo "configure:6480: 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 6482 "configure"
+#line 6485 "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
@@ -6489,7 +6492,7 @@
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:6493: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6496: \"$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
@@ -6514,12 +6517,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:6518: checking "$xe_msg_checking"" >&5
+echo "configure:6521: 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 6523 "configure"
+#line 6526 "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
@@ -6530,7 +6533,7 @@
 XGetFontProperty()
 ; return 0; }
 EOF
-if { (eval echo configure:6534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6537: \"$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
@@ -6557,12 +6560,12 @@
 
     
 echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6
-echo "configure:6561: checking for XShapeSelectInput in -lXext" >&5
+echo "configure:6564: 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 6566 "configure"
+#line 6569 "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
@@ -6573,7 +6576,7 @@
 XShapeSelectInput()
 ; return 0; }
 EOF
-if { (eval echo configure:6577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6580: \"$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
@@ -6596,12 +6599,12 @@
 
     
 echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6
-echo "configure:6600: checking for XtOpenDisplay in -lXt" >&5
+echo "configure:6603: 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 6605 "configure"
+#line 6608 "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
@@ -6612,7 +6615,7 @@
 XtOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:6616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6619: \"$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
@@ -6635,14 +6638,14 @@
 
 
   echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6
-echo "configure:6639: checking the version of X11 being used" >&5
+echo "configure:6642: checking the version of X11 being used" >&5
   cat > conftest.$ac_ext <<EOF
-#line 6641 "configure"
+#line 6644 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
     int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; }
 EOF
-if { (eval echo configure:6646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:6649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ./conftest foobar; x11_release=$?
 else
@@ -6673,10 +6676,10 @@
   for ac_func in XConvertCase
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6677: checking for $ac_func" >&5
+echo "configure:6680: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6680 "configure"
+#line 6683 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6699,7 +6702,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6706: \"$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
@@ -6731,15 +6734,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6735: checking for $ac_hdr" >&5
+echo "configure:6738: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6738 "configure"
+#line 6741 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6743: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6746: \"$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*
@@ -6772,10 +6775,10 @@
     for ac_func in XRegisterIMInstantiateCallback
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6776: checking for $ac_func" >&5
+echo "configure:6779: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6779 "configure"
+#line 6782 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6798,7 +6801,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6805: \"$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
@@ -6826,9 +6829,9 @@
 done
 
   echo $ac_n "checking for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6
-echo "configure:6830: checking for standard XRegisterIMInstantiateCallback prototype" >&5
+echo "configure:6833: checking for standard XRegisterIMInstantiateCallback prototype" >&5
   cat > conftest.$ac_ext <<EOF
-#line 6832 "configure"
+#line 6835 "configure"
 #include "confdefs.h"
 
 #define NeedFunctionPrototypes 1
@@ -6840,7 +6843,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6844: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -6861,12 +6864,12 @@
 
     test -z "$with_xmu" && { 
 echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6
-echo "configure:6865: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
+echo "configure:6868: 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 6870 "configure"
+#line 6873 "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
@@ -6877,7 +6880,7 @@
 XmuReadBitmapDataFromFile()
 ; return 0; }
 EOF
-if { (eval echo configure:6881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6884: \"$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
@@ -6916,19 +6919,19 @@
 
       
 echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:6920: checking for main in -lXbsd" >&5
+echo "configure:6923: 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 6925 "configure"
+#line 6928 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:6932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6935: \"$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
@@ -6965,22 +6968,22 @@
 fi 
 if test "$with_msw" != "no"; then
   echo "checking for MS-Windows" 1>&6
-echo "configure:6969: checking for MS-Windows" >&5
+echo "configure:6972: checking for MS-Windows" >&5
   
 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6
-echo "configure:6972: checking for main in -lgdi32" >&5
+echo "configure:6975: 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 6977 "configure"
+#line 6980 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:6984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6987: \"$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
@@ -7053,12 +7056,12 @@
  fi
     fi
         cat > conftest.$ac_ext <<EOF
-#line 7057 "configure"
+#line 7060 "configure"
 #include "confdefs.h"
 #include <fcntl.h>
     int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }
 EOF
-if { (eval echo configure:7062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7065: \"$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
@@ -7122,15 +7125,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:7126: checking for X11/extensions/shape.h" >&5
+echo "configure:7129: checking for X11/extensions/shape.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7129 "configure"
+#line 7132 "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:7134: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7137: \"$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*
@@ -7182,7 +7185,7 @@
 esac
 
 echo "checking for WM_COMMAND option" 1>&6
-echo "configure:7186: checking for WM_COMMAND option" >&5;
+echo "configure:7189: checking for WM_COMMAND option" >&5;
 if test "$with_wmcommand" != "no"; then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_WMCOMMAND
@@ -7197,15 +7200,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:7201: checking for X11/Xauth.h" >&5
+echo "configure:7204: checking for X11/Xauth.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7204 "configure"
+#line 7207 "configure"
 #include "confdefs.h"
 #include <X11/Xauth.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7209: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7212: \"$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*
@@ -7228,12 +7231,12 @@
  }
 test -z "$with_xauth" && { 
 echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6
-echo "configure:7232: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:7235: 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 7237 "configure"
+#line 7240 "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
@@ -7244,7 +7247,7 @@
 XauGetAuthByAddr()
 ; return 0; }
 EOF
-if { (eval echo configure:7248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7251: \"$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
@@ -7289,15 +7292,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:7293: checking for ${dir}tt_c.h" >&5
+echo "configure:7296: checking for ${dir}tt_c.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7296 "configure"
+#line 7299 "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:7301: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7304: \"$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*
@@ -7333,12 +7336,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:7337: checking "$xe_msg_checking"" >&5
+echo "configure:7340: 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 7342 "configure"
+#line 7345 "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
@@ -7349,7 +7352,7 @@
 tt_message_create()
 ; return 0; }
 EOF
-if { (eval echo configure:7353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7356: \"$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
@@ -7406,15 +7409,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:7410: checking for Dt/Dt.h" >&5
+echo "configure:7413: checking for Dt/Dt.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7413 "configure"
+#line 7416 "configure"
 #include "confdefs.h"
 #include <Dt/Dt.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7418: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7421: \"$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*
@@ -7437,12 +7440,12 @@
  }
 test -z "$with_cde" && { 
 echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6
-echo "configure:7441: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:7444: 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 7446 "configure"
+#line 7449 "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
@@ -7453,7 +7456,7 @@
 DtDndDragStart()
 ; return 0; }
 EOF
-if { (eval echo configure:7457: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7460: \"$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
@@ -7526,7 +7529,7 @@
 
 if test "$with_dragndrop" != "no" ; then
   echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6
-echo "configure:7530: checking if drag and drop API is needed" >&5
+echo "configure:7533: 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
@@ -7546,18 +7549,18 @@
 fi
 
 echo "checking for LDAP" 1>&6
-echo "configure:7550: checking for LDAP" >&5
+echo "configure:7553: 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:7553: checking for ldap.h" >&5
+echo "configure:7556: checking for ldap.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7556 "configure"
+#line 7559 "configure"
 #include "confdefs.h"
 #include <ldap.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7561: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7564: \"$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*
@@ -7580,15 +7583,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:7584: checking for lber.h" >&5
+echo "configure:7587: checking for lber.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7587 "configure"
+#line 7590 "configure"
 #include "confdefs.h"
 #include <lber.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7592: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7595: \"$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*
@@ -7612,12 +7615,12 @@
 if test "$with_ldap" != "no"; then
   
 echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6
-echo "configure:7616: checking for ldap_search in -lldap" >&5
+echo "configure:7619: 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 7621 "configure"
+#line 7624 "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
@@ -7628,7 +7631,7 @@
 ldap_search()
 ; return 0; }
 EOF
-if { (eval echo configure:7632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7635: \"$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
@@ -7653,12 +7656,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:7657: checking "$xe_msg_checking"" >&5
+echo "configure:7660: 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 7662 "configure"
+#line 7665 "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
@@ -7669,7 +7672,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7676: \"$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
@@ -7694,12 +7697,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:7698: checking "$xe_msg_checking"" >&5
+echo "configure:7701: 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 7703 "configure"
+#line 7706 "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
@@ -7710,7 +7713,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7717: \"$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
@@ -7735,12 +7738,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:7739: checking "$xe_msg_checking"" >&5
+echo "configure:7742: 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 7744 "configure"
+#line 7747 "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
@@ -7751,7 +7754,7 @@
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7758: \"$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
@@ -7802,10 +7805,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:7806: checking for $ac_func" >&5
+echo "configure:7809: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7809 "configure"
+#line 7812 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7828,7 +7831,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7832: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7835: \"$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
@@ -7859,20 +7862,20 @@
 
 if test "$with_postgresql" != "no"; then
   echo "checking for PostgreSQL" 1>&6
-echo "configure:7863: checking for PostgreSQL" >&5
+echo "configure:7866: 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:7868: checking for ${header_dir}libpq-fe.h" >&5
+echo "configure:7871: checking for ${header_dir}libpq-fe.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7871 "configure"
+#line 7874 "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:7876: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7879: \"$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*
@@ -7896,12 +7899,12 @@
 
   test -n "$libpq_fe_h_file" && { 
 echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6
-echo "configure:7900: checking for PQconnectdb in -lpq" >&5
+echo "configure:7903: 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 7905 "configure"
+#line 7908 "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
@@ -7912,7 +7915,7 @@
 PQconnectdb()
 ; return 0; }
 EOF
-if { (eval echo configure:7916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7919: \"$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
@@ -7945,12 +7948,12 @@
 
     
 echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6
-echo "configure:7949: checking for PQconnectStart in -lpq" >&5
+echo "configure:7952: 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 7954 "configure"
+#line 7957 "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
@@ -7961,7 +7964,7 @@
 PQconnectStart()
 ; return 0; }
 EOF
-if { (eval echo configure:7965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7968: \"$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
@@ -8009,15 +8012,15 @@
 
 if test "$window_system" != "none"; then
   echo "checking for graphics libraries" 1>&6
-echo "configure:8013: checking for graphics libraries" >&5
+echo "configure:8016: checking for graphics libraries" >&5
 
     xpm_problem=""
   if test -z "$with_xpm"; then
     echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6
-echo "configure:8018: checking for Xpm - no older than 3.4f" >&5
+echo "configure:8021: checking for Xpm - no older than 3.4f" >&5
     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF
-#line 8021 "configure"
+#line 8024 "configure"
 #include "confdefs.h"
 #define XPM_NUMBERS
 #include <X11/xpm.h>
@@ -8026,7 +8029,7 @@
       XpmIncludeVersion != XpmLibraryVersion() ? 1 :
       XpmIncludeVersion < 30406 ? 2 : 0 ;}
 EOF
-if { (eval echo configure:8030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:8033: \"$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
@@ -8068,17 +8071,17 @@
 
     libs_x="-lXpm $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lXpm\" to \$libs_x"; fi
     echo $ac_n "checking for \"FOR_MSW\" xpm""... $ac_c" 1>&6
-echo "configure:8072: checking for \"FOR_MSW\" xpm" >&5
+echo "configure:8075: checking for \"FOR_MSW\" xpm" >&5
     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF
-#line 8075 "configure"
+#line 8078 "configure"
 #include "confdefs.h"
 
 int main() {
 XpmCreatePixmapFromData()
 ; return 0; }
 EOF
-if { (eval echo configure:8082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8085: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   xpm_for_msw=no
 else
@@ -8104,15 +8107,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:8108: checking for compface.h" >&5
+echo "configure:8111: checking for compface.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8111 "configure"
+#line 8114 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8119: \"$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*
@@ -8135,12 +8138,12 @@
  }
   test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:8139: checking for UnGenFace in -lcompface" >&5
+echo "configure:8142: 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 8144 "configure"
+#line 8147 "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
@@ -8151,7 +8154,7 @@
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:8155: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8158: \"$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
@@ -8203,12 +8206,12 @@
       if test "$with_png $with_tiff" != "no no"; then
     
 echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6
-echo "configure:8207: checking for inflate in -lc" >&5
+echo "configure:8210: 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 8212 "configure"
+#line 8215 "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
@@ -8219,7 +8222,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8223: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8226: \"$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
@@ -8238,12 +8241,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:8242: checking for inflate in -lz" >&5
+echo "configure:8245: 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 8247 "configure"
+#line 8250 "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
@@ -8254,7 +8257,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8261: \"$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
@@ -8273,12 +8276,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6
-echo "configure:8277: checking for inflate in -lgz" >&5
+echo "configure:8280: 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 8282 "configure"
+#line 8285 "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
@@ -8289,7 +8292,7 @@
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8296: \"$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
@@ -8319,15 +8322,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:8323: checking for jpeglib.h" >&5
+echo "configure:8326: checking for jpeglib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8326 "configure"
+#line 8329 "configure"
 #include "confdefs.h"
 #include <jpeglib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8331: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8334: \"$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*
@@ -8350,12 +8353,12 @@
  }
   test -z "$with_jpeg" && { 
 echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
-echo "configure:8354: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:8357: 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 8359 "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
@@ -8366,7 +8369,7 @@
 jpeg_destroy_decompress()
 ; return 0; }
 EOF
-if { (eval echo configure:8370: \"$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
@@ -8402,10 +8405,10 @@
 
     png_problem=""
   test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
-echo "configure:8406: checking for pow" >&5
+echo "configure:8409: checking for pow" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8409 "configure"
+#line 8412 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pow(); below.  */
@@ -8428,7 +8431,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8435: \"$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
@@ -8449,15 +8452,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:8453: checking for png.h" >&5
+echo "configure:8456: checking for png.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8456 "configure"
+#line 8459 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8461: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8464: \"$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*
@@ -8480,12 +8483,12 @@
  }
   test -z "$with_png" && { 
 echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:8484: checking for png_read_image in -lpng" >&5
+echo "configure:8487: 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 8489 "configure"
+#line 8492 "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
@@ -8496,7 +8499,7 @@
 png_read_image()
 ; return 0; }
 EOF
-if { (eval echo configure:8500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8503: \"$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
@@ -8519,10 +8522,10 @@
  }
   if test -z "$with_png"; then
     echo $ac_n "checking for workable png version information""... $ac_c" 1>&6
-echo "configure:8523: checking for workable png version information" >&5
+echo "configure:8526: checking for workable png version information" >&5
     xe_check_libs="-lpng -lz"
     cat > conftest.$ac_ext <<EOF
-#line 8526 "configure"
+#line 8529 "configure"
 #include "confdefs.h"
 #include <png.h>
     int main(int c, char **v) {
@@ -8530,7 +8533,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:8534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:8537: \"$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
@@ -8573,15 +8576,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:8577: checking for tiffio.h" >&5
+echo "configure:8580: checking for tiffio.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8580 "configure"
+#line 8583 "configure"
 #include "confdefs.h"
 #include <tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8585: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8588: \"$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*
@@ -8604,12 +8607,12 @@
  }
   test -z "$with_tiff" && { 
 echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8608: checking for TIFFClientOpen in -ltiff" >&5
+echo "configure:8611: 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 8613 "configure"
+#line 8616 "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
@@ -8620,7 +8623,7 @@
 TIFFClientOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:8624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8627: \"$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
@@ -8659,15 +8662,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:8663: checking for compface.h" >&5
+echo "configure:8666: checking for compface.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8666 "configure"
+#line 8669 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8671: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8674: \"$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*
@@ -8690,12 +8693,12 @@
  }
   test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:8694: checking for UnGenFace in -lcompface" >&5
+echo "configure:8697: 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 8699 "configure"
+#line 8702 "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
@@ -8706,7 +8709,7 @@
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:8710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8713: \"$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
@@ -8746,10 +8749,10 @@
 if test "$with_x11" = "yes"; then
 
   echo "checking for X11 graphics libraries" 1>&6
-echo "configure:8750: checking for X11 graphics libraries" >&5
+echo "configure:8753: checking for X11 graphics libraries" >&5
 
   echo "checking for the Athena widgets" 1>&6
-echo "configure:8753: checking for the Athena widgets" >&5
+echo "configure:8756: checking for the Athena widgets" >&5
 
     case "$with_athena" in
         "xaw" | "")	athena_variant=Xaw	athena_3d=no  ;;
@@ -8763,12 +8766,12 @@
     if test "$athena_3d" = "no"; then
     
 echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:8767: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
+echo "configure:8770: 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 8772 "configure"
+#line 8775 "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
@@ -8779,7 +8782,7 @@
 XawScrollbarSetThumb()
 ; return 0; }
 EOF
-if { (eval echo configure:8783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8786: \"$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
@@ -8795,12 +8798,12 @@
   echo "$ac_t""yes" 1>&6
           
 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:8799: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:8802: 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 8804 "configure"
+#line 8807 "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
@@ -8811,7 +8814,7 @@
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:8815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8818: \"$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
@@ -8842,12 +8845,12 @@
   else
         
 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:8846: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:8849: 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 8851 "configure"
+#line 8854 "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
@@ -8858,7 +8861,7 @@
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:8862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8865: \"$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
@@ -8876,12 +8879,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for threeDClassRec in -lXaw""... $ac_c" 1>&6
-echo "configure:8880: checking for threeDClassRec in -lXaw" >&5
+echo "configure:8883: 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 8885 "configure"
+#line 8888 "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
@@ -8892,7 +8895,7 @@
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:8896: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8899: \"$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
@@ -8923,15 +8926,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:8927: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:8930: checking for X11/Xaw/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8930 "configure"
+#line 8933 "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:8935: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8938: \"$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*
@@ -8951,15 +8954,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:8955: checking for X11/Xaw/XawInit.h" >&5
+echo "configure:8958: checking for X11/Xaw/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8958 "configure"
+#line 8961 "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:8963: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8966: \"$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*
@@ -8985,15 +8988,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:8989: checking for X11/$athena_variant/XawInit.h" >&5
+echo "configure:8992: checking for X11/$athena_variant/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8992 "configure"
+#line 8995 "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:8997: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9000: \"$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*
@@ -9010,15 +9013,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:9014: checking for X11/$athena_variant/ThreeD.h" >&5
+echo "configure:9017: checking for X11/$athena_variant/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9017 "configure"
+#line 9020 "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:9022: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9025: \"$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*
@@ -9046,15 +9049,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:9050: checking for $athena_variant/XawInit.h" >&5
+echo "configure:9053: checking for $athena_variant/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9053 "configure"
+#line 9056 "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:9058: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9061: \"$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*
@@ -9071,15 +9074,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:9075: checking for $athena_variant/ThreeD.h" >&5
+echo "configure:9078: checking for $athena_variant/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9078 "configure"
+#line 9081 "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:9083: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9086: \"$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*
@@ -9108,15 +9111,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:9112: checking for X11/Xaw3d/XawInit.h" >&5
+echo "configure:9115: checking for X11/Xaw3d/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9115 "configure"
+#line 9118 "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:9120: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9123: \"$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*
@@ -9133,15 +9136,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:9137: checking for X11/Xaw3d/ThreeD.h" >&5
+echo "configure:9140: checking for X11/Xaw3d/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9140 "configure"
+#line 9143 "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:9145: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9148: \"$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*
@@ -9173,15 +9176,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:9177: checking for Xaw3d/XawInit.h" >&5
+echo "configure:9180: checking for Xaw3d/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9180 "configure"
+#line 9183 "configure"
 #include "confdefs.h"
 #include <Xaw3d/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9188: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9198,15 +9201,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:9202: checking for Xaw3d/ThreeD.h" >&5
+echo "configure:9205: checking for Xaw3d/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9205 "configure"
+#line 9208 "configure"
 #include "confdefs.h"
 #include <Xaw3d/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9210: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9213: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9238,15 +9241,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:9242: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:9245: checking for X11/Xaw/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9245 "configure"
+#line 9248 "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:9250: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9253: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -9281,15 +9284,15 @@
 
     ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
-echo "configure:9285: checking for Xm/Xm.h" >&5
+echo "configure:9288: checking for Xm/Xm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9288 "configure"
+#line 9291 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9293: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9296: \"$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*
@@ -9306,12 +9309,12 @@
   echo "$ac_t""yes" 1>&6
   
 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
-echo "configure:9310: checking for XmStringFree in -lXm" >&5
+echo "configure:9313: 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 9315 "configure"
+#line 9318 "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
@@ -9322,7 +9325,7 @@
 XmStringFree()
 ; return 0; }
 EOF
-if { (eval echo configure:9326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9329: \"$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
@@ -9351,9 +9354,9 @@
 
   if test "$have_motif" = "yes"; then
         echo $ac_n "checking for Lesstif""... $ac_c" 1>&6
-echo "configure:9355: checking for Lesstif" >&5
+echo "configure:9358: checking for Lesstif" >&5
     cat > conftest.$ac_ext <<EOF
-#line 9357 "configure"
+#line 9360 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 #ifdef LESSTIF_VERSION
@@ -9777,7 +9780,7 @@
 
 if test "$with_mule" = "yes" ; then
   echo "checking for Mule-related features" 1>&6
-echo "configure:9781: checking for Mule-related features" >&5
+echo "configure:9784: checking for Mule-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining MULE
 EOF
@@ -9802,15 +9805,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9806: checking for $ac_hdr" >&5
+echo "configure:9809: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9809 "configure"
+#line 9812 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9814: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9817: \"$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*
@@ -9841,12 +9844,12 @@
 
   
 echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
-echo "configure:9845: checking for strerror in -lintl" >&5
+echo "configure:9848: 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 9850 "configure"
+#line 9853 "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
@@ -9857,7 +9860,7 @@
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:9861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9864: \"$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
@@ -9890,18 +9893,18 @@
 
 
   echo "checking for Mule input methods" 1>&6
-echo "configure:9894: checking for Mule input methods" >&5
+echo "configure:9897: checking for Mule input methods" >&5
         case "$with_xim" in "" | "yes" )
     echo "checking for XIM" 1>&6
-echo "configure:9897: checking for XIM" >&5
+echo "configure:9900: checking for XIM" >&5
     
 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6
-echo "configure:9900: checking for XOpenIM in -lX11" >&5
+echo "configure:9903: 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 9905 "configure"
+#line 9908 "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
@@ -9912,7 +9915,7 @@
 XOpenIM()
 ; return 0; }
 EOF
-if { (eval echo configure:9916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9919: \"$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
@@ -9936,12 +9939,12 @@
         if test "$have_motif $have_lesstif" = "yes no"; then
       
 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:9940: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:9943: 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 9945 "configure"
+#line 9948 "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
@@ -9952,7 +9955,7 @@
 XmImMbLookupString()
 ; return 0; }
 EOF
-if { (eval echo configure:9956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9959: \"$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
@@ -10017,15 +10020,15 @@
 
     if test "$with_xfs" = "yes" ; then
     echo "checking for XFontSet" 1>&6
-echo "configure:10021: checking for XFontSet" >&5
+echo "configure:10024: checking for XFontSet" >&5
     
 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6
-echo "configure:10024: checking for XmbDrawString in -lX11" >&5
+echo "configure:10027: 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 10029 "configure"
+#line 10032 "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
@@ -10036,7 +10039,7 @@
 XmbDrawString()
 ; return 0; }
 EOF
-if { (eval echo configure:10040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10076,15 +10079,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:10080: checking for wnn/jllib.h" >&5
+echo "configure:10083: checking for wnn/jllib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10083 "configure"
+#line 10086 "configure"
 #include "confdefs.h"
 #include <wnn/jllib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10088: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10091: \"$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*
@@ -10107,15 +10110,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:10111: checking for wnn/commonhd.h" >&5
+echo "configure:10114: checking for wnn/commonhd.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10114 "configure"
+#line 10117 "configure"
 #include "confdefs.h"
 #include <wnn/commonhd.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10119: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10122: \"$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*
@@ -10140,10 +10143,10 @@
     for ac_func in crypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10144: checking for $ac_func" >&5
+echo "configure:10147: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10147 "configure"
+#line 10150 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10166,7 +10169,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10170: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10173: \"$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
@@ -10195,12 +10198,12 @@
 
     test "$ac_cv_func_crypt" != "yes" && { 
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:10199: checking for crypt in -lcrypt" >&5
+echo "configure:10202: 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 10204 "configure"
+#line 10207 "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
@@ -10211,7 +10214,7 @@
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:10215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10218: \"$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
@@ -10246,12 +10249,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:10250: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:10253: 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 10255 "configure"
+#line 10258 "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
@@ -10262,7 +10265,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10269: \"$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
@@ -10280,12 +10283,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:10284: checking for jl_dic_list_e in -lwnn4" >&5
+echo "configure:10287: 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 10289 "configure"
+#line 10292 "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
@@ -10296,7 +10299,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10303: \"$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
@@ -10314,12 +10317,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:10318: checking for jl_dic_list_e in -lwnn6" >&5
+echo "configure:10321: 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 10323 "configure"
+#line 10326 "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
@@ -10330,7 +10333,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10337: \"$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
@@ -10348,12 +10351,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:10352: checking for dic_list_e in -lwnn6_fromsrc" >&5
+echo "configure:10355: 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 10357 "configure"
+#line 10360 "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
@@ -10364,7 +10367,7 @@
 dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10371: \"$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
@@ -10412,12 +10415,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:10416: checking for jl_fi_dic_list in -l$libwnn" >&5
+echo "configure:10419: 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 10421 "configure"
+#line 10424 "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
@@ -10428,7 +10431,7 @@
 jl_fi_dic_list()
 ; return 0; }
 EOF
-if { (eval echo configure:10432: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10435: \"$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
@@ -10463,15 +10466,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:10467: checking for canna/jrkanji.h" >&5
+echo "configure:10470: checking for canna/jrkanji.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10470 "configure"
+#line 10473 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10475: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10478: \"$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*
@@ -10498,15 +10501,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:10502: checking for canna/jrkanji.h" >&5
+echo "configure:10505: checking for canna/jrkanji.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10505 "configure"
+#line 10508 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10513: \"$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*
@@ -10534,15 +10537,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:10538: checking for canna/RK.h" >&5
+echo "configure:10541: checking for canna/RK.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10541 "configure"
+#line 10544 "configure"
 #include "confdefs.h"
 #include <canna/RK.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10546: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10549: \"$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*
@@ -10565,12 +10568,12 @@
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
-echo "configure:10569: checking for RkBgnBun in -lRKC" >&5
+echo "configure:10572: 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 10574 "configure"
+#line 10577 "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
@@ -10581,7 +10584,7 @@
 RkBgnBun()
 ; return 0; }
 EOF
-if { (eval echo configure:10585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10588: \"$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
@@ -10604,12 +10607,12 @@
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
-echo "configure:10608: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:10611: 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 10613 "configure"
+#line 10616 "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
@@ -10620,7 +10623,7 @@
 jrKanjiControl()
 ; return 0; }
 EOF
-if { (eval echo configure:10624: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10627: \"$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
@@ -10669,12 +10672,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:10673: checking for layout_object_getvalue in -li18n" >&5
+echo "configure:10676: 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 10678 "configure"
+#line 10681 "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
@@ -10685,7 +10688,7 @@
 layout_object_getvalue()
 ; return 0; }
 EOF
-if { (eval echo configure:10689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10692: \"$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
@@ -10771,10 +10774,10 @@
 for ac_func in cbrt closedir dup2 eaccess fmod fpathconf frexp ftime getaddrinfo gethostname getnameinfo getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strerror tzset ulimit usleep waitpid vsnprintf fsync ftruncate umask
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10775: checking for $ac_func" >&5
+echo "configure:10778: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10778 "configure"
+#line 10781 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10797,7 +10800,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10804: \"$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
@@ -10829,10 +10832,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:10833: checking for $ac_func" >&5
+echo "configure:10836: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10836 "configure"
+#line 10839 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10855,7 +10858,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10862: \"$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
@@ -10884,10 +10887,10 @@
 
 
 echo $ac_n "checking for openpty""... $ac_c" 1>&6
-echo "configure:10888: checking for openpty" >&5
+echo "configure:10891: checking for openpty" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10891 "configure"
+#line 10894 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char openpty(); below.  */
@@ -10910,7 +10913,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:10914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10917: \"$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
@@ -10929,12 +10932,12 @@
 
   
 echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:10933: checking for openpty in -lutil" >&5
+echo "configure:10936: 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 10938 "configure"
+#line 10941 "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
@@ -10945,7 +10948,7 @@
 openpty()
 ; return 0; }
 EOF
-if { (eval echo configure:10949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10952: \"$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
@@ -10980,15 +10983,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10984: checking for $ac_hdr" >&5
+echo "configure:10987: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10987 "configure"
+#line 10990 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10992: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10995: \"$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*
@@ -11024,15 +11027,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11028: checking for $ac_hdr" >&5
+echo "configure:11031: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11031 "configure"
+#line 11034 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11036: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11039: \"$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*
@@ -11065,10 +11068,10 @@
   for ac_func in isastream
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11069: checking for $ac_func" >&5
+echo "configure:11072: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11072 "configure"
+#line 11075 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11091,7 +11094,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11098: \"$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
@@ -11122,15 +11125,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11126: checking for $ac_hdr" >&5
+echo "configure:11129: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11129 "configure"
+#line 11132 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11134: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11137: \"$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*
@@ -11167,10 +11170,10 @@
 for ac_func in getloadavg
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11171: checking for $ac_func" >&5
+echo "configure:11174: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11174 "configure"
+#line 11177 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11193,7 +11196,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11200: \"$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
@@ -11226,15 +11229,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11230: checking for $ac_hdr" >&5
+echo "configure:11233: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11233 "configure"
+#line 11236 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11241: \"$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*
@@ -11270,12 +11273,12 @@
 
     
 echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:11274: checking for kstat_open in -lkstat" >&5
+echo "configure:11277: 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 11279 "configure"
+#line 11282 "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
@@ -11286,7 +11289,7 @@
 kstat_open()
 ; return 0; }
 EOF
-if { (eval echo configure:11290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11293: \"$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
@@ -11321,15 +11324,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11325: checking for $ac_hdr" >&5
+echo "configure:11328: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11328 "configure"
+#line 11331 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11333: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11336: \"$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*
@@ -11361,12 +11364,12 @@
 
     
 echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:11365: checking for kvm_read in -lkvm" >&5
+echo "configure:11368: 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 11370 "configure"
+#line 11373 "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
@@ -11377,7 +11380,7 @@
 kvm_read()
 ; 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:11384: \"$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
@@ -11411,16 +11414,16 @@
 fi
 
 echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:11415: checking whether netdb declares h_errno" >&5
+echo "configure:11418: checking whether netdb declares h_errno" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11417 "configure"
+#line 11420 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 return h_errno;
 ; return 0; }
 EOF
-if { (eval echo configure:11424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11427: \"$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
@@ -11440,16 +11443,16 @@
 rm -f conftest*
 
 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:11444: checking for sigsetjmp" >&5
+echo "configure:11447: checking for sigsetjmp" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11446 "configure"
+#line 11449 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigjmp_buf bar; sigsetjmp (bar, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:11453: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11456: \"$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
@@ -11469,11 +11472,11 @@
 rm -f conftest*
 
 echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
-echo "configure:11473: checking whether localtime caches TZ" >&5
+echo "configure:11476: checking whether localtime caches TZ" >&5
 
 if test "$ac_cv_func_tzset" = "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 11477 "configure"
+#line 11480 "configure"
 #include "confdefs.h"
 #include <time.h>
 #if STDC_HEADERS
@@ -11508,7 +11511,7 @@
   exit (0);
 }
 EOF
-if { (eval echo configure:11512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:11515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   emacs_cv_localtime_cache=no
 else
@@ -11538,9 +11541,9 @@
 
 if test "$HAVE_TIMEVAL" = "yes"; then
 echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6
-echo "configure:11542: checking whether gettimeofday accepts one or two arguments" >&5
+echo "configure:11545: checking whether gettimeofday accepts one or two arguments" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11544 "configure"
+#line 11547 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -11561,7 +11564,7 @@
 
 ; 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:11568: \"$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
@@ -11583,19 +11586,19 @@
 
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:11587: checking for inline" >&5
+echo "configure:11590: checking for inline" >&5
 
 ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 11592 "configure"
+#line 11595 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:11599: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11602: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -11636,17 +11639,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:11640: checking for working alloca.h" >&5
+echo "configure:11643: checking for working alloca.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11643 "configure"
+#line 11646 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:11650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11653: \"$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
@@ -11670,10 +11673,10 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:11674: checking for alloca" >&5
+echo "configure:11677: checking for alloca" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11677 "configure"
+#line 11680 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -11701,7 +11704,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:11705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11708: \"$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
@@ -11740,10 +11743,10 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:11744: checking whether alloca needs Cray hooks" >&5
+echo "configure:11747: checking whether alloca needs Cray hooks" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11747 "configure"
+#line 11750 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -11767,10 +11770,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:11771: checking for $ac_func" >&5
+echo "configure:11774: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11774 "configure"
+#line 11777 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11793,7 +11796,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:11797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11800: \"$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
@@ -11823,10 +11826,10 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:11827: checking stack direction for C alloca" >&5
+echo "configure:11830: checking stack direction for C alloca" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11830 "configure"
+#line 11833 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -11845,7 +11848,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:11849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:11852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_c_stack_direction=1
 else
@@ -11875,15 +11878,15 @@
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:11879: checking for vfork.h" >&5
+echo "configure:11882: checking for vfork.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11882 "configure"
+#line 11885 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11887: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11890: \"$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*
@@ -11911,10 +11914,10 @@
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:11915: checking for working vfork" >&5
+echo "configure:11918: checking for working vfork" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11918 "configure"
+#line 11921 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -12009,7 +12012,7 @@
   }
 }
 EOF
-if { (eval echo configure:12013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12016: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_vfork_works=yes
 else
@@ -12035,10 +12038,10 @@
 
 
 echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:12039: checking for working strcoll" >&5
+echo "configure:12042: checking for working strcoll" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12042 "configure"
+#line 12045 "configure"
 #include "confdefs.h"
 #include <string.h>
 main ()
@@ -12048,7 +12051,7 @@
 	strcoll ("123", "456") >= 0);
 }
 EOF
-if { (eval echo configure:12052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_strcoll_works=yes
 else
@@ -12076,10 +12079,10 @@
 for ac_func in getpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12080: checking for $ac_func" >&5
+echo "configure:12083: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12083 "configure"
+#line 12086 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -12102,7 +12105,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12109: \"$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
@@ -12130,10 +12133,10 @@
 done
 
 echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:12134: checking whether getpgrp takes no argument" >&5
+echo "configure:12137: checking whether getpgrp takes no argument" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12137 "configure"
+#line 12140 "configure"
 #include "confdefs.h"
 
 /*
@@ -12188,7 +12191,7 @@
 }
 
 EOF
-if { (eval echo configure:12192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_getpgrp_void=yes
 else
@@ -12215,10 +12218,10 @@
 
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:12219: checking for working mmap" >&5
+echo "configure:12222: checking for working mmap" >&5
 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 cat > conftest.$ac_ext <<EOF
-#line 12222 "configure"
+#line 12225 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <unistd.h>
@@ -12251,7 +12254,7 @@
   return 1;
 }
 EOF
-if { (eval echo configure:12255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   have_mmap=yes
 else
@@ -12280,9 +12283,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:12284: checking for M_MMAP_THRESHOLD" >&5
+echo "configure:12287: checking for M_MMAP_THRESHOLD" >&5
     cat > conftest.$ac_ext <<EOF
-#line 12286 "configure"
+#line 12289 "configure"
 #include "confdefs.h"
 #include <malloc.h>
 int main() {
@@ -12294,7 +12297,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12298: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   rel_alloc=no; echo "$ac_t""yes" 1>&6;
 else
@@ -12319,15 +12322,15 @@
 
 ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:12323: checking for termios.h" >&5
+echo "configure:12326: checking for termios.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12326 "configure"
+#line 12329 "configure"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12331: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12334: \"$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*
@@ -12370,15 +12373,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:12374: checking for termio.h" >&5
+echo "configure:12377: checking for termio.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12377 "configure"
+#line 12380 "configure"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12382: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12385: \"$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*
@@ -12410,10 +12413,10 @@
 
 
 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:12414: checking for socket" >&5
+echo "configure:12417: checking for socket" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12417 "configure"
+#line 12420 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -12436,7 +12439,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12443: \"$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
@@ -12451,15 +12454,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:12455: checking for netinet/in.h" >&5
+echo "configure:12458: checking for netinet/in.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12458 "configure"
+#line 12461 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12463: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12466: \"$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*
@@ -12476,15 +12479,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:12480: checking for arpa/inet.h" >&5
+echo "configure:12483: checking for arpa/inet.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12483 "configure"
+#line 12486 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12488: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12491: \"$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*
@@ -12509,9 +12512,9 @@
 }
 
       echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:12513: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:12516: checking "for sun_len member in struct sockaddr_un"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 12515 "configure"
+#line 12518 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12522,7 +12525,7 @@
 static struct sockaddr_un x; x.sun_len = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:12526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12529: \"$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
@@ -12540,9 +12543,9 @@
 fi
 rm -f conftest*
       echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6
-echo "configure:12544: checking "for ip_mreq struct in netinet/in.h"" >&5
+echo "configure:12547: checking "for ip_mreq struct in netinet/in.h"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 12546 "configure"
+#line 12549 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12552,7 +12555,7 @@
 static struct ip_mreq x;
 ; return 0; }
 EOF
-if { (eval echo configure:12556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12559: \"$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
@@ -12583,10 +12586,10 @@
 
 
 echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:12587: checking for msgget" >&5
+echo "configure:12590: checking for msgget" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12590 "configure"
+#line 12593 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char msgget(); below.  */
@@ -12609,7 +12612,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:12613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12616: \"$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
@@ -12624,15 +12627,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:12628: checking for sys/ipc.h" >&5
+echo "configure:12631: checking for sys/ipc.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12631 "configure"
+#line 12634 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12636: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12639: \"$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*
@@ -12649,15 +12652,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:12653: checking for sys/msg.h" >&5
+echo "configure:12656: checking for sys/msg.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12656 "configure"
+#line 12659 "configure"
 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12664: \"$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*
@@ -12695,15 +12698,15 @@
 
 ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:12699: checking for dirent.h" >&5
+echo "configure:12702: checking for dirent.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12702 "configure"
+#line 12705 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12707: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12710: \"$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*
@@ -12730,15 +12733,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:12734: checking for sys/dir.h" >&5
+echo "configure:12737: checking for sys/dir.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12737 "configure"
+#line 12740 "configure"
 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12742: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12745: \"$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*
@@ -12771,15 +12774,15 @@
 
 ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:12775: checking for nlist.h" >&5
+echo "configure:12778: checking for nlist.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12778 "configure"
+#line 12781 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12783: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12786: \"$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*
@@ -12809,22 +12812,22 @@
 
 
 echo "checking "for sound support"" 1>&6
-echo "configure:12813: checking "for sound support"" >&5
+echo "configure:12816: 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:12820: checking for multimedia/audio_device.h" >&5
+echo "configure:12823: checking for multimedia/audio_device.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12823 "configure"
+#line 12826 "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:12828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12831: \"$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*
@@ -12872,12 +12875,12 @@
       if test -z "$native_sound_lib"; then
         
 echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:12876: checking for ALopenport in -laudio" >&5
+echo "configure:12879: 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 12881 "configure"
+#line 12884 "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
@@ -12888,7 +12891,7 @@
 ALopenport()
 ; return 0; }
 EOF
-if { (eval echo configure:12892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12895: \"$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
@@ -12919,12 +12922,12 @@
       if test -z "$native_sound_lib"; then
 	
 echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:12923: checking for AOpenAudio in -lAlib" >&5
+echo "configure:12926: 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 12928 "configure"
+#line 12931 "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
@@ -12935,7 +12938,7 @@
 AOpenAudio()
 ; return 0; }
 EOF
-if { (eval echo configure:12939: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12942: \"$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
@@ -12973,15 +12976,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:12977: checking for ${dir}/soundcard.h" >&5
+echo "configure:12980: checking for ${dir}/soundcard.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12980 "configure"
+#line 12983 "configure"
 #include "confdefs.h"
 #include <${dir}/soundcard.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12985: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12988: \"$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*
@@ -13042,15 +13045,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:13046: checking for audio/audiolib.h" >&5
+echo "configure:13049: checking for audio/audiolib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13049 "configure"
+#line 13052 "configure"
 #include "confdefs.h"
 #include <audio/audiolib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13054: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13057: \"$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,12 +13071,12 @@
   
     
 echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6
-echo "configure:13072: checking for AuOpenServer in -laudio" >&5
+echo "configure:13075: 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 13077 "configure"
+#line 13080 "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
@@ -13084,7 +13087,7 @@
 AuOpenServer()
 ; return 0; }
 EOF
-if { (eval echo configure:13088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13091: \"$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
@@ -13123,7 +13126,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 13127 "configure"
+#line 13130 "configure"
 #include "confdefs.h"
 #include <audio/Xtutil.h>
 EOF
@@ -13154,7 +13157,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:13158: checking for $ac_word" >&5
+echo "configure:13161: 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.
@@ -13183,10 +13186,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:13187: checking for esd_play_stream" >&5
+echo "configure:13190: checking for esd_play_stream" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13190 "configure"
+#line 13193 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char esd_play_stream(); below.  */
@@ -13209,7 +13212,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13216: \"$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
@@ -13260,7 +13263,7 @@
 
 if test "$with_tty" = "yes"  ; then
   echo "checking for TTY-related features" 1>&6
-echo "configure:13264: checking for TTY-related features" >&5
+echo "configure:13267: checking for TTY-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_TTY
 EOF
@@ -13276,12 +13279,12 @@
     if test -z "$with_ncurses"; then
     
 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:13280: checking for tgetent in -lncurses" >&5
+echo "configure:13283: 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 13285 "configure"
+#line 13288 "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
@@ -13292,7 +13295,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13299: \"$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
@@ -13325,15 +13328,15 @@
 
     ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:13329: checking for ncurses/curses.h" >&5
+echo "configure:13332: checking for ncurses/curses.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13332 "configure"
+#line 13335 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13337: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13340: \"$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*
@@ -13355,15 +13358,15 @@
 
     ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
-echo "configure:13359: checking for ncurses/term.h" >&5
+echo "configure:13362: checking for ncurses/term.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13362 "configure"
+#line 13365 "configure"
 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13367: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13370: \"$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*
@@ -13393,15 +13396,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:13397: checking for ncurses/curses.h" >&5
+echo "configure:13400: checking for ncurses/curses.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13400 "configure"
+#line 13403 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13405: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13408: \"$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*
@@ -13436,12 +13439,12 @@
 	for lib in curses termlib termcap; do
 	  
 echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:13440: checking for tgetent in -l$lib" >&5
+echo "configure:13443: 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 13445 "configure"
+#line 13448 "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
@@ -13452,7 +13455,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13459: \"$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
@@ -13483,12 +13486,12 @@
       else
 	
 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:13487: checking for tgetent in -lcurses" >&5
+echo "configure:13490: 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 13492 "configure"
+#line 13495 "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
@@ -13499,7 +13502,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13506: \"$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
@@ -13517,12 +13520,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:13521: checking for tgetent in -ltermcap" >&5
+echo "configure:13524: 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 13526 "configure"
+#line 13529 "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
@@ -13533,7 +13536,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13540: \"$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
@@ -13581,15 +13584,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:13585: checking for gpm.h" >&5
+echo "configure:13588: checking for gpm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13588 "configure"
+#line 13591 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13593: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13596: \"$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*
@@ -13612,12 +13615,12 @@
  }
   test -z "$with_gpm" && { 
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:13616: checking for Gpm_Open in -lgpm" >&5
+echo "configure:13619: 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 13621 "configure"
+#line 13624 "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
@@ -13628,7 +13631,7 @@
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:13632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13635: \"$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
@@ -13678,20 +13681,20 @@
 
 test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
   != "no no no" && echo "checking for database support" 1>&6
-echo "configure:13682: checking for database support" >&5
+echo "configure:13685: 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:13687: checking for ndbm.h" >&5
+echo "configure:13690: checking for ndbm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13690 "configure"
+#line 13693 "configure"
 #include "confdefs.h"
 #include <ndbm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13698: \"$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*
@@ -13721,12 +13724,12 @@
 if test "$with_database_gdbm" != "no"; then
   
 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:13725: checking for dbm_open in -lgdbm" >&5
+echo "configure:13728: 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 13730 "configure"
+#line 13733 "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
@@ -13737,7 +13740,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:13741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13744: \"$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
@@ -13765,10 +13768,10 @@
 
 if test "$with_database_dbm" != "no"; then
   echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:13769: checking for dbm_open" >&5
+echo "configure:13772: checking for dbm_open" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13772 "configure"
+#line 13775 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */
@@ -13791,7 +13794,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13798: \"$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
@@ -13810,12 +13813,12 @@
 
     
 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:13814: checking for dbm_open in -ldbm" >&5
+echo "configure:13817: 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 13819 "configure"
+#line 13822 "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
@@ -13826,7 +13829,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:13830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13833: \"$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
@@ -13867,10 +13870,10 @@
 
 if test "$with_database_berkdb" != "no"; then
   echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
-echo "configure:13871: checking for Berkeley db.h" >&5
+echo "configure:13874: checking for Berkeley db.h" >&5
   for header in "db/db.h" "db.h"; do
     cat > conftest.$ac_ext <<EOF
-#line 13874 "configure"
+#line 13877 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13892,7 +13895,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13896: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13899: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   db_h_file="$header"; break
 else
@@ -13908,9 +13911,9 @@
 
   if test "$with_database_berkdb" != "no"; then
     echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6
-echo "configure:13912: checking for Berkeley DB version" >&5
+echo "configure:13915: checking for Berkeley DB version" >&5
     cat > conftest.$ac_ext <<EOF
-#line 13914 "configure"
+#line 13917 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 1
@@ -13922,7 +13925,7 @@
   egrep "yes" >/dev/null 2>&1; then
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 13926 "configure"
+#line 13929 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 2
@@ -13949,10 +13952,10 @@
 rm -f conftest*
 
     echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6
-echo "configure:13953: checking for $dbfunc" >&5
+echo "configure:13956: checking for $dbfunc" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13956 "configure"
+#line 13959 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $dbfunc(); below.  */
@@ -13975,7 +13978,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:13979: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13982: \"$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
@@ -13994,12 +13997,12 @@
 
     
 echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
-echo "configure:13998: checking for $dbfunc in -ldb" >&5
+echo "configure:14001: 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 14003 "configure"
+#line 14006 "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
@@ -14010,7 +14013,7 @@
 $dbfunc()
 ; return 0; }
 EOF
-if { (eval echo configure:14014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14017: \"$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
@@ -14074,12 +14077,12 @@
 if test "$with_socks" = "yes"; then
   
 echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:14078: checking for SOCKSinit in -lsocks" >&5
+echo "configure:14081: 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 14083 "configure"
+#line 14086 "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
@@ -14090,7 +14093,7 @@
 SOCKSinit()
 ; return 0; }
 EOF
-if { (eval echo configure:14094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14097: \"$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
@@ -14145,22 +14148,22 @@
 
 if test "$with_modules" != "no"; then
   echo "checking for module support" 1>&6
-echo "configure:14149: checking for module support" >&5
+echo "configure:14152: 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:14156: checking for dlfcn.h" >&5
+echo "configure:14159: checking for dlfcn.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14159 "configure"
+#line 14162 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14164: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14167: \"$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*
@@ -14177,16 +14180,16 @@
   echo "$ac_t""yes" 1>&6
   
       echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6
-echo "configure:14181: checking for dlopen in -lc" >&5
+echo "configure:14184: checking for dlopen in -lc" >&5
       cat > conftest.$ac_ext <<EOF
-#line 14183 "configure"
+#line 14186 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int main() {
 	dlopen ("", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:14190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    have_dl=yes 
 else
@@ -14195,18 +14198,18 @@
   rm -rf conftest*
   
       echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:14199: checking for dlopen in -ldl" >&5
+echo "configure:14202: checking for dlopen in -ldl" >&5
       ac_save_LIBS="$LIBS"
       LIBS="-ldl $LIBS"
       cat > conftest.$ac_ext <<EOF
-#line 14203 "configure"
+#line 14206 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int main() {
 	dlopen ("", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:14210: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    have_dl=yes 
 else
@@ -14235,12 +14238,12 @@
     else
       
 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:14239: checking for shl_load in -ldld" >&5
+echo "configure:14242: 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 14244 "configure"
+#line 14247 "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
@@ -14251,7 +14254,7 @@
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo configure:14255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14258: \"$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
@@ -14278,12 +14281,12 @@
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
-echo "configure:14282: checking for dld_init in -ldld" >&5
+echo "configure:14285: 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 14287 "configure"
+#line 14290 "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
@@ -14294,7 +14297,7 @@
 dld_init()
 ; return 0; }
 EOF
-if { (eval echo configure:14298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14301: \"$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
@@ -14339,7 +14342,7 @@
 xealias=$internal_configuration
 
 echo "checking how to build dynamic libraries for ${xehost}" 1>&6
-echo "configure:14343: checking how to build dynamic libraries for ${xehost}" >&5
+echo "configure:14346: checking how to build dynamic libraries for ${xehost}" >&5
 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
 case "$xehost" in
 *-*-linux-gnu*) ;;
@@ -14367,9 +14370,9 @@
   XEGCC=yes
 else
   echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:14371: checking checking whether we are using GNU C" >&5
+echo "configure:14374: checking checking whether we are using GNU C" >&5
   cat > conftest.$ac_ext <<EOF
-#line 14373 "configure"
+#line 14376 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -14391,7 +14394,7 @@
 fi
 
 echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6
-echo "configure:14395: checking how to produce PIC code" >&5
+echo "configure:14398: checking how to produce PIC code" >&5
 wl=
 
 can_build_shared=yes
@@ -14492,18 +14495,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:14496: checking if PIC flag ${dll_cflags} really works" >&5
+echo "configure:14499: checking if PIC flag ${dll_cflags} really works" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS $dll_cflags -DPIC"
   cat > conftest.$ac_ext <<EOF
-#line 14500 "configure"
+#line 14503 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:14507: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14510: \"$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
@@ -14534,7 +14537,7 @@
 xldf=
 xcldf=
 echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6
-echo "configure:14538: checking if C compiler can produce shared libraries" >&5
+echo "configure:14541: checking if C compiler can produce shared libraries" >&5
 if test "$XEGCC" = yes; then
   xcldf="-shared"
   xldf="-shared"
@@ -14585,14 +14588,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 14589 "configure"
+#line 14592 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:14596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14599: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cc_produces_so=yes
 else
@@ -14617,7 +14620,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:14621: checking for ld used by GCC" >&5
+echo "configure:14624: checking for ld used by GCC" >&5
     ac_prog=`($CC -print-prog-name=ld) 2>&5`
     case "$ac_prog" in
     # Accept absolute paths.
@@ -14642,7 +14645,7 @@
     esac
   else
     echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:14646: checking for GNU ld" >&5
+echo "configure:14649: checking for GNU ld" >&5
   fi
 
   if test -z "$LTLD"; then
@@ -14680,7 +14683,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:14684: checking if the linker is GNU ld" >&5
+echo "configure:14687: 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
@@ -14708,7 +14711,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:14712: checking whether the linker supports shared libraries" >&5
+echo "configure:14715: checking whether the linker supports shared libraries" >&5
   dll_ld=$CC
   dll_ldflags=$LDFLAGS
   ld_shlibs=yes
@@ -14919,10 +14922,10 @@
     for ac_func in dlerror _dlerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14923: checking for $ac_func" >&5
+echo "configure:14926: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14926 "configure"
+#line 14929 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -14945,7 +14948,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:14949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14952: \"$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
@@ -14984,11 +14987,11 @@
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 14988 "configure"
+#line 14991 "configure"
 #include "confdefs.h"
 int main(int c,char *v[]){return 0;}
 EOF
-if { (eval echo configure:14992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:14995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
diff --text -u 'xemacs-21.2.46/configure.in' 'xemacs-21.5.0/configure.in'
Index: ./configure.in
--- ./configure.in	Wed Mar 21 16:05:17 2001
+++ ./configure.in	Fri Apr 13 03:20:41 2001
@@ -1884,13 +1884,15 @@
   test "$need_kalloca" = "yes" && XE_APPEND(-Kalloca,c_switch_system)
 fi
 
-dnl Calculalate value of CFLAGS:
+dnl Calculate value of CFLAGS:
 dnl Use either command line flag, environment var, or autodetection
 if test "$cflags_specified" = "no"; then
   dnl Following values of CFLAGS are known to work well.
   dnl Should we take debugging options into consideration?
   if   test "$GCC" = "yes"; then
     CFLAGS="-g -O3 -Wall -Wno-switch -Winline -Wmissing-prototypes -Wshadow"
+    dnl Yuck, bad compares have been worth at least 3 crashes!
+    CFLAGS="$CFLAGS -Wsign-compare"
     dnl glibc is intentionally not `-Wpointer-arith'-clean.
     dnl Ulrich Drepper has rejected patches to fix the glibc header files.
     test "$have_glibc" != "yes" && CFLAGS="$CFLAGS -Wpointer-arith"
@@ -2753,7 +2755,9 @@
     cd ..
     rm -fr conftestdir
     for word in $xmkmf_defines; do
-      case "$word" in -D* )
+      case "$word" in 
+      -D__STDC__*) ;;
+      -D* )
 	sym=`echo '' $word | sed -e 's:^ *-D::' -e 's:=.*::'`
 	case "$word" in
 	  -D*=* ) val=`echo '' $word | sed -e 's:^.*=::'` ;;
diff --text -u 'xemacs-21.2.46/configure.usage' 'xemacs-21.5.0/configure.usage'
Index: ./configure.usage
--- ./configure.usage	Mon Mar 19 15:16:33 2001
+++ ./configure.usage	Fri Apr 13 03:20:41 2001
@@ -193,6 +193,11 @@
 --pdump                 New, experimental, non-working, don't-sue-me-if-
                         your-house-collapses-and-your-wife-leaves-you,
                         portable dumper.
+--with-file-coding      Allows transparent use of "foreign" line break
+                        conventions in text files (such as LF-delimited text
+                        imported from a Unix system to a Windows environment),
+                        optionally including autodetection.  Defaults to ON
+                        on Windows, OFF on Unix.
 
 Internationalization options:
 
diff --text -u 'xemacs-21.2.46/dynodump/dynodump.c' 'xemacs-21.5.0/dynodump/dynodump.c'
Index: ./dynodump/dynodump.c
Prereq:  1.6.2.2 
--- ./dynodump/dynodump.c	Wed Sep 20 11:49:32 2000
+++ ./dynodump/dynodump.c	Fri Apr 13 18:11:20 2001
@@ -73,7 +73,7 @@
  * N.B. The above commentary is not quite correct in the flags have been hardwired
  *      to RTLD_SAVREL.
  */
-#pragma ident	"@(#) $Id: dynodump.c,v 1.6.2.2 2000/09/20 02:39:17 martinb Exp $ - SMI"
+#pragma ident	"@(#) $Id: dynodump.c,v 1.9 2001/04/13 09:11:20 michaels Exp $ - SMI"
 
 #define __EXTENSIONS__ 1
 
diff --text -u 'xemacs-21.2.46/etc/NEWS' 'xemacs-21.5.0/etc/NEWS'
Index: ./etc/NEWS
--- ./etc/NEWS	Wed Mar 21 16:05:18 2001
+++ ./etc/NEWS	Fri Apr 13 03:20:46 2001
@@ -3,9 +3,12 @@
 * Introduction
 ==============
 
-This file presents some general information about XEmacs.  It is
-primarily about the changes in recent XEmacs versions and its release
-history.
+This file presents the changes in recent XEmacs versions.  It
+primarily documents user-visible (interface) changes, but also
+includes internal changes of possible interest to the users.  When
+describing new features, we try to also document ways of reverting to
+the old behavior, where applicable.  If you dislike a recent change in
+how XEmacs behaves, this file might contain a remedy.
 
 Use `C-c C-f' to move to the next equal level of outline, and
 `C-c C-b' to move to previous equal level.  `C-h m' will give more
@@ -17,25 +20,18 @@
 Starting with version 20.0, XEmacs includes ChangeLogs, which can be
 consulted for a more detailed list of changes.
 
-Users interested in some of the details of how XEmacs differs from GNU
-Emacs should read the section "What's Different?" near the end of this
-file.
-
     N.B.  The term "GNU Emacs" refers to any release of Emacs Version
     19 from the Free Software Foundation's GNU Project.  (We do not
     say just "Emacs" as Richard M. Stallman ["RMS"] prefers, because
     it is clearly a more generic term.)  The term "XEmacs" refers to
-    this program or to its predecessors "Era" and "Lucid Emacs".  The
-    predecessor of all these program is called "Emacs 18".  When no
-    particular version is implied, "Emacs" will be used.
+    this program or sometimes to its predecessors "Era" and "Lucid
+    Emacs".  The predecessor of all these program is called "Emacs
+    18".  When no particular version is implied, "Emacs" will be used.
 
 
-* Changes in XEmacs 21.2
+* Changes in XEmacs 21.4
 ========================
 
-** The modeline's text is now scrollable. Please refer to the variable
-`modeline-scrolling-method' for more information.
-
 ** The delete key now deletes forward by default.
 
 This is regulated by the variable `delete-key-deletes-forward', which
@@ -50,23 +46,38 @@
 Delete key to delete backwards, despite the presence (according to
 Xlib) of a BackSpace key on the keyboard.
 
+** You can now build XEmacs with support for GTK+ widget set.
+
+XEmacs built that way uses GTK+ to draw menubars, scrollbars, and
+other GUI components, as well GDK for drawing text, choosing fonts,
+allocating colors, etc.  Additionally, GTK-XEmacs supports Lisp
+functions for writing your own GTK programs in Emacs Lisp!
+
+To use this, build XEmacs with the `--with-gtk' configure flag.  (Of
+course, you'll need to have the GTK+ libraries and header files on the
+system.)  Gnome widgets and functionality are supported where
+available, and can be turned off.
+
 ** Shifted motion keys now select text by default.  You can turn this
 off by setting `shifted-motion-keys-select-region' to nil.
 
-** You can now set the variable `kill-whole-line' to `always', which
-makes `kill-line' (C-k) delete the entire line always, not just when
-the cursor is at the beginning of the line.  This behavior, as well as
-the existing kill-whole-line behavior, now only take effect when
-kill-line is called interactively, although this is a departure from a
-previous behavior in the case of setting this variable kill-whole-line
-to t.  It is almost certainly what has always been intended, and most
-likely the old way of doing things introduced bugs.
-
-The new function `historical-kill-line' ignores the `kill-whole-line'
-setting and always gives the historical behavior of only killing to
-the end of the line.  This function is bound to Sh-C-k, so that the
-kill to end of line behavior is available, even when `kill-whole-line'
-has been customized.
+** There is a new command `kill-entire-line' that always kills the
+entire line at point, regardless of whether the point is at the
+beginning of line, and regardless of the setting of `kill-whole-line'.
+
+** The variable `kill-whole-line' now only takes effect when kill-line
+is called interactively.  Although this is a departure from a previous
+behavior in the case of setting this variable kill-whole-line to t,
+it is almost certainly what has always been intended, and most likely
+the old way of doing things introduced bugs.
+
+** The help buffers created by the plethora of C-h commands now
+contain hyperlinks.
+
+** The modeline's text is now scrollable.  This is controlled by the
+variable `modeline-scrolling-method', which you need to set to a
+non-nil value.  You can also choose scrolling types; see the docstring
+of `modeline-scrolling-method' for more information.
 
 ** XEmacs menus now have accelerators by default.  If a menu item does
 not have an accelerator specified, one is created dynamically, using
@@ -90,6 +101,11 @@
 point.  If you want to disable the feature, set
 `isearch-highlight-all-matches' to nil.
 
+** The "coding systems" feature now works even in an XEmacs compiled
+without international (Mule) support.  This means that for example
+XEmacs can recognize newline convention used by the file you are
+editing.
+
 ** You can now use the buffer tabs to switch between buffers.  The
 tabs are located between the toolbar and the uppermost window, in a
 location called "gutter".  If you dislike the buffer tabs, you can
@@ -114,6 +130,16 @@
 accessing the logical "future" value.  Not all minibuffer prompts have
 yet been converted to support this feature.
 
+** International keysyms are now supported under X.  This means that
+XEmacs running under Mule will automatically recognize the keysym
+`scaron' to be the lower-case `s' with caron in the Latin 2 character
+set.  (Specifically, it will bind the keysym to `self-insert' and
+augment its `ascii-character' property.)  This is very useful with
+XFree under European locales as shipped by recent Linux distributions.
+If XEmacs is compiled without Mule support, the feature still works,
+but it is unaware of different character sets -- it unconditionally
+sets the `ascii-character' property to values in the [160, 256) range.
+
 ** The rectangle functions have been almost completely rewritten in
 order to avoid inserting undesirable spaces, notably at the end of
 lines.  Two typical examples of the old behavior were
@@ -176,7 +202,7 @@
 It will try NAS first, then ESD, then playing native sound directly.
 
 ** X-Face support is now available under MS-Windows.
-If an X-Face libary built under MS-Windows is available then XEmacs
+If an X-Face library built under MS-Windows is available then XEmacs
 will use this at build time.
 
 ** The font-menu is now available under MS-Windows.
@@ -193,6 +219,14 @@
 as this would break the MS-Windows model.  If you want this behavior
 then set `selection-sets-clipboard' to t.
 
+** Motif selection support is now more correct (but slower) in its behaviour.
+
+Changes have been made to allow correct operation of cut/copy/paste
+operations between native widgets and XEmacs buffers. However, this
+can lead to a lot of X traffic which slows down the performance of
+`C-k'. If you want the old behaviour then set
+`x-selection-strict-motif-ownership' to nil.
+
 ** Mail spool locking now works correctly.
 XEmacs has always come with a little auxiliary program, movemail,
 which moves mail out of the system's spool area into user storage.  To
@@ -208,42 +242,45 @@
 binary kit, set the `mail-lock-method' variable at startup, or the
 EMACSLOCKMETHOD environment variable.
 
-** Init file will move to ~/.xemacs/init.el.
-
-If `~/.xemacs/init.el' exists, XEmacs will prefer it over `~/.emacs'
-as an init file.  The file may be byte-compiled as
-`~/.xemacs/init.elc'.
+** Indentation no longer indents comments that begin at column zero.
+This makes it easy to deal with commented out regions of code.
 
-Future versions of XEmacs will stop supporting `~/.emacs' as an init
-file.  XEmacs offers automatic migration upon startup.
+** Init file changes.
 
-** Custom file will move to ~/.xemacs/custom.el.
+*** XEmacs now supports a `~/.xemacs/init.el' startup file.  If
+it exists, XEmacs will prefer it over `.emacs' and `.emacs.el'.  The
+file may be byte-compiled as `~/.xemacs/init.elc'.
 
-Whereas customize settings were formerly stored in the regular init
-file, XEmacs now prefers them to be in a separate file
-`~/.xemacs/custom.el', completely under automatic control.  This
-change goes with the migration of the init file, and XEmacs offers
-automatic migration upon startup.
+If present, the `~/.xemacs/' directory may contain startup files for
+XEmacs packages that support it.
 
-** Init file may be called .emacs.el.
+*** Init file in your home directory may be called `.emacs.el'.
 
-For the time being, like in GNU Emacs 20.4 and on, you can now name
-the XEmacs init file `.emacs.el'.  Formerly the name had to be
-`.emacs'.  If you use the name `.emacs.el', you can byte-compile the
-file in the usual way.
+Like in GNU Emacs 20.4 and on, you can now name the XEmacs init file
+located in your home directory `.emacs.el'.  Formerly the name had to
+be `.emacs'.  If you use the name `.emacs.el', you can byte-compile
+the file in the usual way.
 
 If both `.emacs' and `.emacs.el' exist, the latter file is the one
 that is used.
 
-** New command-line switches -user-init-file and -user-init-directory.
+*** New command-line switches -user-init-file and -user-init-directory.
 These can be used to specify alternate locations for what is normally
 ~/.emacs and ~/.xemacs.
 
-Moreover, -user <user> (which used to only work in unpredictable ways)
-is now equivalent to -user-init-file ~<user>/.xemacs/init.el
--user-init-directory ~<user>/.xemacs.  or -user-init-file
-~<user>/.emacs -user-init-directory ~<user>/.xemacs, whichever init
-file comes first.
+Moreover, the `-user <user>' command-line option (which used to only
+work in unpredictable ways) is now equivalent to `-user-init-file
+~<user>/.xemacs/init.el -user-init-directory ~<user>/.xemacs', or
+`-user-init-file ~<user>/.emacs -user-init-directory ~<user>/.xemacs',
+whichever init file comes first.
+
+*** Custom file will move to ~/.xemacs/custom.el.
+
+Whereas customize settings were formerly stored in the regular init
+file, XEmacs now prefers them to be in a separate file
+`~/.xemacs/custom.el', completely under automatic control.  This
+change goes with the migration of the init file, and XEmacs offers
+automatic migration upon startup.
 
 ** New variable `mswindows-alt-by-itself-activates-menu'.
 If you set this variable to nil then pressing and releasing the Alt
@@ -268,6 +305,26 @@
 Supported versions of PostgreSQL are 6.5.3 (earlier versions may work,
 but have not been tested) and 7.0-beta1.
 
+** Help functions (e.g. `C-h f') now know how to print macro argument
+lists.  If your macro definition included an argument list for the
+sake of help output, you no longer need to do that.
+
+** Mule changes.
+
+*** Windows 1251 code page is now supported as coding system
+`windows-1251'.
+
+*** Czech, Thai, Cyrillic-KOI8, Vietnamese, Ethiopic support now
+available.
+
+*** The appropriate characters in Latin 3 and Latin 4 character sets
+are correctly defined as words.
+
+*** The default coding-priority-list is now safer.  This means that if
+you have no language environment set, Mule no longer automatically
+recognizes ISO 2022 escapes in your files.  This makes editing binary
+files safe.
+
 ** Etags changes.
 
 *** In DOS, etags looks for file.cgz if it cannot find file.c.
@@ -287,7 +344,7 @@
 *** New language Ada: tags are functions, procedures, packages, tasks, and
 types.
 
-*** In Fortran, procedure is no more tagged.
+*** In Fortran, procedure is no longer tagged.
 
 *** In Java, tags are created for "interface".
 
@@ -303,27 +360,34 @@
 for PSWrap.
 
 
-* Lisp and internal changes in XEmacs 21.2
+* Lisp and internal changes in XEmacs 21.4
 ==========================================
 
 ** A new portable dumper is available for beta testing.
 
 Olivier Galibert has written a portable dumper for XEmacs, based on
-initial work by Kyle Jones.  Normally, XEmacs C sources link into an
-executable called `temacs', which loads the Lisp code and "unexecs"
-into a proper `xemacs' executable.  The unexec() process is hard to
+initial work by Kyle Jones.  To perform even the most basic editor,
+XEmacs requires some amount of Lisp code to be loaded.  To avoid
+repeating the expensive loading process at every startup, XEmacs is
+built in a special way.  Its C sources link into an executable called
+`temacs', which loads the bootstrap Lisp code and uses a special
+"unexec" call to dump the resulting memory image into a proper
+`xemacs' executable on disk.  The unexec() process is hard to
 implement correctly and makes XEmacs very hard to port to new
 operating systems, or even to new releases of old systems.
 
-A portable dumper is a different approach to dumping: instead of
-dumping full-fledged executable, it only dumps out the initialized
+The new portable dumper uses a different approach to dumping: instead
+of dumping full-fledged executable, it only dumps out the initialized
 data structures (both Lisp and C) into an external file.  A normally
-running XEmacs only needs to mmap() that file and relocate a bit to
-get to the initialized data.  In that scheme, there is no difference
+running XEmacs only needs to mmap that file and relocate a bit to get
+to the initialized data.  In that scheme, there is no difference
 between `temacs' and `xemacs'.
 
-This is all very experimental, though.  Configure with `--pdump' to
-try testing it.
+Unfortunately, the portable dumper has not been completely finished
+for this release, and will not be used by default.  However, if you
+wish to experiment with it, or if you need to compile XEmacs on a new
+and unsupported platform, you can test it by configuring XEmacs with
+`--pdump' flag.
 
 ** Much effort has been invested to make XEmacs Lisp faster:
 
@@ -331,7 +395,7 @@
 This is especially the case when running a Mule-enabled XEmacs.
 
 A general overhaul of the lisp engine should produce a speedup of 1.4
-in a Latin-1 XEmacs, and 2.1 in a Mule XEmacs.  These numbers were
+in a non-Mule XEmacs, and 2.1 in a Mule XEmacs.  These numbers were
 obtained running `(byte-compile "simple.el")', which should be a
 pretty typical test of "pure" Lisp.
 
@@ -344,6 +408,9 @@
 *** The garbage collector has been tuned, leading to a speedup of
 1.16.
 
+*** The byte-compiler and the byte-optimizer have been tuned to
+produce better code in many small ways.
+
 *** The family of functions that iterate over lists, like `memq', and
 `rassq', have been made a little faster (typically 1.3).
 
@@ -377,11 +444,42 @@
 The buffers-tab functionality and progress gauge have been implemented
 using this feature.
 
-** `user-init-file' and `user-init-directory' are now absolute
-file/directory names.  Previously, both variables used to be relative
-to (concat "~" init-file-user).  This turned out to be too complicated
-for most packages (and some core Lisp files) to use correctly.  Also,
-the `init-file-user' variable has been obsoleted in the process.
+** A new Windows installer, netinstall ported from Cygwin.
+
+Nearly complete automation of the XEmacs install process from
+ftp.xemacs.org.  Includes selection of Lisp packages to install, etc.
+
+** Syntax tables may now be specified for a part of a buffer by
+attaching the `syntax-table' property to an extent.  For compatibility
+with GNU Emacs, you may use the text-property interface to achieve the
+same result.
+
+** Case translation now supports international characters.
+
+*** Instead of being lists of 256-character strings, case tables are
+now opaque objects.  The interface to access them is almost the same,
+except it now works for international characters, and you can set the
+case pairs using `put-case-table-pair'.  `set-case-table' and friends
+still support the old list/string based interface for backward
+compatibility.
+
+*** As a consequence of this change, functions `downcase' and `upcase'
+as well as all the case-transformation commands now work with
+non-ASCII characters.  Built-in tables cover all the Latin character
+sets that we support.  If your language has a distinction between
+upper and lower case that is not handled by XEmacs/Mule, please let us
+know.
+
+*** The code that implements case-insensitive search has been modified
+to respect the case table settings.  This also applies to regexp
+search.
+
+** Values of variables `user-init-file' and `user-init-directory' are
+now absolute file/directory names.  Previously, both variables used to
+be relative to `(concat "~" init-file-user)'.  This turned out to be
+too complicated for most packages (and some core Lisp files) to use
+correctly.  Also, the `init-file-user' variable has been obsoleted in
+the process.
 
 The user-visible options like `-u' have not changed their behavior.
 
@@ -427,8 +525,9 @@
 this argument is non-nil, it should be a string; that string is used
 in two ways:
 
-  It is returned if the user enters empty input.
-  It is available through the history command M-n.
+ * It is returned if the user enters empty input.
+ * It is available as the logical "future" entry, by pressing the down
+   arrow.
 
 ** LDAP changes.
 
@@ -477,7 +576,7 @@
 ** `translate-region' has been improved in several ways.  Its TABLE
 argument used to be a 256-character string.  In addition to this, it
 can now also be a vector or a char-table, which makes the function
-useful for Mule, which it wasn't.  If TABLE a vector or a generic
+useful for Mule, which it wasn't.  If TABLE is a vector or a generic
 char-table, you can map characters to strings instead of to other
 characters.  For instance:
 
@@ -514,8 +613,12 @@
 
 This behavior is compatible with other code which treats symbols
 beginning with colon as keywords only if they are interned in the
-global obarray.  `keywordp' used to wrongly return t in both cases
-above.
+global obarray.  `keywordp' used to wrongly return t in both above
+cases.
+
+** The function `replace-in-string' has been rewritten to use
+`replace-match'.  This not only makes it much faster, but adds all the
+features of `replace-match'.
 
 ** New variables `this-command-properties' and
 `last-command-properties' are now available for communication between
@@ -529,8 +632,8 @@
 has run.
 
 ** The descriptor that specifies the text of a menu item can now be an
-evaluated expression.  This makes this descriptor parallel with
-others, which can also be expressions.
+evaluated expression.  This makes it parallel with other descriptors,
+which can also be expressions.
 
 
 * Changes in XEmacs 21.0
@@ -1021,3 +1124,6 @@
 *** `Info-default-directory-list' is now obsolete.  If you want to
 change the path which XEmacs uses to search for info files, set
 `Info-directory-list' instead.
+
+
+* For older news, see the file ONEWS.
diff --text -u /dev/null 'xemacs-21.5.0/etc/ONEWS'
Index: ./etc/ONEWS
--- ./etc/ONEWS	Thu Jan  1 09:00:00 1970
+++ ./etc/ONEWS	Fri Apr 13 03:20:47 2001
@@ -0,0 +1,1084 @@
+-*- mode:outline -*-
+
+* Changes in XEmacs 20.4
+========================
+
+** XEmacs 20.4 is a bugfix release with no user-visible changes.
+
+
+* Changes in XEmacs 20.3
+========================
+
+** Quail input method is now available.
+
+Quail is a simple key-translation system that allows users to input
+any multilingual text from normal ASCII keyboard.  This means that
+XEmacs with Mule now supports a number of European languages.
+
+** More Windows NT support.
+
+Thanks to efforts of many people, coordinated by David Hobley
+<davidh@wr.com.au> and Marc Paquette <marcpa@cam.org>, beta versions
+of XEmacs now run on 32-bit Windows platforms (Windows NT and Windows
+95).  The current betas require having an X server to run XEmacs;
+however, a native NT/95 port is in alpha, thanks to Jonathan Harris
+<jhar@tardis.ed.ac.uk>.
+
+The NT development is now coordinated by a mailing list at
+<xemacs-nt@xemacs.org>.  Mail to <xemacs-nt-request@xemacs.org> to
+subscribe.
+
+** Multiple TTY frames are now available.
+
+On consoles that display only one frame at a time (e.g. TTY consoles),
+creating a new frame with `C-x 5 2' also raises and selects that
+frame.  The behavior of window system frames is unchanged.
+
+** Package starting changes.
+
+State of Emacs should never be changed with loading a package.  The
+following XEmacs packages that used to break this have been changed.
+
+*** Loading `paren' no longer enables paren-blinking.  Use
+`paren-set-mode' explicitly, or customize `paren-mode'.
+
+*** Loading `uniquify' no longer enables uniquify.  Set
+`uniquify-buffer-name-style' to a legal value.
+
+*** Loading `time' no longer enables display time.  Invoke
+`display-time' explicitly.
+
+*** Loading `jka-compr' no longer enables on-the-fly compression.  Use
+`toggle-auto-compression' instead.
+
+*** Loading `id-select' no longer enables its behaviour.  Use
+`id-select-install' instead.
+
+** Zmacs region is not deactivated when an error is signaled.
+
+The behavior of the zmacs region can now be controlled in the event of
+a signaled error.  The new variable `errors-deactivate-region' may be
+set to nil to revert to the old behaviour.  As before, typing C-g
+deactivates the region.
+
+** Multiple Info `dir' functionality has been merged with GNU Emacs
+19.34.
+
+XEmacs will now correctly merge all the `dir' files in
+`Info-directory-list' (initialized from either the `INFOPATH'
+env. variable or `Info-default-directory-list'.)  These files may be
+full-fledged info files containing subnodes or menus.  Previously
+supported `localdir' files are looked for also, secondary to `dir's.
+See the manual for details.
+
+** Abbreviations can now contain non-word characters.
+
+This means that it is finally possible to do such simple things as
+define `#in' to expand to `#include' in C mode, `s-c-b' to
+`save-current-buffer' in Lisp mode, `call/cc' to
+`call-with-current-continuation' in Scheme mode, etc.
+
+** `C-x n d' now runs the new command `narrow-to-defun',
+which narrows the accessible parts of the buffer to just
+the current defun.
+
+** The new command `C-x 4 0' (kill-buffer-and-window) kills the
+current buffer and deletes the selected window.  It asks for
+confirmation first.
+
+** `ESC ESC ESC' (keyboard-escape-quit) will now correctly abort
+recursive edits (as documented.)
+
+** arc-mode has a new function called `archive-quit' bound to q, which
+quits archive mode in the same fashion dired-quit works.
+
+** A `tetris' clone is now available within XEmacs, written by Glynn
+Clements.  Try it out with `M-x tetris'.
+ 
+** The feature to teach the key bindings of extended commands now
+prints the message after the command finishes.  After some time, the
+previous echo area contents are restored (in case the command prints
+something useful).
+
+** If you set scroll-conservatively to a small number, then when you
+move point a short distance off the screen, XEmacs will scroll the
+screen just far enough to bring point back on screen, provided that
+does not exceed `scroll-conservatively' lines.
+
+** Face background colors now take precedence over the default face
+background pixmap, which means that background pixmaps no longer clash
+with zmacs-regions, or clickable buttons.
+
+** Regexps can now contain additional Perl-like constructs.
+
+** Modifiers can be added to a keystroke by preceding it with a `C-x @
+<x>' sequence where <x> is one of letters `S', `c', `m', `a', `h', `s'
+corresponding to shift, control, meta, alt, hyper, and super modifiers,
+respectively.  It is possible to add several modifiers by repeating this
+sequence.  This feature is especially useful on text terminals where it
+allows one to enter keystrokes like, e.g., `M-home'.
+
+** An arbitrary keystroke can be generated by entering `C-x @ k
+<keysym-name> RET'.  For example a sequence:
+
+  C-x @ c C-x @ k b a c k s p a c e RET
+
+will result in a `C-backspace' keystroke even on text terminals.
+
+** Customize changes.
+
+*** Customize has undergone a massive speedup, and should now operate
+acceptably fast.  Slowness of the interface used to be the biggest
+gripe.
+
+*** Many more packages have been modified to use the facility, so
+almost all of XEmacs options can now be examined through the Customize
+groups.
+
+*** There is a new `browser' mode of traversing customizations, in
+many ways easier to follow than the standard one.  Try it out with
+`M-x customize-browse'.
+
+** Pending-delete changes.
+
+*** Pending-delete is now a minor mode, with the normal minor-mode
+semantics and toggle functions.  Old functions are left for
+compatibility.
+
+*** Loading pending-del no longer turns on pending-delete mode.  In
+fact, it is no longer necessary to explicitly load pending-del.  All
+you need to do to turn on pending-delete is run the pending-delete
+function:
+
+  Within XEmacs:   Type      M-x pending-delete <ret>
+                    not      M-x load-library <ret> pending-delete <ret>
+  
+  In .emacs:       Use       (turn-on-pending-delete)
+                   not       (load "pending-del")
+
+** XEmacs can now save the minibuffer histories from various
+minibuffers.  To use this feature, add the line:
+
+   (savehist-load)
+
+to your .emacs.  This will load the minibuffer histories (if any) at
+startup, as well as instruct XEmacs to save them before exiting.  You
+can use Customize to add or remove the histories being saved.
+
+** The default format for ChangeLog entries (as created by `C-x 4 a')
+is now the international ISO 8601 format.
+
+To revert to the old behaviour, use:
+
+   (setq add-log-time-format 'current-time-string)
+
+Or `M-x customize RET add-log RET'.
+
+** In ChangeLog mode, you can now press `C-c C-c' to save the file
+and restore old window configuration, or `C-c C-k' to abandon the
+changes.
+
+** The key `C-x m' no longer runs the `mail' command directly.
+Instead, it runs the command `compose-mail', which invokes the mail
+composition mechanism you have selected with the variable
+`mail-user-agent'.  The default choice of user agent is
+`sendmail-user-agent', which gives behavior compatible with the old
+behavior.
+
+C-x 4 m now runs compose-mail-other-window, and C-x 5 m runs
+compose-mail-other-frame.
+
+** When you kill a buffer that visits a file, if there are any
+registers that save positions in the file, these register values no
+longer become completely useless.  If you try to go to such a register
+with `C-x j', then you are asked whether to visit the file again.  If
+you say yes, it visits the file and then goes to the same position.
+
+** When you visit a file that changes frequently outside Emacs--for
+example, a log of output from a process that continues to run--it may
+be useful for Emacs to revert the file without querying you whenever
+you visit the file afresh with `C-x C-f'.
+
+You can request this behavior for certain files by setting the
+variable revert-without-query to a list of regular expressions.  If a
+file's name matches any of these regular expressions, find-file and
+revert-buffer revert the buffer without asking for permission--but
+only if you have not edited the buffer text yourself.
+
+** Gnuserv changes
+
+*** The Lisp part of gnuserv has been rewritten to allow for more
+flexibility and features.
+
+*** Many new options and variables are now customizable.  Try
+`M-x customize RET gnuserv RET'.
+
+*** The functionality of `gnuattach' and `gnudoit' programs is
+provided by `gnuclient', which now accepts the standard `-nw',
+`-display', `-eval' and `-f' options.
+
+** Etags changes.
+
+*** In C, C++, Objective C and Java, Etags tags global variables by
+default.  The resulting tags files are inflated by 30% on average.
+Use --no-globals to turn this feature off.  Etags can also tag
+variables that are members of structure-like constructs, but it does
+not by default.  Use --members to turn this feature on.
+
+*** C++ member functions are now recognized as tags.
+
+*** Java is tagged like C++.  In addition, "extends" and "implements"
+constructs are tagged.  Files are recognised by the extension .java.
+
+*** Etags can now handle programs written in Postscript.  Files are
+recognised by the extensions .ps and .pdb (Postscript with C syntax).
+In Postscript, tags are lines that start with a slash.
+
+*** Etags now handles Objective C and Objective C++ code.  The usual C and
+C++ tags are recognized in these languages; in addition, etags
+recognizes special Objective C syntax for classes, class categories,
+methods and protocols.
+
+*** Etags also handles Cobol.  Files are recognised by the extension
+.cobol.  The tagged lines are those containing a word that begins in
+column 8 and ends in a full stop, i.e. anything that could be a
+paragraph name.
+
+*** Regexps in Etags now support intervals, as in ed or grep.  The syntax of
+an interval is \{M,N\}, and it means to match the preceding expression
+at least M times and as many as N times.
+
+** Ada mode changes.
+
+*** There is now better support for using find-file.el with Ada mode.
+If you switch between spec and body, the cursor stays in the same
+procedure (modulo overloading).  If a spec has no body file yet, but
+you try to switch to its body file, Ada mode now generates procedure
+stubs.
+
+*** There are two new commands:
+ - `ada-make-local'   : invokes gnatmake on the current buffer
+ - `ada-check-syntax' : check syntax of current buffer.
+
+The user options `ada-compiler-make', `ada-make-options',
+`ada-language-version', `ada-compiler-syntax-check', and
+`ada-compile-options' are used within these commands. 
+
+*** Ada mode can now work with Outline minor mode.  The outline level
+is calculated from the indenting, not from syntactic constructs.
+Outlining does not work if your code is not correctly indented.
+
+*** The new function `ada-gnat-style' converts the buffer to the style of
+formatting used in GNAT.  It places two blanks after a comment start,
+places one blank between a word end and an opening '(', and puts one
+space between a comma and the beginning of a word.
+
+** New demand based locking implementation
+
+A faster, but experimental replacement for lazy-lock (called lazy-shot) is
+provided.  Like lazy-lock it provides demand based and idle time
+font-lock-ing.  However the lazy-lock versions that came with previous
+versions slowed down XEmacs (possibly quite a lot).  Lazy-shot solves
+this problem by relying on new support from the C code part of XEmacs.
+The support however is experimental and will cause some flashing as
+parts of the buffer are colored.  This likely to change in the future
+as the C support is completed. 
+
+The current lazy-shot implementation is mostly interface compatible
+with lazy-lock v2.06 (the version shipped with XEmacs is v1.x).
+
+*** To enable:
+ 1. Despite the flashing, lazy-shot was deemed such an improvement by
+    the majority of beta testers that it is now the standard method
+    provided by the options menu. Alternatively add
+
+	(add-hook 'font-lock-mode-hook 'turn-on-lazy-shot)
+
+    to '.emacs'.	
+ 2. If you were using lazy-lock before, just replace all occurrences of 
+    "lazy-lock" by "lazy-shot" in your '.emacs' file.
+
+*** To disable:
+
+If prefer to use lazy-lock in stead of lazy-shot, put
+
+	(remove-hook 'font-lock-mode-hook 'turn-on-lazy-shot)
+	(add-hook 'font-lock-mode-hook 'turn-on-lazy-lock)
+
+at the END of `.emacs'.
+
+** RefTeX mode
+
+RefTeX mode is a new minor mode with special support for \label{}, \ref{}
+and \cite{} macros in LaTeX documents.  RefTeX distinguishes labels of
+different environments (equation, figure, ...) and has full support for
+multifile documents.  To use it, select a buffer with a LaTeX document and
+turn the mode on with M-x reftex-mode.  Here are the main user commands:
+
+C-c (    reftex-label        
+   Creates a label semi-automatically.  RefTeX is context sensitive and
+   knows which kind of label is needed.
+
+C-c )    reftex-reference
+   Offers in a menu all labels in the document, along with context of the
+   label definition.  The selected label is referenced as \ref{LABEL}.
+
+C-c [    reftex-citation
+   Prompts for a regular expression and displays a list of matching BibTeX
+   database entries.  The selected entry is cited with a \cite{KEY} macro.
+
+C-c &    reftex-view-crossref
+   Views the cross reference of a \ref{} or \cite{} command near point.
+
+C-c =    reftex-toc
+   Shows a table of contents of the (multifile) document.  From there you
+   can quickly jump to every section.
+ 
+Under X, RefTeX installs a "Ref" menu in the menu bar, with additional
+commands.  Full documentation and customization examples are in the file
+reftex.el.  You can use the finder to view this information:
+C-h p --> tex --> reftex.el
+
+
+* Lisp and internal changes in XEmacs 20.3
+==========================================
+
+** Autoconf 2 is supported, making XEmacs more conforming to
+conventions used by other free software.
+
+** `tty-erase-char' is a new variable that reports which character
+was set up as the terminal's erase character at the time Emacs was
+started.
+
+** It is now possible to attach the menubar accelerator keys to menu
+entries.  Look at the Lispref under Menus->Menu Accelerators for
+details.
+
+** `insert-file-contents' can now read from a special file,
+as long as the arguments VISIT and REPLACE are nil.
+
+** `string-to-number' now accepts an optional BASE argument that
+specifies which base to use.  The default base is 10.
+
+** The TIME argument to `format-time-string' is now optional and
+defaults to the current time.
+
+** The PATTERN argument to `split-string' is now optional and defaults
+to whitespace ("[ \f\t\n\r\v]+").
+
+** `set-extent-properties' is a new function that can be used to
+change properties of an extent at once, and is analogous to
+`set-frame-properties'.
+
+** If a format field width is specified as `*', the field width is
+now assumed to have been specified as an argument (as in C.)
+
+  (format "%*s" 10 "abc")
+    => "       abc"
+
+** The new macro `with-current-buffer' lets you evaluate an expression
+conveniently with a different current buffer.  It looks like this:
+
+  (with-current-buffer BUFFER BODY-FORMS...)
+
+BUFFER is the expression that says which buffer to use.
+BODY-FORMS say what to do in that buffer.
+The old `eval-in-buffer' macro is obsoleted by `with-current-buffer'.
+
+** The new primitive `save-current-buffer' saves and restores the
+choice of current buffer, like `save-excursion', but without saving or
+restoring the value of point or the mark.  `with-current-buffer'
+works using `save-current-buffer'.
+
+** The new macro `with-temp-file' lets you do some work in a new buffer and
+write the output to a specified file.  Like `progn', it returns the value
+of the last form.
+
+** The variable `debug-ignored-errors' now works in XEmacs.  It allows
+one to ignore the debugger for some common errors, even when
+`debug-on-error' is t.  It has no effect when `debug-on-signal' is
+non-nil.
+
+** The new function `current-message' returns the message currently
+displayed in the echo area, or nil if there is none.
+
+** File-access primitive functions no longer discard an extra redundant
+directory name from the beginning of the file name.  In other words,
+they no longer do anything special with // or /~.  The same goes for
+`expand-file-name'.  That conversion is now done only in
+`substitute-in-file-name'.
+
+This makes it possible for a Lisp program to open a file whose name
+begins with ~.
+
+** The regexp matcher has been extended to recognize the following
+constructs, borrowed from Perl:
+
+*** Additional quantifiers.
+
+In addition to `*', `+' and `?', XEmacs now recognizes the following
+quantifiers:
+
+  \{n\}    Match exactly n times
+  \{n,\}   Match at least n times
+  \{n,m\}  Match at least n but not more than m times
+
+*** Non-greedy quantifiers.
+
+Any of the standard quantifiers (`*', `+' and others) can now be
+followed by an optional `?', which will make them become "non-greedy", 
+i.e. they will match as little text as possible.  Note that the
+meanings don't change, just the "gravity."
+
+*** Shy groups.
+
+The \(?: ... \) groups things like \( ... \), but doesn't record the
+context for backreferences or future use.  This is useful when you
+need a lot of groups for the sake of priorities, but actually want to
+record only one or two.
+
+** The new function `regexp-opt' returns an efficient regexp to match
+a string.  The arguments are STRINGS and (optionally) PAREN.  This
+function can be used where regexp matching or searching is intensively
+used and speed is important, e.g., in Font Lock mode.
+
+** The featurep syntax has been extended to resemble the Common Lisp
+one, as suggested by Erik Naggum.
+
+*** The `xemacs' feature is defined in XEmacs by default.
+
+*** The expression `#+fexp form' is equivalent to
+(when (featurep fexp) form), only it is evaluated at read-time.  Also,
+`#-fexp form' is equivalent to (unless (featurep fexp) form).
+
+*** In addition to symbols, a FEXP can also be a number, or a logical
+operator.  Here are some examples:
+  ;; evaluates to non-nil on XEmacs:
+  (featurep 'xemacs)
+  ;; evaluates to non-nil on XEmacs 20.3 or later:
+  (featurep '(and xemacs 20.03))
+  ;; evaluates to non-nil either on Emacs, or on XEmacs built without
+  ;; X support:
+  (featurep '(or emacs (and xemacs (not x))))
+
+
+
+* Changes in XEmacs 20.2
+========================
+
+** Why XEmacs 20.1 is called 20.2
+
+Testing of XEmacs 20.1 revealed a number of showstopping bugs at the
+very final moment.  Instead of confusing the version numbers further,
+the `20.1' designation was abandoned, and the release was renamed to
+`20.2'.
+
+** Delete/backspace keysyms have been separated
+
+The Delete and Backspace keysyms are now no longer identical.  A better
+version of delbackspace.el has been added called delbs.el.
+
+** XEmacs 20.0 MULE API supported for backwards compatibility
+
+XEmacs 20.2 primarily supports the MULE 3 API.  It now also supports
+the XEmacs 20.0 MULE API.
+
+** The logo has been changed, and the default background color is
+now a shade of gray instead of the eye-burning white.
+
+The sample .Xdefaults and .emacs files contain examples of how to
+revert to the old background color.
+
+** Default modeline colors are now less of a color-salad.
+
+** The `C-z' key now iconifies only the current X frame.  You can use
+`C-x C-z' to get the old behavior.
+
+On the tty frames `C-z' behaves as before.
+
+** The command `display-time' now draws a pretty image in the modeline
+when new mail arrives.  It also supports balloon-help messages.
+
+** Various commands that were previously disabled are now enabled, like
+eval-expression (`M-:') and upcase-region (`C-x C-u')/downcase-region
+(`C-x C-l').
+
+** It is now possible to customize the functions called by XEmacs toolbar.
+
+Type `M-x customize RET toolbar RET' to customize it.  Customizations
+include the choice of functions for the buttons to invoke, as well as
+a wide choice of mailers and newsreaders to invoked by the respective
+functions.
+
+** `temp-buffer-shrink-to-fit' now defaults to nil.
+
+There are unresolved issues regarding this feature, which is why the
+XEmacs developers decided to disable it by default.
+
+** `ps-print-color-p' now defaults to nil.
+
+This is because the new default background color is non-white.  The
+`Printing Options' in the `Options' menu now include an item that
+enables color printing, and sets the white background.
+
+** `line-number-mode' should be used to get line numbers in the
+modeline, and `column-number-mode' to get column numbers.  Line
+numbers now number from 1 by default.
+
+** font-lock-mode will now correctly fontify `int a, b, c;'
+expressions in C mode.
+
+** The blinking cursor is always "on" during movement.
+
+** The XEmacs build process has been changed to make site
+administration easier.  See lisp/site-load.el for details.
+
+** Numerous causes of crashes have been fixed.  XEmacs should now be
+even more stable than before.
+
+** configure no longer defaults to using --with-xim=motif if Motif libraries
+are linked.
+
+There are many bugs in the Xlib XIM support in X11R6.3.
+
+** A number of new packages are added, and many packages were
+updated.
+
+** Gnus-5.4.52, courtesy of Lars Magne Ingebrigtsen
+
+*** nntp.el has been totally rewritten in an asynchronous fashion.
+
+*** Article prefetching functionality has been moved up into 
+Gnus.  
+
+*** Scoring can now be performed with logical operators like 
+`and', `or', `not', and parent redirection.
+
+*** Article washing status can be displayed in the
+article mode line.
+
+*** gnus.el has been split into many smaller files.
+
+*** Suppression of duplicate articles based on Message-ID.
+
+(setq gnus-suppress-duplicates t)
+
+*** New variables for specifying what score and adapt files
+are to be considered home score and adapt files.  See
+`gnus-home-score-file' and `gnus-home-adapt-files'.
+
+*** Groups can inherit group parameters from parent topics.
+
+*** Article editing has been revamped and is now usable.
+
+*** Signatures can be recognized in more intelligent fashions.
+See `gnus-signature-separator' and `gnus-signature-limit'.
+
+*** Summary pick mode has been made to look more nn-like.
+Line numbers are displayed and the `.' command can be
+used to pick articles.
+
+*** Commands for moving the .newsrc.eld from one server to
+another have been added.
+
+    `M-x gnus-change-server'
+
+*** A way to specify that "uninteresting" fields be suppressed when
+generating lines in buffers.
+
+*** Several commands in the group buffer can be undone with
+`M-C-_'.
+
+*** Scoring can be done on words using the new score type `w'.
+
+*** Adaptive scoring can be done on a Subject word-by-word basis:
+
+    (setq gnus-use-adaptive-scoring '(word))
+
+*** Scores can be decayed.
+ 
+    (setq gnus-decay-scores t)
+
+*** Scoring can be performed using a regexp on the Date header.  The
+Date is normalized to compact ISO 8601 format first.
+
+*** A new command has been added to remove all data on articles from
+the native server.
+
+   `M-x gnus-group-clear-data-on-native-groups'
+
+*** A new command for reading collections of documents
+(nndoc with nnvirtual on top) has been added -- `M-C-d'.
+
+*** Process mark sets can be pushed and popped.
+
+*** A new mail-to-news backend makes it possible to post
+even when the NNTP server doesn't allow posting.
+
+*** A new backend for reading searches from Web search engines
+(DejaNews, Alta Vista, InReference) has been added.
+
+    Use the `G w' command in the group buffer to create such
+    a group.
+
+*** Groups inside topics can now be sorted using the standard
+sorting functions, and each topic can be sorted independently.
+
+    See the commands under the `T S' submap.
+
+*** Subsets of the groups can be sorted independently.
+
+    See the commands under the `G P' submap.
+
+*** Cached articles can be pulled into the groups.
+  
+    Use the `Y c' command.
+
+*** Score files are now applied in a more reliable order.
+
+*** Reports on where mail messages end up can be generated.
+
+    `M-x nnmail-split-history'
+
+*** More hooks and functions have been added to remove junk
+from incoming mail before saving the mail.
+ 
+    See `nnmail-prepare-incoming-header-hook'.
+
+*** The nnml mail backend now understands compressed article files.
+
+** Custom 1.86, courtesy of Per Abrahamsen
+
+The Customize library enables Emacs Lisp programmers to specify types
+of their variables, so that the users can customize them.
+
+Invoke the customizations buffer using the menus (Customize is at the
+top of the Options menu), or using commands `M-x customize',
+`M-x customize-variable' and `M-x customize-face'.  Customize can save
+the changed settings to your `.emacs' file.
+
+Customize is now the preferred way to change XEmacs settings.  Tens of
+packages have been converted to take advantage of the Customize
+features, including Gnus, Message, Supercite, Psgml, Comint, W3,
+cc-mode (and many other programming language modes), ispell.el,
+ps-print.el, id-select.el, most of the programming language modes, and
+many many more.
+
+See the "Lisp Changes" section later for a short description of why
+and how to add custom support to your Lisp packages.  Custom is also
+documented in the XEmacs info manuals.
+
+** W3-3.0.86, courtesy of William Perry
+
+Version 3 of Emacs/W3, the Emacs World Wide Web browser, has been
+included.  It is significantly faster than any of the previous
+versions, and contains numerous new features.
+
+** AUCTeX-9.7k, courtesy of Per Abrahamsen
+
+AUC TeX is a comprehensive customizable integrated environment for
+writing input files for LaTeX using Emacs.
+
+AUC TeX lets you run TeX/LaTeX and other LaTeX-related tools, such as
+a output filters or post processor from inside Emacs.  Especially
+`running LaTeX' is interesting, as AUC TeX lets you browse through the
+errors TeX reported, while it moves the cursor directly to the
+reported error, and displays some documentation for that particular
+error.  This will even work when the document is spread over several
+files.
+
+AUC TeX automatically indents your `LaTeX-source', not only as you
+write it -- you can also let it indent and format an entire document.
+It has a special outline feature, which can greatly help you `getting
+an overview' of a document.
+
+Apart from these special features, AUC TeX provides an large range of
+handy Emacs macros, which in several different ways can help you write
+your LaTeX documents fast and painless.
+
+** redo.el-1.01, courtesy of Kyle Jones
+
+redo.el is a package that implements true redo mechanism in XEmacs
+buffers.  Once you load it from your `.emacs', you can bind the `redo'
+command to a convenient key to use it.
+
+Emacs' normal undo system allows you to undo an arbitrary number of
+buffer changes.  These undos are recorded as ordinary buffer changes
+themselves.  So when you break the chain of undos by issuing some
+other command, you can then undo all the undos.  The chain of recorded
+buffer modifications therefore grows without bound, truncated only at
+garbage collection time.
+
+The redo/undo system is different in two ways:
+
+*** The undo/redo command chain is only broken by a buffer modification.
+
+You can move around the buffer or switch buffers and still come back
+and do more undos or redos.
+
+*** The `redo' command rescinds the most recent undo without
+recording the change as a _new_ buffer change.
+
+It completely reverses the effect of the undo, which includes making
+the chain of buffer modification records shorter by one, to counteract
+the effect of the undo command making the record list longer by one.
+
+** edmacro.el-3.10, courtesy of Dave Gillespie, ported to XEmacs by
+Hrvoje Niksic.
+
+Edmacro is a utility that provides easy editing of keyboard macros.
+Originally written by Dave Gillespie, it has been mostly rewritten by
+Hrvoje Niksic, in order to make it distinguish characters and integer,
+as well as to adapt it to XEmacs keysyms.
+
+Press `C-x C-k' to invoke the `edit-kbd-macro' command that lets you
+edit old as well as define new keyboard macros.  You can also edit the
+last 100 keystrokes and insert them into a macro to be bound to a key
+or named as a command.  The recorded/edited macros can be dumped to
+`.emacs' file.
+
+** xmine.el-1.8, courtesy of Jens Lautenbacher
+
+XEmacs now includes a minesweeper game with a full-featured graphics
+and mouse interface.  Invoke with `M-x xmine'.
+
+** efs-1.15-x5 courtesy of Andy Norman and Michael Sperber
+
+EFS is now integrated with XEmacs, and replaces the old ange-ftp.  It
+has many more features, including info documentation, support for many
+different FTP servers, and integration with dired.
+
+** mic-paren.el-1.3.1, courtesy of Mikael Sjödin
+** hyperbole-4.022, courtesy of Bob Weiner
+** hm--html-menus-5.3, courtesy of Heiko Muenkel
+** python-mode.el-2.90, courtesy of Barry Warsaw
+** balloon-help-1.06, courtesy of Kyle Jones
+** xrdb-mode.el-1.21, courtesy of Barry Warsaw
+** igrep.el-2.56, courtesy of Kevin Rodgers
+** frame-icon.el, courtesy of Michael Lamoureux and Bob Weiner
+** itimer.el-1.05, courtesy of Kyle Jones
+** VM-6.30, courtesy of Kyle Jones
+** OO-Browser-2.10, courtesy of Bob Weiner
+** viper-2.93, courtesy of Michael Kifer
+** ediff-2.65, courtesy of Michael Kifer
+** detached-minibuf-1.1, courtesy of Alvin Shelton
+** whitespace-mode.el, courtesy of Heiko Muenkel
+** winmgr-mode.el, courtesy of David Konerding, Stefan Strobel & Barry Warsaw
+** fast-lock.el-3.11.01, courtesy of Simon Marshall
+** lazy-lock.el-1.16, courtesy of Simon Marshall
+** browse-cltl2.el-1.1, courtesy of Holger Schauer
+** eldoc.el-1.10, courtesy of Noah Friedman
+** tm-7.105, courtesy of MORIOKA Tomohiko
+** verilog-mode.el-2.25, courtesy of Michael McNamara & Adrian Aichner
+** overlay.el, courtesy of Joseph Nuspl
+** live-icon.el-1.3, fixes courtesy of Karl Hegbloom
+** tpu-edt.el, fixes courtesy of R. Kevin Oberman
+** etags.c-11.86 Courtesy of F. Potortì
+
+
+* Lisp and internal changes in XEmacs 20.2
+==========================================
+
+** `defcustom' and `defgroup' can now be used to specify types and
+placement of the user-settable variables.
+
+You can now specify the types of user-settable variables in your Lisp
+packages to be customized by users.  To do so, use `defcustom' as a
+replacement for `defvar'.
+
+For example, the old declaration:
+
+(defvar foo-blurgoze nil
+  "*non-nil means that foo will act very blurgozely.")
+
+can be rewritten as:
+
+(defcustom foo-blurgoze nil
+  "*non-nil means that foo will act very blurgozely."
+  :type 'boolean
+  :group 'foo)
+
+From a package writer's point of view, nothing has been changed
+However, the user can now type `M-x customize RET foo-blurgoze RET' to
+customize the variable.
+
+Other, more complex data structures can be described with `defcustom'
+too, for instance:
+
+(defcustom foo-hairy-alist '((somekey . "somestring")
+                             (otherkey . (foo-doit))
+                             (thirdkey . [1 2 3]))
+"*Alist describing the hairy options of the foo package.
+The CAR of each element is a symbol, whereas the CDR can be either a
+string, a form to evaluate, or a vector of integers.
+New Emacs users simply adore alists like this one."
+  :type '(repeat (cons (symbol :tag "Key")
+                       (choice string
+                               (vector (repeat :inline t integer))
+                               sexp)))
+  :group 'foo)
+
+The user will be able to add and remove the entries to the list in a
+visually appealing way, as well as save the settings to his/her
+`.emacs'.
+
+Note that `defcustom' will also be included in GNU Emacs 19.35, and
+that both XEmacs and GNU Emacs will be using it in the future.
+Although the user-interface of customize may change, the Lisp
+interface will remain the same.  This is why we recommend that you use
+`defcustom' for user-settable variables in your new Lisp packages.
+
+** The `read-kbd-macro' function is now available.
+
+The `read-kbd-macro' function (as well as the read-time evaluated
+`kbd' macro) from the edmacro package is now available in XEmacs.  For
+example:
+
+(define-key foo-mode-map (kbd "C-c <up>") 'foo-up)
+
+is completely equivalent to
+
+(define-key foo-mode-map [(control ?c) up] 'foo-up)
+
+The `kbd' macro is preferred over `read-kbd-macro' function , as it
+evaluates before compiling, thus having no loading overhead.
+
+Using `kbd' is not necessary for GNU Emacs compatibility (GNU Emacs
+supports the XEmacs-style keysyms), but adds to clarity.  For example,
+(kbd "C-?") is usually easier to read than [(control ??)].  The full
+description of the syntax of keybindings accepted by `read-kbd-macro'
+is documented in the docstring of `edmacro-mode'.
+
+** Overlay compatibility is implemented.
+
+The overlay support in XEmacs is now functional.  Written by Joe
+Nuspl, the overlay compatibility library overlay.el is implemented on
+top of the native XEmacs extents, and can be used as a GNU
+Emacs-compatible way of changing display properties.
+
+** You should use keysyms kp-* (kp-1, kp-2, ..., kp-enter etc.)
+rather than the old form kp_*.  The new form is also compatible with
+GNU Emacs.
+
+** The keysyms mouse-1, mouse-2, mouse-3 and down-mouse-1,
+down-mouse-2, and down-mouse-3 have been added for GNU Emacs
+compatibility.
+
+** A new user variable `signal-error-on-buffer-boundary' has been
+added.
+
+Set this to variable to nil to avoid XEmacs usual lossage of zmacs
+region when moving up against a buffer boundary.
+
+** lib-complete.el was MULE-ized.
+
+The commands `find-library', `find-library-other-window' and
+`find-library-other-frame' now take an optional coding system
+argument.
+
+** Experimental support for Lisp reader macros #-, #+.
+
+The Common Lisp reader macros for feature test are now supported.  This
+feature is present for evaluation purposes and is subject to change.
+
+** `values' now has a setf method
+
+** The `eval-after-load' and `eval-next-after-load' functions are
+now available.
+
+** A bug that prevented `current-display-table' to be correctly set
+with `set-specifier' has been fixed.
+
+** The bug in easymenu which prevented multiple menus from being
+accessible through button3 has been fixed.
+
+You can now safely use easymenu to define multiple menu entries in a
+compatible way, with the added menus accessible via button3 as local
+submenus.
+
+** Many bugs in the scrollbar code have been fixed.
+
+** First alpha level support of MS Windows NT is available, courtesy
+of David Hobley and Marc Paquette.
+
+** Wnn/egg now has initial support Courtesy of Jareth Hein.
+
+** Some old non-working code has been removed until someone chooses
+to work on it.
+
+This includes much of the NeXTStep stuff.  The VMS support is also
+likely to be removed in the future.
+
+** Many files have been purged out of the etc/ directory.
+
+If you still need the purged files, look for them in the GNU Emacs
+distribution.
+
+
+* Major Differences Between 19.14 and 20.0
+===========================================
+
+XEmacs 20.0 is the first public release to have support for MULE
+(Multi-Lingual Emacs).  The --with-mule configuration flag must be
+used to enable Mule support.
+
+Many bugs have been fixed.  An effort has been made to eradicate all
+XEmacs crashes, although we are not quite done yet.  The overall
+quality of XEmacs should be higher than any previous release.  XEmacs
+now compiles with nary a warning with some compilers.
+
+-- Multiple character sets can be displayed in a buffer.  The file
+   mule-doc/demo in the distribution contains a greeting in many
+   different languages.
+
+-- Although the Mule work is for all languages, particular effort has
+   been invested in Japanese, with particular focus on Japanese users
+   of Sun WorkShop.  Many menubar labels have been translated into
+   Japanese.  Martin Buchholz, the maintainer of MULE features within
+   XEmacs normally runs XEmacs in a Japanese language environment.
+   Some of the other contributors are Japanese, most importantly
+   Morioka Tomohiko, author of the TM package, providing MIME support
+   for Mail and News.
+
+-- Input for complex Asian languages is supported via XIM, a mechanism
+   introduced in X11R5 to allow applications to get localized input
+   without knowledge of the language.  The way XIM works is that when
+   the locale has a complex character set, such as Japanese, and extra
+   minibuffer-like status window appears attached to various
+   application windows, and indicates the status of the input method.
+   Composed input in XEmacs should work the same as with other
+   applications.  If Motif and Mule support is configured into XEmacs,
+   then XIM support is automatically configured in as well.
+
+-- TM (Tools for Mime) now comes with XEmacs.  This provides MIME
+   (Multipurpose Internet Mail Extensions) support for Mail and News.
+   The primary author is Morioka Tomohiko.
+
+-- Japanese input can also be input using the `canna' input method.
+   This support was contributed by Morioka Tomohiko.  Setting up canna
+   usually requires more user effort (and better knowledge of Japanese!)
+   than XIM, but provides a better-integrated input method.
+
+-- A mini-tutorial on using Mule:
+
+   -- Every time data passes between XEmacs and the rest of the
+      environment, via file or process input or output, XEmacs must
+      convert between its internal multi-character representation and
+      the external representation (`coding system').  Many
+      difficulties with Mule are related to controlling these coding
+      system conversions.
+
+      -- file-coding-system, file-coding-system-for-read,
+         overriding-file-coding-system, and file-coding-system-alist
+         are used to determine the coding systems used on file input
+         and output.
+
+      -- For each process, (set-process-input-coding-system) and
+         (set-process-output-coding-system) determine the coding
+         system used for I/O from the process.
+
+      -- Many other things are encoded using pathname-coding-system:
+         -- file and directory names
+         -- window manager properties: window title, icon name
+         -- process names and process arguments
+         -- XIM input.
+
+      -- In many cases, you will want to have the same values for all
+         the above variables in many cases.  For example, in a
+         Japanese environment, you will want to use the 'euc-japan
+         coding system consistently, except when running certain
+         processes that do byte-oriented, rather than
+         character-oriented I/O, such as gzip, or when processing Mail
+         or News, where ISO2022-based coding systems are the norm,
+         since they support multiple character sets.
+
+   -- To add support for a new language or character set, start by
+      trying to copy code in japanese-hooks.el.
+
+   -- The traditional pre-Mule data conversion is equivalent to the
+      'binary coding system under Mule.  In this case all characters
+      are treated as iso8859-1 (i.e. characters for English + Western
+      European languages).
+
+   -- many fileio-related commands such as find-file and write-file
+      take an extra argument, coding-system, which specifies the
+      encoding to be used with the file on disk.  For example, here is
+      a command that converts from the Japanese EUC to ISO2022 format:
+
+         xemacs -batch -eval '(progn (find-file
+         "locale-start.el.euc" (quote euc-japan)) (write-file
+         "locale-start.el" nil (quote iso-2022-8-unix)))'
+
+      Interactively, you can be prompted for a coding system by
+      providing a prefix argument to the fileio command.  In
+      particular, C-u C-x C-f is a useful sequence to edit a file
+      using a particular coding system.
+
+   -- In an Asian locale (i.e. if $LANG is set to ja, ko, or zh),
+      XEmacs automatically sets up a language environment assuming
+      that the operating system encodes information in the national
+      version of EUC, which supports English and the national
+      language, but typically no other character sets.
+
+-- Command line processing should work much better now - no more order
+   dependencies.
+
+-- Many many package upgraded (thanks go to countless maintainers):
+
+  -- ediff 2.64 (Michael Kifer)
+  -- Gnus 5.2.40 (Lars Magne Ingebrigtsen)
+  -- w3 3.0.51  (Bill Perry)
+  -- ilisp 5.8 (Chris McConnell, Ivan Vasquez, Marco Antoniotti, Rick
+     Campbell)
+  -- VM 5.97     (Kyle Jones)
+  -- etags 11.78 (Francesco Potorti`)
+  -- ksh-mode.el 2.9
+  -- vhdl-mode.el 2.73 (Rod Whitby)
+  -- id-select.el (Bob Weiner)
+  -- EDT/TPU emulation modes should work now for the first time.
+  -- viper 2.92 (Michael Kifer) is now the `official' vi emulator for XEmacs.
+  -- big-menubar should work much better now.
+  -- mode-motion+.el 3.16
+  -- backup-dir 2.0 (Greg Klanderman)
+  -- ps-print.el-3.05 (Jacques Duthen Prestataire)
+  -- lazy-lock-1.15 (Simon Marshall)
+  -- reporter 3.3 (Barry Warsaw)
+  -- hm--html-menus 5.0 (Heiko Muenkel)
+  -- cc-mode 4.322 (Barry Warsaw)
+  -- elp 2.37 (Barry Warsaw)
+
+
+-- Many new packages have been added:
+  -- m4-mode 1.8 (Andrew Csillag)
+  -- crisp.el - crisp/brief emulation (Gary D. Foster)
+  -- Johan Vroman's iso-acc.el has been ported to XEmacs by Alexandre Oliva
+  -- psgml-1.01 (Lennart Staflin, James Clark)
+  -- python-mode.el 2.83 (Barry Warsaw)
+  -- vrml-mode.el (Ben Wing)
+  -- enriched.el, face-menu.el (Boris Goldowsky, Michael Sperber)
+  -- sh-script.el (Daniel Pfeiffer)
+  -- decipher.el (Christopher J. Madsen)
+
+-- New function x-keysym-on-keyboard-p helps determine keyboard
+   characteristics for key rebinding:
+
+  x-keysym-on-keyboard-p: (KEYSYM &optional DEVICE)
+    -- a built-in function.
+  Return true if KEYSYM names a key on the keyboard of DEVICE.
+  More precisely, return true if pressing a physical key
+  on the keyboard of DEVICE without any modifier keys generates KEYSYM.
+  Valid keysyms are listed in the files /usr/include/X11/keysymdef.h and in
+  /usr/lib/X11/XKeysymDB, or whatever the equivalents are on your system.
+
+-- Installed info files are now compressed (support courtesy of Joseph J Nuspl)
+
+-- (load-average) works on Solaris, even if you're not root. Thanks to
+   Hrvoje Niksic.
+
+-- OffiX drag-and-drop support added
+
+-- lots of syncing with 19.34 elisp files, most by Steven Baur
+
+
+* For older news and for alternate news (the ones dealing with XEmacs
+19.15 and 19.16), see the file ONEWS.
diff --text -u 'xemacs-21.2.46/etc/OXYMORONS' 'xemacs-21.5.0/etc/OXYMORONS'
Index: ./etc/OXYMORONS
--- ./etc/OXYMORONS	Thu Mar 15 20:26:41 2001
+++ ./etc/OXYMORONS	Fri Apr 13 03:20:48 2001
@@ -18,25 +18,25 @@
 
 N.B. I expect that the Stable Release Maintainer will choose a new
 theme for the releases following the promotion of 21.4 from "gamma" to
-"stable".  So 15 should be enough....
+"stable".  So 15 or so should be enough....
 
 21.4.0: Solid Vapor
 21.4.1: Copyleft
 21.4.2: Developer-Friendly Unix APIs
 21.4.3: Academic Rigor
-21.4.3: Artificial Intelligence
-21.4.3: Civil Service
-21.4.3: Common Lisp
-21.4.3: Economic Science
-21.4.3: Honest Politician
-21.4.3: Informed Management
-21.4.3: Military Intelligence
-21.4.3: Portable Code
-21.4.3: Rational FORTRAN
-21.4.3: Reasonable Discussion
-21.4.3: Standard C
+21.4.4: Artificial Intelligence
+21.4.5: Civil Service
+21.4.6: Common Lisp
+21.4.7: Economic Science
+21.4.8: Honest Recruiter
+21.4.9: Informed Management
+21.4.10: Military Intelligence
+21.4.11: Portable Code
+21.4.12: Rational FORTRAN
+21.4.13: Reasonable Discussion
+21.4.14: Security Through Obscurity
+21.4.15: Standard C
+21.4.16: Successful IPO
 
-N.B.  Suggestions welcome until shortly before the release.  (The
-non-incrementing version number is precisely to make it easy to add
-new oxymorons.)
+N.B.  Only incredibly redeeming suggestoins can be accepted now.
 
diff --text -u 'xemacs-21.2.46/etc/gnuserv.1' 'xemacs-21.5.0/etc/gnuserv.1'
Index: ./etc/gnuserv.1
--- ./etc/gnuserv.1	Tue Oct  3 17:22:24 2000
+++ ./etc/gnuserv.1	Fri Apr 13 03:20:50 2001
@@ -171,9 +171,11 @@
 A Unix-domain socket is used to communicate between \fIgnuclient\fP
 and \fIgnuserv\fP if the symbol UNIX_DOMAIN_SOCKETS is defined at the
 top of gnuserv.h.  A file called /tmp/gsrvdir????/gsrv is created for
-communication and if deleted will cause communication between server
-and client to fail.  Only the user running gnuserv will be able to
-connect to the socket.
+communication.  If the symbol USE_TMPDIR is set at the top of gnuserv.h,
+$TMPDIR, when set, is used instead of /tmp.  If that file is deleted,
+or TMPDIR has different values for the server and the client, communication
+between server and client will fail.  Only the user running gnuserv will be
+able to connect to the socket.
 .SH INTERNET-DOMAIN SOCKETS
 Internet-domain sockets are used to communicate between
 \fIgnuclient\fP and \fIgnuserv\fP if the symbol
diff --text -u 'xemacs-21.2.46/etc/sample.init.el' 'xemacs-21.5.0/etc/sample.init.el'
Index: ./etc/sample.init.el
--- ./etc/sample.init.el	Thu Mar  8 20:07:13 2001
+++ ./etc/sample.init.el	Fri Apr 13 03:20:51 2001
@@ -273,6 +273,12 @@
 ;; the line, but that messes up the common idiom `f8 move-cursor f4'.
 
 (defun Init-kill-entire-line (&optional arg)
+"Kill the entire line.
+With prefix argument, kill that many lines from point.  Negative
+arguments kill lines backward.
+
+When calling from a program, nil means \"no arg\",
+a number counts as a prefix arg."
   (interactive "*P")
   (let ((kill-whole-line t))
     (beginning-of-line)
@@ -649,6 +655,13 @@
 ;; Useful programming-related keystrokes.
 
 (defun describe-foo-at-point ()
+  "Show the documentation of the Elisp function and variable near point.
+This checks in turn:
+
+-- for a function name where point is
+-- for a variable name where point is
+-- for a surrounding function call
+"
   (interactive)
   (let (sym)
     ;; sigh, function-at-point is too clever.  we want only the first half.
@@ -747,42 +760,86 @@
   'kill-current-buffer-and-window)
 
 (defun kill-current-buffer ()
+  "Kill the current buffer (prompting if it is modified)."
   (interactive)
   (kill-buffer (current-buffer)))
 
 (defun kill-current-buffer-and-window ()
+  "Kill the current buffer (prompting if it is modified) and its window."
   (interactive)
   (kill-buffer (current-buffer))
   (delete-window))
 
-(defun grep-c-files ()
-  (interactive)
+(defvar grep-all-files-history nil)
+
+(defvar grep-all-files-omitted-expressions
+  '("*~" "#*" ".#*" ",*" "*.elc" "*.obj" "*.o" "*.exe" "*.dll" "*.lib" "*.a"
+    "*.dvi" "*.class" "*.bin")
+  "List of expressions matching files to be omitted in `grep-all-files-...'.
+Each entry should be a simple name or a shell wildcard expression.")
+
+(defvar grep-all-files-omitted-directories '("CVS" "RCS" "SCCS")
+  "List of directories not to recurse into in `grep-all-files-...'.
+Each entry should be a simple name or a shell wildcard expression.")
+
+(defun construct-grep-all-files-command (find-segment grep-segment)
+  (let ((omit-annoying
+	 (mapconcat #'(lambda (wildcard)
+			(concat "-name '" wildcard "' -or "))
+		    grep-all-files-omitted-expressions
+		    "")))
+    (cond ((eq grep-find-use-xargs 'gnu)
+	   (format "find . %s %s -type f -print0 | xargs -0 -e %s"
+		   find-segment omit-annoying grep-segment))
+	  (grep-find-use-xargs
+	   (format "find . %s %s -type f -print | xargs %s"
+		   find-segment omit-annoying grep-segment))
+	  (t
+	   (format "find . %s %s -type f -exec %s {} /dev/null \\;"
+		   find-segment omit-annoying grep-segment)))))
+
+(defun grep-all-files-in-current-directory (command)
+  "Run `grep' in all non-annoying files in the current directory.
+`Non-annoying' excludes backup files, autosave files, CVS merge files, etc.
+More specifically, this is controlled by `grep-all-files-omitted-expressions'.
+
+This function does not recurse into subdirectories.  If you want this,
+use \\[grep-all-files-in-current-directory-and-below]."
+  (interactive
+   (progn
+     (require 'compile)
+     (list (read-shell-command "Run grep (like this): "
+			       grep-command 'grep-all-files-history))))
   (require 'compile)
-  (let ((grep-command
-	 (cons (concat grep-command " *.[chCH]"
-					; i wanted to also use *.cc and *.hh.
-					; see long comment below under Perl.
-		       )
-	       (length grep-command))))
-    (call-interactively 'grep)))
+  (grep (construct-grep-all-files-command
+	 "-name . -or -type d -prune -or" command)))
 
-(defun grep-lisp-files ()
-  (interactive)
+(defun grep-all-files-in-current-directory-and-below ()
+  "Run `grep' in all non-annoying files in the current directory and below.
+`Non-annoying' excludes backup files, autosave files, CVS merge files, etc.
+More specifically, this is controlled by `grep-all-files-omitted-expressions'.
+
+This function recurses into subdirectories.  If you do not want this,
+use \\[grep-all-files-in-current-directory]."
+  (interactive
+   (progn
+     (require 'compile)
+     (list (read-shell-command "Run grep (like this): "
+			       grep-command 'grep-all-files-history))))
   (require 'compile)
-  (let ((grep-command
-	 (cons (concat grep-command " *.el"
-					; i wanted to also use *.cc and *.hh.
-					; see long comment below under Perl.
-		       )
-	       (length grep-command))))
-    (call-interactively 'grep)))
-
-;; This repeatedly selects larger and larger balanced expressions
-;; around the cursor.  Once you have such an expression marked, you
-;; can expand to the end of the following expression with C-M-SPC and
-;; to the beginning of the previous with M-left.
+  (grep (construct-grep-all-files-command
+	 ;; prune all specified directories.
+	 (mapconcat #'(lambda (wildcard)
+			(concat "-name '" wildcard "' -prune -or "))
+		    grep-all-files-omitted-directories
+		    "")
+	 command)))
 
 (defun clear-select ()
+  "Repeatedly select ever larger balanced expressions around the cursor.
+Once you have such an expression marked, you can expand to the end of
+the following expression with \\[mark-sexp] and to the beginning of the
+previous with \\[backward-sexp]."
   (interactive "_") ;this means "preserve the active region after this command"
   (backward-up-list 1)
   (let ((end (save-excursion (forward-sexp) (point))))
@@ -792,8 +849,8 @@
 ;; -- always reports as /. #### this should be fixable.
 (global-set-key 'kp-add 'query-replace)
 (global-set-key '(shift kp-add) 'query-replace-regexp)
-(global-set-key '(control kp-add) 'grep-c-files)
-(global-set-key '(meta kp-add) 'grep-lisp-files)
+(global-set-key '(control kp-add) 'grep-all-files-in-current-directory)
+(global-set-key '(meta kp-add) 'grep-all-files-in-current-directory-and-below)
 (global-set-key 'clear 'clear-select)
 ;; Note that you can use a "lambda" expression (an anonymous function)
 ;; in place of a function name.  This function would be called
@@ -803,7 +860,7 @@
 ;; buffer, etc.).
 (global-set-key 'kp-enter (lambda () (interactive) (set-mark-command t)))
 (global-set-key '(shift kp-enter) 'repeat-complex-command)
-(global-set-key 'pause 'repeat-complex-command) ;; useful on Windows-stlye kbds
+(global-set-key 'pause 'repeat-complex-command) ;; useful on Windows-style kbds
 (global-set-key '(control kp-enter) 'eval-expression)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;
@@ -889,11 +946,29 @@
   ;(setq user-full-name "Ben Wing")
   ;(setq smtpmail-smtp-server "pop.tcsn.uswest.net")
 
-  ;; Make Alt+accelerator traverse to the menu in new enough XEmacs
+  ;; Make Meta+accelerator traverse to the menu in new enough XEmacs
   ;; versions.  Note that this only overrides Meta bindings that would
-  ;; actually invoke a menu, and that none of the most common commands
-  ;; are overridden.  You can use ESC+key to access the overridden
-  ;; ones if necessary.
+  ;; actually invoke a menu, and the most common commands that are
+  ;; overridden have preferred alternative bindings using the arrow
+  ;; keys.  You can always access the overridden ones using
+  ;; Shift+Meta+Key. (Note that "Alt" and "Meta" normally refer to the
+  ;; same key, except on some Sun keyboards [where "Meta" is actually
+  ;; labelled with a diamond] or if you have explicitly made them
+  ;; different under X Windows using `xmodmap'.)
+  ;;
+  ;; More specifically, the following bindings are overridden:
+  ;;
+  ;; M-f		(use C-right or Sh-M-f instead)
+  ;; M-e		(use M-C-right or Sh-M-e instead)
+  ;; M-v		(use Prior aka PgUp or Sh-M-v instead)
+  ;; M-m		(use Sh-M-m instead)
+  ;; M-t		(use Sh-M-t instead)
+  ;; M-o		(normally undefined)
+  ;; M-b		(use C-left or Sh-M-b instead)
+  ;; M-h		(use M-e h or Sh-M-h instead)
+  ;; in Lisp mode, M-l	(use Sh-M-l instead)
+  ;; in C mode, M-c	(use Sh-M-c instead)
+
   (setq menu-accelerator-enabled 'menu-force)
 
   ;; Make Cygwin `make' work inside a shell buffer.
diff --text -u 'xemacs-21.2.46/lib-src/ChangeLog' 'xemacs-21.5.0/lib-src/ChangeLog'
Index: ./lib-src/ChangeLog
--- ./lib-src/ChangeLog	Wed Mar 21 16:12:38 2001
+++ ./lib-src/ChangeLog	Wed Apr 18 15:56:42 2001
@@ -1,3 +1,16 @@
+2001-04-18  Martin Buchholz  <martin@xemacs.org>
+
+	* XEmacs 21.5.0 "alfalfa" is released.
+
+2000-08-01  Jon Schewe  <jpschewe@eggplant.mtu.net>
+
+	* gnuclient.c (filename_expand): Let Cygwin convert Windows path
+	to Unix.
+
+2001-03-23  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* gnuserv.h: Document TMPDIR lossage if client/server values differ.
+
 2001-03-21  Martin Buchholz <martin@xemacs.org>
 
 	* XEmacs 21.2.46 "Urania" is released.
diff --text -u 'xemacs-21.2.46/lib-src/gnuclient.c' 'xemacs-21.5.0/lib-src/gnuclient.c'
Index: ./lib-src/gnuclient.c
--- ./lib-src/gnuclient.c	Wed Mar 14 17:55:52 2001
+++ ./lib-src/gnuclient.c	Fri Apr 13 03:21:01 2001
@@ -48,6 +48,10 @@
  * ../etc/gnuserv.README relative to the directory containing this file)
  */
 
+#ifdef  CYGWIN
+extern void cygwin_conv_to_posix_path(const char *path, char *posix_path);
+#endif
+
 #include "gnuserv.h"
 
 char gnuserv_version[] = "gnuclient version " GNUSERV_VERSION;
@@ -189,35 +193,26 @@
   /* fullpath - returned full pathname */
   /* filename - filename to expand */
 {
-  int len;
+#ifdef  CYGWIN
+  char cygwinFilename[MAXPATHLEN+1];
+#endif
 
+  int len;
   fullpath[0] = '\0';
 
+#ifdef  CYGWIN
+  /*
+    If we're in cygwin, just convert it and let the unix stuff handle it.
+  */
+  cygwin_conv_to_posix_path(filename, cygwinFilename);
+  filename = cygwinFilename;
+#endif
+
   if (filename[0] && filename[0] == '/')
      {
        /* Absolute (unix-style) pathname.  Do nothing */
        strcat (fullpath, filename);
      }
-#ifdef  CYGWIN
-  else if (filename[0] && filename[0] == '\\' &&
-           filename[1] && filename[1] == '\\')
-    {
-      /* This path includes the server name (something like
-         "\\server\path"), so we assume it's absolute.  Do nothing to
-         it. */
-      strcat (fullpath, filename);
-    }
-  else if (filename[0] &&
-           filename[1] && filename[1] == ':' &&
-           filename[2] && filename[2] == '\\')
-    {
-      /* Absolute pathname with drive letter.  Convert "<drive>:"
-         to "//<drive>/". */
-      strcat (fullpath, "//");
-      strncat (fullpath, filename, 1);
-      strcat (fullpath, &filename[2]);
-    }
-#endif
   else
     {
       /* Assume relative Unix style path.  Get the current directory
diff --text -u 'xemacs-21.2.46/lib-src/gnuserv.h' 'xemacs-21.5.0/lib-src/gnuserv.h'
Index: ./lib-src/gnuserv.h
--- ./lib-src/gnuserv.h	Thu Jan 25 19:41:48 2001
+++ ./lib-src/gnuserv.h	Fri Apr 13 03:21:02 2001
@@ -32,6 +32,9 @@
 
 #define GNUSERV_VERSION "3.12"
 
+/* Note: this setting can cause client-server connection failure if the
+ * value of TMPDIR is not shared by client and server at run-time.
+ */
 #define USE_TMPDIR
 
 #define PATCHLEVEL 2
diff --text -u 'xemacs-21.2.46/lisp/ChangeLog' 'xemacs-21.5.0/lisp/ChangeLog'
Index: ./lisp/ChangeLog
--- ./lisp/ChangeLog	Wed Mar 21 16:12:38 2001
+++ ./lisp/ChangeLog	Wed Apr 18 15:56:38 2001
@@ -1,3 +1,107 @@
+2001-04-18  Martin Buchholz  <martin@xemacs.org>
+
+	* XEmacs 21.5.0 "alfalfa" is released.
+
+2001-04-17  Didier Verna  <didier@xemacs.org>
+
+	* startup.el (load-user-init-file): define `custom-file' before
+	loading the user's init file.
+
+2001-04-02  Jan Vroonhof  <jan.vroonhof@ntlworld.com>
+
+	* dialog.el (make-dialog-box): Disable dialog box titles until
+	we get them working.
+
+2001-03-30  Ben Wing  <ben@xemacs.org>
+
+	* help.el:
+	* help.el (Help-princ-face):
+	* help.el (Help-prin1-face):
+	* help.el (frob-help-extents):
+	* help.el (describe-function-1):
+	* help.el (describe-variable):
+	Avoid using font-lock faces, which may not be defined.
+	Instead, use hyper-apropos faces, and make sure they're
+	defined as necessary by using `require'. (It's not so safe
+	to do this for font-lock.) In any case, we will eventually
+	be merging this functionality into hyper-apropos.
+
+	* loaddefs.el (completion-ignored-extensions):
+	Fix documentation.
+
+	* menubar-items.el (menu-truncate-list): Removed.
+	* menubar-items.el (Menubar-items-truncate-list): New.
+	* menubar-items.el (default-menubar):
+	Fix errors if grep or compile command is too long.  Rename helper
+	function to be less visible.
+
+2001-03-23  Martin Buchholz  <martin@xemacs.org>
+
+	* byte-optimize.el (byte-optimize-minus):
+	Fix mis-byte-compilation of (- 0 x) --> (- (- x))
+
+2001-03-26  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+	* dumped-lisp.el (preloaded-file-list): Load mule/latin.el when
+	Mule is available.
+
+	* mule/latin.el: New file.
+
+2001-03-11  Ben Wing  <ben@xemacs.org>
+
+	* auto-save.el:
+	* auto-save.el (auto-save-directory):
+	* auto-save.el (make-auto-save-file-name):
+	* auto-save.el (auto-save-file-name-p): New.
+
+	Merge in improvements from other definition of
+	make-auto-save-file-name in files.el.
+
+	* auto-save.el (auto-save-original-name):
+	* auto-save.el (auto-save-name-in-fixed-directory):
+	* auto-save.el (auto-save-unslashify-name): Removed.
+	* auto-save.el (auto-save-slashify-name): Removed.
+	* auto-save.el (auto-save-reserved-chars): New.
+	* auto-save.el (auto-save-escape-name): New.
+	* auto-save.el (auto-save-unhex): New.
+	* auto-save.el (auto-save-unescape-name): New.
+
+	Change algorithm for encoding filenames in auto-save names to be
+	entirely safe with all filesystems and all possible characters in
+	a filename, and 100% reversible. (Essentially, uses
+	quoted-printable as the encoding.)
+
+	* auto-save.el (recover-all-files):
+
+	Use insert-directory rather than calling ls directly -- fixes
+	things under Windows.
+
+	* files.el:
+	* files.el (convert-standard-filename): Substitute FSF's
+	definition for this (we had nothing here before).
+
+	* files.el (backup-buffer): Warning fix.
+
+	* files.el (make-backup-file-name):
+	* files.el (find-backup-file-name):
+	Fix error in calling sequence to auto-save-file-name-p.
+
+	* files.el (recover-file):
+	Use insert-directory rather than calling ls directly -- fixes
+	things under Windows.
+
+	* files.el (make-auto-save-file-name): Removed.
+	* files.el (auto-save-file-name-p): Removed.
+	auto-save is always dumped so no sense in having a definition
+	that will always be overwritten with another.
+
+	* files.el (insert-directory):
+	* win32-native.el:
+	* win32-native.el (debug-mswindows-process-command-lines):
+	* win32-native.el (original-make-auto-save-file-name): Removed.
+	* win32-native.el (make-auto-save-file-name): Removed.
+
+
 2001-03-21  Martin Buchholz <martin@xemacs.org>
 
 	* XEmacs 21.2.46 "Urania" is released.
@@ -44,7 +148,7 @@
 	View files in view-mode rather than Fundamental.
 	Remove separators from context menus -- now handled in generic code.
 	Add `Find Tag' to context menu.
-	
+
 	* menubar.el (popup-mode-menu):
 
 	Rewrite code that outputs the popup menu to (a) put more specific
@@ -63,11 +167,11 @@
 	* keydefs.el:
 	* keydefs.el (global-map):
 	Add commented-out change of M-k (for 21.5).
-	
+
 	* menubar-items.el (default-menubar):
 	Fix items to control kill-line behavior; add items for
 	shifted motion.
-	
+
 	* simple.el:
 	* simple.el (kill-whole-line):
 	* simple.el (historical-kill-line): Removed.
@@ -178,11 +282,11 @@
 
 	* XEmacs 21.2.45 "Thelxepeia" is released.
 
-2001-01-25  Jason R. Mastaler  <jason@xemacs.org> 
- 
-        * about.el (xemacs-hackers): update my entry. 
-        * about.el (about-maintainer-info): ditto. 
-        * about.el (about-hackers): ditto. 
+2001-01-25  Jason R. Mastaler  <jason@xemacs.org>
+
+        * about.el (xemacs-hackers): update my entry.
+        * about.el (about-maintainer-info): ditto.
+        * about.el (about-hackers): ditto.
 
 2001-02-20  Jan Vroonhof  <jan@xemacs.org>
 
diff --text -u 'xemacs-21.2.46/lisp/auto-autoloads.el' 'xemacs-21.5.0/lisp/auto-autoloads.el'
Index: ./lisp/auto-autoloads.el
--- ./lisp/auto-autoloads.el	Wed Mar 14 17:56:06 2001
+++ ./lisp/auto-autoloads.el	Fri Apr 13 03:21:10 2001
@@ -1258,6 +1258,20 @@
 
 ;;;***
 
+;;;### (autoloads (gtk-reset-device-font-menus) "gtk-font-menu" "lisp/gtk-font-menu.el")
+
+(autoload 'gtk-reset-device-font-menus "gtk-font-menu" "\
+Generates the `Font', `Size', and `Weight' submenus for the Options menu.
+This is run the first time that a font-menu is needed for each device.
+If you don't like the lazy invocation of this function, you can add it to
+`create-device-hook' and that will make the font menus respond more quickly
+when they are selected for the first time.  If you add fonts to your system, 
+or if you change your font path, you can call this to re-initialize the menus." nil nil)
+
+(defun* gtk-font-menu-font-data (face dcache) (defvar gtk-font-regexp) (defvar gtk-font-regexp-foundry-and-family) (let* ((case-fold-search t) (domain (if font-menu-this-frame-only-p (selected-frame) (selected-device))) (name (font-instance-name (face-font-instance face domain))) (truename (font-instance-truename (face-font-instance face domain (if (featurep 'mule) 'ascii)))) family size weight entry slant) (when (string-match gtk-font-regexp-foundry-and-family name) (setq family (capitalize (match-string 1 name))) (setq entry (vassoc family (aref dcache 0)))) (when (and (null entry) (string-match gtk-font-regexp-foundry-and-family truename)) (setq family (capitalize (match-string 1 truename))) (setq entry (vassoc family (aref dcache 0)))) (when (null entry) (return-from gtk-font-menu-font-data (make-vector 5 nil))) (when (string-match gtk-font-regexp name) (setq weight (capitalize (match-string 1 name))) (setq size (string-to-int (match-string 6 name)))) (when (string-match gtk-font-regexp truename) (when (not (member weight (aref entry 1))) (setq weight (capitalize (match-string 1 truename)))) (when (not (member size (aref entry 2))) (setq size (string-to-int (match-string 6 truename)))) (setq slant (capitalize (match-string 2 truename)))) (vector entry family size weight slant)))
+
+;;;***
+
 ;;;### (autoloads nil "help-macro" "lisp/help-macro.el")
 
 (defcustom three-step-help t "*Non-nil means give more info about Help command in three steps.\nThe three steps are simple prompt, prompt with all options,\nand window listing and describing the options.\nA value of nil means skip the middle step, so that\n\\[help-command] \\[help-command] gives the window that lists the options." :type 'boolean :group 'help-appearance)
diff --text -u 'xemacs-21.2.46/lisp/auto-save.el' 'xemacs-21.5.0/lisp/auto-save.el'
Index: ./lisp/auto-save.el
--- ./lisp/auto-save.el	Wed Mar 14 17:56:06 2001
+++ ./lisp/auto-save.el	Fri Apr 13 03:21:10 2001
@@ -2,6 +2,7 @@
 
 ;; Copyright (C) 1997 Free Software Foundation, Inc.
 ;; Copyright (C) 1992 by Sebastian Kremer <sk@thp.uni-koeln.de>
+;; Copyright (C) 2001 Ben Wing.
 
 ;; Author: Sebastian Kremer <sk@thp.uni-koeln.de>
 ;; Maintainer: XEmacs Development Team
@@ -34,13 +35,10 @@
 ;; disk, in case NFS is slow.  The auto-save file used for
 ;;     /usr/foo/bar/baz.txt
 ;; will be
-;;     AUTOSAVE/#\!usr\!foo\!bar\!baz.txt#
+;;     AUTOSAVE/#=2Fusr=2Ffoo=2Fbar=2Fbaz.txt#"
 ;; assuming AUTOSAVE is the non-nil value of the variable
 ;; `auto-save-directory'.
 
-;; Takes care that autosave files for non-file-buffers (e.g. *mail*)
-;; from two simultaneous Emacses don't collide.
-
 ;; Autosaves even if the current directory is not writable.
 
 ;; Can limit autosave names to 14 characters using a hash function,
@@ -60,7 +58,7 @@
 ;;       (concat "/tmp/" (user-login-name) "-autosave/"))
 
 ;; If you don't want to save in /tmp (e.g., because it is swap
-;; mounted) but rather in ~/autosave/
+;; mounted) but rather in ~/.autosave/
 ;;   (setq auto-save-directory (expand-file-name "~/.autosave/"))
 
 ;; If you want to save each file in its own directory (the default)
@@ -144,7 +142,7 @@
 
 will have a longish filename like
 
-    AUTO-SAVE-DIRECTORY/#\\!home\\!sk\\!lib\\!emacs\\!lisp\\!auto-save.el#
+    AUTO-SAVE-DIRECTORY/#=2Fhome=2Fsk=2Flib=2Femacs=2Flisp=2Fauto-save.el#
 
 as auto save file.
 
@@ -222,12 +220,7 @@
 
 ;;; Computing an autosave name for a file and vice versa
 
-;; #### Now that this file is dumped, we should turn off the routine
-;; from files.el.  But it would make it harder to remove it!
-
-(defun make-auto-save-file-name (&optional file-name);; redefines files.el
-  ;; auto-save-file-name-p need not be redefined.
-
+(defun make-auto-save-file-name (&optional file-name)
   "Return file name to use for auto-saves of current buffer.
 Does not consider `auto-save-visited-file-name'; that is checked
 before calling this function.
@@ -285,8 +278,8 @@
 	    (save-name (or file-name
 			   ;; Prevent autosave errors.  Buffername
 			   ;; (to become non-dir part of filename) will
-			   ;; be unslashified twice.  Don't care.
-			   (auto-save-unslashify-name (buffer-name))))
+			   ;; be escaped twice.  Don't care.
+			   (auto-save-escape-name (buffer-name))))
 	    (remote-p (and (stringp file-name)
 			   (fboundp 'efs-ftp-path)
 			   (efs-ftp-path file-name))))
@@ -316,12 +309,26 @@
 
     (error (warn "Error caught in `make-auto-save-file-name':\n%s"
 		 (error-message-string error-data))
-	   (if buffer-file-name
-	       (concat (file-name-directory buffer-file-name)
-		       "#"
-		       (file-name-nondirectory buffer-file-name)
-		       "#")
-	     (expand-file-name (concat "#%" (buffer-name) "#"))))))
+	   (let ((fname
+		  (if file-name
+		      (concat (file-name-directory file-name)
+			      "#"
+			      (file-name-nondirectory file-name)
+			      "#")
+		    (expand-file-name
+		     (concat "#%" (auto-save-escape-name (buffer-name))
+			     "#")))))
+	     (if (or (file-writable-p fname)
+		     (file-exists-p fname))
+		 fname
+	       (expand-file-name (concat "~/"
+					 (file-name-nondirectory fname))))))))
+
+(defun auto-save-file-name-p (filename)
+  "Return non-nil if FILENAME can be yielded by `make-auto-save-file-name'.
+FILENAME should lack slashes.
+You can redefine this for customization."
+  (string-match "\\`#.*#\\'" filename))
 
 (defun auto-save-original-name (savename)
   "Reverse of `make-auto-save-file-name'.
@@ -342,13 +349,13 @@
 	       (equal savedir
 		      (expand-file-name auto-save-directory-fallback)))
 	   ;; it is of the `-fixed-directory' type
-	   (auto-save-slashify-name (substring basename 1 -1)))
+	   (auto-save-unescape-name (substring basename 1 -1)))
 	  (t
 	   ;; else it is of `-same-directory' type
 	   (concat savedir (substring basename 1 -1))))))
 
 (defun auto-save-name-in-fixed-directory (filename &optional prefix)
-  ;; Unslashify and enclose the whole FILENAME in `#' to make an auto
+  ;; Escape and enclose the whole FILENAME in `#' to make an auto
   ;; save file in the auto-save-directory, or if that is nil, in
   ;; auto-save-directory-fallback (which must be the name of an
   ;; existing directory).  If the results would be too long for 14
@@ -356,7 +363,7 @@
   ;; into a shorter name.
   ;; Optional PREFIX is string to use instead of "#" to prefix name.
   (let ((base-name (concat (or prefix "#")
-			   (auto-save-unslashify-name filename)
+			   (auto-save-escape-name filename)
 			   "#")))
     (if (and auto-save-hash-p
 	     auto-save-hash-directory
@@ -386,34 +393,83 @@
 	    (file-name-nondirectory filename)
 	    "#")))
 
-;; #### The following two should probably use `replace-in-string'.
-
-(defun auto-save-unslashify-name (s)
-  ;;  "Quote any slashes in string S by replacing them with the two
-  ;;characters `\\!'.
-  ;;Also, replace any backslash by double backslash, to make it one-to-one."
-  (let ((limit 0))
-    (while (string-match "[/\\]" s limit)
-      (setq s (concat (substring s 0 (match-beginning 0))
-		      (if (string= (substring s
-					      (match-beginning 0)
-					      (match-end 0))
-				   "/")
-			  "\\!"
-			"\\\\")
-		      (substring s (match-end 0))))
-      (setq limit (1+ (match-end 0)))))
-  s)
-
-(defun auto-save-slashify-name (s)
-  ;;"Reverse of `auto-save-unslashify-name'."
-  (let (pos)
-    (while (setq pos (string-match "\\\\[\\!]" s pos))
-      (setq s (concat (substring s 0 pos)
-		      (if (eq ?! (aref s (1+ pos))) "/" "\\")
-		      (substring s (+ pos 2)))
-	    pos (1+ pos))))
-  s)
+(defconst auto-save-reserved-chars
+  '(
+    ?\0 ?\1 ?\2 ?\3 ?\4 ?\5 ?\6 ?\7 ?\10 ?\11 ?\12 ?\13 ?\14 ?\15 ?\16
+    ?\17 ?\20 ?\21 ?\22 ?\23 ?\24 ?\25 ?\26 ?\27 ?\30 ?\31 ?\32 ?\33
+    ?\34 ?\35 ?\36 ?\37 ?\40 ?? ?* ?: ?< ?> ?| ?/ ?\\ ?& ?^ ?% ?= ?\")
+  "List of characters disallowed (or potentially disallowed) in filenames.
+Includes everything that can get us into trouble under MS Windows or Unix.")
+
+;; This code based on code in Bill Perry's url.el.
+    
+(defun auto-save-escape-name (str)
+  "Escape any evil nasty characters in a potential filename.
+Uses quoted-printable-style escaping -- e.g. the dreaded =3D.
+Does not use URL escaping (with %) because filenames beginning with #% are
+a special signal for non-file buffers."
+  (mapconcat
+   (function
+    (lambda (char)
+      (if (memq char auto-save-reserved-chars)
+	  (if (< char 16)
+	      (upcase (format "=0%x" char))
+	    (upcase (format "=%x" char)))
+	(char-to-string char))))
+   str ""))
+
+(defun auto-save-unhex (x)
+  (if (> x ?9)
+      (if (>= x ?a)
+	  (+ 10 (- x ?a))
+	(+ 10 (- x ?A)))
+    (- x ?0)))
+
+(defun auto-save-unescape-name (str)
+  "Undo any escaping of evil nasty characters in a file name.
+See `auto-save-escape-name'."
+  (setq str (or str ""))
+  (let ((tmp "")
+	(case-fold-search t))
+    (while (string-match "=[0-9a-f][0-9a-f]" str)
+      (let* ((start (match-beginning 0))
+	     (ch1 (auto-save-unhex (elt str (+ start 1))))
+	     (code (+ (* 16 ch1)
+		      (auto-save-unhex (elt str (+ start 2))))))
+	(setq tmp (concat tmp (substring str 0 start)
+			  (char-to-string code))
+	      str (substring str (match-end 0)))))
+    (setq tmp (concat tmp str))
+    tmp))
+
+;; The old versions are below.
+
+;(defun auto-save-escape-name (s)
+;  ;;  "Quote any slashes in string S by replacing them with the two
+;  ;;characters `\\!'.
+;  ;;Also, replace any backslash by double backslash, to make it one-to-one."
+;  (let ((limit 0))
+;    (while (string-match "[/\\]" s limit)
+;      (setq s (concat (substring s 0 (match-beginning 0))
+;		      (if (string= (substring s
+;					      (match-beginning 0)
+;					      (match-end 0))
+;				   "/")
+;			  "\\!"
+;			"\\\\")
+;		      (substring s (match-end 0))))
+;      (setq limit (1+ (match-end 0)))))
+;  s)
+
+;(defun auto-save-unescape-name (s)
+;  ;;"Reverse of `auto-save-escape-name'."
+;  (let (pos)
+;    (while (setq pos (string-match "\\\\[\\!]" s pos))
+;      (setq s (concat (substring s 0 pos)
+;		      (if (eq ?! (aref s (1+ pos))) "/" "\\")
+;		      (substring s (+ pos 2)))
+;	    pos (1+ pos))))
+;  s)
 
 
 ;;; Hashing for autosave names
@@ -454,7 +510,7 @@
 
 ;; This leaves two characters that could be used to wrap it in `#' or
 ;; make two filenames from it: one for autosaving, and another for a
-;; file containing the name of the autosaved filed, to make hashing
+;; file containing the name of the autosaved file, to make hashing
 ;; reversible.
 ;(defun auto-save-cyclic-hash-12 (s)
 ;  "Outputs the 12-characters ascii hex representation of a 6-bytes
@@ -518,8 +574,14 @@
 	    (t
 	     (incf total)
 	     (with-output-to-temp-buffer "*Directory*"
-	       (apply 'call-process "ls" nil standard-output nil
-		      "-l" afile (if file (list file))))
+	       (buffer-disable-undo standard-output)
+	       (save-excursion
+		 (set-buffer "*Directory*")
+		 (setq default-directory (file-name-directory afile))
+		 (insert-directory afile "-l")
+		 (when file
+		   (setq default-directory (file-name-directory file))
+		   (insert-directory file "-l"))))
 	     (if (yes-or-no-p (format "Recover %s from auto save file? "
 				      (or file "non-file buffer")))
 		 (let* ((obuf (current-buffer)))
diff --text -u 'xemacs-21.2.46/lisp/build-report.el' 'xemacs-21.5.0/lisp/build-report.el'
Index: ./lisp/build-report.el
--- ./lisp/build-report.el	Mon Mar 19 15:17:39 2001
+++ ./lisp/build-report.el	Fri Apr 13 18:11:23 2001
@@ -4,7 +4,7 @@
 
 ;; Author: Adrian Aichner <adrian@xemacs.org>
 ;; Date: Sun., Apr. 20, 1997-2000.
-;; Version: $Revision: 1.5.2.9 $
+;; Version: $Revision: 1.9 $
 ;; Keywords: internal
 
 ;; This file is part of XEmacs.
diff --text -u 'xemacs-21.2.46/lisp/byte-optimize.el' 'xemacs-21.5.0/lisp/byte-optimize.el'
Index: ./lisp/byte-optimize.el
--- ./lisp/byte-optimize.el	Mon Jan 15 23:54:52 2001
+++ ./lisp/byte-optimize.el	Fri Apr 13 03:21:11 2001
@@ -729,9 +729,15 @@
       (decf (nth 1 form) last)
       (butlast form))
 
-     ;; (- 0 x ...)  -->  (- (- x) ...)
-     ((and (eq 0 (nth 1 form)) (>= (length form) 3))
-      `(- (- ,(nth 2 form)) ,@(nthcdr 3 form)))
+     ;; (- 0 ...) -->
+     ((eq 0 (nth 1 form))
+      (case (length form)
+	;; (- 0) --> 0
+	(2 0)
+	;; (- 0 x)  -->  (- x)
+	(3 `(- ,(nth 2 form)))
+	;; (- 0 x y ...)  -->  (- (- x) y ...)
+	(t `(- (- ,(nth 2 form)) ,@(nthcdr 3 form)))))
 
      (t (byte-optimize-predicate form)))))
 
diff --text -u 'xemacs-21.2.46/lisp/custom-load.el' 'xemacs-21.5.0/lisp/custom-load.el'
Index: ./lisp/custom-load.el
--- ./lisp/custom-load.el	Wed Mar 14 17:56:13 2001
+++ ./lisp/custom-load.el	Fri Apr 13 03:21:16 2001
@@ -86,7 +86,7 @@
 (custom-add-loads 'matching '("simple" "isearch-mode" "hyper-apropos"))
 (custom-add-loads 'i18n '("cus-edit"))
 (custom-add-loads 'info '("toolbar-items" "info"))
-(custom-add-loads 'x '("x-faces"))
+(custom-add-loads 'x '("gtk-faces" "x-faces"))
 (custom-add-loads 'buffers-tab '("gutter-items"))
 
 ;;; custom-load.el ends here
diff --text -u 'xemacs-21.2.46/lisp/dialog.el' 'xemacs-21.5.0/lisp/dialog.el'
Index: ./lisp/dialog.el
--- ./lisp/dialog.el	Wed Nov  8 00:12:33 2000
+++ ./lisp/dialog.el	Fri Apr 13 03:21:17 2001
@@ -642,7 +642,9 @@
 		       (set-buffer-dedicated-frame newbuf frame)
 		       (set-frame-property frame 'dialog-box-buffer newbuf)
 		       (with-current-buffer newbuf
-			 (setq frame-title-format cl-title)
+			 ;; Should be frame specific, so
+			 ;; we don't do this for now.
+			 ;; (setq frame-title-format cl-title)
 			 (make-local-hook 'delete-frame-hook)
 			 (add-hook 'delete-frame-hook
 				   #'(lambda (frame)
diff --text -u 'xemacs-21.2.46/lisp/dumped-lisp.el' 'xemacs-21.5.0/lisp/dumped-lisp.el'
Index: ./lisp/dumped-lisp.el
--- ./lisp/dumped-lisp.el	Wed Mar 14 17:56:14 2001
+++ ./lisp/dumped-lisp.el	Fri Apr 13 03:21:17 2001
@@ -158,6 +158,7 @@
 	(when-feature mule "hebrew")
 	(when-feature mule "japanese")
 	(when-feature mule "korean")
+	(when-feature mule "latin")
 	(when-feature mule "misc-lang")
 	(when-feature mule "thai-xtis-chars")
 	(when-feature mule "mule/thai-xtis") ; overloaded in leim/quail
diff --text -u 'xemacs-21.2.46/lisp/files.el' 'xemacs-21.5.0/lisp/files.el'
Index: ./lisp/files.el
--- ./lisp/files.el	Wed Mar 14 17:56:20 2001
+++ ./lisp/files.el	Fri Apr 13 03:21:18 2001
@@ -371,11 +371,22 @@
 ;      (apply op args))
 
 (defun convert-standard-filename (filename)
-  "Convert a standard file's name to something suitable for the current OS.
-This function's standard definition is trivial; it just returns the argument.
-However, on some systems, the function is redefined
-with a definition that really does change some file names."
-  filename)
+  "Convert a standard file's name to something suitable for the current OS."
+  (if (eq system-type 'windows-nt)
+      (let ((name (copy-sequence filename))
+	    (start 0))
+	;; leave ':' if part of drive specifier
+	(if (eq (aref name 1) ?:)
+	    (setq start 2))
+	;; destructively replace invalid filename characters with !
+	(while (string-match "[?*:<>|\"\000-\037]" name start)
+	  (aset name (match-beginning 0) ?!)
+	  (setq start (match-end 0)))
+	;; FSF: [convert directory separators to Windows format ...]
+	;; unneeded in XEmacs.
+	name)
+    filename))
+
 
 (defun pwd ()
   "Show the current default directory."
@@ -1927,7 +1938,9 @@
 				(setq setmodes (file-modes backupname)))
 			    (file-error
 			     ;; If trouble writing the backup, write it in ~.
-			     (setq backupname (expand-file-name "~/%backup%~"))
+			     (setq backupname
+				   (expand-file-name
+				    (convert-standard-filename "~/%backup%~")))
 			     (message "Cannot write backup file; backing up in ~/%%backup%%~")
 			     (sleep-for 1)
 			     (condition-case ()
@@ -2013,6 +2026,7 @@
 (defun make-backup-file-name (file)
   "Create the non-numeric backup file name for FILE.
 This is a separate function so you can redefine it for customization."
+  ;; FSF has code here for MS-DOS short filenames, not supported in XEmacs.
     (concat file "~"))
 
 (defun backup-file-name-p (file)
@@ -2040,6 +2054,7 @@
 Value is a list whose car is the name for the backup file
  and whose cdr is a list of old versions to consider deleting now.
 If the value is nil, don't make a backup."
+  (declare (special bv-length))
   (let ((handler (find-file-name-handler fn 'find-backup-file-name)))
     ;; Run a handler for this function so that ange-ftp can refuse to do it.
     (if handler
@@ -2761,7 +2776,7 @@
 		     'recover-file))))
     (if handler
 	(funcall handler 'recover-file file)
-      (if (auto-save-file-name-p file)
+      (if (auto-save-file-name-p (file-name-nondirectory file))
 	  (error "%s is an auto-save file" file))
       (let ((file-name (let ((buffer-file-name file))
 			 (make-auto-save-file-name))))
@@ -2770,12 +2785,17 @@
 		 (not (file-exists-p file-name)))
 	       (error "Auto-save file %s not current" file-name))
 	      ((save-window-excursion
-		 (if (not (eq system-type 'windows-nt))
-		     (with-output-to-temp-buffer "*Directory*"
-		       (buffer-disable-undo standard-output)
-		       (call-process "ls" nil standard-output nil
-				     (if (file-symlink-p file) "-lL" "-l")
-				     file file-name)))
+		 ;; XEmacs change: use insert-directory instead of
+		 ;; calling ls directly.
+		 (with-output-to-temp-buffer "*Directory*"
+		   (buffer-disable-undo standard-output)
+		   (save-excursion
+		     (set-buffer "*Directory*")
+		     (setq default-directory (file-name-directory file))
+		     (insert-directory file
+				       (if (file-symlink-p file) "-lL" "-l"))
+		     (setq default-directory (file-name-directory file-name))
+		     (insert-directory file-name "-l")))
 		 (yes-or-no-p (format "Recover auto save file %s? " file-name)))
 	       (switch-to-buffer (find-file-noselect file t))
 	       (let ((buffer-read-only nil))
@@ -2941,72 +2961,9 @@
 	     (recent-auto-save-p))
 	(rename-file osave buffer-auto-save-file-name t))))
 
-;; see also ../packages/auto-save.el
-(defun make-auto-save-file-name (&optional filename)
-  "Return file name to use for auto-saves of current buffer.
-Does not consider `auto-save-visited-file-name' as that variable is checked
-before calling this function.  You can redefine this for customization.
-See also `auto-save-file-name-p'."
-  (let ((fname (or filename buffer-file-name))
-	name)
-    (setq name
-	  (if fname
-	      (concat (file-name-directory fname)
-		      "#"
-		      (file-name-nondirectory fname)
-		      "#")
-
-	    ;; Deal with buffers that don't have any associated files.  (Mail
-	    ;; mode tends to create a good number of these.)
-
-	    (let ((buffer-name (buffer-name))
-		  (limit 0))
-	      ;; Use technique from Sebastian Kremer's auto-save
-	      ;; package to turn slashes into \\!.  This ensures that
-	      ;; the auto-save buffer name is unique.
-
-	      ;; #### - yuck!  yuck!  yuck!  move this functionality
-	      ;; somewhere else and make the name translation customizable.
-	      ;; Using "\!" as part of a filename on a UNIX filesystem is nearly
-	      ;; IMPOSSIBLE to get past a shell parser.  -stig
-
-	      (while (string-match "[/\\]" buffer-name limit)
-		(setq buffer-name
-		      (concat (substring buffer-name 0 (match-beginning 0))
-			      (if (string= (substring buffer-name
-						      (match-beginning 0)
-						      (match-end 0))
-					   "/")
-				  "\\!"
-				"\\\\")
-			      (substring buffer-name (match-end 0))))
-		(setq limit (1+ (match-end 0))))
-
-	      ;;    (expand-file-name (format "#%s#%s#" (buffer-name) (make-temp-name "")))
-
-	      ;; jwz: putting the emacs PID in the auto-save file name
-	      ;; is bad news, because that defeats auto-save-recovery of
-	      ;; *mail* buffers -- the (sensible) code in sendmail.el
-	      ;; calls (make-auto-save-file-name) to determine whether
-	      ;; there is unsent, auto-saved mail to recover.  If that
-	      ;; mail came from a previous emacs process (far and away
-	      ;; the most likely case) then this can never succeed as
-	      ;; the pid differs.
-
-	      (expand-file-name (format "#%s#" buffer-name)))
-	    ))
-    ;; don't try to write auto-save files in unwritable places.  Unless
-    ;; there's already an autosave file here, put ours somewhere safe. --Stig
-    (if (or (file-writable-p name)
-	    (file-exists-p name))
-	name
-      (expand-file-name (concat "~/" (file-name-nondirectory name))))))
-
-(defun auto-save-file-name-p (filename)
-  "Return non-nil if FILENAME can be yielded by `make-auto-save-file-name'.
-FILENAME should lack slashes.
-You can redefine this for customization."
-  (string-match "\\`#.*#\\'" filename))
+;; make-auto-save-file-name and auto-save-file-name-p are now only in
+;; auto-save.el.
+
 
 (defun wildcard-to-regexp (wildcard)
   "Given a shell file name pattern WILDCARD, return an equivalent regexp.
@@ -3150,8 +3107,9 @@
 	(funcall handler 'insert-directory file switches
 		 wildcard full-directory-p)
       (cond
-       ;; #### mswindows-insert-directory should be called
-       ;; nt-insert-directory - kkm.
+       ;; [mswindows-insert-directory should be called
+       ;; nt-insert-directory - kkm].  not true any more according to
+       ;; my new naming scheme. --ben
        ((and (fboundp 'mswindows-insert-directory)
 	     (eq system-type 'windows-nt))
 	(mswindows-insert-directory file switches wildcard full-directory-p))
diff --text -u 'xemacs-21.2.46/lisp/help.el' 'xemacs-21.5.0/lisp/help.el'
Index: ./lisp/help.el
--- ./lisp/help.el	Wed Mar 14 17:56:36 2001
+++ ./lisp/help.el	Fri Apr 13 03:21:27 2001
@@ -1075,60 +1075,38 @@
 	     (string-match "[\n\t ]*\narguments: ?(\\(.*\\))\n?\\'" doc))
 	(setq doc (substring doc 0 (match-beginning 0))))
     doc))
-;  (let ((name-char "[-+a-zA-Z0-9_*]") (sym-char "[-+a-zA-Z0-9_:*]"))
-;    (list
-;     ;;
-;     ;; The symbol itself.
-;     (list (concat "\\`\\(" name-char "+\\)\\(:\\)?")
-;	   '(1 (if (match-beginning 2)
-;		   'font-lock-function-name-face
-;		 'font-lock-variable-name-face)
-;	       nil t))
-;     ;;
-;     ;; Words inside `' which tend to be symbol names.
-;     (list (concat "`\\(" sym-char sym-char "+\\)'")
-;	   1 '(prog1
-;		  'font-lock-reference-face
-;		(add-list-mode-item (match-beginning 1)
-;			       (match-end 1)
-;			       nil
-;			       'help-follow-reference))
-;	   t)
-;     ;;
-;     ;; CLisp `:' keywords as references.
-;     (list (concat "\\<:" sym-char "+\\>") 0 'font-lock-reference-face t)))
 
 ;; replacement for `princ' that puts the text in the specified face,
 ;; if possible
 (defun Help-princ-face (object face)
   (cond ((bufferp standard-output)
-        (let ((opoint (point standard-output)))
-          (princ object)
-          (put-nonduplicable-text-property opoint (point standard-output)
-                                           'face face standard-output)))
-       ((markerp standard-output)
-        (let ((buf (marker-buffer standard-output))
-              (pos (marker-position standard-output)))
-          (princ object)
-          (put-nonduplicable-text-property
-           pos (marker-position standard-output) 'face face buf)))
-       (t princ object)))
+	 (let ((opoint (point standard-output)))
+	   (princ object)
+	   (put-nonduplicable-text-property opoint (point standard-output)
+					    'face face standard-output)))
+	((markerp standard-output)
+	 (let ((buf (marker-buffer standard-output))
+	       (pos (marker-position standard-output)))
+	   (princ object)
+	   (put-nonduplicable-text-property
+	    pos (marker-position standard-output) 'face face buf)))
+	(t princ object)))
 
 ;; replacement for `prin1' that puts the text in the specified face,
 ;; if possible
 (defun Help-prin1-face (object face)
   (cond ((bufferp standard-output)
-        (let ((opoint (point standard-output)))
-          (prin1 object)
-          (put-nonduplicable-text-property opoint (point standard-output)
-                                           'face face standard-output)))
-       ((markerp standard-output)
-        (let ((buf (marker-buffer standard-output))
-              (pos (marker-position standard-output)))
-          (prin1 object)
-          (put-nonduplicable-text-property
-           pos (marker-position standard-output) 'face face buf)))
-       (t prin1 object)))
+	 (let ((opoint (point standard-output)))
+	   (prin1 object)
+	   (put-nonduplicable-text-property opoint (point standard-output)
+					    'face face standard-output)))
+	((markerp standard-output)
+	 (let ((buf (marker-buffer standard-output))
+	       (pos (marker-position standard-output)))
+	   (prin1 object)
+	   (put-nonduplicable-text-property
+	    pos (marker-position standard-output) 'face face buf)))
+	(t prin1 object)))
 
 (defvar help-symbol-regexp
   (let ((sym-char "[+a-zA-Z0-9_:*]")
@@ -1185,7 +1163,7 @@
   ;; properties:
   ;; 1. mouse-face is 'highlight (so the extent gets highlighted on mouse over)
   ;; 2. help-symbol is the name of the symbol.
-  ;; 3. face is 'font-lock-reference-face.
+  ;; 3. face is 'hyper-apropos-hyperlink.
   ;; 4. context-menu is a list of context menu items, specific to whether
   ;;    the symbol is a function, variable, or both.
   ;; 5. activate-function will cause the function or variable to be described,
@@ -1207,7 +1185,7 @@
 	    (let ((ex (make-extent b e)))
 	      (set-extent-property ex 'mouse-face 'highlight)
 	      (set-extent-property ex 'help-symbol sym)
-	      (set-extent-property ex 'face 'font-lock-reference-face)
+	      (set-extent-property ex 'face 'hyper-apropos-hyperlink)
 	      (set-extent-property
 	       ex 'context-menu
 	       (cond ((and var fun)
@@ -1292,7 +1270,8 @@
     (if describe-function-show-arglist
 	(let ((arglist (function-arglist function)))
 	  (when arglist
-	    (Help-princ-face arglist 'font-lock-comment-face)
+	    (require 'hyper-apropos)
+	    (Help-princ-face arglist 'hyper-apropos-documentation)
 	    (terpri))))
     (terpri)
     (cond (kbd-macro-p
@@ -1434,7 +1413,7 @@
        (let ((print-escape-newlines t))
 	 (princ "`")
 	 ;; (Help-princ-face (symbol-name variable)
-	 ;;               'font-lock-variable-name-face) overkill
+	 ;;		  'font-lock-variable-name-face) overkill
 	 (princ (symbol-name variable))
 	 (princ "' is ")
 	 (while (variable-alias variable)
@@ -1457,9 +1436,11 @@
 	   (if file-name
 	       (princ (format "  -- loaded from \"%s\"\n" file-name))))
 	 (princ "\nValue: ")
-	 (if (not (boundp variable))
-	     (Help-princ-face "void\n" 'font-lock-comment-face)
-	   (Help-prin1-face (symbol-value variable) 'font-lock-comment-face)
+	 (require 'hyper-apropos)
+    	 (if (not (boundp variable))
+	     (Help-princ-face "void\n" 'hyper-apropos-documentation)
+	   (Help-prin1-face (symbol-value variable)
+			    'hyper-apropos-documentation)
 	   (terpri))
 	 (terpri)
 	 (cond ((local-variable-p variable (current-buffer))
diff --text -u 'xemacs-21.2.46/lisp/ldap.el' 'xemacs-21.5.0/lisp/ldap.el'
Index: ./lisp/ldap.el
--- ./lisp/ldap.el	Wed Mar 14 17:56:42 2001
+++ ./lisp/ldap.el	Fri Apr 13 18:11:24 2001
@@ -5,7 +5,7 @@
 ;; Author: Oscar Figueiredo <Oscar.Figueiredo@di.epfl.ch>
 ;; Maintainer: Oscar Figueiredo <Oscar.Figueiredo@di.epfl.ch>
 ;; Created: Jan 1998
-;; Version: $Revision: 1.7.2.11 $
+;; Version: $Revision: 1.11 $
 ;; Keywords: help comm
 
 ;; This file is part of XEmacs
diff --text -u 'xemacs-21.2.46/lisp/loaddefs.el' 'xemacs-21.5.0/lisp/loaddefs.el'
Index: ./lisp/loaddefs.el
--- ./lisp/loaddefs.el	Thu Oct 12 19:57:31 2000
+++ ./lisp/loaddefs.el	Fri Apr 13 03:21:30 2001
@@ -85,14 +85,15 @@
 ;; are ignored in completion,
 ;; making it more likely you will get a unique match.
 (setq completion-ignored-extensions
-	      ;; this is way way way bogus.
-	      ;; completely wtf?
-	      ;; the only things that should be here are those that are
-	      ;; (a) universally recognizable, and
-	      ;; (b) obvious backup files, or
-	      ;; (c) obvious binary files that are generated on a
-	      ;;     PER-SOURCE-FILE basis, so that they will actually
-	      ;;     cause annoyance.  This includes .exe files, e.g.
+      ;; this is way way way bogus.
+      ;; completely wtf?
+      ;; the only things that should be here are those that are
+      ;; (a) universally recognizable, and
+      ;; (b) obvious backup files, or
+      ;; (c) obvious binary files that are generated on a
+      ;;     PER-SOURCE-FILE basis, so that they will actually
+      ;;     cause annoyance.  This excludes executables (.exe, .com)
+      ;;     and libraries (.a, .lib, .dll).
 ;	      '(".o" ".elc" "~" ".bin" ".lbin" ".fasl"
 ;		".dvi" ".toc" ;".log"
 ;		".aux" ".a" ".ln"
@@ -100,7 +101,7 @@
 ;		".diff" ".oi" ".class")))
       '(".o" ".obj" ".elc" "~"
 	".bin" ".lbin" ;; #### these are doubtful, esp. the latter.
-	".dvi";; possibly doubtful, too.
+	".dvi" ;; possibly doubtful, too.
 	".class"))
 
 
diff --text -u 'xemacs-21.2.46/lisp/menubar-items.el' 'xemacs-21.5.0/lisp/menubar-items.el'
Index: ./lisp/menubar-items.el
--- ./lisp/menubar-items.el	Mon Mar 19 15:17:46 2001
+++ ./lisp/menubar-items.el	Fri Apr 13 03:21:30 2001
@@ -54,10 +54,12 @@
 
 ;;; Code:
 
-(defun menu-truncate-list (list n)
-  (if (<= (length list) n)
-      list
-    (butlast list (- (length list) n))))
+(defun Menubar-items-truncate-list (list n)
+  (mapcar #'(lambda (x)
+	      (if (<= (length x) 50) x (concat "..." (substring x -50))))
+	  (if (<= (length list) n)
+	      list
+	    (butlast list (- (length list) n)))))
 
 (defun submenu-generate-accelerator-spec (list &optional omit-chars-list)
   "Add auto-generated accelerator specifications to a submenu.
@@ -432,7 +434,7 @@
 		   (mapcar #'(lambda (string)
 			       (vector string
 				       (list 'grep string)))
-			   (menu-truncate-list grep-history 10)))))
+			   (Menubar-items-truncate-list grep-history 10)))))
 	     (append menu '("---") items))))
        ["%_Grep..." grep :active (fboundp 'grep)]
        ["%_Kill Grep" kill-compilation
@@ -540,7 +542,7 @@
 		   (mapcar #'(lambda (string)
 			       (vector string
 				       (list 'compile string)))
-			   (menu-truncate-list compile-history 10)))))
+			   (Menubar-items-truncate-list compile-history 10)))))
 	     (append menu '("---") items))))
        ["%_Compile..." compile :active (fboundp 'compile)]
        ["%_Repeat Compilation" recompile :active (fboundp 'recompile)]
diff --text -u /dev/null 'xemacs-21.5.0/lisp/mule/latin.el'
Index: ./lisp/mule/latin.el
--- ./lisp/mule/latin.el	Thu Jan  1 09:00:00 1970
+++ ./lisp/mule/latin.el	Fri Apr 13 03:21:45 2001
@@ -0,0 +1,248 @@
+;;; latin.el --- Support for Latin charsets.
+
+;; Copyright (C) 2001 Free Software Foundation, Inc.
+
+;; Author: Hrvoje Niksic <hniksic@xemacs.org>
+;; Maintainer: XEmacs Development Team
+;; Keywords: multilingual, European, dumped
+
+;; 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.
+
+;;; Commentary:
+
+;; This file is meant to provide support for Latin character sets.
+;; The place for that used to be `european.el', but I am hesitant to
+;; change that file, as it is full of old cruft that I hope to phase
+;; out.  Currently this file provides only the case table setup.
+
+
+;;; Code:
+
+;; Case table setup.  We set up all the case tables using
+;; put-case-table-pair.  The data for this comes from FSF Emacs 20.7
+;; (lisp/international/latin-*.el), written by several people and
+;; updated by Erik Naggum.
+
+(defun setup-case-pairs (charset pairs)
+  (let ((tbl (standard-case-table)))
+    (loop for (uc lc) in pairs do
+      (put-case-table-pair (make-char charset uc) (make-char charset lc) tbl))))
+
+;; Latin 1.
+
+(setup-case-pairs
+ 'latin-iso8859-1
+ '((192 224)				;latin letter a with grave
+   (193 225)				;latin letter a with acute
+   (194 226)				;latin letter a with circumflex
+   (195 227)				;latin letter a with tilde
+   (196 228)				;latin letter a with diaeresis
+   (197 229)				;latin letter a with ring above
+   (198 230)				;latin letter ae
+   (199 231)				;latin letter c with cedilla
+   (200 232)				;latin letter e with grave
+   (201 233)				;latin letter e with acute
+   (202 234)				;latin letter e with circumflex
+   (203 235)				;latin letter e with diaeresis
+   (204 236)				;latin letter i with grave
+   (205 237)				;latin letter i with acute
+   (206 238)				;latin letter i with circumflex
+   (207 239)				;latin letter i with diaeresis
+   (208 240)				;latin letter eth
+   (209 241)				;latin letter n with tilde
+   (210 242)				;latin letter o with grave
+   (211 243)				;latin letter o with acute
+   (212 244)				;latin letter o with circumflex
+   (213 245)				;latin letter o with tilde
+   (214 246)				;latin letter o with diaeresis
+   (216 248)				;latin letter o with stroke
+   (217 249)				;latin letter u with grave
+   (218 250)				;latin letter u with acute
+   (219 251)				;latin letter u with circumflex
+   (220 252)				;latin letter u with diaeresis
+   (221 253)				;latin letter y with acute
+   (222 254)				;latin letter thorn
+   ))
+
+;; Latin 2.
+
+(setup-case-pairs
+ 'latin-iso8859-2
+ '((161 177)				;latin letter a with ogonek
+   (163 179)				;latin letter l with stroke
+   (165 181)				;latin letter l with caron
+   (166 182)				;latin letter s with acute
+   (169 185)				;latin letter s with caron
+   (170 186)				;latin letter s with cedilla
+   (171 187)				;latin letter t with caron
+   (172 188)				;latin letter z with acute
+   (174 190)				;latin letter z with caron
+   (175 191)				;latin letter z with dot above
+   (192 224)				;latin letter r with acute
+   (193 225)				;latin letter a with acute
+   (194 226)				;latin letter a with circumflex
+   (195 227)				;latin letter a with breve
+   (196 228)				;latin letter a with diaeresis
+   (197 229)				;latin letter l with acute
+   (198 230)				;latin letter c with acute
+   (199 231)				;latin letter c with cedilla
+   (200 232)				;latin letter c with caron
+   (201 233)				;latin letter e with acute
+   (202 234)				;latin letter e with ogonek
+   (203 235)				;latin letter e with diaeresis
+   (204 236)				;latin letter e with caron
+   (205 237)				;latin letter i with acute
+   (206 238)				;latin letter i with circumflex
+   (207 239)				;latin letter d with caron
+   (208 240)				;latin letter d with stroke
+   (209 241)				;latin letter n with acute
+   (210 242)				;latin letter n with caron
+   (211 243)				;latin letter o with acute
+   (212 244)				;latin letter o with circumflex
+   (213 245)				;latin letter o with double acute
+   (214 246)				;latin letter o with diaeresis
+   (216 248)				;latin letter r with caron
+   (217 249)				;latin letter u with ring above
+   (218 250)				;latin letter u with acute
+   (219 251)				;latin letter u with double acute
+   (220 252)				;latin letter u with diaeresis
+   (221 253)				;latin letter y with acute
+   (222 254)				;latin letter t with cedilla
+   ))
+
+;; Latin 3.
+
+(setup-case-pairs
+ 'latin-iso8859-3
+ '((161 177)				;latin letter h with stroke
+   (166 182)				;latin letter h with circumflex
+   (170 186)				;latin letter s with cedilla
+   (171 187)				;latin letter g with breve
+   (172 188)				;latin letter j with circumflex
+   (175 191)				;latin letter z with dot above
+   (192 224)				;latin letter a with grave
+   (193 225)				;latin letter a with acute
+   (194 226)				;latin letter a with circumflex
+   (196 228)				;latin letter a with diaeresis
+   (197 229)				;latin letter c with dot above
+   (198 230)				;latin letter c with circumflex
+   (199 231)				;latin letter c with cedilla
+   (200 232)				;latin letter e with grave
+   (201 233)				;latin letter e with acute
+   (202 234)				;latin letter e with circumflex
+   (203 235)				;latin letter e with diaeresis
+   (204 236)				;latin letter i with grave
+   (205 237)				;latin letter i with acute
+   (206 238)				;latin letter i with circumflex
+   (207 239)				;latin letter i with diaeresis
+   (209 241)				;latin letter n with tilde
+   (210 242)				;latin letter o with grave
+   (211 243)				;latin letter o with acute
+   (212 244)				;latin letter o with circumflex
+   (213 245)				;latin letter g with dot above
+   (214 246)				;latin letter o with diaeresis
+   (216 248)				;latin letter g with circumflex
+   (217 249)				;latin letter u with grave
+   (218 250)				;latin letter u with acute
+   (219 251)				;latin letter u with circumflex
+   (220 252)				;latin letter u with diaeresis
+   (221 253)				;latin letter u with breve
+   (222 254)				;latin letter s with circumflex
+   ))
+
+;; Latin 4.
+
+(setup-case-pairs
+ 'latin-iso8859-4
+ '((161 177)				;latin letter a with ogonek
+   (163 179)				;latin letter r with cedilla
+   (165 181)				;latin letter i with tilde
+   (166 182)				;latin letter l with cedilla
+   (169 185)				;latin letter s with caron
+   (170 186)				;latin letter e with macron
+   (171 187)				;latin letter g with cedilla
+   (172 188)				;latin letter t with stroke
+   (174 190)				;latin letter z with caron
+   (189 191)				;eng
+   (192 224)				;latin letter a with macron
+   (193 225)				;latin letter a with acute
+   (194 226)				;latin letter a with circumflex
+   (195 227)				;latin letter a with tilde
+   (196 228)				;latin letter a with diaeresis
+   (197 229)				;latin letter a with ring above
+   (198 230)				;latin letter ae
+   (199 231)				;latin letter i with ogonek
+   (200 232)				;latin letter c with caron
+   (201 233)				;latin letter e with acute
+   (202 234)				;latin letter e with ogonek
+   (203 235)				;latin letter e with diaeresis
+   (204 236)				;latin letter e with dot above
+   (205 237)				;latin letter i with acute
+   (206 238)				;latin letter i with circumflex
+   (207 239)				;latin letter i with macron
+   (208 240)				;latin letter d with stroke
+   (209 241)				;latin letter n with cedilla
+   (210 242)				;latin letter o with macron
+   (211 243)				;latin letter k with cedilla
+   (212 244)				;latin letter o with circumflex
+   (213 245)				;latin letter o with tilde
+   (214 246)				;latin letter o with diaeresis
+   (216 248)				;latin letter o with stroke
+   (217 249)				;latin letter u with ogonek
+   (218 250)				;latin letter u with acute
+   (219 251)				;latin letter u with circumflex
+   (220 252)				;latin letter u with diaeresis
+   (221 253)				;latin letter u with tilde
+   (222 254)				;latin letter u with macron
+   ))
+
+;; Latin 5.  Currently unsupported.
+
+;(setup-case-pairs
+; 'latin-iso8859-5
+; '((192 224)				;latin letter a with grave
+;   (193 225)				;latin letter a with acute
+;   (194 226)				;latin letter a with circumflex
+;   (195 227)				;latin letter a with tilde
+;   (196 228)				;latin letter a with diaeresis
+;   (197 229)				;latin letter a with ring above
+;   (198 230)				;latin letter ae
+;   (199 231)				;latin letter c with cedilla
+;   (200 232)				;latin letter e with grave
+;   (201 233)				;latin letter e with acute
+;   (203 235)				;latin letter e with diaeresis
+;   (205 237)				;latin letter i with acute
+;   (206 238)				;latin letter i with circumflex
+;   (208 240)				;latin letter g with breve
+;   (209 241)				;latin letter n with tilde
+;   (210 242)				;latin letter o with grave
+;   (211 243)				;latin letter o with acute
+;   (212 244)				;latin letter o with circumflex
+;   (213 245)				;latin letter o with tilde
+;   (214 246)				;latin letter o with diaeresis
+;   (216 248)				;latin letter o with stroke
+;   (217 249)				;latin letter u with grave
+;   (218 250)				;latin letter u with acute
+;   (219 251)				;latin letter u with circumflex
+;   (220 252)				;latin letter u with diaeresis
+;   (222 254)				;latin letter s with cedilla
+;   ))
+
+;; This is our utility function; we don't want it in the dumped XEmacs.
+
+(fmakunbound 'setup-case-pairs)
diff --text -u 'xemacs-21.2.46/lisp/startup.el' 'xemacs-21.5.0/lisp/startup.el'
Index: ./lisp/startup.el
--- ./lisp/startup.el	Mon Mar 19 15:17:48 2001
+++ ./lisp/startup.el	Wed Apr 18 00:50:12 2001
@@ -794,11 +794,11 @@
   (if (not user-init-file)
       (setq user-init-file
 	    (find-user-init-file user-init-directory)))
+  (if (not custom-file)
+      (setq custom-file (make-custom-file-name user-init-file)))
   (if (and user-init-file
 	   (file-readable-p user-init-file))
       (load user-init-file t t t))
-  (if (not custom-file)
-      (setq custom-file (make-custom-file-name user-init-file)))
   (if (and custom-file
 	   (or (not user-init-file)
 	       (not (string= custom-file user-init-file)))
diff --text -u 'xemacs-21.2.46/lisp/win32-native.el' 'xemacs-21.5.0/lisp/win32-native.el'
Index: ./lisp/win32-native.el
--- ./lisp/win32-native.el	Wed Mar 14 17:57:01 2001
+++ ./lisp/win32-native.el	Fri Apr 13 03:21:39 2001
@@ -62,32 +62,6 @@
   '(("^\\(\\([a-zA-Z]:\\)?[^:( \t\n]+\\)[:( \t]+\\([0-9]+\\)[:) \t]" 1 3)))
 
 ;;----------------------------------------------------------------------
-;; Autosave hack
-;;--------------------
-
-;; Avoid creating auto-save file names containing invalid characters
-;; (primarily "*", eg. for the *mail* buffer).
-;; Avoid "doc lost for function" warning
-(defun original-make-auto-save-file-name (&optional junk)
-  "You do not want to call this."
-  )
-(fset 'original-make-auto-save-file-name
-      (symbol-function 'make-auto-save-file-name))
-
-(defun make-auto-save-file-name ()
-  "Return file name to use for auto-saves of current buffer.
-Does not consider `auto-save-visited-file-name' as that variable is checked
-before calling this function.  You can redefine this for customization.
-See also `auto-save-file-name-p'."
-  (let ((name (original-make-auto-save-file-name))
-	(start 0))
-    ;; destructively replace occurrences of * or ? with $
-    (while (string-match "[?*]" name start)
-      (aset name (match-beginning 0) ?$)
-      (setq start (1+ (match-end 0))))
-    name))
-
-;;----------------------------------------------------------------------
 ;; Quoting process args
 ;;--------------------
 
diff --text -u 'xemacs-21.2.46/lwlib/ChangeLog' 'xemacs-21.5.0/lwlib/ChangeLog'
Index: ./lwlib/ChangeLog
--- ./lwlib/ChangeLog	Wed Mar 21 16:12:38 2001
+++ ./lwlib/ChangeLog	Wed Apr 18 15:56:34 2001
@@ -1,6 +1,56 @@
+2001-04-18  Martin Buchholz  <martin@xemacs.org>
+
+	* XEmacs 21.5.0 "alfalfa" is released.
+
+2001-03-30  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* ChangeLog: Restore logs lost in the GTK merge.
+
 2001-03-21  Martin Buchholz <martin@xemacs.org>
 
 	* XEmacs 21.2.46 "Urania" is released.
+
+2001-03-15  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* xlwradio.c: Revert gratuitous whitespace changes from GTK merge.
+
+2001-02-23  Martin Buchholz <martin@xemacs.org>
+
+	* XEmacs 21.2.45 "Thelxepeia" is released.
+
+2001-02-16  Raymond Toy  <toy@rtp.ericsson.se>
+
+	* lwlib-Xaw.c: Always include ATHENA_AsciiText_h_ to get the
+	text-field widget.
+	(xaw_creation_table): Always include the text-field widget
+
+2001-02-08  Martin Buchholz <martin@xemacs.org>
+
+	* XEmacs 21.2.44 "Thalia" is released.
+
+2001-02-06  Martin Buchholz  <martin@xemacs.org>
+
+	* xlwgauge.c:
+	* xlwgcs.c:
+	* xlwgcs.c (XtAllocateGC): Fix typo for X11R4.
+	* xlwgcs.h:
+	* xlwradio.c (RadioExpose):
+	* xlwcheckbox.c:
+	Remove use of BSD-specific types.
+	s/u_(char|short|int_long)/unsigned $1/g
+
+2001-02-05  Martin Buchholz  <martin@xemacs.org>
+
+	* lwlib-Xm.c (xm_update_one_value):
+	Obey the man page; use XtFree instead of free.
+
+2001-02-02  Martin Buchholz  <martin@xemacs.org>
+
+	* config.h.in: Use "..." to include config.h
+
+2001-01-26  Martin Buchholz <martin@xemacs.org>
+
+	* XEmacs 21.2.43 "Terspichore" is released.
 
 2001-01-20  Martin Buchholz <martin@xemacs.org>
 
diff --text -u 'xemacs-21.2.46/man/ChangeLog' 'xemacs-21.5.0/man/ChangeLog'
Index: ./man/ChangeLog
--- ./man/ChangeLog	Wed Mar 21 16:12:38 2001
+++ ./man/ChangeLog	Wed Apr 18 15:56:31 2001
@@ -1,3 +1,22 @@
+2001-04-18  Martin Buchholz  <martin@xemacs.org>
+
+	* XEmacs 21.5.0 "alfalfa" is released.
+
+2001-03-30  Ben Wing  <ben@xemacs.org>
+
+	* internals\internals.texi:
+	* internals\internals.texi (Top):
+	* internals\internals.texi (Lucid Emacs):
+	* internals\internals.texi (XEmacs):
+	* internals\internals.texi (XEmacs From the Outside):
+	Bump version to 1.4 and fix this everywhere.  Document all
+	XEmacs releases up through 21.2.46.
+
+2001-03-16  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* lispref/postgresql.texi (libpq Lisp Symbols and DataTypes): Save
+	result of INSERT in R in pq-cmd-status example.
+
 2001-03-21  Martin Buchholz <martin@xemacs.org>
 
 	* XEmacs 21.2.46 "Urania" is released.
diff --text -u 'xemacs-21.2.46/man/info.texi' 'xemacs-21.5.0/man/info.texi'
Index: ./man/info.texi
Prereq:  1.4.2.6 
--- ./man/info.texi	Fri Dec  1 19:09:27 2000
+++ ./man/info.texi	Fri Apr 13 18:11:28 2001
@@ -3,7 +3,7 @@
 @setfilename ../info/info.info
 @settitle Info
 @comment %**end of header
-@comment $Id: info.texi,v 1.4.2.6 2000/11/29 08:27:28 stephent Exp $
+@comment $Id: info.texi,v 1.9 2001/04/13 09:11:28 michaels Exp $
 
 @dircategory Texinfo documentation system
 @direntry
diff --text -u 'xemacs-21.2.46/man/internals/internals.texi' 'xemacs-21.5.0/man/internals/internals.texi'
Index: ./man/internals/internals.texi
--- ./man/internals/internals.texi	Wed Mar 14 17:58:45 2001
+++ ./man/internals/internals.texi	Fri Apr 13 03:22:08 2001
@@ -63,7 +63,7 @@
 
 @titlepage
 @title XEmacs Internals Manual
-@subtitle Version 1.3, August 1999
+@subtitle Version 1.4, March 2001
 
 @author Ben Wing
 @author Martin Buchholz
@@ -74,14 +74,14 @@
 @vskip 0pt plus 1fill
 
 @noindent
-Copyright @copyright{} 1992 - 1996 Ben Wing. @*
+Copyright @copyright{} 1992 - 1996, 2001 Ben Wing. @*
 Copyright @copyright{} 1996, 1997 Sun Microsystems, Inc. @*
 Copyright @copyright{} 1994 - 1998 Free Software Foundation. @*
 Copyright @copyright{} 1994, 1995 Board of Trustees, University of Illinois.
 
 @sp 2
-Version 1.3 @*
-August 1999.@*
+Version 1.4 @*
+March 2001.@*
 
 Permission is granted to make and distribute verbatim copies of this
 manual provided the copyright notice and this permission notice are
@@ -105,7 +105,7 @@
 @node Top, A History of Emacs, (dir), (dir)
 
 @ifinfo
-This Info file contains v1.3 of the XEmacs Internals Manual, August 1999.
+This Info file contains v1.4 of the XEmacs Internals Manual, March 2001.
 @end ifinfo
 
 @menu
@@ -497,7 +497,7 @@
 and Eric Benson, and the work was later taken over by Jamie Zawinski,
 who became ``Mr. Lucid Emacs'' for many releases.
 
-  A time line for Lucid Emacs/XEmacs is
+  A time line for Lucid Emacs is
 
 @itemize @bullet
 @item
@@ -545,7 +545,39 @@
 @item
 version 20.3 (the first stable version of XEmacs 20.x) released November 30,
 1997.
+@item
 version 20.4 released February 28, 1998.
+@item
+version 21.1.2 released May 14, 1999. (The version naming scheme was
+changed at this point: [a] the second version number is odd for stable
+versions, even for beta versions; [b] a third version number is added,
+replacing the "beta xxx" ending for beta versions and allowing for
+periodic maintenance releases for stable versions.  Therefore, 21.0 was
+never "officially" released; similarly for 21.2, etc.)
+@item
+version 21.1.3 released June 26, 1999.
+@item
+version 21.1.4 released July 8, 1999.
+@item
+version 21.1.6 released August 14, 1999. (There was no 21.1.5.)
+@item
+version 21.1.7 released September 26, 1999.
+@item
+version 21.1.8 released November 2, 1999.
+@item
+version 21.1.9 released February 13, 2000.
+@item
+version 21.1.10 released May 7, 2000.
+@item
+version 21.1.10a released June 24, 2000.
+@item
+version 21.1.11 released July 18, 2000.
+@item
+version 21.1.12 released August 5, 2000.
+@item
+version 21.1.13 released January 7, 2001.
+@item
+version 21.1.14 released January 27, 2001.
 @end itemize
 
 @node GNU Emacs 19
@@ -723,6 +755,157 @@
 have consistently failed.
 
   A more detailed history is contained in the XEmacs About page.
+
+  A time line for XEmacs is
+
+@itemize @bullet
+@item
+version 19.11 (first XEmacs) released September 13, 1994.
+@item
+version 19.12 released June 23, 1995.
+@item
+version 19.13 released September 1, 1995.
+@item
+version 19.14 released June 23, 1996.
+@item
+version 20.0 released February 9, 1997.
+@item
+version 19.15 released March 28, 1997.
+@item
+version 20.1 (not released to the net) April 15, 1997.
+@item
+version 20.2 released May 16, 1997.
+@item
+version 19.16 released October 31, 1997.
+@item
+version 20.3 (the first stable version of XEmacs 20.x) released November 30,
+1997.
+@item
+version 20.4 released February 28, 1998.
+@item
+version 21.0.60 released December 10, 1998. (The version naming scheme was
+changed at this point: [a] the second version number is odd for stable
+versions, even for beta versions; [b] a third version number is added,
+replacing the "beta xxx" ending for beta versions and allowing for
+periodic maintenance releases for stable versions.  Therefore, 21.0 was
+never "officially" released; similarly for 21.2, etc.)
+@item
+version 21.0.61 released January 4, 1999.
+@item
+version 21.0.63 released February 3, 1999.
+@item
+version 21.0.64 released March 1, 1999.
+@item
+version 21.0.65 released March 5, 1999.
+@item
+version 21.0.66 released March 12, 1999.
+@item
+version 21.0.67 released March 25, 1999.
+@item
+version 21.1.2 released May 14, 1999. (This is the followup to 21.0.67.
+The second version number was bumped to indicate the beginning of the
+"stable" series.)
+@item
+version 21.1.3 released June 26, 1999.
+@item
+version 21.1.4 released July 8, 1999.
+@item
+version 21.1.6 released August 14, 1999. (There was no 21.1.5.)
+@item
+version 21.1.7 released September 26, 1999.
+@item
+version 21.1.8 released November 2, 1999.
+@item
+version 21.1.9 released February 13, 2000.
+@item
+version 21.1.10 released May 7, 2000.
+@item
+version 21.1.10a released June 24, 2000.
+@item
+version 21.1.11 released July 18, 2000.
+@item
+version 21.1.12 released August 5, 2000.
+@item
+version 21.1.13 released January 7, 2001.
+@item
+version 21.1.14 released January 27, 2001.
+@item
+version 21.2.9 released February 3, 1999.
+@item
+version 21.2.10 released February 5, 1999.
+@item
+version 21.2.11 released March 1, 1999.
+@item
+version 21.2.12 released March 5, 1999.
+@item
+version 21.2.13 released March 12, 1999.
+@item
+version 21.2.14 released May 14, 1999.
+@item
+version 21.2.15 released June 4, 1999.
+@item
+version 21.2.16 released June 11, 1999.
+@item
+version 21.2.17 released June 22, 1999.
+@item
+version 21.2.18 released July 14, 1999.
+@item
+version 21.2.19 released July 30, 1999.
+@item
+version 21.2.20 released November 10, 1999.
+@item
+version 21.2.21 released November 28, 1999.
+@item
+version 21.2.22 released November 29, 1999.
+@item
+version 21.2.23 released December 7, 1999.
+@item
+version 21.2.24 released December 14, 1999.
+@item
+version 21.2.25 released December 24, 1999.
+@item
+version 21.2.26 released December 31, 1999.
+@item
+version 21.2.27 released January 18, 2000.
+@item
+version 21.2.28 released February 7, 2000.
+@item
+version 21.2.29 released February 16, 2000.
+@item
+version 21.2.30 released February 21, 2000.
+@item
+version 21.2.31 released February 23, 2000.
+@item
+version 21.2.32 released March 20, 2000.
+@item
+version 21.2.33 released May 1, 2000.
+@item
+version 21.2.34 released May 28, 2000.
+@item
+version 21.2.35 released July 19, 2000.
+@item
+version 21.2.36 released October 4, 2000.
+@item
+version 21.2.37 released November 14, 2000.
+@item
+version 21.2.38 released December 5, 2000.
+@item
+version 21.2.39 released December 31, 2000.
+@item
+version 21.2.40 released January 8, 2001.
+@item
+version 21.2.41 released January 17, 2001.
+@item
+version 21.2.42 released January 20, 2001.
+@item
+version 21.2.43 released January 26, 2001.
+@item
+version 21.2.44 released February 8, 2001.
+@item
+version 21.2.45 released February 23, 2001.
+@item
+version 21.2.46 released March 21, 2001.
+@end itemize
 
 @node XEmacs From the Outside, The Lisp Language, A History of Emacs, Top
 @chapter XEmacs From the Outside
diff --text -u 'xemacs-21.2.46/man/lispref/postgresql.texi' 'xemacs-21.5.0/man/lispref/postgresql.texi'
Index: ./man/lispref/postgresql.texi
--- ./man/lispref/postgresql.texi	Wed Nov  8 00:17:35 2000
+++ ./man/lispref/postgresql.texi	Fri Apr 13 03:22:19 2001
@@ -521,8 +521,8 @@
 @var{result} is a PGresult object.
 @example
 @comment This example was written on day 3 of the 2000 Haru Basho.
-(pq-exec P "INSERT INTO xemacs_test
-            VALUES (6, 'Wakanohana', 'Yokozuna');")
+(setq R (pq-exec P "INSERT INTO xemacs_test
+                   VALUES (6, 'Wakanohana', 'Yokozuna');"))
      @result{} #<PGresult PGRES_COMMAND_OK[1] - INSERT 542086 1>
 (pq-cmd-status R)
      @result{} "INSERT 542086 1"
diff --text -u 'xemacs-21.2.46/man/texinfo.texi' 'xemacs-21.5.0/man/texinfo.texi'
Index: ./man/texinfo.texi
Prereq:  1.8.2.7 
--- ./man/texinfo.texi	Thu Jan 11 11:50:32 2001
+++ ./man/texinfo.texi	Fri Apr 13 18:11:29 2001
@@ -1,5 +1,5 @@
 \input texinfo.tex    @c -*-texinfo-*-
-@c $Id: texinfo.texi,v 1.8.2.7 2001/01/09 20:52:53 adrian Exp $
+@c $Id: texinfo.texi,v 1.15 2001/04/13 09:11:29 michaels Exp $
 @c %**start of header
 
 @c All text is ignored before the setfilename.
diff --text -u 'xemacs-21.2.46/man/xemacs-faq.texi' 'xemacs-21.5.0/man/xemacs-faq.texi'
Index: ./man/xemacs-faq.texi
--- ./man/xemacs-faq.texi	Wed Mar 14 17:58:34 2001
+++ ./man/xemacs-faq.texi	Fri Apr 13 18:11:32 2001
@@ -7,7 +7,7 @@
 @finalout
 @titlepage
 @title XEmacs FAQ
-@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2001/03/08 08:19:10 $
+@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2001/04/13 09:11:32 $
 @sp 1
 @author Tony Rossini <rossini@@biostat.washington.edu>
 @author Ben Wing <ben@@xemacs.org>
diff --text -u 'xemacs-21.2.46/netinstall/ChangeLog' 'xemacs-21.5.0/netinstall/ChangeLog'
Index: ./netinstall/ChangeLog
--- ./netinstall/ChangeLog	Wed Mar 21 16:12:39 2001
+++ ./netinstall/ChangeLog	Wed Apr 18 15:56:27 2001
@@ -1,3 +1,7 @@
+2001-04-18  Martin Buchholz  <martin@xemacs.org>
+
+	* XEmacs 21.5.0 "alfalfa" is released.
+
 2001-03-21  Martin Buchholz <martin@xemacs.org>
 
 	* XEmacs 21.2.46 "Urania" is released.
diff --text -u 'xemacs-21.2.46/netinstall/msg.cc' 'xemacs-21.5.0/netinstall/msg.cc'
Index: ./netinstall/msg.cc
Prereq:  1.1.2.1 
--- ./netinstall/msg.cc	Tue Dec 12 07:01:36 2000
+++ ./netinstall/msg.cc	Fri Apr 13 18:11:35 2001
@@ -16,7 +16,7 @@
 /* The purpose of this file is to centralize all the message
    functions. */
 
-static char *cvsid = "\n%%% $Id: msg.cc,v 1.1.2.1 2000/12/11 22:01:36 andyp Exp $\n";
+static char *cvsid = "\n%%% $Id: msg.cc,v 1.3 2001/04/13 09:11:35 michaels Exp $\n";
 
 #include "win32.h"
 #include <stdio.h>
diff --text -u 'xemacs-21.2.46/netinstall/nio-ie5.cc' 'xemacs-21.5.0/netinstall/nio-ie5.cc'
Index: ./netinstall/nio-ie5.cc
Prereq:  1.1.2.1 
--- ./netinstall/nio-ie5.cc	Tue Dec 12 07:01:41 2000
+++ ./netinstall/nio-ie5.cc	Fri Apr 13 18:11:35 2001
@@ -18,7 +18,7 @@
    must already have installed and configured IE5.  This module is
    called from netio.cc, which is called from geturl.cc */
 
-static char *cvsid = "\n%%% $Id: nio-ie5.cc,v 1.1.2.1 2000/12/11 22:01:41 andyp Exp $\n";
+static char *cvsid = "\n%%% $Id: nio-ie5.cc,v 1.3 2001/04/13 09:11:35 michaels Exp $\n";
 
 #include "win32.h"
 
diff --text -u 'xemacs-21.2.46/netinstall/res.rc' 'xemacs-21.5.0/netinstall/res.rc'
Index: ./netinstall/res.rc
Prereq:  1.1.2.6 
--- ./netinstall/res.rc	Wed Mar 14 17:59:02 2001
+++ ./netinstall/res.rc	Fri Apr 13 18:11:35 2001
@@ -478,7 +478,7 @@
     IDS_ERR_OPEN_READ       "Can't open %s for reading: %s"
     IDS_ROOT_ABSOLUTE       "The install directory must be absolute, with both a drive letter and leading slash, like C:\\Cygwin"
     IDS_DOWNLOAD_COMPLETE   "Download Complete"
-    IDS_CVSID               "\n%%% $Id: res.rc,v 1.1.2.6 2001/03/09 04:13:05 wmperry Exp $\n"
+    IDS_CVSID               "\n%%% $Id: res.rc,v 1.3 2001/04/13 09:11:35 michaels Exp $\n"
     IDS_NOLOGFILE           "Cannot open log file %s for writing"
     IDS_UNINSTALL_COMPLETE  "Uninstalls complete."
     IDS_WININET             "Unable to find or load the Internet Explorer 5 DLLs"
diff --text -u 'xemacs-21.2.46/nt/ChangeLog' 'xemacs-21.5.0/nt/ChangeLog'
Index: ./nt/ChangeLog
--- ./nt/ChangeLog	Wed Mar 21 16:12:38 2001
+++ ./nt/ChangeLog	Wed Apr 18 15:56:22 2001
@@ -1,3 +1,11 @@
+2001-04-18  Martin Buchholz  <martin@xemacs.org>
+
+	* XEmacs 21.5.0 "alfalfa" is released.
+
+2001-03-14  Craig Lanning  <CraigL@Knology.net>
+
+	* minitar.c: Clean up some compiler warnings.
+
 2001-03-21  Martin Buchholz <martin@xemacs.org>
 
 	* XEmacs 21.2.46 "Urania" is released.
diff --text -u 'xemacs-21.2.46/nt/minitar.c' 'xemacs-21.5.0/nt/minitar.c'
Index: ./nt/minitar.c
--- ./nt/minitar.c	Wed Jan 19 06:01:56 2000
+++ ./nt/minitar.c	Fri Apr 13 03:22:59 2001
@@ -14,9 +14,12 @@
 
 #include <stdio.h>
 #include <errno.h>
+#include <string.h>
+#include <io.h>
 
 #include <zlib.h>
 
+static int
 Usage(char *name)
 {
   fprintf(stderr,"Usage: %s file.tar.gz [base-dir]\n",name);
@@ -28,7 +31,8 @@
 #define BLOCKSIZE 512
 #define MAXNAMELEN 1024
 
-int octal(char *str)
+static int
+octal(char *str)
 {
   int ret = -1;
   sscanf(str,"%o",&ret);
@@ -39,7 +43,8 @@
    the final component is assumed to be a file, rather than a
    path component, so it is not created as a directory */
 
-int makepath(char *path)
+static int
+makepath(char *path)
 {
   char tmp[MAXNAMELEN];
   char *cp;
@@ -53,7 +58,11 @@
     tmp[cp-path] = '\0';
     if (strlen(tmp) == 0)
       continue;
+#ifdef WIN32_NATIVE
+    if (mkdir(tmp)){
+#else
     if (mkdir(tmp,0777)){
+#endif
       if (errno == EEXIST)
 	continue;
       else
@@ -66,12 +75,12 @@
   
 		     
 
+int
 main(int argc, char **argv)
 {
   char fullname[MAXNAMELEN];
   char *basedir = ".";
   char *tarfile;
-  char *cp;
   int size;
   char osize[13];
   char name[101];
diff --text -u 'xemacs-21.2.46/src/ChangeLog' 'xemacs-21.5.0/src/ChangeLog'
Index: ./src/ChangeLog
--- ./src/ChangeLog	Wed Mar 21 16:12:38 2001
+++ ./src/ChangeLog	Wed Apr 18 15:56:14 2001
@@ -1,3 +1,65 @@
+2001-04-18  Martin Buchholz  <martin@xemacs.org>
+
+	* XEmacs 21.5.0 "alfalfa" is released.
+
+2001-03-31  Mike Sperber <mike@xemacs.org>
+
+	* search.c (Freplace_match): [Again] support FSF-style
+	specification of match subexpression when applied to a buffer.
+
+2001-04-07  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+	* extents.c (Fset_extent_endpoints): Force creation of extent info
+	in buffer_or_string.
+
+2001-04-07  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+	* extents.c (process_extents_for_insertion_mapper): Correctly
+	check for open-open zero-length extents.
+
+2001-04-02  Jan Vroonhof  <jan@xemacs.org>
+
+	* redisplay.c (add_bufbyte_string_runes): Update data->bytepos
+
+2001-04-03  Mike Sperber <mike@xemacs.org>
+
+	* search.c: Revert previous patch due because of release.
+
+2001-03-30  Ben Wing  <ben@xemacs.org>
+
+	* s\cygwin32.h:
+	Add missing killpg prototype.
+
+	* elhash.c:
+	Add a comment about fixing problems when a new entry is added
+	while mapping.
+
+	* frame-msw.c (mswindows_init_frame_1):
+	Fix compile warnings.
+
+	* menubar.c (vars_of_menubar):
+	Provide `menu-accelerator-support' to indicate that we properly
+	support %_ in menu specifications, so that package code can
+	conditionalize on this (and remove %_ from menu specifications
+	on older versions).
+
+	* event-msw.c:
+	* scrollbar-msw.c:
+	* scrollbar-msw.c (can_scroll):
+	* scrollbar-msw.h:
+	Fix handling of mouse wheel under Windows to follow standards --
+	now scrolls window under pointer, not selected window.
+
+2001-03-31  Mike Sperber <mike@xemacs.org>
+
+	* search.c (Freplace_match): Support FSF-style specification of
+	match subexpression when applied to a buffer.
+
+2001-03-15  Martin Buchholz  <martin@xemacs.org>
+
+	* keymap.c (Fmap_keymap): map-keymap explicitly allows a mapping
+	function to modify KEYMAP, so map over a copy of the hash table.
+
 2001-03-21  Martin Buchholz <martin@xemacs.org>
 
 	* XEmacs 21.2.46 "Urania" is released.
diff --text -u 'xemacs-21.2.46/src/elhash.c' 'xemacs-21.5.0/src/elhash.c'
Index: ./src/elhash.c
--- ./src/elhash.c	Wed Mar 14 17:59:55 2001
+++ ./src/elhash.c	Fri Apr 13 03:23:36 2001
@@ -1201,6 +1201,19 @@
   return Qnil;
 }
 
+/* #### If the Lisp function being called does a puthash and this
+   #### causes the hash table to be resized, the results will be quite
+   #### random and we will likely crash.  To fix this, either set a
+   #### flag in the hash table while we're mapping and signal an error
+   #### when new entries are added, or fix things to make this
+   #### operation work properly, like this: Store two hash tables in
+   #### each hash table object -- the second one is written to when
+   #### you do a puthash inside of a mapping operation, and the
+   #### various operations need to check both hash tables for entries.
+   #### As soon as the last maphash over a particular hash table
+   #### object terminates, the entries in the second table are added
+   #### to the first (using an unwind-protect). --ben */
+
 /* Map *C* function FUNCTION over the elements of a lisp hash table. */
 void
 elisp_maphash (maphash_function_t function,
diff --text -u 'xemacs-21.2.46/src/event-gtk.c' 'xemacs-21.5.0/src/event-gtk.c'
Index: ./src/event-gtk.c
--- ./src/event-gtk.c	Fri Mar  9 13:13:14 2001
+++ ./src/event-gtk.c	Fri Apr 13 03:23:40 2001
@@ -1727,6 +1727,7 @@
   dispatch_event_queue = Qnil;
   staticpro (&dispatch_event_queue);
   dispatch_event_queue_tail = Qnil;
+  staticpro (&dispatch_event_queue_tail);
 
   DEFVAR_BOOL ("gtk-allow-sendevents", &gtk_allow_sendevents /*
 *Non-nil means to allow synthetic events.  Nil means they are ignored.
diff --text -u 'xemacs-21.2.46/src/event-msw.c' 'xemacs-21.5.0/src/event-msw.c'
Index: ./src/event-msw.c
--- ./src/event-msw.c	Wed Mar 14 18:00:12 2001
+++ ./src/event-msw.c	Fri Apr 13 03:23:41 2001
@@ -2745,7 +2745,9 @@
 	int delta = (short) HIWORD (wParam); /* Wheel rotation amount */
 	struct gcpro gcpro1, gcpro2;
 
-	if (mswindows_handle_mousewheel_event (mswindows_find_frame (hwnd), keys,  delta))
+	if (mswindows_handle_mousewheel_event (mswindows_find_frame (hwnd),
+					       keys, delta,
+					       MAKEPOINTS (lParam)))
 	  {
 	    GCPRO2 (emacs_event, fobj);
 	    mswindows_pump_outstanding_events ();	/* Can GC */
diff --text -u 'xemacs-21.2.46/src/extents.c' 'xemacs-21.5.0/src/extents.c'
Index: ./src/extents.c
--- ./src/extents.c	Sun Jan 28 17:44:05 2001
+++ ./src/extents.c	Fri Apr 13 18:11:41 2001
@@ -3843,6 +3843,7 @@
   get_buffer_or_string_range_byte (buffer_or_string, start, end, &s, &e,
 				   GB_ALLOW_PAST_ACCESSIBLE);
 
+  buffer_or_string_extent_info_force (buffer_or_string);
   set_extent_endpoints (ext, s, e, buffer_or_string);
   return extent;
 }
@@ -4574,27 +4575,36 @@
 #endif
 
   /* The extent-adjustment code adjusted the extent's endpoints as if
-     they were markers -- endpoints at the gap (i.e. the insertion
-     point) go to the left of the insertion point, which is correct
-     for [) extents.  We need to fix the other kinds of extents.
-
-     Note that both conditions below will hold for zero-length (]
-     extents at the gap.  Zero-length () extents would get adjusted
-     such that their start is greater than their end; we treat them
-     as [) extents.  This is unfortunately an inelegant part of the
-     extent model, but there is no way around it. */
+     all extents were closed-open -- endpoints at the insertion point
+     remain unchanged.  We need to fix the other kinds of extents:
+
+     1. Start position of start-open extents needs to be moved.
+
+     2. End position of end-closed extents needs to be moved.
+
+     Note that both conditions hold for zero-length (] extents at the
+     insertion point.  But under these rules, zero-length () extents
+     would get adjusted such that their start is greater than their
+     end; instead of allowing that, we treat them as [) extents by
+     modifying condition #1 to not fire nothing when dealing with a
+     zero-length open-open extent.
+
+     Existence of zero-length open-open extents is unfortunately an
+     inelegant part of the extent model, but there is no way around
+     it. */
 
   {
-    Memind new_start, new_end;
+    Memind new_start = extent_start (extent);
+    Memind new_end   = extent_end (extent);
 
-    new_start = extent_start (extent);
-    new_end = extent_end (extent);
-    if (indice == extent_start (extent) && extent_start_open_p (extent) &&
-	/* coerce zero-length () extents to [) */
-	new_start != new_end)
+    if (indice == extent_start (extent) && extent_start_open_p (extent)
+	/* zero-length () extents are exempt; see comment above. */
+	&& !(new_start == new_end && extent_end_open_p (extent))
+	)
       new_start += closure->length;
     if (indice == extent_end (extent) && !extent_end_open_p (extent))
       new_end += closure->length;
+
     set_extent_endpoints_1 (extent, new_start, new_end);
   }
 
diff --text -u 'xemacs-21.2.46/src/frame-msw.c' 'xemacs-21.5.0/src/frame-msw.c'
Index: ./src/frame-msw.c
--- ./src/frame-msw.c	Wed Sep 20 11:57:27 2000
+++ ./src/frame-msw.c	Fri Apr 13 03:23:46 2001
@@ -199,10 +199,9 @@
 
   hwnd = CreateWindowEx (exstyle,
 			 XEMACS_CLASS,
-			 STRINGP(f->name) ? XSTRING_DATA(f->name) :
-			 (STRINGP(name) ?
-			  (const Extbyte*)XSTRING_DATA(name) :
-			  (const Extbyte*)XEMACS_CLASS),
+			 STRINGP (f->name) ? (LPCTSTR) XSTRING_DATA (f->name) :
+			 (STRINGP (name) ? (LPCTSTR) XSTRING_DATA (name) :
+			  XEMACS_CLASS),
 			 style,
 			 rect_default.left, rect_default.top,
 			 rect_default.width, rect_default.height,
diff --text -u 'xemacs-21.2.46/src/keymap.c' 'xemacs-21.5.0/src/keymap.c'
Index: ./src/keymap.c
--- ./src/keymap.c	Wed Mar 14 18:00:42 2001
+++ ./src/keymap.c	Fri Apr 13 03:23:57 2001
@@ -2990,7 +2990,8 @@
      (function, keymap, sort_first))
 {
   /* This function can GC */
-  struct gcpro gcpro1, gcpro2;
+  struct gcpro gcpro1, gcpro2, gcpro3;
+  Lisp_Object table = Qnil;
 
  /* tolerate obviously transposed args */
   if (!NILP (Fkeymapp (function)))
@@ -2999,9 +3000,17 @@
       function = keymap;
       keymap = tmp;
     }
-  GCPRO2 (function, keymap);
+
+  GCPRO3 (function, keymap, table);
   keymap = get_keymap (keymap, 1, 1);
-  map_keymap (XKEYMAP (keymap)->table, !NILP (sort_first),
+
+  /* elisp_maphash does not allow mapping functions to modify the hash
+     table being mapped over.  Since map-keymap explicitly allows a
+     mapping function to modify KEYMAP, we map over a copy of the hash
+     table instead.  */
+  table = Fcopy_hash_table (XKEYMAP (keymap)->table);
+
+  map_keymap (table, !NILP (sort_first),
 	      map_keymap_mapper, LISP_TO_VOID (function));
   UNGCPRO;
   return Qnil;
diff --text -u 'xemacs-21.2.46/src/menubar.c' 'xemacs-21.5.0/src/menubar.c'
Index: ./src/menubar.c
--- ./src/menubar.c	Sun Jan  7 23:50:07 2001
+++ ./src/menubar.c	Fri Apr 13 03:24:02 2001
@@ -723,6 +723,7 @@
 */ );
 
   Fprovide (intern ("menubar"));
+  Fprovide (intern ("menu-accelerator-support"));
 }
 
 void
diff --text -u 'xemacs-21.2.46/src/redisplay.c' 'xemacs-21.5.0/src/redisplay.c'
Index: ./src/redisplay.c
--- ./src/redisplay.c	Wed Mar 14 18:01:04 2001
+++ ./src/redisplay.c	Fri Apr 13 03:24:14 2001
@@ -972,6 +972,8 @@
 
   for (pos = c_string; pos < end;)
     {
+      Bufbyte *old_pos = pos;
+
       data->ch = charptr_emchar (pos);
 
       prop = add_emchar_rune (data);
@@ -997,6 +999,9 @@
 	}
       INC_CHARPTR (pos);
       assert (pos <= end);
+      /* #### Duplicate code from add_string_to_fstring_db_runes
+	 should we do more?*/
+      data->bytepos += pos - old_pos;
     }
 
   return NULL;
diff --text -u 'xemacs-21.2.46/src/s/cygwin32.h' 'xemacs-21.5.0/src/s/cygwin32.h'
Index: ./src/s/cygwin32.h
--- ./src/s/cygwin32.h	Thu Nov 23 18:17:57 2000
+++ ./src/s/cygwin32.h	Fri Apr 13 03:24:42 2001
@@ -113,7 +113,8 @@
 # endif /* CYGWIN_VERSION_DLL_MAJOR <= 20 */
 
 /* Still left out of 1.1! */
-double	logb (double);
+double logb (double);
+int killpg (int pgrp, int sig);
 
 #endif
 
diff --text -u 'xemacs-21.2.46/src/scrollbar-msw.c' 'xemacs-21.5.0/src/scrollbar-msw.c'
Index: ./src/scrollbar-msw.c
--- ./src/scrollbar-msw.c	Wed Sep 20 11:58:46 2000
+++ ./src/scrollbar-msw.c	Fri Apr 13 03:24:17 2001
@@ -266,7 +266,7 @@
 }
 
 static int
-can_scroll(struct scrollbar_instance* scrollbar)
+can_scroll (struct scrollbar_instance* scrollbar)
 {
   return scrollbar != NULL
 	&& IsWindowVisible (SCROLLBAR_MSW_HANDLE (scrollbar))
@@ -274,15 +274,48 @@
 }
 
 int
-mswindows_handle_mousewheel_event (Lisp_Object frame, int keys, int delta)
+mswindows_handle_mousewheel_event (Lisp_Object frame, int keys, int delta,
+				   POINTS where)
 {
   int hasVertBar, hasHorzBar;	/* Indicates presence of scroll bars */
   unsigned wheelScrollLines = 0; /* Number of lines per wheel notch */
+  Lisp_Object win;
+  struct window_mirror *mirror;
+  POINT donde_esta;
 
-  /* Find the currently selected window */
-  Lisp_Object win = FRAME_SELECTED_WINDOW (XFRAME (frame));
-  struct window* w = XWINDOW (win);
-  struct window_mirror* mirror = find_window_mirror (w);
+  donde_esta.x = where.x;
+  donde_esta.y = where.y;
+
+  ScreenToClient (FRAME_MSWINDOWS_HANDLE (XFRAME (frame)), &donde_esta);
+
+  /* Find the window to scroll */
+  {
+    int mene, _mene, tekel, upharsin;
+    Bufpos mens, sana;
+    Charcount in;
+    Lisp_Object corpore, sano;
+    struct window *needle_in_haystack;
+
+    // stderr_out ("donde_esta: %d %d\n", donde_esta.x, donde_esta.y);
+    pixel_to_glyph_translation (XFRAME (frame), donde_esta.x, donde_esta.y,
+				&mene, &_mene, &tekel, &upharsin,
+				&needle_in_haystack,
+				&mens, &sana, &in, &corpore, &sano);
+
+    if (needle_in_haystack)
+      {
+	XSETWINDOW (win, needle_in_haystack);
+	// stderr_out ("found needle\n");
+	// debug_print (win);
+      }
+    else
+      {
+	win = FRAME_SELECTED_WINDOW (XFRAME (frame));
+	needle_in_haystack = XWINDOW (win);
+      }
+
+    mirror = find_window_mirror (needle_in_haystack);
+  }
 
   /* Check that there is something to scroll */
   hasVertBar = can_scroll (mirror->scrollbar_vertical_instance);
diff --text -u 'xemacs-21.2.46/src/scrollbar-msw.h' 'xemacs-21.5.0/src/scrollbar-msw.h'
Index: ./src/scrollbar-msw.h
--- ./src/scrollbar-msw.h	Sat Jan 22 22:24:50 2000
+++ ./src/scrollbar-msw.h	Fri Apr 13 03:24:17 2001
@@ -57,7 +57,8 @@
      */
 
 void mswindows_handle_scrollbar_event (HWND hwnd, int code, int pos);
-int mswindows_handle_mousewheel_event (Lisp_Object frame, int keys, int delta);
+int mswindows_handle_mousewheel_event (Lisp_Object frame, int keys, int delta,
+				       POINTS where);
 
 #endif /* HAVE_MS_WINDOWS and HAVE_SCROLLBARS */
 #endif /* INCLUDED_scrollbar_msw_h_ */
diff --text -u 'xemacs-21.2.46/src/search.c' 'xemacs-21.5.0/src/search.c'
Index: ./src/search.c
--- ./src/search.c	Wed Mar 14 18:01:08 2001
+++ ./src/search.c	Sat Apr 14 00:04:40 2001
@@ -2245,6 +2245,11 @@
 defaults to the current buffer.  When fourth argument is not a string,
 the buffer that the match occurred in has automatically been remembered
 and you do not need to specify it.
+
+When fourth argument is nil, STRBUFFER specifies a subexpression of
+the match.  It says to replace just that subexpression instead of the
+whole match.  This is useful only after a regular expression search or
+match since only regular expressions have distinguished subexpressions.
 */
        (replacement, fixedcase, literal, string, strbuffer))
 {
@@ -2264,6 +2269,7 @@
   Lisp_Object buffer;
   int_dynarr *ul_action_dynarr = 0;
   int_dynarr *ul_pos_dynarr = 0;
+  int sub;
   int speccount;
 
   CHECK_STRING (replacement);
@@ -2284,6 +2290,15 @@
     }
   else
     {
+      if (NILP (strbuffer))
+	sub = 0;
+      else
+	{
+	  CHECK_INT (strbuffer);
+	  sub = XINT (strbuffer);
+	  if (sub < 0 || sub >= (int) search_regs.num_regs)
+	    args_out_of_range (strbuffer, make_int (search_regs.num_regs));
+	}
       if (!BUFFERP (last_thing_searched))
 	error ("last thing matched was not a buffer");
       buffer = last_thing_searched;
@@ -2300,11 +2315,11 @@
 
   if (NILP (string))
     {
-      if (search_regs.start[0] < BUF_BEGV (buf)
-	  || search_regs.start[0] > search_regs.end[0]
-	  || search_regs.end[0] > BUF_ZV (buf))
-	args_out_of_range (make_int (search_regs.start[0]),
-			   make_int (search_regs.end[0]));
+      if (search_regs.start[sub] < BUF_BEGV (buf)
+	  || search_regs.start[sub] > search_regs.end[sub]
+	  || search_regs.end[sub] > BUF_ZV (buf))
+	args_out_of_range (make_int (search_regs.start[sub]),
+			   make_int (search_regs.end[sub]));
     }
   else
     {
diff --text -u 'xemacs-21.2.46/tests/ChangeLog' 'xemacs-21.5.0/tests/ChangeLog'
Index: ./tests/ChangeLog
--- ./tests/ChangeLog	Wed Mar 21 16:12:39 2001
+++ ./tests/ChangeLog	Wed Apr 18 15:56:05 2001
@@ -1,3 +1,12 @@
+2001-04-18  Martin Buchholz  <martin@xemacs.org>
+
+	* XEmacs 21.5.0 "alfalfa" is released.
+
+2001-03-23  Martin Buchholz  <martin@xemacs.org>
+
+	* automated/lisp-tests.el:
+	Add test for mis-byte-compilation of (- 0 x).
+
 2001-03-21  Martin Buchholz <martin@xemacs.org>
 
 	* XEmacs 21.2.46 "Urania" is released.
diff --text -u /dev/null 'xemacs-21.5.0/tests/automated/extent-tests.el'
Index: ./tests/automated/extent-tests.el
--- ./tests/automated/extent-tests.el	Thu Jan  1 09:00:00 1970
+++ ./tests/automated/extent-tests.el	Fri Apr 13 18:11:46 2001
@@ -0,0 +1,371 @@
+;; Copyright (C) 2001 Free Software Foundation, Inc.
+
+;; Author: Hrvoje Niksic <hniksic@xemacs.org>
+;; Maintainer: Hrvoje Niksic <hniksic@xemacs.org>
+;; Created: 1999
+;; Keywords: tests
+
+;; 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: Not in FSF.
+
+;;; Commentary:
+
+;; Test extents operations.
+;; See test-harness.el for instructions on how to run these tests.
+
+(eval-when-compile
+  (condition-case nil
+      (require 'test-harness)
+    (file-error
+     (push "." load-path)
+     (when (and (boundp 'load-file-name) (stringp load-file-name))
+       (push (file-name-directory load-file-name) load-path))
+     (require 'test-harness))))
+
+
+;;-----------------------------------------------------
+;; Creating and attaching.
+;;-----------------------------------------------------
+
+(with-temp-buffer
+  (let ((extent (make-extent nil nil))
+	(string "somecoolstring"))
+
+    ;; Detached extent.
+    (Assert (extent-detached-p extent))
+
+    ;; Put it in a buffer.
+    (set-extent-endpoints extent 1 1 (current-buffer))
+    (Assert (eq (extent-object extent) (current-buffer)))
+
+    ;; And then into another buffer.
+    (with-temp-buffer
+      (set-extent-endpoints extent 1 1 (current-buffer))
+      (Assert (eq (extent-object extent) (current-buffer))))
+
+    ;; Now that the buffer doesn't exist, extent should be detached
+    ;; again.
+    (Assert (extent-detached-p extent))
+
+    ;; This line crashes XEmacs 21.2.46 and prior.
+    (set-extent-endpoints extent 1 (length string) string)
+    (Assert (eq (extent-object extent) string))
+    )
+
+  (let ((extent (make-extent 1 1)))
+    ;; By default, extent should be closed-open
+    (Assert (eq (get extent 'start-closed) t))
+    (Assert (eq (get extent 'start-open) nil))
+    (Assert (eq (get extent 'end-open) t))
+    (Assert (eq (get extent 'end-closed) nil))
+
+    ;; Make it closed-closed.
+    (set-extent-property extent 'end-closed t)
+
+    (Assert (eq (get extent 'start-closed) t))
+    (Assert (eq (get extent 'start-open) nil))
+    (Assert (eq (get extent 'end-open) nil))
+    (Assert (eq (get extent 'end-closed) t))
+
+    ;; open-closed
+    (set-extent-property extent 'start-open t)
+
+    (Assert (eq (get extent 'start-closed) nil))
+    (Assert (eq (get extent 'start-open) t))
+    (Assert (eq (get extent 'end-open) nil))
+    (Assert (eq (get extent 'end-closed) t))
+
+    ;; open-open
+    (set-extent-property extent 'end-open t)
+
+    (Assert (eq (get extent 'start-closed) nil))
+    (Assert (eq (get extent 'start-open) t))
+    (Assert (eq (get extent 'end-open) t))
+    (Assert (eq (get extent 'end-closed) nil)))
+
+  )
+
+;;-----------------------------------------------------
+;; Insertion behavior.
+;;-----------------------------------------------------
+
+(defun et-range (extent)
+  "List (START-POSITION END-POSITION) of EXTENT."
+  (list (extent-start-position extent)
+	(extent-end-position extent)))
+
+(defun et-insert-at (string position)
+  "Insert STRING at POSITION in the current buffer."
+  (save-excursion
+    (goto-char position)
+    (insert string)))
+
+;; Test insertion at the beginning, middle, and end of the extent.
+
+;; closed-open
+
+(with-temp-buffer
+  (insert "###eee###")
+  (let ((e (make-extent 4 7)))
+    ;; current state: "###[eee)###"
+    ;;                 123 456 789
+    (Assert (equal (et-range e) '(4 7)))
+
+    (et-insert-at "xxx" 4)
+
+    ;; current state: "###[xxxeee)###"
+    ;;                 123 456789 012
+    (Assert (equal (et-range e) '(4 10)))
+
+    (et-insert-at "yyy" 7)
+
+    ;; current state: "###[xxxyyyeee)###"
+    ;;                 123 456789012 345
+    (Assert (equal (et-range e) '(4 13)))
+
+    (et-insert-at "zzz" 13)
+
+    ;; current state: "###[xxxyyyeee)zzz###"
+    ;;                 123 456789012 345678
+    (Assert (equal (et-range e) '(4 13)))
+    ))
+
+;; closed-closed
+
+(with-temp-buffer
+  (insert "###eee###")
+  (let ((e (make-extent 4 7)))
+    (put e 'end-closed t)
+
+    ;; current state: "###[eee]###"
+    ;;                 123 456 789
+    (Assert (equal (et-range e) '(4 7)))
+
+    (et-insert-at "xxx" 4)
+
+    ;; current state: "###[xxxeee]###"
+    ;;                 123 456789 012
+    (Assert (equal (et-range e) '(4 10)))
+
+    (et-insert-at "yyy" 7)
+
+    ;; current state: "###[xxxyyyeee]###"
+    ;;                 123 456789012 345
+    (Assert (equal (et-range e) '(4 13)))
+
+    (et-insert-at "zzz" 13)
+
+    ;; current state: "###[xxxyyyeeezzz]###"
+    ;;                 123 456789012345 678
+    (Assert (equal (et-range e) '(4 16)))
+    ))
+
+;; open-closed
+
+(with-temp-buffer
+  (insert "###eee###")
+  (let ((e (make-extent 4 7)))
+    (put e 'start-open t)
+    (put e 'end-closed t)
+
+    ;; current state: "###(eee]###"
+    ;;                 123 456 789
+    (Assert (equal (et-range e) '(4 7)))
+
+    (et-insert-at "xxx" 4)
+
+    ;; current state: "###xxx(eee]###"
+    ;;                 123456 789 012
+    (Assert (equal (et-range e) '(7 10)))
+
+    (et-insert-at "yyy" 8)
+
+    ;; current state: "###xxx(eyyyee]###"
+    ;;                 123456 789012 345
+    (Assert (equal (et-range e) '(7 13)))
+
+    (et-insert-at "zzz" 13)
+
+    ;; current state: "###xxx(eyyyeezzz]###"
+    ;;                 123456 789012345 678
+    (Assert (equal (et-range e) '(7 16)))
+    ))
+
+;; open-open
+
+(with-temp-buffer
+  (insert "###eee###")
+  (let ((e (make-extent 4 7)))
+    (put e 'start-open t)
+
+    ;; current state: "###(eee)###"
+    ;;                 123 456 789
+    (Assert (equal (et-range e) '(4 7)))
+
+    (et-insert-at "xxx" 4)
+
+    ;; current state: "###xxx(eee)###"
+    ;;                 123456 789 012
+    (Assert (equal (et-range e) '(7 10)))
+
+    (et-insert-at "yyy" 8)
+
+    ;; current state: "###xxx(eyyyee)###"
+    ;;                 123456 789012 345
+    (Assert (equal (et-range e) '(7 13)))
+
+    (et-insert-at "zzz" 13)
+
+    ;; current state: "###xxx(eyyyee)zzz###"
+    ;;                 123456 789012 345678
+    (Assert (equal (et-range e) '(7 13)))
+    ))
+
+
+;;-----------------------------------------------------
+;; Deletion behavior.
+;;-----------------------------------------------------
+
+(dolist (props '((start-closed t end-open t)
+		 (start-closed t end-open nil)
+		 (start-closed nil end-open nil)
+		 (start-closed nil end-open t)))
+  ;; Deletion needs to behave the same regardless of the open-ness of
+  ;; the boundaries.
+
+  (with-temp-buffer
+    (insert "xxxxxxxxxx")
+    (let ((e (make-extent 3 9)))
+      (set-extent-properties e props)
+
+      ;; current state: xx[xxxxxx]xx
+      ;;                12 345678 90
+      (Assert (equal (et-range e) '(3 9)))
+
+      (delete-region 1 2)
+
+      ;; current state: x[xxxxxx]xx
+      ;;                1 234567 89
+      (Assert (equal (et-range e) '(2 8)))
+
+      (delete-region 2 4)
+
+      ;; current state: x[xxxx]xx
+      ;;                1 2345 67
+      (Assert (equal (et-range e) '(2 6)))
+
+      (delete-region 1 3)
+
+      ;; current state: [xxx]xx
+      ;;                 123 45
+      (Assert (equal (et-range e) '(1 4)))
+
+      (delete-region 3 5)
+
+      ;; current state: [xx]x
+      ;;                 12 3
+      (Assert (equal (et-range e) '(1 3)))
+
+      )))
+
+;;; #### Should have a test for read-only-ness and insertion and
+;;; deletion!
+
+;;-----------------------------------------------------
+;; `detachable' property
+;;-----------------------------------------------------
+
+(dolist (props '((start-closed t end-open t)
+		 (start-closed t end-open nil)
+		 (start-closed nil end-open nil)
+		 (start-closed nil end-open t)))
+  ;; `detachable' shouldn't relate to region properties, hence the
+  ;; loop.
+  (with-temp-buffer
+    (insert "###eee###")
+    (let ((e (make-extent 4 7)))
+      (set-extent-properties e props)
+      (Assert (get e 'detachable))
+
+      (Assert (not (extent-detached-p e)))
+
+      (delete-region 4 5)
+      ;; ###ee### (not detached yet)
+      (Assert (not (extent-detached-p e)))
+
+      (delete-region 4 6)
+      ;; ###### (should be detached now)
+      (Assert (extent-detached-p e))))
+
+  (with-temp-buffer
+    (insert "###eee###")
+    (let ((e (make-extent 4 7)))
+      (set-extent-properties e props)
+      (put e 'detachable nil)
+      (Assert (not (get e 'detachable)))
+    
+      (Assert (not (extent-detached-p e)))
+
+      (delete-region 4 5)
+      ;; ###ee###
+      (Assert (not (extent-detached-p e)))
+
+      (delete-region 4 6)
+      ;; ###[]###
+      (Assert (not (extent-detached-p e)))
+      (Assert (equal (et-range e) '(4 4)))
+      ))
+  )
+
+
+;;-----------------------------------------------------
+;; Zero-length extents.
+;;-----------------------------------------------------
+
+;; closed-open (should stay put)
+(with-temp-buffer
+  (insert "######")
+  (let ((e (make-extent 4 4)))
+    (et-insert-at "foo" 4)
+    (Assert (equal (et-range e) '(4 4)))))
+
+;; open-closed (should move)
+(with-temp-buffer
+  (insert "######")
+  (let ((e (make-extent 4 4)))
+    (put e 'start-open t)
+    (put e 'end-closed t)
+    (et-insert-at "foo" 4)
+    (Assert (equal (et-range e) '(7 7)))))
+
+;; closed-closed (should extend)
+(with-temp-buffer
+  (insert "######")
+  (let ((e (make-extent 4 4)))
+    (put e 'end-closed t)
+    (et-insert-at "foo" 4)
+    (Assert (equal (et-range e) '(4 7)))))
+
+;; open-open (illegal; forced to behave like closed-open)
+(with-temp-buffer
+  (insert "######")
+  (let ((e (make-extent 4 4)))
+    (put e 'start-open t)
+    (et-insert-at "foo" 4)
+    (Assert (equal (et-range e) '(4 4)))))
diff --text -u 'xemacs-21.2.46/tests/automated/lisp-tests.el' 'xemacs-21.5.0/tests/automated/lisp-tests.el'
Index: ./tests/automated/lisp-tests.el
--- ./tests/automated/lisp-tests.el	Thu Dec 28 19:23:23 2000
+++ ./tests/automated/lisp-tests.el	Fri Apr 13 03:24:54 2001
@@ -243,6 +243,8 @@
   (Assert (= (- one) -1))
   (Assert (= (- one one) 0))
   (Assert (= (- one one one) -1))
+  (Assert (= (- 0 one) -1))
+  (Assert (= (- 0 one one) -2))
   (Assert (= (+ one 1) 2))
   (dolist (zero '(0 0.0 ?\0))
     (Assert (= (+ 1 zero) 1))
diff --text -u 'xemacs-21.2.46/version.sh' 'xemacs-21.5.0/version.sh'
Index: ./version.sh
--- ./version.sh	Wed Mar 21 16:12:39 2001
+++ ./version.sh	Wed Apr 18 15:54:28 2001
@@ -1,9 +1,9 @@
 #!/bin/sh
 emacs_is_beta=t
 emacs_major_version=21
-emacs_minor_version=2
-emacs_beta_version=46
-xemacs_codename="Urania"
+emacs_minor_version=5
+emacs_beta_version=0
+xemacs_codename="alfalfa"
 infodock_major_version=4
 infodock_minor_version=0
 infodock_build_version=8
#### End of Patch data ####

#### ApplyPatch data follows ####
# Data version        : 1.0
# Date generated      : Wed Apr 18 17:28:55 2001
# Generated by        : makepatch 2.00_05
# Recurse directories : Yes
# Excluded files      : (\A|/)display\Z
# r 'src/dump-id.h' 0 0
# r 'lib-src/aixcc.lex' 0 0
# p 'CHANGES-beta' 28830 987577078 0100644
# p 'ChangeLog' 137124 987577005 0100644
# p 'PROBLEMS' 72997 987099632 0100644
# p 'configure' 454711 987577156 0100755
# p 'configure.in' 169358 987099641 0100644
# p 'configure.usage' 14458 987099641 0100644
# p 'dynodump/dynodump.c' 17384 987153080 0100644
# p 'etc/NEWS' 43305 987099646 0100644
# c 'etc/ONEWS' 0 987099647 0100644
# p 'etc/OXYMORONS' 1601 987099648 0100644
# p 'etc/gnuserv.1' 11535 987099650 0100644
# p 'etc/sample.init.el' 56207 987099651 0100644
# p 'lib-src/ChangeLog' 38524 987577002 0100644
# p 'lib-src/gnuclient.c' 18653 987099661 0100644
# p 'lib-src/gnuserv.h' 5914 987099662 0100644
# p 'lisp/ChangeLog' 327123 987576998 0100644
# p 'lisp/auto-autoloads.el' 99598 987099670 0100644
# p 'lisp/auto-save.el' 20797 987099670 0100644
# p 'lisp/build-report.el' 19483 987153083 0100644
# p 'lisp/byte-optimize.el' 75820 987099671 0100644
# p 'lisp/custom-load.el' 4482 987099676 0100644
# p 'lisp/dialog.el' 25481 987099677 0100644
# p 'lisp/dumped-lisp.el' 8502 987099677 0100644
# p 'lisp/files.el' 129248 987099678 0100644
# p 'lisp/help.el' 60839 987099687 0100644
# p 'lisp/ldap.el' 22331 987153084 0100644
# p 'lisp/loaddefs.el' 6352 987099690 0100644
# p 'lisp/menubar-items.el' 71172 987099690 0100644
# c 'lisp/mule/latin.el' 0 987099705 0100644
# p 'lisp/startup.el' 51153 987522612 0100644
# p 'lisp/win32-native.el' 10374 987099699 0100644
# p 'lwlib/ChangeLog' 19915 987576994 0100644
# p 'man/ChangeLog' 77179 987576991 0100644
# p 'man/info.texi' 37793 987153088 0100644
# p 'man/internals/internals.texi' 389028 987099728 0100644
# p 'man/lispref/postgresql.texi' 42107 987099739 0100644
# p 'man/texinfo.texi' 599867 987153089 0100644
# p 'man/xemacs-faq.texi' 226336 987153092 0100644
# p 'netinstall/ChangeLog' 5487 987576987 0100644
# p 'netinstall/msg.cc' 1499 987153095 0100644
# p 'netinstall/nio-ie5.cc' 3750 987153095 0100644
# p 'netinstall/res.rc' 20645 987153095 0100644
# p 'nt/ChangeLog' 36653 987576982 0100644
# p 'nt/minitar.c' 4354 987099779 0100644
# p 'src/ChangeLog' 302687 987576974 0100644
# p 'src/elhash.c' 45728 987099816 0100644
# p 'src/event-gtk.c' 65722 987099820 0100644
# p 'src/event-msw.c' 110103 987099821 0100644
# p 'src/extents.c' 218802 987153101 0100644
# p 'src/frame-msw.c' 36252 987099826 0100644
# p 'src/keymap.c' 134623 987099837 0100644
# p 'src/menubar.c' 27970 987099842 0100644
# p 'src/redisplay.c' 282881 987099854 0100644
# p 'src/s/cygwin32.h' 7360 987099882 0100644
# p 'src/scrollbar-msw.c' 12578 987099857 0100644
# p 'src/scrollbar-msw.h' 2222 987099857 0100644
# p 'src/search.c' 89710 987174280 0100644
# p 'tests/ChangeLog' 10479 987576965 0100644
# c 'tests/automated/extent-tests.el' 0 987153106 0100644
# p 'tests/automated/lisp-tests.el' 40005 987099894 0100644
# p 'version.sh' 193 987576868 0100755
#### End of ApplyPatch data ####

#### End of Patch kit [created: Wed Apr 18 17:28:55 2001] ####
#### Patch checksum: 9862 367003 57519 ####
#### Checksum: 9898 368270 33231 ####