From: tomo <tomo>
Date: Sat, 31 Aug 2002 08:17:28 +0000 (+0000)
Subject: XEmacs 21.4.4 "Artificial Intelligence".
X-Git-Tag: r21-4-4~2
X-Git-Url: http://git.chise.org/gitweb/?p=chise%2Fxemacs-chise.git.1;a=commitdiff_plain;h=02f4d2761a98c5cb9d5b423d2361160a5d8c9ee4

XEmacs 21.4.4 "Artificial Intelligence".
---

diff --git a/ChangeLog b/ChangeLog
index 3daa021..221cff5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,64 @@
+2001-07-28  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.4 "Artificial Intelligence" is released.
+
+2001-07-22  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* configure.in (with_esd_sound): Default to no.
+
+	* configure.usage: Various documentation improvements.
+
+	* configure.in (--with-ipv6-cname): New Boolean option.  Defaults on.
+	* configure.usage:
+	* PROBLEMS (IPv6 CNAME lookup):
+	Document it.
+
+2001-07-18  Adrian Aichner  <adrian@xemacs.org>
+
+	* etc\TUTORIAL: Fix minor typo.
+	* etc\TUTORIAL.de: Sync with TUTORIAL.
+
+2001-05-23  Ben Wing  <ben@xemacs.org>
+
+	* etc\sample.init.el:
+	* etc\sample.init.el (Init-safe-require): New.
+	* etc\sample.init.el ((fboundp 'pending-delete-mode)):
+	* etc\sample.init.el ((eq system-type 'windows-nt)):
+	* etc\sample.init.el (dired):
+	* etc\sample.init.el ((Init-safe-require 'efs-auto)):
+	* etc\sample.init.el (completer):
+	* etc\sample.init.el (crypt):
+	* etc\sample.init.el (filladapt):
+	* etc\sample.init.el ((fboundp 'turn-on-lazy-lock)):
+	* etc\sample.init.el ((fboundp 'resize-minibuffer-mode)):
+	* etc\sample.init.el ((Init-safe-require 'scroll-in-place)):
+	Rewrite to be much more careful about loading features -- now
+	it decays gracefully even in the complete absence of packages.
+	Also avoid doing obnoxious things when loading efs.
+
+2001-04-14  Gordon Sadler  <gbsadler1@lcisp.com>
+
+	* configure.in: Add GTK_CFLAGS to CPPFLAGS for glade.h check.
+
+2001-07-01  Alexey Mahotkin  <alexm@hsys.msk.ru>
+
+	* configure.in (option processing):  with_widgets=m is ambiguous;
+	don't allow it.
+	(AC_CHECKING for the Athena widgets): Don't check for Athena when
+	with_widgets=no.
+
+2001-05-29  Martin Buchholz  <martin@xemacs.org>
+
+	* configure.in: Remove stray backslash.
+
+2001-05-27  Kazuo Oishi  <oishi@n-pl.org>
+
+	* etc/xemacs-ja.1: Replace with new translation.
+
+2001-05-17  Andrew Begel  <abegel@eecs.berkeley.edu>
+
+	* aclocal.m4 (LTLD): Don't use "gcc", use the ld reported by gcc.
+
 2001-05-17  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.4.3 "Academic Rigor" is released.
diff --git a/PROBLEMS b/PROBLEMS
index b7362e4..8525d37 100644
--- a/PROBLEMS
+++ b/PROBLEMS
@@ -556,7 +556,7 @@ and later.
 *** In general use etc/check_cygwin_setup.sh to trap environment problems.
 
 The script etc/check_cygwin_setup.sh will attempt to detect whether
-you have a suitable environment for building. This script may not work
+you have a suitable environment for building.  This script may not work
 correctly if you are using ash instead of bash (see below).
 
 *** Syntax errors running configure scripts, make failing with exit code 127
@@ -1485,9 +1485,9 @@ file is not necessary with this approach.
 A newer problem is due to XEmacs changing to use the modern
 getaddrinfo() interface from the older gethostbyname() interface.  The
 solution above is insufficient, because getaddrinfo() by default tries
-to get IPv6 information for localhost.  This always involves a dns
-lookup to get the CNAME, and the strategies above don't work.  It then
-falls back to IPv4 behavior.
+to get IPv6 information for localhost (including the local X server).
+This always involves a dns lookup to get the CNAME, and the strategies
+above don't work.  It then falls back to IPv4 behavior.
 
 ***** Robust network case
 
@@ -1503,22 +1503,20 @@ IPv4 behavior.  Explicitly setting DISPLAY=127.0.0.1:0.0 (or whatever
 is appropriate) works in most cases.
 
 If you cannot or do not want to do that, you can hard code IPv4
-behavior in src/process-unix.c.  This is bad[tm], on your own head be
-it.  In the function unix_canonicalize_host_name() about ten lines
-down, change the statement
+behavior in src/process-unix.c.  Add `--with-ipv6-cname=no" to your
+configure options and rebuild XEmacs.
 
-  hints.ai_family = AF_UNSPEC;
+*** XEmacs disappears after several sound events in succession
 
-to
-
-  hints.ai_family = PF_INET;
-
-and rebuild XEmacs.
-
-getaddrinfo() is also called in src/sysdep.c:init_system_name() and in
-src/process-unix.c:unix_open_network_stream().  It should not be
-useful to make this change in either of those places.
+If esd is not running (e.g. you unchecked the run esd checkbox in the
+GNOME Configuration tool), every sound event will cause the esound
+client library to signal SIGUSR1.  It is not that difficult (hold down
+PgUp or PgDn, for example) to cause XEmacs to generate additional
+SIGUSR1 signals before the first handler has a chance to reset, so the
+second SIGUSR1 causes the default behavior of ending the process.
 
+The solution is either to build XEmacs with -sound=native,noesd or to make sure
+that esd is in fact running. 
 
 ** IRIX
 *** On Irix, I don't see the toolbar icons and I'm getting lots of
@@ -1752,14 +1750,38 @@ GCC.
 
 
 ** Windows
-*** Emacs exits with "X protocol error" when run with an X server for
-Windows.
+*** In general, the Windows code is less mature than the Unix code.
+
+The Windows code base is still changing quickly.  If you are
+experiencing problems, try the latest beta version to see if the
+problem still exists.  Also ask on xemacs-nt@xemacs.org.
 
-A certain X server for Windows had a bug which caused this.
-Supposedly the newer 32-bit version of this server doesn't have the
-problem.
 
+** Cygwin
+*** Subprocesses do not work.
+ 
+You do not have "tty" in your CYGWIN environment variable.  This must
+be set in your autoexec.bat (win95) or the system properties (winnt)
+as it must be read before the cygwin DLL initializes.
 
+*** ^G does not work on hung subprocesses.
+
+This is a known problem. It can be remedied by defining BROKEN_SIGIO
+in src/s/cygwin.h, however this currently leads to instability in XEmacs.
+(#### is this still true?)
+
+*** Errors from make like `/c:not found' when running `M-x compile'.
+
+Make sure you set the environment variable MAKE_MODE to UNIX in your
+init file (.xemacs/init.el), Control Panel (Windows 2000/NT), or
+AUTOEXEC.BAT (Windows 98/95).
+
+*** There are no images in the toolbar buttons.
+
+You need version 4.71 of commctrl.dll which does not ship with windows
+95. You can get this by installing IE 4.0 or downloading it from the
+microsoft website.
+ 
 
 * Compatibility problems (with Emacs 18, GNU Emacs, or previous XEmacs/lemacs)
 ==============================================================================
diff --git a/aclocal.m4 b/aclocal.m4
index 7e20505..08c81c1 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -313,12 +313,13 @@ if test -z "$LTLD"; then
     # Accept absolute paths.
     /*)
       if test -z "$LTLD"; then
-        case "$ac_prog" in
-          *gcc-lib*) LTLD="$CC"
-                     ;;
-          *)         LTLD="$ac_prog"
-                     ;;
-        esac
+#        case "$ac_prog" in
+#          *gcc-lib*) LTLD="$CC"
+#                     ;;
+#          *)
+         LTLD="$ac_prog"
+#                     ;;
+#        esac
       fi
       ;;
     "")
diff --git a/configure b/configure
index 8d63166..3f5a328 100755
--- a/configure
+++ b/configure
@@ -247,6 +247,7 @@ with_msw=''
 rel_alloc='default'
 with_system_malloc='default'
 with_dlmalloc='default'
+with_esd_sound='no'
 native_sound_lib=''
 with_gtk='no'
 with_gnome='no'
@@ -257,6 +258,7 @@ use_union_type="no"
 with_dnet=""
 pdump="no"
 with_dragndrop="no"
+with_ipv6_cname="yes"
 
 
 
@@ -350,7 +352,8 @@ while test $# != 0; do
 	with_hesiod	| \
 	with_dnet	| \
 	with_infodock	| \
-	with_netinstall   | \
+	with_netinstall | \
+	with_ipv6_cname | \
 	external_widget | \
 	verbose		| \
 	extra_verbose	| \
@@ -466,7 +469,8 @@ echo "  Use \`$progname --help' to show usage.") >&2 && exit 1
 		(echo "$progname: Usage error:"
 echo " " "Valid types for the \`--$optname' option are:
   $types.
-The default is to autodetect all sound support."
+Option \`all' or \`none' must be first in the list.
+The default is to autodetect native and NAS sound support."
 echo "  Use \`$progname --help' to show usage.") >&2 && exit 1
 	    elif test -n "$new_sdefault" ; then
 		with_native_sound=$new_sdefault
@@ -733,15 +737,15 @@ EOF
 	"with_widgets" )
 	  case "$val" in
 	    l | lu | luc | luci | lucid )		val=lucid  ;;
-	    m | mo | mot | moti | motif )		val=motif  ;;
+	    mo | mot | moti | motif )			val=motif  ;;
 	    a | at | ath | athe | athen | athena )	val=athena ;;
 	    n | no | non | none )			val=no     ;;
 	    y | ye | yes )				val=yes    ;;
 	    g | gt | gtk )				val=gtk    ;;
-	    m | ms | msw )				val=msw    ;;
+	    ms | msw )					val=msw    ;;
 	    * ) (echo "$progname: Usage error:"
 echo " " "The \`--$optname' option must have one of these values:
-  \`gtk\', \`lucid', \`motif', \`athena', \`yes', or \`no'."
+  \`gtk', \`lucid', \`motif', \`athena', \`yes', or \`no'."
 echo "  Use \`$progname --help' to show usage.") >&2 && exit 1 ;;
 	  esac
 	  eval "$opt=\"$val\""
@@ -843,7 +847,7 @@ echo "  Use \`$progname --help' to show usage.") >&2 && exit 1
 fi
 
 echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
-echo "configure:847: checking whether ln -s works" >&5
+echo "configure:851: checking whether ln -s works" >&5
 
 rm -f conftestdata
 if ln -s X conftestdata 2>/dev/null
@@ -1108,7 +1112,7 @@ EOF
 
 
 echo $ac_n "checking "host system type"""... $ac_c" 1>&6
-echo "configure:1112: checking "host system type"" >&5
+echo "configure:1116: checking "host system type"" >&5
 internal_configuration=`echo $configuration | sed 's/-\(workshop\)//'`
 canonical=`${CONFIG_SHELL-/bin/sh} $srcdir/config.sub "$internal_configuration"`
 configuration=`echo "$configuration" | sed 's/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/'`
@@ -1623,7 +1627,7 @@ xe_save_CFLAGS="$CFLAGS"
 # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1627: checking for $ac_word" >&5
+echo "configure:1631: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1650,7 +1654,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1654: checking for $ac_word" >&5
+echo "configure:1658: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1698,7 +1702,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1702: checking for $ac_word" >&5
+echo "configure:1706: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1727,7 +1731,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1731: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1735: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
@@ -1740,12 +1744,12 @@ cross_compiling=no
 
 cat > conftest.$ac_ext << EOF
 
-#line 1744 "configure"
+#line 1748 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1773,19 +1777,19 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1777: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1781: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1782: checking whether we are using GNU C" >&5
+echo "configure:1786: checking whether we are using GNU C" >&5
 
 cat > conftest.c <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1789: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1793: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -1803,7 +1807,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:1807: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:1811: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -1836,7 +1840,7 @@ if   test "$with_gcc" = "no"  -a "$GCC" = "yes"; then
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1840: checking for $ac_word" >&5
+echo "configure:1844: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1863,7 +1867,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1867: checking for $ac_word" >&5
+echo "configure:1871: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1911,7 +1915,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1915: checking for $ac_word" >&5
+echo "configure:1919: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -1940,7 +1944,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:1944: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:1948: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
@@ -1953,12 +1957,12 @@ cross_compiling=no
 
 cat > conftest.$ac_ext << EOF
 
-#line 1957 "configure"
+#line 1961 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:1962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:1966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -1986,19 +1990,19 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:1990: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:1994: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:1995: checking whether we are using GNU C" >&5
+echo "configure:1999: checking whether we are using GNU C" >&5
 
 cat > conftest.c <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2002: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2006: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -2016,7 +2020,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2020: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2024: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -2049,7 +2053,7 @@ elif test "$with_gcc" = "yes" -a "$GCC" != "yes" ; then
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2053: checking for $ac_word" >&5
+echo "configure:2057: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2076,7 +2080,7 @@ if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2080: checking for $ac_word" >&5
+echo "configure:2084: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2124,7 +2128,7 @@ fi
       # Extract the first word of "cl", so it can be a program name with args.
 set dummy cl; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2128: checking for $ac_word" >&5
+echo "configure:2132: checking for $ac_word" >&5
 
 if test -n "$CC"; then
   ac_cv_prog_CC="$CC" # Let the user override the test.
@@ -2153,7 +2157,7 @@ fi
 fi
 
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
-echo "configure:2157: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+echo "configure:2161: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
 
 ac_ext=c
 xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS'
@@ -2166,12 +2170,12 @@ cross_compiling=no
 
 cat > conftest.$ac_ext << EOF
 
-#line 2170 "configure"
+#line 2174 "configure"
 #include "confdefs.h"
 
 main(){return(0);}
 EOF
-if { (eval echo configure:2175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   ac_cv_prog_cc_works=yes
   # If we can't run a trivial program, we are probably using a cross compiler.
   if (./conftest; exit) 2>/dev/null; then
@@ -2199,19 +2203,19 @@ if test $ac_cv_prog_cc_works = no; then
   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
 fi
 echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
-echo "configure:2203: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+echo "configure:2207: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
 cross_compiling=$ac_cv_prog_cc_cross
 
 echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:2208: checking whether we are using GNU C" >&5
+echo "configure:2212: checking whether we are using GNU C" >&5
 
 cat > conftest.c <<EOF
 #ifdef __GNUC__
   yes;
 #endif
 EOF
-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2215: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
   ac_cv_prog_gcc=yes
 else
   ac_cv_prog_gcc=no
@@ -2229,7 +2233,7 @@ ac_test_CFLAGS="${CFLAGS+set}"
 ac_save_CFLAGS="$CFLAGS"
 CFLAGS=
 echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
-echo "configure:2233: checking whether ${CC-cc} accepts -g" >&5
+echo "configure:2237: checking whether ${CC-cc} accepts -g" >&5
 
 echo 'void f(){}' > conftest.c
 if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
@@ -2266,7 +2270,7 @@ test -n "$CPP" -a -d "$CPP" && CPP=
 test -n "$NON_GNU_CPP" -a "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP"
 
 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
-echo "configure:2270: checking how to run the C preprocessor" >&5
+echo "configure:2274: checking how to run the C preprocessor" >&5
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
   CPP=
@@ -2279,13 +2283,13 @@ if test -z "$CPP"; then
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp.
   cat > conftest.$ac_ext <<EOF
-#line 2283 "configure"
+#line 2287 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2289: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2293: \"$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
   :
@@ -2296,13 +2300,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -E -traditional-cpp"
   cat > conftest.$ac_ext <<EOF
-#line 2300 "configure"
+#line 2304 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2306: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2310: \"$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
   :
@@ -2313,13 +2317,13 @@ else
   rm -rf conftest*
   CPP="${CC-cc} -nologo -E"
   cat > conftest.$ac_ext <<EOF
-#line 2317 "configure"
+#line 2321 "configure"
 #include "confdefs.h"
 #include <assert.h>
 Syntax Error
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:2323: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:2327: \"$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
   :
@@ -2345,9 +2349,9 @@ echo "$ac_t""$CPP" 1>&6
 
 
 echo $ac_n "checking for AIX""... $ac_c" 1>&6
-echo "configure:2349: checking for AIX" >&5
+echo "configure:2353: checking for AIX" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2351 "configure"
+#line 2355 "configure"
 #include "confdefs.h"
 #ifdef _AIX
   yes
@@ -2374,9 +2378,9 @@ rm -f conftest*
  
 
 echo $ac_n "checking for GNU libc""... $ac_c" 1>&6
-echo "configure:2378: checking for GNU libc" >&5
+echo "configure:2382: checking for GNU libc" >&5
 cat > conftest.$ac_ext <<EOF
-#line 2380 "configure"
+#line 2384 "configure"
 #include "confdefs.h"
 #include <features.h>
 int main() {
@@ -2388,7 +2392,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:2392: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:2396: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   have_glibc=yes
 else
@@ -2465,7 +2469,7 @@ EOF
 esac
 
 cat > conftest.$ac_ext <<EOF
-#line 2469 "configure"
+#line 2473 "configure"
 #include "confdefs.h"
 int main () {
 #if defined __SUNPRO_C
@@ -2479,7 +2483,7 @@ return 0;
 #endif
 }
 EOF
-if { (eval echo configure:2483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:2487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -2713,17 +2717,17 @@ test "$__DECC" = "yes" && c_switch_site="$c_switch_site -std1" &&  if test "$ext
 
 if test "$__USLC__" = yes; then
   echo $ac_n "checking for whether the -Kalloca compiler flag is needed""... $ac_c" 1>&6
-echo "configure:2717: checking for whether the -Kalloca compiler flag is needed" >&5
+echo "configure:2721: checking for whether the -Kalloca compiler flag is needed" >&5
   need_kalloca=no
   cat > conftest.$ac_ext <<EOF
-#line 2720 "configure"
+#line 2724 "configure"
 #include "confdefs.h"
 
 int main() {
 void *x = alloca(4);
 ; return 0; }
 EOF
-if { (eval echo configure:2727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2731: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   :
 else
@@ -2734,14 +2738,14 @@ else
     xe_save_c_switch_system="$c_switch_system"
     c_switch_system="$c_switch_system -Kalloca"
     cat > conftest.$ac_ext <<EOF
-#line 2738 "configure"
+#line 2742 "configure"
 #include "confdefs.h"
 
 int main() {
 void *x = alloca(4);
 ; return 0; }
 EOF
-if { (eval echo configure:2745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    need_kalloca=yes 
 else
@@ -2776,7 +2780,7 @@ fi
 
 if test "$GCC" = "yes"; then
 echo $ac_n "checking for buggy gcc versions""... $ac_c" 1>&6
-echo "configure:2780: checking for buggy gcc versions" >&5
+echo "configure:2784: 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.*)
@@ -2899,7 +2903,7 @@ test "$pdump" = "yes" && extra_objs="$extra_objs dumper.o" &&  if test "$extra_v
  fi
 
 echo $ac_n "checking for dynodump""... $ac_c" 1>&6
-echo "configure:2903: checking for dynodump" >&5
+echo "configure:2907: checking for dynodump" >&5
 if test "$unexec" != "unexsol2.o"; then
   echo "$ac_t""no" 1>&6
 else
@@ -2937,12 +2941,12 @@ if test "$unexec" = "unexaix.o"; then
   done
   
 echo $ac_n "checking for terminateAndUnload in -lC""... $ac_c" 1>&6
-echo "configure:2941: checking for terminateAndUnload in -lC" >&5
+echo "configure:2945: 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 2946 "configure"
+#line 2950 "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
@@ -2953,7 +2957,7 @@ int main() {
 terminateAndUnload()
 ; return 0; }
 EOF
-if { (eval echo configure:2957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:2961: \"$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
@@ -3061,7 +3065,7 @@ fi
 
 if test "$add_runtime_path" = "yes"; then
       echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6
-echo "configure:3065: checking "for runtime libraries flag"" >&5
+echo "configure:3069: checking "for runtime libraries flag"" >&5
   case "$opsys" in
     sol2 ) dash_r="-R" ;;
     decosf* | linux* | irix*) dash_r="-rpath " ;;
@@ -3083,14 +3087,14 @@ if test "$GCC" = "yes"; then
   done
 fi
         cat > conftest.$ac_ext <<EOF
-#line 3087 "configure"
+#line 3091 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   dash_r="$try_dash_r"
 else
@@ -3191,10 +3195,10 @@ else
 fi
 after_morecore_hook_exists=yes
 echo $ac_n "checking for malloc_set_state""... $ac_c" 1>&6
-echo "configure:3195: checking for malloc_set_state" >&5
+echo "configure:3199: checking for malloc_set_state" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3198 "configure"
+#line 3202 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char malloc_set_state(); below.  */
@@ -3217,7 +3221,7 @@ malloc_set_state();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3225: \"$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
@@ -3237,16 +3241,16 @@ doug_lea_malloc=no
 fi
 
 echo $ac_n "checking whether __after_morecore_hook exists""... $ac_c" 1>&6
-echo "configure:3241: checking whether __after_morecore_hook exists" >&5
+echo "configure:3245: checking whether __after_morecore_hook exists" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3243 "configure"
+#line 3247 "configure"
 #include "confdefs.h"
 extern void (* __after_morecore_hook)();
 int main() {
 __after_morecore_hook = 0
 ; return 0; }
 EOF
-if { (eval echo configure:3250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3254: \"$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
@@ -3302,7 +3306,7 @@ fi
 # 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:3306: checking for $ac_word" >&5
+echo "configure:3310: checking for $ac_word" >&5
 
 if test -n "$RANLIB"; then
   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
@@ -3357,7 +3361,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 # 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:3361: checking for a BSD compatible install" >&5
+echo "configure:3365: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 
   IFS="${IFS= 	}"; ac_save_IFS="$IFS"; IFS=":"
@@ -3411,7 +3415,7 @@ do
 # 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:3415: checking for $ac_word" >&5
+echo "configure:3419: checking for $ac_word" >&5
 
 if test -n "$YACC"; then
   ac_cv_prog_YACC="$YACC" # Let the user override the test.
@@ -3443,15 +3447,15 @@ for ac_hdr in   a.out.h   elf.h   cygwin/version.h   fcntl.h   inttypes.h   libg
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:3447: checking for $ac_hdr" >&5
+echo "configure:3451: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3450 "configure"
+#line 3454 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3455: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3459: \"$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*
@@ -3481,10 +3485,10 @@ fi
 done
 
 echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6
-echo "configure:3485: checking for sys/wait.h that is POSIX.1 compatible" >&5
+echo "configure:3489: checking for sys/wait.h that is POSIX.1 compatible" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3488 "configure"
+#line 3492 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -3500,7 +3504,7 @@ wait (&s);
 s = WIFEXITED (s) ? WEXITSTATUS (s) : 1;
 ; return 0; }
 EOF
-if { (eval echo configure:3504: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3508: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_sys_wait_h=yes
 else
@@ -3524,10 +3528,10 @@ EOF
 fi
 
 echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6
-echo "configure:3528: checking for ANSI C header files" >&5
+echo "configure:3532: checking for ANSI C header files" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3531 "configure"
+#line 3535 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3535,7 +3539,7 @@ cat > conftest.$ac_ext <<EOF
 #include <float.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:3539: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3543: \"$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*
@@ -3552,7 +3556,7 @@ rm -f conftest*
 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 3556 "configure"
+#line 3560 "configure"
 #include "confdefs.h"
 #include <string.h>
 EOF
@@ -3570,7 +3574,7 @@ fi
 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 3574 "configure"
+#line 3578 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 EOF
@@ -3588,7 +3592,7 @@ fi
 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 3592 "configure"
+#line 3596 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
@@ -3599,7 +3603,7 @@ if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2);
 exit (0); }
 
 EOF
-if { (eval echo configure:3603: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:3607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -3625,10 +3629,10 @@ EOF
 fi
 
 echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6
-echo "configure:3629: checking whether time.h and sys/time.h may both be included" >&5
+echo "configure:3633: checking whether time.h and sys/time.h may both be included" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3632 "configure"
+#line 3636 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -3637,7 +3641,7 @@ int main() {
 struct tm *tp;
 ; return 0; }
 EOF
-if { (eval echo configure:3641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3645: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_header_time=yes
 else
@@ -3661,10 +3665,10 @@ EOF
 fi
 
 echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6
-echo "configure:3665: checking for sys_siglist declaration in signal.h or unistd.h" >&5
+echo "configure:3669: checking for sys_siglist declaration in signal.h or unistd.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3668 "configure"
+#line 3672 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3676,7 +3680,7 @@ int main() {
 char *msg = *(sys_siglist + 1);
 ; return 0; }
 EOF
-if { (eval echo configure:3680: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3684: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_decl_sys_siglist=yes
 else
@@ -3702,9 +3706,9 @@ fi
 
 
 echo $ac_n "checking for utime""... $ac_c" 1>&6
-echo "configure:3706: checking for utime" >&5
+echo "configure:3710: checking for utime" >&5
 cat > conftest.$ac_ext <<EOF
-#line 3708 "configure"
+#line 3712 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <utime.h>
@@ -3712,7 +3716,7 @@ int main() {
 struct utimbuf x; x.actime = x.modtime = 0; utime ("/", &x);
 ; return 0; }
 EOF
-if { (eval echo configure:3716: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3720: \"$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
@@ -3731,10 +3735,10 @@ else
       for ac_func in utimes
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:3735: checking for $ac_func" >&5
+echo "configure:3739: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3738 "configure"
+#line 3742 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -3757,7 +3761,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:3761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:3765: \"$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
@@ -3789,10 +3793,10 @@ rm -f conftest*
 
 
 echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6
-echo "configure:3793: checking return type of signal handlers" >&5
+echo "configure:3797: checking return type of signal handlers" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3796 "configure"
+#line 3800 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -3809,7 +3813,7 @@ int main() {
 int i;
 ; return 0; }
 EOF
-if { (eval echo configure:3813: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:3817: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_type_signal=void
 else
@@ -3831,10 +3835,10 @@ EOF
 
 
 echo $ac_n "checking for size_t""... $ac_c" 1>&6
-echo "configure:3835: checking for size_t" >&5
+echo "configure:3839: checking for size_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3838 "configure"
+#line 3842 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3865,10 +3869,10 @@ EOF
 fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:3869: checking for pid_t" >&5
+echo "configure:3873: checking for pid_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3872 "configure"
+#line 3876 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3899,10 +3903,10 @@ EOF
 fi
 
 echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6
-echo "configure:3903: checking for uid_t in sys/types.h" >&5
+echo "configure:3907: checking for uid_t in sys/types.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3906 "configure"
+#line 3910 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 EOF
@@ -3938,10 +3942,10 @@ EOF
 fi
 
 echo $ac_n "checking for mode_t""... $ac_c" 1>&6
-echo "configure:3942: checking for mode_t" >&5
+echo "configure:3946: checking for mode_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3945 "configure"
+#line 3949 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -3972,10 +3976,10 @@ EOF
 fi
 
 echo $ac_n "checking for off_t""... $ac_c" 1>&6
-echo "configure:3976: checking for off_t" >&5
+echo "configure:3980: checking for off_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 3979 "configure"
+#line 3983 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4006,10 +4010,10 @@ EOF
 fi
 
 echo $ac_n "checking for ssize_t""... $ac_c" 1>&6
-echo "configure:4010: checking for ssize_t" >&5
+echo "configure:4014: checking for ssize_t" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4013 "configure"
+#line 4017 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -4041,9 +4045,9 @@ fi
 
 
 echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
-echo "configure:4045: checking for socklen_t" >&5
+echo "configure:4049: checking for socklen_t" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4047 "configure"
+#line 4051 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 socklen_t x;
@@ -4052,7 +4056,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4056: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4060: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -4061,7 +4065,7 @@ else
   rm -rf conftest*
   
 cat > conftest.$ac_ext <<EOF
-#line 4065 "configure"
+#line 4069 "configure"
 #include "confdefs.h"
 #include <sys/socket.h>
 int accept (int, struct sockaddr *, size_t *);
@@ -4070,7 +4074,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:4074: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4078: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   
 echo "$ac_t""size_t" 1>&6
@@ -4102,9 +4106,9 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking for struct timeval""... $ac_c" 1>&6
-echo "configure:4106: checking for struct timeval" >&5
+echo "configure:4110: checking for struct timeval" >&5
 cat > conftest.$ac_ext <<EOF
-#line 4108 "configure"
+#line 4112 "configure"
 #include "confdefs.h"
 #ifdef TIME_WITH_SYS_TIME
 #include <sys/time.h>
@@ -4120,7 +4124,7 @@ int main() {
 static struct timeval x; x.tv_sec = x.tv_usec;
 ; return 0; }
 EOF
-if { (eval echo configure:4124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4128: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
   HAVE_TIMEVAL=yes
@@ -4142,10 +4146,10 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6
-echo "configure:4146: checking whether struct tm is in sys/time.h or time.h" >&5
+echo "configure:4150: checking whether struct tm is in sys/time.h or time.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4149 "configure"
+#line 4153 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <time.h>
@@ -4153,7 +4157,7 @@ int main() {
 struct tm *tp; tp->tm_sec;
 ; return 0; }
 EOF
-if { (eval echo configure:4157: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4161: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm=time.h
 else
@@ -4177,10 +4181,10 @@ EOF
 fi
 
 echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6
-echo "configure:4181: checking for tm_zone in struct tm" >&5
+echo "configure:4185: checking for tm_zone in struct tm" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4184 "configure"
+#line 4188 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <$ac_cv_struct_tm>
@@ -4188,7 +4192,7 @@ int main() {
 struct tm tm; tm.tm_zone;
 ; return 0; }
 EOF
-if { (eval echo configure:4192: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4196: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_struct_tm_zone=yes
 else
@@ -4211,10 +4215,10 @@ EOF
 
 else
   echo $ac_n "checking for tzname""... $ac_c" 1>&6
-echo "configure:4215: checking for tzname" >&5
+echo "configure:4219: checking for tzname" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4218 "configure"
+#line 4222 "configure"
 #include "confdefs.h"
 #include <time.h>
 #ifndef tzname /* For SGI.  */
@@ -4224,7 +4228,7 @@ int main() {
 atoi(*tzname);
 ; return 0; }
 EOF
-if { (eval echo configure:4228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_cv_var_tzname=yes
 else
@@ -4250,10 +4254,10 @@ fi
 
 
 echo $ac_n "checking for working const""... $ac_c" 1>&6
-echo "configure:4254: checking for working const" >&5
+echo "configure:4258: checking for working const" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4257 "configure"
+#line 4261 "configure"
 #include "confdefs.h"
 
 int main() {
@@ -4302,7 +4306,7 @@ ccp = (char const *const *) p;
 
 ; return 0; }
 EOF
-if { (eval echo configure:4306: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4310: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_const=yes
 else
@@ -4327,7 +4331,7 @@ fi
 
 
 echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6
-echo "configure:4331: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "configure:4335: checking whether ${MAKE-make} sets \${MAKE}" >&5
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'`
 
 cat > conftestmake <<\EOF
@@ -4352,12 +4356,12 @@ fi
 
 
 echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
-echo "configure:4356: checking whether byte ordering is bigendian" >&5
+echo "configure:4360: 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 4361 "configure"
+#line 4365 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -4368,11 +4372,11 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4372: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4376: \"$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 4376 "configure"
+#line 4380 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -4383,7 +4387,7 @@ int main() {
 #endif
 ; return 0; }
 EOF
-if { (eval echo configure:4387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:4391: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_bigendian=yes
 else
@@ -4400,7 +4404,7 @@ fi
 rm -f conftest*
 if test $ac_cv_c_bigendian = unknown; then
 cat > conftest.$ac_ext <<EOF
-#line 4404 "configure"
+#line 4408 "configure"
 #include "confdefs.h"
 main () {
   /* Are we little or big endian?  From Harbison&Steele.  */
@@ -4413,7 +4417,7 @@ main () {
   exit (u.c[sizeof (long) - 1] == 1);
 }
 EOF
-if { (eval echo configure:4417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_c_bigendian=no
 else
@@ -4440,10 +4444,10 @@ fi
 
 
 echo $ac_n "checking size of short""... $ac_c" 1>&6
-echo "configure:4444: checking size of short" >&5
+echo "configure:4448: checking size of short" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4447 "configure"
+#line 4451 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -4455,7 +4459,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:4459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_short=`cat conftestval`
 else
@@ -4483,10 +4487,10 @@ if test "$ac_cv_sizeof_short" = 0; then
   exit 1
 fi
 echo $ac_n "checking size of int""... $ac_c" 1>&6
-echo "configure:4487: checking size of int" >&5
+echo "configure:4491: checking size of int" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4490 "configure"
+#line 4494 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -4498,7 +4502,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:4502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_int=`cat conftestval`
 else
@@ -4520,10 +4524,10 @@ EOF
 
 
 echo $ac_n "checking size of long""... $ac_c" 1>&6
-echo "configure:4524: checking size of long" >&5
+echo "configure:4528: checking size of long" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4527 "configure"
+#line 4531 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -4535,7 +4539,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:4539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_sizeof_long=`cat conftestval`
 else
@@ -4557,10 +4561,10 @@ EOF
 
 
 echo $ac_n "checking size of long long""... $ac_c" 1>&6
-echo "configure:4561: checking size of long long" >&5
+echo "configure:4565: checking size of long long" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4564 "configure"
+#line 4568 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -4572,7 +4576,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:4576: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4580: \"$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
@@ -4594,10 +4598,10 @@ EOF
 
 
 echo $ac_n "checking size of void *""... $ac_c" 1>&6
-echo "configure:4598: checking size of void *" >&5
+echo "configure:4602: checking size of void *" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4601 "configure"
+#line 4605 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <sys/types.h>
@@ -4609,7 +4613,7 @@ main()
   exit(0);
 }
 EOF
-if { (eval echo configure:4613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:4617: \"$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
@@ -4632,7 +4636,7 @@ EOF
 
 
 echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:4636: checking for long file names" >&5
+echo "configure:4640: 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:
@@ -4678,10 +4682,10 @@ fi
 
 
 echo $ac_n "checking for sin""... $ac_c" 1>&6
-echo "configure:4682: checking for sin" >&5
+echo "configure:4686: checking for sin" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4685 "configure"
+#line 4689 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char sin(); below.  */
@@ -4704,7 +4708,7 @@ sin();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4712: \"$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
@@ -4722,12 +4726,12 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
-echo "configure:4726: checking for sin in -lm" >&5
+echo "configure:4730: 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 4731 "configure"
+#line 4735 "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
@@ -4738,7 +4742,7 @@ int main() {
 sin()
 ; return 0; }
 EOF
-if { (eval echo configure:4742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4746: \"$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
@@ -4782,14 +4786,14 @@ EOF
 
 
 cat > conftest.$ac_ext <<EOF
-#line 4786 "configure"
+#line 4790 "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:4793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4797: \"$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
@@ -4806,14 +4810,14 @@ fi
 rm -f conftest*
 
 echo "checking type of mail spool file locking" 1>&6
-echo "configure:4810: checking type of mail spool file locking" >&5
+echo "configure:4814: 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:4814: checking for $ac_func" >&5
+echo "configure:4818: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 4817 "configure"
+#line 4821 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -4836,7 +4840,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:4840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4844: \"$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
@@ -4918,12 +4922,12 @@ test "$mail_locking" = "locking" -a "$ac_cv_func_locking" != "yes" && \
 case "$opsys" in decosf*)
   
 echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
-echo "configure:4922: checking for cma_open in -lpthreads" >&5
+echo "configure:4926: 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 4927 "configure"
+#line 4931 "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
@@ -4934,7 +4938,7 @@ int main() {
 cma_open()
 ; return 0; }
 EOF
-if { (eval echo configure:4938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4942: \"$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
@@ -4970,7 +4974,7 @@ fi
 esac
 
 echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
-echo "configure:4974: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:4978: 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;
@@ -4982,7 +4986,7 @@ fi
 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:4986: checking for \"-z ignore\" linker flag" >&5
+echo "configure:4990: 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 ;;
@@ -4993,7 +4997,7 @@ fi
 
 
 echo "checking "for specified window system"" 1>&6
-echo "configure:4997: checking "for specified window system"" >&5
+echo "configure:5001: checking "for specified window system"" >&5
 
 
 GNOME_CONFIG=no
@@ -5001,7 +5005,7 @@ GTK_CONFIG=no
 
 if test "$with_gnome" != "no"; then
    echo $ac_n "checking for GNOME configuration script""... $ac_c" 1>&6
-echo "configure:5005: checking for GNOME configuration script" >&5
+echo "configure:5009: checking for GNOME configuration script" >&5
    for possible in gnome-config
    do
       possible_version=`${possible} --version 2> /dev/null`
@@ -5032,7 +5036,7 @@ fi
 
 if test "$with_gtk" != "no";then
    echo $ac_n "checking for GTK configuration script""... $ac_c" 1>&6
-echo "configure:5036: checking for GTK configuration script" >&5
+echo "configure:5040: checking for GTK configuration script" >&5
    for possible in gtk12-config gtk14-config gtk-config
    do
       possible_version=`${possible} --version 2> /dev/null`
@@ -5054,37 +5058,37 @@ fi
 
 if test "${GTK_CONFIG}" != "no"; then
       echo $ac_n "checking gtk version""... $ac_c" 1>&6
-echo "configure:5058: checking gtk version" >&5
+echo "configure:5062: 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:5063: checking gtk libs" >&5
+echo "configure:5067: 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:5069: checking gtk cflags" >&5
+echo "configure:5073: 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:5076: checking for main in -lgdk_imlib" >&5
+echo "configure:5080: 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 5081 "configure"
+#line 5085 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5092: \"$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
@@ -5106,12 +5110,12 @@ fi
 
       
 echo $ac_n "checking for Imlib_init in -lImlib""... $ac_c" 1>&6
-echo "configure:5110: checking for Imlib_init in -lImlib" >&5
+echo "configure:5114: 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 5115 "configure"
+#line 5119 "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
@@ -5122,7 +5126,7 @@ int main() {
 Imlib_init()
 ; return 0; }
 EOF
-if { (eval echo configure:5126: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5130: \"$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
@@ -5145,10 +5149,10 @@ fi
       for ac_func in gdk_imlib_init
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:5149: checking for $ac_func" >&5
+echo "configure:5153: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5152 "configure"
+#line 5156 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -5171,7 +5175,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5175: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5179: \"$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,22 +5245,24 @@ EOF
  fi
 
             OLD_CFLAGS="${CFLAGS}"
+      OLD_CPPFLAGS="${CPPFLAGS}"
       OLD_LDFLAGS="${LDFLAGS}"
       CFLAGS="${GTK_CFLAGS} ${CFLAGS}"
+      CPPFLAGS="${GTK_CFLAGS} ${CFLAGS}"
       LDFLAGS="${LDFLAGS} ${GTK_LIBS}"
       for ac_hdr in glade/glade.h glade.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:5252: checking for $ac_hdr" >&5
+echo "configure:5258: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5255 "configure"
+#line 5261 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5260: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5266: \"$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*
@@ -5287,19 +5293,19 @@ done
 
       
 echo $ac_n "checking for main in -lxml""... $ac_c" 1>&6
-echo "configure:5291: checking for main in -lxml" >&5
+echo "configure:5297: 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 5296 "configure"
+#line 5302 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5309: \"$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
@@ -5321,19 +5327,19 @@ fi
 
       
 echo $ac_n "checking for main in -lglade""... $ac_c" 1>&6
-echo "configure:5325: checking for main in -lglade" >&5
+echo "configure:5331: 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 5330 "configure"
+#line 5336 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5343: \"$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
@@ -5355,19 +5361,19 @@ fi
 
       
 echo $ac_n "checking for main in -lglade-gnome""... $ac_c" 1>&6
-echo "configure:5359: checking for main in -lglade-gnome" >&5
+echo "configure:5365: 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 5364 "configure"
+#line 5370 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5371: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5377: \"$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
@@ -5388,7 +5394,7 @@ fi
 
 
       cat > conftest.$ac_ext <<EOF
-#line 5392 "configure"
+#line 5398 "configure"
 #include "confdefs.h"
 #include <glade/glade-xml.h>
 EOF
@@ -5411,6 +5417,7 @@ fi
 rm -f conftest*
 
       CFLAGS="${OLD_CFLAGS}"
+      CPPFLAGS="${OLD_CPPFLAGS}"
       LDFLAGS="${OLD_LDFLAGS}"
 fi
 
@@ -5446,7 +5453,7 @@ if test "$with_x11" != "no"; then
 # 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:5450: checking for X" >&5
+echo "configure:5457: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -5506,12 +5513,12 @@ if test "$ac_x_includes" = NO; then
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 5510 "configure"
+#line 5517 "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:5515: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5522: \"$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*
@@ -5580,14 +5587,14 @@ if test "$ac_x_libraries" = NO; then
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 5584 "configure"
+#line 5591 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:5591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5598: \"$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.
@@ -5696,17 +5703,17 @@ else
     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:5700: checking whether -R must be followed by a space" >&5
+echo "configure:5707: 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 5703 "configure"
+#line 5710 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -5722,14 +5729,14 @@ rm -f conftest*
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 5726 "configure"
+#line 5733 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:5733: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -5765,12 +5772,12 @@ ac_cv_lib_dnet_dnet_ntoa=no
 else
 
 echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:5769: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:5776: 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 5774 "configure"
+#line 5781 "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
@@ -5781,7 +5788,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5792: \"$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
@@ -5805,12 +5812,12 @@ fi
     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:5809: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:5816: 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 5814 "configure"
+#line 5821 "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
@@ -5821,7 +5828,7 @@ int main() {
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:5825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5832: \"$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
@@ -5850,10 +5857,10 @@ fi
     # 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:5854: checking for gethostbyname" >&5
+echo "configure:5861: checking for gethostbyname" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5857 "configure"
+#line 5864 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -5876,7 +5883,7 @@ gethostbyname();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5887: \"$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
@@ -5897,12 +5904,12 @@ fi
     if test $ac_cv_func_gethostbyname = no; then
       
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:5901: checking for gethostbyname in -lnsl" >&5
+echo "configure:5908: 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 5906 "configure"
+#line 5913 "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
@@ -5913,7 +5920,7 @@ int main() {
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:5917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5924: \"$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
@@ -5943,10 +5950,10 @@ fi
     # -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:5947: checking for connect" >&5
+echo "configure:5954: checking for connect" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 5950 "configure"
+#line 5957 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -5969,7 +5976,7 @@ connect();
 
 ; return 0; }
 EOF
-if { (eval echo configure:5973: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:5980: \"$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
@@ -5992,12 +5999,12 @@ fi
 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:5996: checking "$xe_msg_checking"" >&5
+echo "configure:6003: 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 6001 "configure"
+#line 6008 "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
@@ -6008,7 +6015,7 @@ int main() {
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:6012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6019: \"$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
@@ -6032,10 +6039,10 @@ fi
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:6036: checking for remove" >&5
+echo "configure:6043: checking for remove" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6039 "configure"
+#line 6046 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -6058,7 +6065,7 @@ remove();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6069: \"$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
@@ -6079,12 +6086,12 @@ fi
     if test $ac_cv_func_remove = no; then
       
 echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:6083: checking for remove in -lposix" >&5
+echo "configure:6090: 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 6088 "configure"
+#line 6095 "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
@@ -6095,7 +6102,7 @@ int main() {
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:6099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6106: \"$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
@@ -6119,10 +6126,10 @@ fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:6123: checking for shmat" >&5
+echo "configure:6130: checking for shmat" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6126 "configure"
+#line 6133 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -6145,7 +6152,7 @@ shmat();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6156: \"$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
@@ -6166,12 +6173,12 @@ fi
     if test $ac_cv_func_shmat = no; then
       
 echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:6170: checking for shmat in -lipc" >&5
+echo "configure:6177: 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 6175 "configure"
+#line 6182 "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
@@ -6182,7 +6189,7 @@ int main() {
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:6186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6193: \"$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
@@ -6218,12 +6225,12 @@ fi
 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:6222: checking "$xe_msg_checking"" >&5
+echo "configure:6229: 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 6227 "configure"
+#line 6234 "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
@@ -6234,7 +6241,7 @@ int main() {
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:6238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6245: \"$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
@@ -6401,7 +6408,7 @@ EOF
 
 
     echo "checking for X defines extracted by xmkmf" 1>&6
-echo "configure:6405: checking for X defines extracted by xmkmf" >&5
+echo "configure:6412: checking for X defines extracted by xmkmf" >&5
   rm -fr conftestdir
   if mkdir conftestdir; then
     cd conftestdir
@@ -6450,15 +6457,15 @@ EOF
 
     ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6
-echo "configure:6454: checking for X11/Intrinsic.h" >&5
+echo "configure:6461: checking for X11/Intrinsic.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6457 "configure"
+#line 6464 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6462: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6469: \"$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*
@@ -6482,12 +6489,12 @@ fi
 
       
 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:6486: checking for XOpenDisplay in -lX11" >&5
+echo "configure:6493: 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 6491 "configure"
+#line 6498 "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
@@ -6498,7 +6505,7 @@ int main() {
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:6502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6509: \"$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
@@ -6523,12 +6530,12 @@ fi
 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:6527: checking "$xe_msg_checking"" >&5
+echo "configure:6534: 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 6532 "configure"
+#line 6539 "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
@@ -6539,7 +6546,7 @@ int main() {
 XGetFontProperty()
 ; return 0; }
 EOF
-if { (eval echo configure:6543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6550: \"$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
@@ -6566,12 +6573,12 @@ fi
 
     
 echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6
-echo "configure:6570: checking for XShapeSelectInput in -lXext" >&5
+echo "configure:6577: 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 6575 "configure"
+#line 6582 "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
@@ -6582,7 +6589,7 @@ int main() {
 XShapeSelectInput()
 ; return 0; }
 EOF
-if { (eval echo configure:6586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6593: \"$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
@@ -6605,12 +6612,12 @@ fi
 
     
 echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6
-echo "configure:6609: checking for XtOpenDisplay in -lXt" >&5
+echo "configure:6616: 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 6614 "configure"
+#line 6621 "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
@@ -6621,7 +6628,7 @@ int main() {
 XtOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:6625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6632: \"$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
@@ -6644,14 +6651,14 @@ fi
 
 
   echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6
-echo "configure:6648: checking the version of X11 being used" >&5
+echo "configure:6655: checking the version of X11 being used" >&5
   cat > conftest.$ac_ext <<EOF
-#line 6650 "configure"
+#line 6657 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
     int main(int c, char *v[]) { return c>1 ? XlibSpecificationRelease : 0; }
 EOF
-if { (eval echo configure:6655: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:6662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ./conftest foobar; x11_release=$?
 else
@@ -6682,10 +6689,10 @@ EOF
   for ac_func in XConvertCase
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6686: checking for $ac_func" >&5
+echo "configure:6693: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6689 "configure"
+#line 6696 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6708,7 +6715,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6719: \"$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
@@ -6740,15 +6747,15 @@ done
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6744: checking for $ac_hdr" >&5
+echo "configure:6751: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6747 "configure"
+#line 6754 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6759: \"$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*
@@ -6781,10 +6788,10 @@ done
     for ac_func in XRegisterIMInstantiateCallback
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6785: checking for $ac_func" >&5
+echo "configure:6792: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 6788 "configure"
+#line 6795 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6807,7 +6814,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:6811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6818: \"$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
@@ -6835,9 +6842,9 @@ fi
 done
 
   echo $ac_n "checking for standard XRegisterIMInstantiateCallback prototype""... $ac_c" 1>&6
-echo "configure:6839: checking for standard XRegisterIMInstantiateCallback prototype" >&5
+echo "configure:6846: checking for standard XRegisterIMInstantiateCallback prototype" >&5
   cat > conftest.$ac_ext <<EOF
-#line 6841 "configure"
+#line 6848 "configure"
 #include "confdefs.h"
 
 #define NeedFunctionPrototypes 1
@@ -6849,7 +6856,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:6853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
 else
@@ -6870,12 +6877,12 @@ rm -f conftest*
 
     test -z "$with_xmu" && { 
 echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6
-echo "configure:6874: checking for XmuReadBitmapDataFromFile in -lXmu" >&5
+echo "configure:6881: 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 6879 "configure"
+#line 6886 "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
@@ -6886,7 +6893,7 @@ int main() {
 XmuReadBitmapDataFromFile()
 ; return 0; }
 EOF
-if { (eval echo configure:6890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6897: \"$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
@@ -6925,19 +6932,19 @@ EOF
 
       
 echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:6929: checking for main in -lXbsd" >&5
+echo "configure:6936: 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 6934 "configure"
+#line 6941 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:6941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:6948: \"$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
@@ -6974,22 +6981,22 @@ fi
 fi 
 if test "$with_msw" != "no"; then
   echo "checking for MS-Windows" 1>&6
-echo "configure:6978: checking for MS-Windows" >&5
+echo "configure:6985: checking for MS-Windows" >&5
   
 echo $ac_n "checking for main in -lgdi32""... $ac_c" 1>&6
-echo "configure:6981: checking for main in -lgdi32" >&5
+echo "configure:6988: 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 6986 "configure"
+#line 6993 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:6993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7000: \"$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
@@ -7062,12 +7069,12 @@ EOF
  fi
     fi
         cat > conftest.$ac_ext <<EOF
-#line 7066 "configure"
+#line 7073 "configure"
 #include "confdefs.h"
 #include <fcntl.h>
     int main() { return (open("/dev/windows", O_RDONLY, 0) > 0)? 0 : 1; }
 EOF
-if { (eval echo configure:7071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:7078: \"$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
@@ -7131,15 +7138,15 @@ fi
 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:7135: checking for X11/extensions/shape.h" >&5
+echo "configure:7142: checking for X11/extensions/shape.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7138 "configure"
+#line 7145 "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:7143: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7150: \"$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*
@@ -7191,7 +7198,7 @@ case "$x_libraries" in *X11R4* )
 esac
 
 echo "checking for WM_COMMAND option" 1>&6
-echo "configure:7195: checking for WM_COMMAND option" >&5;
+echo "configure:7202: checking for WM_COMMAND option" >&5;
 if test "$with_wmcommand" != "no"; then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_WMCOMMAND
@@ -7206,15 +7213,15 @@ fi
 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:7210: checking for X11/Xauth.h" >&5
+echo "configure:7217: checking for X11/Xauth.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7213 "configure"
+#line 7220 "configure"
 #include "confdefs.h"
 #include <X11/Xauth.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7218: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7225: \"$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*
@@ -7237,12 +7244,12 @@ fi
  }
 test -z "$with_xauth" && { 
 echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6
-echo "configure:7241: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:7248: 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 7246 "configure"
+#line 7253 "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
@@ -7253,7 +7260,7 @@ int main() {
 XauGetAuthByAddr()
 ; return 0; }
 EOF
-if { (eval echo configure:7257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7264: \"$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
@@ -7298,15 +7305,15 @@ if test "$with_tooltalk" != "no" ; then
       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:7302: checking for ${dir}tt_c.h" >&5
+echo "configure:7309: checking for ${dir}tt_c.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7305 "configure"
+#line 7312 "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:7310: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7317: \"$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*
@@ -7342,12 +7349,12 @@ if test "$with_tooltalk" != "no" ; then
 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:7346: checking "$xe_msg_checking"" >&5
+echo "configure:7353: 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 7351 "configure"
+#line 7358 "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
@@ -7358,7 +7365,7 @@ int main() {
 tt_message_create()
 ; return 0; }
 EOF
-if { (eval echo configure:7362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7369: \"$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
@@ -7415,15 +7422,15 @@ fi
 
 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:7419: checking for Dt/Dt.h" >&5
+echo "configure:7426: checking for Dt/Dt.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7422 "configure"
+#line 7429 "configure"
 #include "confdefs.h"
 #include <Dt/Dt.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7427: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7434: \"$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*
@@ -7446,12 +7453,12 @@ fi
  }
 test -z "$with_cde" && { 
 echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6
-echo "configure:7450: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:7457: 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 7455 "configure"
+#line 7462 "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
@@ -7462,7 +7469,7 @@ int main() {
 DtDndDragStart()
 ; return 0; }
 EOF
-if { (eval echo configure:7466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7473: \"$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
@@ -7535,7 +7542,7 @@ fi
 
 if test "$with_dragndrop" != "no" ; then
   echo $ac_n "checking if drag and drop API is needed""... $ac_c" 1>&6
-echo "configure:7539: checking if drag and drop API is needed" >&5
+echo "configure:7546: 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
@@ -7555,18 +7562,18 @@ EOF
 fi
 
 echo "checking for LDAP" 1>&6
-echo "configure:7559: checking for LDAP" >&5
+echo "configure:7566: 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:7562: checking for ldap.h" >&5
+echo "configure:7569: checking for ldap.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7565 "configure"
+#line 7572 "configure"
 #include "confdefs.h"
 #include <ldap.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7570: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7577: \"$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*
@@ -7589,15 +7596,15 @@ fi
  }
 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:7593: checking for lber.h" >&5
+echo "configure:7600: checking for lber.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7596 "configure"
+#line 7603 "configure"
 #include "confdefs.h"
 #include <lber.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7601: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7608: \"$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*
@@ -7621,12 +7628,12 @@ fi
 if test "$with_ldap" != "no"; then
   
 echo $ac_n "checking for ldap_search in -lldap""... $ac_c" 1>&6
-echo "configure:7625: checking for ldap_search in -lldap" >&5
+echo "configure:7632: 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 7630 "configure"
+#line 7637 "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
@@ -7637,7 +7644,7 @@ int main() {
 ldap_search()
 ; return 0; }
 EOF
-if { (eval echo configure:7641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7648: \"$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
@@ -7662,12 +7669,12 @@ fi
 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:7666: checking "$xe_msg_checking"" >&5
+echo "configure:7673: 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 7671 "configure"
+#line 7678 "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
@@ -7678,7 +7685,7 @@ int main() {
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7689: \"$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
@@ -7703,12 +7710,12 @@ fi
 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:7707: checking "$xe_msg_checking"" >&5
+echo "configure:7714: 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 7712 "configure"
+#line 7719 "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
@@ -7719,7 +7726,7 @@ int main() {
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7723: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7730: \"$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
@@ -7744,12 +7751,12 @@ fi
 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:7748: checking "$xe_msg_checking"" >&5
+echo "configure:7755: 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 7753 "configure"
+#line 7760 "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
@@ -7760,7 +7767,7 @@ int main() {
 ldap_open()
 ; return 0; }
 EOF
-if { (eval echo configure:7764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7771: \"$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
@@ -7811,10 +7818,10 @@ EOF
   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:7815: checking for $ac_func" >&5
+echo "configure:7822: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7818 "configure"
+#line 7825 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7837,7 +7844,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:7841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7848: \"$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
@@ -7868,20 +7875,20 @@ fi
 
 if test "$with_postgresql" != "no"; then
   echo "checking for PostgreSQL" 1>&6
-echo "configure:7872: checking for PostgreSQL" >&5
+echo "configure:7879: 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:7877: checking for ${header_dir}libpq-fe.h" >&5
+echo "configure:7884: checking for ${header_dir}libpq-fe.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 7880 "configure"
+#line 7887 "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:7885: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7892: \"$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*
@@ -7905,12 +7912,12 @@ fi
 
   test -n "$libpq_fe_h_file" && { 
 echo $ac_n "checking for PQconnectdb in -lpq""... $ac_c" 1>&6
-echo "configure:7909: checking for PQconnectdb in -lpq" >&5
+echo "configure:7916: 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 7914 "configure"
+#line 7921 "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
@@ -7921,7 +7928,7 @@ int main() {
 PQconnectdb()
 ; return 0; }
 EOF
-if { (eval echo configure:7925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7932: \"$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
@@ -7954,12 +7961,12 @@ EOF
 
     
 echo $ac_n "checking for PQconnectStart in -lpq""... $ac_c" 1>&6
-echo "configure:7958: checking for PQconnectStart in -lpq" >&5
+echo "configure:7965: 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 7963 "configure"
+#line 7970 "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
@@ -7970,7 +7977,7 @@ int main() {
 PQconnectStart()
 ; return 0; }
 EOF
-if { (eval echo configure:7974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:7981: \"$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
@@ -8018,15 +8025,15 @@ fi
 
 if test "$window_system" != "none"; then
   echo "checking for graphics libraries" 1>&6
-echo "configure:8022: checking for graphics libraries" >&5
+echo "configure:8029: 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:8027: checking for Xpm - no older than 3.4f" >&5
+echo "configure:8034: checking for Xpm - no older than 3.4f" >&5
     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF
-#line 8030 "configure"
+#line 8037 "configure"
 #include "confdefs.h"
 #define XPM_NUMBERS
 #include <X11/xpm.h>
@@ -8035,7 +8042,7 @@ echo "configure:8027: checking for Xpm - no older than 3.4f" >&5
       XpmIncludeVersion != XpmLibraryVersion() ? 1 :
       XpmIncludeVersion < 30406 ? 2 : 0 ;}
 EOF
-if { (eval echo configure:8039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:8046: \"$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
@@ -8077,17 +8084,17 @@ EOF
 
     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:8081: checking for \"FOR_MSW\" xpm" >&5
+echo "configure:8088: checking for \"FOR_MSW\" xpm" >&5
     xe_check_libs=-lXpm
     cat > conftest.$ac_ext <<EOF
-#line 8084 "configure"
+#line 8091 "configure"
 #include "confdefs.h"
 
 int main() {
 XpmCreatePixmapFromData()
 ; return 0; }
 EOF
-if { (eval echo configure:8091: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8098: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   xpm_for_msw=no
 else
@@ -8113,15 +8120,15 @@ EOF
 
     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:8117: checking for compface.h" >&5
+echo "configure:8124: checking for compface.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8120 "configure"
+#line 8127 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8125: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8132: \"$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*
@@ -8144,12 +8151,12 @@ fi
  }
   test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:8148: checking for UnGenFace in -lcompface" >&5
+echo "configure:8155: 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 8153 "configure"
+#line 8160 "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
@@ -8160,7 +8167,7 @@ int main() {
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:8164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8171: \"$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
@@ -8212,12 +8219,12 @@ EOF
       if test "$with_png $with_tiff" != "no no"; then
     
 echo $ac_n "checking for inflate in -lc""... $ac_c" 1>&6
-echo "configure:8216: checking for inflate in -lc" >&5
+echo "configure:8223: 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 8221 "configure"
+#line 8228 "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
@@ -8228,7 +8235,7 @@ int main() {
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8239: \"$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
@@ -8247,12 +8254,12 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lz""... $ac_c" 1>&6
-echo "configure:8251: checking for inflate in -lz" >&5
+echo "configure:8258: 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 8256 "configure"
+#line 8263 "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
@@ -8263,7 +8270,7 @@ int main() {
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8274: \"$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
@@ -8282,12 +8289,12 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for inflate in -lgz""... $ac_c" 1>&6
-echo "configure:8286: checking for inflate in -lgz" >&5
+echo "configure:8293: 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 8291 "configure"
+#line 8298 "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
@@ -8298,7 +8305,7 @@ int main() {
 inflate()
 ; return 0; }
 EOF
-if { (eval echo configure:8302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8309: \"$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
@@ -8328,15 +8335,15 @@ fi
 
     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:8332: checking for jpeglib.h" >&5
+echo "configure:8339: checking for jpeglib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8335 "configure"
+#line 8342 "configure"
 #include "confdefs.h"
 #include <jpeglib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8347: \"$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*
@@ -8359,12 +8366,12 @@ fi
  }
   test -z "$with_jpeg" && { 
 echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
-echo "configure:8363: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:8370: 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 8368 "configure"
+#line 8375 "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
@@ -8375,7 +8382,7 @@ int main() {
 jpeg_destroy_decompress()
 ; return 0; }
 EOF
-if { (eval echo configure:8379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8386: \"$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
@@ -8411,10 +8418,10 @@ EOF
 
     png_problem=""
   test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
-echo "configure:8415: checking for pow" >&5
+echo "configure:8422: checking for pow" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8418 "configure"
+#line 8425 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pow(); below.  */
@@ -8437,7 +8444,7 @@ pow();
 
 ; return 0; }
 EOF
-if { (eval echo configure:8441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8448: \"$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
@@ -8458,15 +8465,15 @@ fi
  }
   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:8462: checking for png.h" >&5
+echo "configure:8469: checking for png.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8465 "configure"
+#line 8472 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8470: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8477: \"$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*
@@ -8489,12 +8496,12 @@ fi
  }
   test -z "$with_png" && { 
 echo $ac_n "checking for png_read_image in -lpng""... $ac_c" 1>&6
-echo "configure:8493: checking for png_read_image in -lpng" >&5
+echo "configure:8500: 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 8498 "configure"
+#line 8505 "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
@@ -8505,7 +8512,7 @@ int main() {
 png_read_image()
 ; return 0; }
 EOF
-if { (eval echo configure:8509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8516: \"$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
@@ -8528,10 +8535,10 @@ fi
  }
   if test -z "$with_png"; then
     echo $ac_n "checking for workable png version information""... $ac_c" 1>&6
-echo "configure:8532: checking for workable png version information" >&5
+echo "configure:8539: checking for workable png version information" >&5
     xe_check_libs="-lpng -lz"
     cat > conftest.$ac_ext <<EOF
-#line 8535 "configure"
+#line 8542 "configure"
 #include "confdefs.h"
 #include <png.h>
     int main(int c, char **v) {
@@ -8539,7 +8546,7 @@ echo "configure:8532: checking for workable png version information" >&5
     if (strcmp(png_libpng_ver, PNG_LIBPNG_VER_STRING) != 0) return 1;
     return (PNG_LIBPNG_VER < 10002) ? 2 : 0 ;}
 EOF
-if { (eval echo configure:8543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:8550: \"$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
@@ -8582,15 +8589,15 @@ EOF
 
     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:8586: checking for tiffio.h" >&5
+echo "configure:8593: checking for tiffio.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8589 "configure"
+#line 8596 "configure"
 #include "confdefs.h"
 #include <tiffio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8594: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8601: \"$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*
@@ -8613,12 +8620,12 @@ fi
  }
   test -z "$with_tiff" && { 
 echo $ac_n "checking for TIFFClientOpen in -ltiff""... $ac_c" 1>&6
-echo "configure:8617: checking for TIFFClientOpen in -ltiff" >&5
+echo "configure:8624: 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 8622 "configure"
+#line 8629 "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
@@ -8629,7 +8636,7 @@ int main() {
 TIFFClientOpen()
 ; return 0; }
 EOF
-if { (eval echo configure:8633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8640: \"$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
@@ -8668,15 +8675,15 @@ fi
 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:8672: checking for compface.h" >&5
+echo "configure:8679: checking for compface.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8675 "configure"
+#line 8682 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8680: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8687: \"$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*
@@ -8699,12 +8706,12 @@ fi
  }
   test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:8703: checking for UnGenFace in -lcompface" >&5
+echo "configure:8710: 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 8708 "configure"
+#line 8715 "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
@@ -8715,7 +8722,7 @@ int main() {
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:8719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8726: \"$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
@@ -8753,12 +8760,13 @@ fi
 
 
 if test "$with_x11" = "yes"; then
-
   echo "checking for X11 graphics libraries" 1>&6
-echo "configure:8759: checking for X11 graphics libraries" >&5
+echo "configure:8765: checking for X11 graphics libraries" >&5
+fi
 
+if test "$with_x11" = "yes" -a "$with_widgets" = "athena"; then
   echo "checking for the Athena widgets" 1>&6
-echo "configure:8762: checking for the Athena widgets" >&5
+echo "configure:8770: checking for the Athena widgets" >&5
 
     case "$with_athena" in
         "xaw" | "")	athena_variant=Xaw	athena_3d=no  ;;
@@ -8772,12 +8780,12 @@ echo "configure:8762: checking for the Athena widgets" >&5
     if test "$athena_3d" = "no"; then
     
 echo $ac_n "checking for XawScrollbarSetThumb in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:8776: checking for XawScrollbarSetThumb in -l$athena_variant" >&5
+echo "configure:8784: 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 8781 "configure"
+#line 8789 "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
@@ -8788,7 +8796,7 @@ int main() {
 XawScrollbarSetThumb()
 ; return 0; }
 EOF
-if { (eval echo configure:8792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8800: \"$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
@@ -8804,12 +8812,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
   echo "$ac_t""yes" 1>&6
           
 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:8808: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:8816: 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 8813 "configure"
+#line 8821 "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
@@ -8820,7 +8828,7 @@ int main() {
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:8824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8832: \"$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
@@ -8851,12 +8859,12 @@ fi
   else
         
 echo $ac_n "checking for threeDClassRec in -l$athena_variant""... $ac_c" 1>&6
-echo "configure:8855: checking for threeDClassRec in -l$athena_variant" >&5
+echo "configure:8863: 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 8860 "configure"
+#line 8868 "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
@@ -8867,7 +8875,7 @@ int main() {
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:8871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8879: \"$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
@@ -8885,12 +8893,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for threeDClassRec in -lXaw""... $ac_c" 1>&6
-echo "configure:8889: checking for threeDClassRec in -lXaw" >&5
+echo "configure:8897: 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 8894 "configure"
+#line 8902 "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
@@ -8901,7 +8909,7 @@ int main() {
 threeDClassRec()
 ; return 0; }
 EOF
-if { (eval echo configure:8905: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:8913: \"$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
@@ -8932,15 +8940,15 @@ fi
     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:8936: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:8944: checking for X11/Xaw/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8939 "configure"
+#line 8947 "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:8944: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8952: \"$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*
@@ -8960,15 +8968,15 @@ else
   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:8964: checking for X11/Xaw/XawInit.h" >&5
+echo "configure:8972: checking for X11/Xaw/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 8967 "configure"
+#line 8975 "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:8972: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8980: \"$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*
@@ -8994,15 +9002,15 @@ fi
   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:8998: checking for X11/$athena_variant/XawInit.h" >&5
+echo "configure:9006: checking for X11/$athena_variant/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9001 "configure"
+#line 9009 "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:9006: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9014: \"$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*
@@ -9019,15 +9027,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   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:9023: checking for X11/$athena_variant/ThreeD.h" >&5
+echo "configure:9031: checking for X11/$athena_variant/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9026 "configure"
+#line 9034 "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:9031: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9039: \"$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*
@@ -9055,15 +9063,15 @@ fi
         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:9059: checking for $athena_variant/XawInit.h" >&5
+echo "configure:9067: checking for $athena_variant/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9062 "configure"
+#line 9070 "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:9067: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9075: \"$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*
@@ -9080,15 +9088,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   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:9084: checking for $athena_variant/ThreeD.h" >&5
+echo "configure:9092: checking for $athena_variant/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9087 "configure"
+#line 9095 "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:9092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9100: \"$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*
@@ -9117,15 +9125,15 @@ fi
         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:9121: checking for X11/Xaw3d/XawInit.h" >&5
+echo "configure:9129: checking for X11/Xaw3d/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9124 "configure"
+#line 9132 "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:9129: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9137: \"$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*
@@ -9142,15 +9150,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   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:9146: checking for X11/Xaw3d/ThreeD.h" >&5
+echo "configure:9154: checking for X11/Xaw3d/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9149 "configure"
+#line 9157 "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:9154: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9162: \"$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*
@@ -9182,15 +9190,15 @@ fi
         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:9186: checking for Xaw3d/XawInit.h" >&5
+echo "configure:9194: checking for Xaw3d/XawInit.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9189 "configure"
+#line 9197 "configure"
 #include "confdefs.h"
 #include <Xaw3d/XawInit.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9194: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9202: \"$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*
@@ -9207,15 +9215,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   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:9211: checking for Xaw3d/ThreeD.h" >&5
+echo "configure:9219: checking for Xaw3d/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9214 "configure"
+#line 9222 "configure"
 #include "confdefs.h"
 #include <Xaw3d/ThreeD.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9219: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9227: \"$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*
@@ -9247,15 +9255,15 @@ fi
             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:9251: checking for X11/Xaw/ThreeD.h" >&5
+echo "configure:9259: checking for X11/Xaw/ThreeD.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9254 "configure"
+#line 9262 "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:9259: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9267: \"$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*
@@ -9288,17 +9296,21 @@ fi
     have_xaw=no
   fi
 
+else
+  have_xaw=no
+fi 
+if test "$with_x11" = "yes"; then
     ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
-echo "configure:9294: checking for Xm/Xm.h" >&5
+echo "configure:9306: checking for Xm/Xm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9297 "configure"
+#line 9309 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9314: \"$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*
@@ -9315,12 +9327,12 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
-echo "configure:9319: checking for XmStringFree in -lXm" >&5
+echo "configure:9331: 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 9324 "configure"
+#line 9336 "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
@@ -9331,7 +9343,7 @@ int main() {
 XmStringFree()
 ; return 0; }
 EOF
-if { (eval echo configure:9335: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9347: \"$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
@@ -9360,9 +9372,9 @@ fi
 
   if test "$have_motif" = "yes"; then
         echo $ac_n "checking for Lesstif""... $ac_c" 1>&6
-echo "configure:9364: checking for Lesstif" >&5
+echo "configure:9376: checking for Lesstif" >&5
     cat > conftest.$ac_ext <<EOF
-#line 9366 "configure"
+#line 9378 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 #ifdef LESSTIF_VERSION
@@ -9786,7 +9798,7 @@ fi
 
 if test "$with_mule" = "yes" ; then
   echo "checking for Mule-related features" 1>&6
-echo "configure:9790: checking for Mule-related features" >&5
+echo "configure:9802: checking for Mule-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining MULE
 EOF
@@ -9811,15 +9823,15 @@ EOF
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:9815: checking for $ac_hdr" >&5
+echo "configure:9827: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 9818 "configure"
+#line 9830 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9823: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9835: \"$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*
@@ -9850,12 +9862,12 @@ done
 
   
 echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
-echo "configure:9854: checking for strerror in -lintl" >&5
+echo "configure:9866: 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 9859 "configure"
+#line 9871 "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
@@ -9866,7 +9878,7 @@ int main() {
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:9870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9882: \"$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
@@ -9899,18 +9911,18 @@ fi
 
 
   echo "checking for Mule input methods" 1>&6
-echo "configure:9903: checking for Mule input methods" >&5
+echo "configure:9915: checking for Mule input methods" >&5
         case "$with_xim" in "" | "yes" )
     echo "checking for XIM" 1>&6
-echo "configure:9906: checking for XIM" >&5
+echo "configure:9918: checking for XIM" >&5
     
 echo $ac_n "checking for XOpenIM in -lX11""... $ac_c" 1>&6
-echo "configure:9909: checking for XOpenIM in -lX11" >&5
+echo "configure:9921: 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 9914 "configure"
+#line 9926 "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
@@ -9921,7 +9933,7 @@ int main() {
 XOpenIM()
 ; return 0; }
 EOF
-if { (eval echo configure:9925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9937: \"$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
@@ -9945,12 +9957,12 @@ fi
         if test "$have_motif $have_lesstif" = "yes no"; then
       
 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:9949: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:9961: 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 9954 "configure"
+#line 9966 "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
@@ -9961,7 +9973,7 @@ int main() {
 XmImMbLookupString()
 ; return 0; }
 EOF
-if { (eval echo configure:9965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:9977: \"$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
@@ -10026,15 +10038,15 @@ EOF
 
     if test "$with_xfs" = "yes" ; then
     echo "checking for XFontSet" 1>&6
-echo "configure:10030: checking for XFontSet" >&5
+echo "configure:10042: checking for XFontSet" >&5
     
 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6
-echo "configure:10033: checking for XmbDrawString in -lX11" >&5
+echo "configure:10045: 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 10038 "configure"
+#line 10050 "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
@@ -10045,7 +10057,7 @@ int main() {
 XmbDrawString()
 ; return 0; }
 EOF
-if { (eval echo configure:10049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10061: \"$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
@@ -10085,15 +10097,15 @@ EOF
     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:10089: checking for wnn/jllib.h" >&5
+echo "configure:10101: checking for wnn/jllib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10092 "configure"
+#line 10104 "configure"
 #include "confdefs.h"
 #include <wnn/jllib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10097: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10109: \"$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*
@@ -10116,15 +10128,15 @@ fi
  }
     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:10120: checking for wnn/commonhd.h" >&5
+echo "configure:10132: checking for wnn/commonhd.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10123 "configure"
+#line 10135 "configure"
 #include "confdefs.h"
 #include <wnn/commonhd.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10128: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10140: \"$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*
@@ -10149,10 +10161,10 @@ fi
     for ac_func in crypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:10153: checking for $ac_func" >&5
+echo "configure:10165: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10156 "configure"
+#line 10168 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10175,7 +10187,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10191: \"$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
@@ -10204,12 +10216,12 @@ done
 
     test "$ac_cv_func_crypt" != "yes" && { 
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:10208: checking for crypt in -lcrypt" >&5
+echo "configure:10220: 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 10213 "configure"
+#line 10225 "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
@@ -10220,7 +10232,7 @@ int main() {
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:10224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10236: \"$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
@@ -10255,12 +10267,12 @@ fi
     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:10259: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:10271: 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 10264 "configure"
+#line 10276 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10271,7 +10283,7 @@ int main() {
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10289,12 +10301,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for jl_dic_list_e in -lwnn4""... $ac_c" 1>&6
-echo "configure:10293: checking for jl_dic_list_e in -lwnn4" >&5
+echo "configure:10305: 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 10298 "configure"
+#line 10310 "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
@@ -10305,7 +10317,7 @@ int main() {
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10309: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10321: \"$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
@@ -10323,12 +10335,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for jl_dic_list_e in -lwnn6""... $ac_c" 1>&6
-echo "configure:10327: checking for jl_dic_list_e in -lwnn6" >&5
+echo "configure:10339: 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 10332 "configure"
+#line 10344 "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
@@ -10339,7 +10351,7 @@ int main() {
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10355: \"$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
@@ -10357,12 +10369,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for dic_list_e in -lwnn6_fromsrc""... $ac_c" 1>&6
-echo "configure:10361: checking for dic_list_e in -lwnn6_fromsrc" >&5
+echo "configure:10373: 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 10366 "configure"
+#line 10378 "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
@@ -10373,7 +10385,7 @@ int main() {
 dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:10377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10389: \"$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
@@ -10421,12 +10433,12 @@ EOF
     if test "$with_wnn6" != "no"; then
       
 echo $ac_n "checking for jl_fi_dic_list in -l$libwnn""... $ac_c" 1>&6
-echo "configure:10425: checking for jl_fi_dic_list in -l$libwnn" >&5
+echo "configure:10437: 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 10430 "configure"
+#line 10442 "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
@@ -10437,7 +10449,7 @@ int main() {
 jl_fi_dic_list()
 ; return 0; }
 EOF
-if { (eval echo configure:10441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10453: \"$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
@@ -10472,15 +10484,15 @@ EOF
   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:10476: checking for canna/jrkanji.h" >&5
+echo "configure:10488: checking for canna/jrkanji.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10479 "configure"
+#line 10491 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10484: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10496: \"$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*
@@ -10507,15 +10519,15 @@ fi
     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:10511: checking for canna/jrkanji.h" >&5
+echo "configure:10523: checking for canna/jrkanji.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10514 "configure"
+#line 10526 "configure"
 #include "confdefs.h"
 #include <canna/jrkanji.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10519: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10531: \"$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*
@@ -10543,15 +10555,15 @@ fi
 
   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:10547: checking for canna/RK.h" >&5
+echo "configure:10559: checking for canna/RK.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10550 "configure"
+#line 10562 "configure"
 #include "confdefs.h"
 #include <canna/RK.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:10555: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:10567: \"$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*
@@ -10574,12 +10586,12 @@ fi
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
-echo "configure:10578: checking for RkBgnBun in -lRKC" >&5
+echo "configure:10590: 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 10583 "configure"
+#line 10595 "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
@@ -10590,7 +10602,7 @@ int main() {
 RkBgnBun()
 ; return 0; }
 EOF
-if { (eval echo configure:10594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10606: \"$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
@@ -10613,12 +10625,12 @@ fi
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
-echo "configure:10617: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:10629: 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 10622 "configure"
+#line 10634 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -10629,7 +10641,7 @@ int main() {
 jrKanjiControl()
 ; return 0; }
 EOF
-if { (eval echo configure:10633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -10678,12 +10690,12 @@ if test "$need_motif" = "yes" ; then
   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:10682: checking for layout_object_getvalue in -li18n" >&5
+echo "configure:10694: 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 10687 "configure"
+#line 10699 "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
@@ -10694,7 +10706,7 @@ int main() {
 layout_object_getvalue()
 ; return 0; }
 EOF
-if { (eval echo configure:10698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10710: \"$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
@@ -10780,10 +10792,10 @@ fi
 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:10784: checking for $ac_func" >&5
+echo "configure:10796: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10787 "configure"
+#line 10799 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10806,7 +10818,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10810: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10822: \"$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
@@ -10838,10 +10850,10 @@ done
 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:10842: checking for $ac_func" >&5
+echo "configure:10854: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10845 "configure"
+#line 10857 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -10864,7 +10876,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10880: \"$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
@@ -10893,10 +10905,10 @@ done
 
 
 echo $ac_n "checking for openpty""... $ac_c" 1>&6
-echo "configure:10897: checking for openpty" >&5
+echo "configure:10909: checking for openpty" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10900 "configure"
+#line 10912 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char openpty(); below.  */
@@ -10919,7 +10931,7 @@ openpty();
 
 ; return 0; }
 EOF
-if { (eval echo configure:10923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10935: \"$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
@@ -10938,12 +10950,12 @@ else
 
   
 echo $ac_n "checking for openpty in -lutil""... $ac_c" 1>&6
-echo "configure:10942: checking for openpty in -lutil" >&5
+echo "configure:10954: 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 10947 "configure"
+#line 10959 "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
@@ -10954,7 +10966,7 @@ int main() {
 openpty()
 ; return 0; }
 EOF
-if { (eval echo configure:10958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:10970: \"$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
@@ -10989,15 +11001,15 @@ EOF
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:10993: checking for $ac_hdr" >&5
+echo "configure:11005: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 10996 "configure"
+#line 11008 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11013: \"$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*
@@ -11033,15 +11045,15 @@ for ac_hdr in stropts.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11037: checking for $ac_hdr" >&5
+echo "configure:11049: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11040 "configure"
+#line 11052 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11045: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11057: \"$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*
@@ -11074,10 +11086,10 @@ if test "$ac_cv_header_stropts_h" = "yes"; then
   for ac_func in isastream
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11078: checking for $ac_func" >&5
+echo "configure:11090: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11081 "configure"
+#line 11093 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11100,7 +11112,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11104: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11116: \"$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
@@ -11131,15 +11143,15 @@ done
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11135: checking for $ac_hdr" >&5
+echo "configure:11147: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11138 "configure"
+#line 11150 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11143: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11155: \"$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*
@@ -11176,10 +11188,10 @@ extra_objs="$extra_objs realpath.o" &&  if test "$extra_verbose" = "yes"; then
 for ac_func in getloadavg
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:11180: checking for $ac_func" >&5
+echo "configure:11192: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11183 "configure"
+#line 11195 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11202,7 +11214,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11218: \"$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
@@ -11235,15 +11247,15 @@ if test "$ac_cv_func_getloadavg" = "yes"; then
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11239: checking for $ac_hdr" >&5
+echo "configure:11251: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11242 "configure"
+#line 11254 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11247: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11259: \"$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*
@@ -11279,12 +11291,12 @@ else
 
     
 echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:11283: checking for kstat_open in -lkstat" >&5
+echo "configure:11295: 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 11288 "configure"
+#line 11300 "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
@@ -11295,7 +11307,7 @@ int main() {
 kstat_open()
 ; return 0; }
 EOF
-if { (eval echo configure:11299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11311: \"$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
@@ -11330,15 +11342,15 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:11334: checking for $ac_hdr" >&5
+echo "configure:11346: checking for $ac_hdr" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11337 "configure"
+#line 11349 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11342: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11354: \"$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*
@@ -11370,12 +11382,12 @@ done
 
     
 echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:11374: checking for kvm_read in -lkvm" >&5
+echo "configure:11386: 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 11379 "configure"
+#line 11391 "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
@@ -11386,7 +11398,7 @@ int main() {
 kvm_read()
 ; return 0; }
 EOF
-if { (eval echo configure:11390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11402: \"$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
@@ -11420,16 +11432,16 @@ fi
 fi
 
 echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:11424: checking whether netdb declares h_errno" >&5
+echo "configure:11436: checking whether netdb declares h_errno" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11426 "configure"
+#line 11438 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 return h_errno;
 ; return 0; }
 EOF
-if { (eval echo configure:11433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11445: \"$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
@@ -11449,16 +11461,16 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:11453: checking for sigsetjmp" >&5
+echo "configure:11465: checking for sigsetjmp" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11455 "configure"
+#line 11467 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigjmp_buf bar; sigsetjmp (bar, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:11462: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11474: \"$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
@@ -11478,11 +11490,11 @@ fi
 rm -f conftest*
 
 echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
-echo "configure:11482: checking whether localtime caches TZ" >&5
+echo "configure:11494: checking whether localtime caches TZ" >&5
 
 if test "$ac_cv_func_tzset" = "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 11486 "configure"
+#line 11498 "configure"
 #include "confdefs.h"
 #include <time.h>
 #if STDC_HEADERS
@@ -11517,7 +11529,7 @@ main()
   exit (0);
 }
 EOF
-if { (eval echo configure:11521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:11533: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   emacs_cv_localtime_cache=no
 else
@@ -11547,9 +11559,9 @@ fi
 
 if test "$HAVE_TIMEVAL" = "yes"; then
 echo $ac_n "checking whether gettimeofday accepts one or two arguments""... $ac_c" 1>&6
-echo "configure:11551: checking whether gettimeofday accepts one or two arguments" >&5
+echo "configure:11563: checking whether gettimeofday accepts one or two arguments" >&5
 cat > conftest.$ac_ext <<EOF
-#line 11553 "configure"
+#line 11565 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -11570,7 +11582,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:11574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11586: \"$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
@@ -11592,19 +11604,19 @@ fi
 
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:11596: checking for inline" >&5
+echo "configure:11608: checking for inline" >&5
 
 ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 11601 "configure"
+#line 11613 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:11608: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:11620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -11645,17 +11657,17 @@ if test "$__DECC" != "yes"; then
   # 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:11649: checking for working alloca.h" >&5
+echo "configure:11661: checking for working alloca.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11652 "configure"
+#line 11664 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:11659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11671: \"$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
@@ -11679,10 +11691,10 @@ EOF
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:11683: checking for alloca" >&5
+echo "configure:11695: checking for alloca" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11686 "configure"
+#line 11698 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -11710,7 +11722,7 @@ int main() {
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:11714: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11726: \"$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
@@ -11749,10 +11761,10 @@ EOF
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:11753: checking whether alloca needs Cray hooks" >&5
+echo "configure:11765: checking whether alloca needs Cray hooks" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11756 "configure"
+#line 11768 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -11776,10 +11788,10 @@ echo "$ac_t""$ac_cv_os_cray" 1>&6
 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:11780: checking for $ac_func" >&5
+echo "configure:11792: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11783 "configure"
+#line 11795 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -11802,7 +11814,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:11806: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:11818: \"$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
@@ -11832,10 +11844,10 @@ done
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:11836: checking stack direction for C alloca" >&5
+echo "configure:11848: checking stack direction for C alloca" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11839 "configure"
+#line 11851 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -11854,7 +11866,7 @@ main ()
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:11858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:11870: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_c_stack_direction=1
 else
@@ -11884,15 +11896,15 @@ fi
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:11888: checking for vfork.h" >&5
+echo "configure:11900: checking for vfork.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11891 "configure"
+#line 11903 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:11896: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:11908: \"$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*
@@ -11920,10 +11932,10 @@ else
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:11924: checking for working vfork" >&5
+echo "configure:11936: checking for working vfork" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 11927 "configure"
+#line 11939 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -12018,7 +12030,7 @@ main() {
   }
 }
 EOF
-if { (eval echo configure:12022: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_vfork_works=yes
 else
@@ -12044,10 +12056,10 @@ fi
 
 
 echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:12048: checking for working strcoll" >&5
+echo "configure:12060: checking for working strcoll" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12051 "configure"
+#line 12063 "configure"
 #include "confdefs.h"
 #include <string.h>
 main ()
@@ -12057,7 +12069,7 @@ main ()
 	strcoll ("123", "456") >= 0);
 }
 EOF
-if { (eval echo configure:12061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_strcoll_works=yes
 else
@@ -12085,10 +12097,10 @@ fi
 for ac_func in getpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:12089: checking for $ac_func" >&5
+echo "configure:12101: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12092 "configure"
+#line 12104 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -12111,7 +12123,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:12115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12127: \"$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
@@ -12139,10 +12151,10 @@ fi
 done
 
 echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:12143: checking whether getpgrp takes no argument" >&5
+echo "configure:12155: checking whether getpgrp takes no argument" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12146 "configure"
+#line 12158 "configure"
 #include "confdefs.h"
 
 /*
@@ -12197,7 +12209,7 @@ main()
 }
 
 EOF
-if { (eval echo configure:12201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   ac_cv_func_getpgrp_void=yes
 else
@@ -12224,10 +12236,10 @@ fi
 
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:12228: checking for working mmap" >&5
+echo "configure:12240: checking for working mmap" >&5
 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 cat > conftest.$ac_ext <<EOF
-#line 12231 "configure"
+#line 12243 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <unistd.h>
@@ -12260,7 +12272,7 @@ int main (int argc, char *argv[])
   return 1;
 }
 EOF
-if { (eval echo configure:12264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:12276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   have_mmap=yes
 else
@@ -12289,9 +12301,9 @@ test "$GNU_MALLOC" != "yes" -a "$have_mmap" != "yes" && rel_alloc=no
 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:12293: checking for M_MMAP_THRESHOLD" >&5
+echo "configure:12305: checking for M_MMAP_THRESHOLD" >&5
     cat > conftest.$ac_ext <<EOF
-#line 12295 "configure"
+#line 12307 "configure"
 #include "confdefs.h"
 #include <malloc.h>
 int main() {
@@ -12303,7 +12315,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:12307: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:12319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   rel_alloc=no; echo "$ac_t""yes" 1>&6;
 else
@@ -12328,15 +12340,15 @@ EOF
 
 ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:12332: checking for termios.h" >&5
+echo "configure:12344: checking for termios.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12335 "configure"
+#line 12347 "configure"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12340: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12352: \"$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*
@@ -12379,15 +12391,15 @@ else
   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:12383: checking for termio.h" >&5
+echo "configure:12395: checking for termio.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12386 "configure"
+#line 12398 "configure"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12391: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12403: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -12419,10 +12431,10 @@ fi
 
 
 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:12423: checking for socket" >&5
+echo "configure:12435: checking for socket" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12426 "configure"
+#line 12438 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -12445,7 +12457,7 @@ socket();
 
 ; return 0; }
 EOF
-if { (eval echo configure:12449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12461: \"$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
@@ -12460,15 +12472,15 @@ if eval "test \"`echo '$ac_cv_func_'socket`\" = yes"; then
   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:12464: checking for netinet/in.h" >&5
+echo "configure:12476: checking for netinet/in.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12467 "configure"
+#line 12479 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12472: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12484: \"$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*
@@ -12485,15 +12497,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   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:12489: checking for arpa/inet.h" >&5
+echo "configure:12501: checking for arpa/inet.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12492 "configure"
+#line 12504 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12497: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12509: \"$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*
@@ -12518,9 +12530,9 @@ EOF
 }
 
       echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:12522: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:12534: checking "for sun_len member in struct sockaddr_un"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 12524 "configure"
+#line 12536 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12531,7 +12543,7 @@ int main() {
 static struct sockaddr_un x; x.sun_len = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:12535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12547: \"$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
@@ -12549,9 +12561,9 @@ else
 fi
 rm -f conftest*
       echo $ac_n "checking "for ip_mreq struct in netinet/in.h"""... $ac_c" 1>&6
-echo "configure:12553: checking "for ip_mreq struct in netinet/in.h"" >&5
+echo "configure:12565: checking "for ip_mreq struct in netinet/in.h"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 12555 "configure"
+#line 12567 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -12561,7 +12573,7 @@ int main() {
 static struct ip_mreq x;
 ; return 0; }
 EOF
-if { (eval echo configure:12565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12577: \"$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
@@ -12592,10 +12604,10 @@ fi
 
 
 echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:12596: checking for msgget" >&5
+echo "configure:12608: checking for msgget" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12599 "configure"
+#line 12611 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char msgget(); below.  */
@@ -12618,7 +12630,7 @@ msgget();
 
 ; return 0; }
 EOF
-if { (eval echo configure:12622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12634: \"$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
@@ -12633,15 +12645,15 @@ if eval "test \"`echo '$ac_cv_func_'msgget`\" = yes"; then
   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:12637: checking for sys/ipc.h" >&5
+echo "configure:12649: checking for sys/ipc.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12640 "configure"
+#line 12652 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12645: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12657: \"$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*
@@ -12658,15 +12670,15 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   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:12662: checking for sys/msg.h" >&5
+echo "configure:12674: checking for sys/msg.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12665 "configure"
+#line 12677 "configure"
 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12670: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12682: \"$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*
@@ -12704,15 +12716,15 @@ fi
 
 ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:12708: checking for dirent.h" >&5
+echo "configure:12720: checking for dirent.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12711 "configure"
+#line 12723 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12716: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12728: \"$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*
@@ -12739,15 +12751,15 @@ else
   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:12743: checking for sys/dir.h" >&5
+echo "configure:12755: checking for sys/dir.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12746 "configure"
+#line 12758 "configure"
 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12751: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12763: \"$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*
@@ -12780,15 +12792,15 @@ fi
 
 ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:12784: checking for nlist.h" >&5
+echo "configure:12796: checking for nlist.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12787 "configure"
+#line 12799 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:12792: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12804: \"$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*
@@ -12818,22 +12830,22 @@ fi
 
 
 echo "checking "for sound support"" 1>&6
-echo "configure:12822: checking "for sound support"" >&5
+echo "configure:12834: 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:12829: checking for multimedia/audio_device.h" >&5
+echo "configure:12841: checking for multimedia/audio_device.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12832 "configure"
+#line 12844 "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:12837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:12849: \"$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*
@@ -12881,12 +12893,12 @@ fi
       if test -z "$native_sound_lib"; then
         
 echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:12885: checking for ALopenport in -laudio" >&5
+echo "configure:12897: 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 12890 "configure"
+#line 12902 "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
@@ -12897,7 +12909,7 @@ int main() {
 ALopenport()
 ; return 0; }
 EOF
-if { (eval echo configure:12901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12913: \"$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
@@ -12928,12 +12940,12 @@ fi
       if test -z "$native_sound_lib"; then
 	
 echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:12932: checking for AOpenAudio in -lAlib" >&5
+echo "configure:12944: 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 12937 "configure"
+#line 12949 "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
@@ -12944,7 +12956,7 @@ int main() {
 AOpenAudio()
 ; return 0; }
 EOF
-if { (eval echo configure:12948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:12960: \"$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
@@ -12989,15 +13001,15 @@ fi
     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:12993: checking for ${dir}/soundcard.h" >&5
+echo "configure:13005: checking for ${dir}/soundcard.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 12996 "configure"
+#line 13008 "configure"
 #include "confdefs.h"
 #include <${dir}/soundcard.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13001: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13013: \"$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*
@@ -13051,15 +13063,15 @@ fi
 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:13055: checking for audio/audiolib.h" >&5
+echo "configure:13067: checking for audio/audiolib.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13058 "configure"
+#line 13070 "configure"
 #include "confdefs.h"
 #include <audio/audiolib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13063: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13075: \"$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*
@@ -13077,12 +13089,12 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   
     
 echo $ac_n "checking for AuOpenServer in -laudio""... $ac_c" 1>&6
-echo "configure:13081: checking for AuOpenServer in -laudio" >&5
+echo "configure:13093: 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 13086 "configure"
+#line 13098 "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
@@ -13093,7 +13105,7 @@ int main() {
 AuOpenServer()
 ; return 0; }
 EOF
-if { (eval echo configure:13097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13109: \"$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
@@ -13132,7 +13144,7 @@ EOF
  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 13136 "configure"
+#line 13148 "configure"
 #include "confdefs.h"
 #include <audio/Xtutil.h>
 EOF
@@ -13163,7 +13175,7 @@ if test "$with_esd_sound" != "no"; then
   # 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:13167: checking for $ac_word" >&5
+echo "configure:13179: 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.
@@ -13192,10 +13204,10 @@ fi
     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:13196: checking for esd_play_stream" >&5
+echo "configure:13208: checking for esd_play_stream" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13199 "configure"
+#line 13211 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char esd_play_stream(); below.  */
@@ -13218,7 +13230,7 @@ esd_play_stream();
 
 ; return 0; }
 EOF
-if { (eval echo configure:13222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13234: \"$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
@@ -13269,7 +13281,7 @@ test -z "$with_tty" && with_tty=yes
 
 if test "$with_tty" = "yes"  ; then
   echo "checking for TTY-related features" 1>&6
-echo "configure:13273: checking for TTY-related features" >&5
+echo "configure:13285: checking for TTY-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_TTY
 EOF
@@ -13285,12 +13297,12 @@ EOF
     if test -z "$with_ncurses"; then
     
 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:13289: checking for tgetent in -lncurses" >&5
+echo "configure:13301: 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 13294 "configure"
+#line 13306 "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
@@ -13301,7 +13313,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13317: \"$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
@@ -13334,15 +13346,15 @@ EOF
 
     ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:13338: checking for ncurses/curses.h" >&5
+echo "configure:13350: checking for ncurses/curses.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13341 "configure"
+#line 13353 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13358: \"$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*
@@ -13364,15 +13376,15 @@ fi
 
     ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
-echo "configure:13368: checking for ncurses/term.h" >&5
+echo "configure:13380: checking for ncurses/term.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13371 "configure"
+#line 13383 "configure"
 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13376: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13388: \"$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*
@@ -13402,15 +13414,15 @@ fi
       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:13406: checking for ncurses/curses.h" >&5
+echo "configure:13418: checking for ncurses/curses.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13409 "configure"
+#line 13421 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13414: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13426: \"$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*
@@ -13445,12 +13457,12 @@ fi
 	for lib in curses termlib termcap; do
 	  
 echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:13449: checking for tgetent in -l$lib" >&5
+echo "configure:13461: 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 13454 "configure"
+#line 13466 "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
@@ -13461,7 +13473,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13477: \"$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
@@ -13492,12 +13504,12 @@ fi
       else
 	
 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:13496: checking for tgetent in -lcurses" >&5
+echo "configure:13508: 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 13501 "configure"
+#line 13513 "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
@@ -13508,7 +13520,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13524: \"$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
@@ -13526,12 +13538,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:13530: checking for tgetent in -ltermcap" >&5
+echo "configure:13542: 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 13535 "configure"
+#line 13547 "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
@@ -13542,7 +13554,7 @@ int main() {
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:13546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13558: \"$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
@@ -13590,15 +13602,15 @@ EOF
 
     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:13594: checking for gpm.h" >&5
+echo "configure:13606: checking for gpm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13597 "configure"
+#line 13609 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13602: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13614: \"$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*
@@ -13621,12 +13633,12 @@ fi
  }
   test -z "$with_gpm" && { 
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:13625: checking for Gpm_Open in -lgpm" >&5
+echo "configure:13637: 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 13630 "configure"
+#line 13642 "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
@@ -13637,7 +13649,7 @@ int main() {
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:13641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13653: \"$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
@@ -13687,20 +13699,20 @@ test "$with_x11" = "yes" -o "$with_tty" = "yes" && extra_objs="$extra_objs event
 
 test "$with_database_gdbm $with_database_dbm $with_database_berkdb" \
   != "no no no" && echo "checking for database support" 1>&6
-echo "configure:13691: checking for database support" >&5
+echo "configure:13703: 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:13696: checking for ndbm.h" >&5
+echo "configure:13708: checking for ndbm.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13699 "configure"
+#line 13711 "configure"
 #include "confdefs.h"
 #include <ndbm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:13704: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:13716: \"$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*
@@ -13730,12 +13742,12 @@ fi
 if test "$with_database_gdbm" != "no"; then
   
 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:13734: checking for dbm_open in -lgdbm" >&5
+echo "configure:13746: 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 13739 "configure"
+#line 13751 "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
@@ -13746,7 +13758,7 @@ int main() {
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:13750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13762: \"$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
@@ -13774,10 +13786,10 @@ fi
 
 if test "$with_database_dbm" != "no"; then
   echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:13778: checking for dbm_open" >&5
+echo "configure:13790: checking for dbm_open" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13781 "configure"
+#line 13793 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */
@@ -13800,7 +13812,7 @@ dbm_open();
 
 ; return 0; }
 EOF
-if { (eval echo configure:13804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13816: \"$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
@@ -13819,12 +13831,12 @@ else
 
     
 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:13823: checking for dbm_open in -ldbm" >&5
+echo "configure:13835: 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 13828 "configure"
+#line 13840 "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
@@ -13835,7 +13847,7 @@ int main() {
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:13839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:13851: \"$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
@@ -13876,10 +13888,10 @@ EOF
 
 if test "$with_database_berkdb" != "no"; then
   echo $ac_n "checking for Berkeley db.h""... $ac_c" 1>&6
-echo "configure:13880: checking for Berkeley db.h" >&5
+echo "configure:13892: checking for Berkeley db.h" >&5
   for header in "db/db.h" "db.h"; do
     cat > conftest.$ac_ext <<EOF
-#line 13883 "configure"
+#line 13895 "configure"
 #include "confdefs.h"
 
 #include <stdlib.h>
@@ -13901,7 +13913,7 @@ int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:13905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:13917: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   db_h_file="$header"; break
 else
@@ -13917,9 +13929,9 @@ rm -f conftest*
 
   if test "$with_database_berkdb" != "no"; then
     echo $ac_n "checking for Berkeley DB version""... $ac_c" 1>&6
-echo "configure:13921: checking for Berkeley DB version" >&5
+echo "configure:13933: checking for Berkeley DB version" >&5
     cat > conftest.$ac_ext <<EOF
-#line 13923 "configure"
+#line 13935 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 1
@@ -13931,7 +13943,7 @@ if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "yes" >/dev/null 2>&1; then
   rm -rf conftest*
   cat > conftest.$ac_ext <<EOF
-#line 13935 "configure"
+#line 13947 "configure"
 #include "confdefs.h"
 #include <$db_h_file>
 #if DB_VERSION_MAJOR > 2
@@ -13958,10 +13970,10 @@ fi
 rm -f conftest*
 
     echo $ac_n "checking for $dbfunc""... $ac_c" 1>&6
-echo "configure:13962: checking for $dbfunc" >&5
+echo "configure:13974: checking for $dbfunc" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 13965 "configure"
+#line 13977 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $dbfunc(); below.  */
@@ -13984,7 +13996,7 @@ $dbfunc();
 
 ; return 0; }
 EOF
-if { (eval echo configure:13988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14000: \"$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
@@ -14003,12 +14015,12 @@ else
 
     
 echo $ac_n "checking for $dbfunc in -ldb""... $ac_c" 1>&6
-echo "configure:14007: checking for $dbfunc in -ldb" >&5
+echo "configure:14019: 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 14012 "configure"
+#line 14024 "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
@@ -14019,7 +14031,7 @@ int main() {
 $dbfunc()
 ; return 0; }
 EOF
-if { (eval echo configure:14023: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14035: \"$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
@@ -14083,12 +14095,12 @@ fi
 if test "$with_socks" = "yes"; then
   
 echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:14087: checking for SOCKSinit in -lsocks" >&5
+echo "configure:14099: 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 14092 "configure"
+#line 14104 "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
@@ -14099,7 +14111,7 @@ int main() {
 SOCKSinit()
 ; return 0; }
 EOF
-if { (eval echo configure:14103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14115: \"$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
@@ -14154,22 +14166,22 @@ fi
 
 if test "$with_modules" != "no"; then
   echo "checking for module support" 1>&6
-echo "configure:14158: checking for module support" >&5
+echo "configure:14170: 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:14165: checking for dlfcn.h" >&5
+echo "configure:14177: checking for dlfcn.h" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14168 "configure"
+#line 14180 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:14173: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:14185: \"$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*
@@ -14186,16 +14198,16 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   echo "$ac_t""yes" 1>&6
   
       echo $ac_n "checking for dlopen in -lc""... $ac_c" 1>&6
-echo "configure:14190: checking for dlopen in -lc" >&5
+echo "configure:14202: checking for dlopen in -lc" >&5
       cat > conftest.$ac_ext <<EOF
-#line 14192 "configure"
+#line 14204 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int main() {
 	dlopen ("", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:14199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14211: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    have_dl=yes 
 else
@@ -14204,18 +14216,18 @@ else
   rm -rf conftest*
   
       echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
-echo "configure:14208: checking for dlopen in -ldl" >&5
+echo "configure:14220: checking for dlopen in -ldl" >&5
       ac_save_LIBS="$LIBS"
       LIBS="-ldl $LIBS"
       cat > conftest.$ac_ext <<EOF
-#line 14212 "configure"
+#line 14224 "configure"
 #include "confdefs.h"
 #include <dlfcn.h>
 int main() {
 	dlopen ("", 0);
 ; return 0; }
 EOF
-if { (eval echo configure:14219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
    have_dl=yes 
 else
@@ -14244,12 +14256,12 @@ EOF
     else
       
 echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6
-echo "configure:14248: checking for shl_load in -ldld" >&5
+echo "configure:14260: 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 14253 "configure"
+#line 14265 "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
@@ -14260,7 +14272,7 @@ int main() {
 shl_load()
 ; return 0; }
 EOF
-if { (eval echo configure:14264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14276: \"$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
@@ -14287,12 +14299,12 @@ else
   echo "$ac_t""no" 1>&6
 
 echo $ac_n "checking for dld_init in -ldld""... $ac_c" 1>&6
-echo "configure:14291: checking for dld_init in -ldld" >&5
+echo "configure:14303: 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 14296 "configure"
+#line 14308 "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
@@ -14303,7 +14315,7 @@ int main() {
 dld_init()
 ; return 0; }
 EOF
-if { (eval echo configure:14307: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14319: \"$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
@@ -14348,7 +14360,7 @@ xehost=$canonical
 xealias=$internal_configuration
 
 echo "checking how to build dynamic libraries for ${xehost}" 1>&6
-echo "configure:14352: checking how to build dynamic libraries for ${xehost}" >&5
+echo "configure:14364: checking how to build dynamic libraries for ${xehost}" >&5
 # Transform *-*-linux* to *-*-linux-gnu*, to support old configure scripts.
 case "$xehost" in
 *-*-linux-gnu*) ;;
@@ -14376,9 +14388,9 @@ if test "$GCC" = "yes"; then
   XEGCC=yes
 else
   echo $ac_n "checking checking whether we are using GNU C""... $ac_c" 1>&6
-echo "configure:14380: checking checking whether we are using GNU C" >&5
+echo "configure:14392: checking checking whether we are using GNU C" >&5
   cat > conftest.$ac_ext <<EOF
-#line 14382 "configure"
+#line 14394 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -14400,7 +14412,7 @@ rm -f conftest*
 fi
 
 echo $ac_n "checking how to produce PIC code""... $ac_c" 1>&6
-echo "configure:14404: checking how to produce PIC code" >&5
+echo "configure:14416: checking how to produce PIC code" >&5
 wl=
 
 can_build_shared=yes
@@ -14501,18 +14513,18 @@ if test -n "$dll_cflags"; then
 
   # 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:14505: checking if PIC flag ${dll_cflags} really works" >&5
+echo "configure:14517: checking if PIC flag ${dll_cflags} really works" >&5
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS $dll_cflags -DPIC"
   cat > conftest.$ac_ext <<EOF
-#line 14509 "configure"
+#line 14521 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:14516: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:14528: \"$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
@@ -14543,7 +14555,7 @@ cc_produces_so=no
 xldf=
 xcldf=
 echo $ac_n "checking if C compiler can produce shared libraries""... $ac_c" 1>&6
-echo "configure:14547: checking if C compiler can produce shared libraries" >&5
+echo "configure:14559: checking if C compiler can produce shared libraries" >&5
 if test "$XEGCC" = yes; then
   xcldf="-shared"
   xldf="-shared"
@@ -14594,14 +14606,14 @@ if test -n "$xcldf"; then
   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 14598 "configure"
+#line 14610 "configure"
 #include "confdefs.h"
 
 int main() {
 int x=0;
 ; return 0; }
 EOF
-if { (eval echo configure:14605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14617: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   cc_produces_so=yes
 else
@@ -14626,18 +14638,19 @@ if test -z "$LTLD"; then
   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:14630: checking for ld used by GCC" >&5
+echo "configure:14642: checking for ld used by GCC" >&5
     ac_prog=`($CC -print-prog-name=ld) 2>&5`
     case "$ac_prog" in
     # Accept absolute paths.
     /*)
       if test -z "$LTLD"; then
-        case "$ac_prog" in
-          *gcc-lib*) LTLD="$CC"
-                     ;;
-          *)         LTLD="$ac_prog"
-                     ;;
-        esac
+#        case "$ac_prog" in
+#          *gcc-lib*) LTLD="$CC"
+#                     ;;
+#          *)
+         LTLD="$ac_prog"
+#                     ;;
+#        esac
       fi
       ;;
     "")
@@ -14651,7 +14664,7 @@ echo "configure:14630: checking for ld used by GCC" >&5
     esac
   else
     echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
-echo "configure:14655: checking for GNU ld" >&5
+echo "configure:14668: checking for GNU ld" >&5
   fi
 
   if test -z "$LTLD"; then
@@ -14689,7 +14702,7 @@ ld_dynamic_link_flags=
 
 # 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:14693: checking if the linker is GNU ld" >&5
+echo "configure:14706: 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
@@ -14717,7 +14730,7 @@ else
   # 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:14721: checking whether the linker supports shared libraries" >&5
+echo "configure:14734: checking whether the linker supports shared libraries" >&5
   dll_ld=$CC
   dll_ldflags=$LDFLAGS
   ld_shlibs=yes
@@ -14928,10 +14941,10 @@ EOF
     for ac_func in dlerror _dlerror
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:14932: checking for $ac_func" >&5
+echo "configure:14945: checking for $ac_func" >&5
 
 cat > conftest.$ac_ext <<EOF
-#line 14935 "configure"
+#line 14948 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -14954,7 +14967,7 @@ $ac_func();
 
 ; return 0; }
 EOF
-if { (eval echo configure:14958: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:14971: \"$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
@@ -14993,11 +15006,11 @@ done
 fi
 
 cat > conftest.$ac_ext <<EOF
-#line 14997 "configure"
+#line 15010 "configure"
 #include "confdefs.h"
 int main(int c,char *v[]){return 0;}
 EOF
-if { (eval echo configure:15001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
+if { (eval echo configure:15014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit $?) 2>&5
 then
   :
 else
@@ -15562,6 +15575,14 @@ cat >> confdefs.h <<\EOF
 EOF
 }
 
+test "$with_ipv6_cname"    = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining IPV6_CANONICALIZE
+EOF
+cat >> confdefs.h <<\EOF
+#define IPV6_CANONICALIZE 1
+EOF
+}
+
 
 
 (
@@ -15762,6 +15783,7 @@ test -n "$mail_locking" && echo "  Compiling in support for \"$mail_locking\" ma
 
 echo "
 Other Features:"
+test "with_ipv6_cname" = no && echo "  Inhibiting IPv6 canonicalization at startup."
 test "$with_tooltalk" = yes && echo "  Compiling in support for ToolTalk."
 test "$with_workshop" = yes && echo "  Compiling in support for Sun WorkShop."
 test "$with_socks" = yes && echo "  Compiling in support for SOCKS."
diff --git a/configure.in b/configure.in
index bfcfd8e..00db67d 100644
--- a/configure.in
+++ b/configure.in
@@ -358,6 +358,8 @@ with_msw=''
 rel_alloc='default'
 with_system_malloc='default'
 with_dlmalloc='default'
+dnl ESD is associated with crashes and lockups due to incorrect signal use.
+with_esd_sound='no'
 native_sound_lib=''
 dnl These should be set to the empty string when we want gtk / gnome to
 dnl be auto-detected instead of manually specified.
@@ -375,6 +377,8 @@ with_dnet=""
 pdump="no"
 dnl dragndrop is still experimental.  When it is stable, comment out the following line:
 with_dragndrop="no"
+dnl I think this is mandated by IPv6 standards.
+with_ipv6_cname="yes"
 
 dnl ------------------
 dnl Options Processing
@@ -500,7 +504,8 @@ while test $# != 0; do
 	with_hesiod	| \
 	with_dnet	| \
 	with_infodock	| \
-	with_netinstall   | \
+	with_netinstall | \
+	with_ipv6_cname | \
 	external_widget | \
 	verbose		| \
 	extra_verbose	| \
@@ -616,7 +621,8 @@ while test $# != 0; do
 		types="\`all', \`none', \`(no)native', \`no(nas)', \`(no)esd'."
 		USAGE_ERROR(["Valid types for the \`--$optname' option are:
   $types.
-The default is to autodetect all sound support."])
+Option \`all' or \`none' must be first in the list.
+The default is to autodetect native and NAS sound support."])
 	    elif test -n "$new_sdefault" ; then
 		with_native_sound=$new_sdefault
 		with_nas_sound=$new_sdefault
@@ -783,14 +789,14 @@ The default is to autodetect all sound support."])
 	"with_widgets" )
 	  case "$val" in
 	    l | lu | luc | luci | lucid )		val=lucid  ;;
-	    m | mo | mot | moti | motif )		val=motif  ;;
+	    mo | mot | moti | motif )			val=motif  ;;
 	    a | at | ath | athe | athen | athena )	val=athena ;;
 	    n | no | non | none )			val=no     ;;
 	    y | ye | yes )				val=yes    ;;
 	    g | gt | gtk )				val=gtk    ;;
-	    m | ms | msw )				val=msw    ;;
+	    ms | msw )					val=msw    ;;
 	    * ) USAGE_ERROR(["The \`--$optname' option must have one of these values:
-  \`gtk\', \`lucid', \`motif', \`athena', \`yes', or \`no'."]) ;;
+  \`gtk', \`lucid', \`motif', \`athena', \`yes', or \`no'."]) ;;
 	  esac
 	  eval "$opt=\"$val\""
 	;;
@@ -2602,8 +2608,10 @@ if test "${GTK_CONFIG}" != "no"; then
 
       dnl Check for libglade support (it rocks)
       OLD_CFLAGS="${CFLAGS}"
+      OLD_CPPFLAGS="${CPPFLAGS}"
       OLD_LDFLAGS="${LDFLAGS}"
       CFLAGS="${GTK_CFLAGS} ${CFLAGS}"
+      CPPFLAGS="${GTK_CFLAGS} ${CFLAGS}"
       LDFLAGS="${LDFLAGS} ${GTK_LIBS}"
       AC_CHECK_HEADERS(glade/glade.h glade.h)
       AC_CHECK_LIB(xml, main, XE_PREPEND(-lxml, libs_gtk))
@@ -2614,6 +2622,7 @@ if test "${GTK_CONFIG}" != "no"; then
                        AC_DEFINE(LIBGLADE_XML_TXTDOMAIN,1)],
                       [AC_MSG_RESULT(no)])
       CFLAGS="${OLD_CFLAGS}"
+      CPPFLAGS="${OLD_CPPFLAGS}"
       LDFLAGS="${OLD_LDFLAGS}"
 fi
 
@@ -3317,9 +3326,10 @@ dnl X-Specific Graphics libraries
 dnl ----------------------
 
 if test "$with_x11" = "yes"; then
-
   AC_CHECKING(for X11 graphics libraries)
+fi
 
+if test "$with_x11" = "yes" -a "$with_widgets" = "athena"; then
   AC_CHECKING(for the Athena widgets)
 
   dnl What in heck did the user actually want?
@@ -3416,6 +3426,11 @@ if test "$with_x11" = "yes"; then
     have_xaw=no
   fi
 
+else
+  have_xaw=no
+fi dnl "$with_x11" = "yes" -a "$with_widgets" = "athena"
+
+if test "$with_x11" = "yes"; then
   dnl autodetect Motif - but only add to libs_x later (if necessary)
   AC_CHECK_HEADER(Xm/Xm.h,
    [AC_CHECK_LIB(Xm, XmStringFree, have_motif=yes, have_motif=no)],
@@ -4162,7 +4177,7 @@ if test "$with_tty" = "yes"  ; then
       XE_ADD_OBJS(tparam.o)
       dnl The HP-UX curses library seems to have a badly broken version of select(2)
       dnl that makes "poll: interrupted system call" messages to appear and
-      dnl Emacs suprocesses to hang (e.g. TeX compilation w/ AUCTeX) */
+      dnl Emacs subprocesses to hang (e.g. TeX compilation w/ AUCTeX) */
       case "$opsys" in *-hp-hpux* ) libs_termcap="-ltermcap" ;; esac
       if test -n "$libs_termcap"; then
 	XE_PREPEND($libs_termcap, LIBS)
@@ -4723,6 +4738,7 @@ test "$with_kerberos"      = "yes" && AC_DEFINE(KERBEROS)
 test "$with_hesiod"        = "yes" && AC_DEFINE(HESIOD)
 test "$use_union_type"     = "yes" && AC_DEFINE(USE_UNION_TYPE)
 test "$pdump"              = "yes" && AC_DEFINE(PDUMP)
+test "$with_ipv6_cname"    = "yes" && AC_DEFINE(IPV6_CANONICALIZE)
 
 dnl -------------------------------
 dnl Report on what we decided to do
@@ -4929,6 +4945,7 @@ test -n "$mail_locking" && echo "  Compiling in support for \"$mail_locking\" ma
 
 echo "
 Other Features:"
+test "with_ipv6_cname" = no && echo "  Inhibiting IPv6 canonicalization at startup."
 test "$with_tooltalk" = yes && echo "  Compiling in support for ToolTalk."
 test "$with_workshop" = yes && echo "  Compiling in support for Sun WorkShop."
 test "$with_socks" = yes && echo "  Compiling in support for SOCKS."
diff --git a/configure.usage b/configure.usage
index c6c25b6..77f52c2 100644
--- a/configure.usage
+++ b/configure.usage
@@ -65,7 +65,8 @@ Window-system options:
 --x-includes=DIR        Search for X header files in DIR.
 --x-libraries=DIR       Search for X libraries in DIR.
 --with-msw (*)          Support MS Windows as a window system (only under
-                        Cygwin and MinGW).
+                        Cygwin and MinGW).  `--with-msw=no' may be needed on
+                        *nix systems with Wine installed.
 --with-toolbars=no      Don't compile with any toolbar support.
 --with-wmcommand=no     Compile without realized leader window which will
                         keep the WM_COMMAND property.
@@ -128,16 +129,17 @@ Image options:
 
 Sound options:
 
---with-sound=TYPE,[TYPE],... Compile with native sound support.
+--with-sound=TYPE[,TYPE[,...]] (*) Compile with sound support.
                         Valid types are `native', `nas' and `esd'.
                         Prefix a type with 'no' to disable.
-                        The first option can be `none' or `all'.
-                        `none' is a synonym for `nonative,nonas,noesd'.
-                        `all' is a synonym for native,nas,esd or `all'.
-                        The default is to autodetect all sound support.
+                        The first type can be `none' or `all'.  `none' means
+                        `nonative,nonas,noesd'.  `all' means `native,nas,esd'.
+                        Later options override earlier ones for the same TYPE.
+                        Autodetect native and NAS sound unless specified.
+                        ESD must be explicitly requested.
 --native-sound-lib=LIB  Native sound support library.  Needed on Suns
-                        with --with-sound=both because both sound libraries
-                        are called libaudio.
+                        with `--with-sound=native,nas' because both sound
+                        libraries are called libaudio.
 
 
 Database options:
@@ -168,7 +170,11 @@ Additional features:
 --with-dnet (*)         Compile with support for DECnet.
 --with-modules          Compile in experimental support for dynamically
                         loaded libraries (Dynamic Shared Objects).
---with-netinstall      Compile in support for installation over the internet.		
+--with-netinstall       Compile in support for installation over the internet.
+                        Only functional on the MS Windows platforms.
+--with-ipv6-cname=no    Don't try to get IPv6 information when canonicalizing
+                        host names.  This option has no effect unless system
+                        supports getaddrinfo(3) and getnameinfo(3).
 --with-site-lisp=yes    Allow for a site-lisp directory in the XEmacs hierarchy
                         searched before the installation packages.
 --with-site-modules=no  Disable site-modules directory in the XEmacs hierarchy,
@@ -190,9 +196,8 @@ Additional features:
                         and localdir files in case run-time searching
                         for them fails.
 --moduledir=DIR         Directory to install dynamic modules in.
---pdump                 New, experimental, non-working, don't-sue-me-if-
-                        your-house-collapses-and-your-wife-leaves-you,
-                        portable dumper.
+--pdump                 New, experimental, 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),
@@ -214,14 +219,14 @@ Internationalization options:
                         on Solaris and the XmIm* routines are detected.
 --with-canna (*)        Compile with support for Canna (a Japanese input method
                         used in conjunction with Mule support).
---with-wnn (*)          Compile with support for WNN (a multi-language input
+--with-wnn (*)          Compile with support for Wnn (a multi-language input
                         method used in conjunction with Mule support).
---with-wnn6 (*)         Compile with support for the commercial package WNN6.
+--with-wnn6 (*)         Compile with support for the commercial package Wnn6.
 --with-i18n3            Compile with I18N level 3 (support for message
                         translation).  This doesn't currently work.
---with-xfs              Compile with XFontSet support for bilingual menubar.
-                        Can't use this option with --with-xim=motif or xlib.
-                        And should have --with-menubars=lucid.
+--with-xfs              Compile with XFontSet support for internationalized
+                        menubar.  Incompatible with `--with-xim=motif'.
+                        `--with-menubars=lucid' (the default) is desirable.
 
 
 Debugging options:
diff --git a/etc/sample.init.el b/etc/sample.init.el
index be87b43..da2e18c 100644
--- a/etc/sample.init.el
+++ b/etc/sample.init.el
@@ -226,6 +226,14 @@ argument are optional. Only the Non-nil arguments are used in the test."
 ;        ;;
 ;        ))
 
+(defun Init-safe-require (feat)
+"Try to REQUIRE the specified feature.  Errors occurring are silenced.
+\(Perhaps in the future there will be a way to get at the error.)
+Returns t if the feature was successfully required."
+  (condition-case nil
+      (progn (require feat) t)
+    (error nil)))
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                          Key Definitions                         ;;
@@ -615,14 +623,11 @@ backward, and defaults to 1.  Buffers whose name begins with a space
 
 ;; Make sure we get Windows-like shifted-motion key selection behavior
 ;; on recent XEmacs versions.
-(if (boundp 'shifted-motion-keys-select-region)
-    (setq shifted-motion-keys-select-region t)
-  ;; otherwise, try the pc-select package -- 
-  (condition-case nil
-      (progn
-	(require 'pc-select)
-	(pc-select-mode 1))
-    (error nil)))
+(cond ((boundp 'shifted-motion-keys-select-region)
+       (setq shifted-motion-keys-select-region t))
+      ;; otherwise, try the pc-select package -- 
+      ((Init-safe-require 'pc-select)
+       (pc-select-mode 1)))
 
 ;; The following commented-out code rearranges the keymap in an
 ;; unconventional but extremely useful way for programmers.  Parens
@@ -929,11 +934,8 @@ previous with \\[backward-sexp]."
 ;;; rather than append -- standard behavior under all window systems
 ;;; nowadays.
 
-(pending-delete-mode 1)
-
-;;; enable region selection with shift+arrows (on by default in 21.5
-;;; and up)
-(setq shifted-motion-keys-select-region t)
+(if (fboundp 'pending-delete-mode)
+    (pending-delete-mode 1))
 
 ;;; NOTE: In this context, `windows-nt' actually refers to all MS
 ;;; Windows operating systems!
@@ -972,7 +974,7 @@ previous with \\[backward-sexp]."
   (setq menu-accelerator-enabled 'menu-force)
 
   ;; Make Cygwin `make' work inside a shell buffer.
-  (setenv "MAKE_MODE" "UNIX"))
+  (if (boundp 'setenv) (setenv "MAKE_MODE" "UNIX")))
 
 ;; This shows how to set up the XEmacs side of tags. (To create the
 ;; TAGS table, use the `etags' program found in the XEmacs bin
@@ -1023,16 +1025,20 @@ previous with \\[backward-sexp]."
 ;; has a NetAudio or ESD server, or on the console of a Linux, Sparc,
 ;; HP, or SGI machine.  Otherwise, you just get the standard beep.)
 
-(cond ((or (and (getenv "DISPLAY") 
-		(string-match ":0" (getenv "DISPLAY")))
-	   (and (eq (console-type) 'mswindows)
-		(device-sound-enabled-p)))
-       (load-default-sounds)
-       ;; On Windows, at least, the sound "quiet-beep", which is normally
-       ;; given the symbolic name `quiet' and is used for Quit and such,
-       ;; is just totally disgusting.  So make this name correspond to a
-       ;; more innocuous sound.
-       (load-sound-file "drum-beep" 'quiet 80))
+(cond ((and (fboundp 'load-default-sounds)
+	    (or (and (getenv "DISPLAY") 
+		     (string-match ":0" (getenv "DISPLAY")))
+		(and (eq (console-type) 'mswindows)
+		     (device-sound-enabled-p))))
+       (condition-case nil
+	   (progn
+	     (load-default-sounds)
+	     ;; On Windows, at least, the sound "quiet-beep", which is normally
+	     ;; given the symbolic name `quiet' and is used for Quit and such,
+	     ;; is just totally disgusting.  So make this name correspond to a
+	     ;; more innocuous sound.
+	     (load-sound-file "drum-beep" 'quiet 80))
+	 (error nil)))
       (t
        (setq bell-volume 40)
        (setq sound-alist
@@ -1182,49 +1188,15 @@ previous with \\[backward-sexp]."
 ;;; When this is loaded, the pathname syntax /user@host:/remote/path
 ;;; refers to files accessible through ftp.
 ;;;
-(require 'dired)
-;; compatible ange-ftp/efs initialization derived from code
-;; from John Turner <turner@lanl.gov>
-;;
-;; The environment variable EMAIL_ADDRESS is used as the password
-;; for access to anonymous ftp sites, if it is set.  If not, one is
-;; constructed using the environment variables USER and DOMAINNAME
-;; (e.g. turner@lanl.gov), if set.
-
-(condition-case nil
-    (progn
-      (require 'efs-auto)
-      (if (getenv "USER")
-	  (setq efs-default-user (getenv "USER")))
-      (if (getenv "EMAIL_ADDRESS")
-	  (setq efs-generate-anonymous-password (getenv "EMAIL_ADDRESS"))
-	(if (and (getenv "USER")
-		 (getenv "DOMAINNAME"))
-	    (setq efs-generate-anonymous-password
-		  (concat (getenv "USER")"@"(getenv "DOMAINNAME")))))
-      (setq efs-auto-save 1))
-  (error
-   (require 'ange-ftp)
-   (if (getenv "USER")
-       (setq ange-ftp-default-user (getenv "USER")))
-   (if (getenv "EMAIL_ADDRESS")
-       (setq ange-ftp-generate-anonymous-password (getenv "EMAIL_ADDRESS"))
-     (if (and (getenv "USER")
-	      (getenv "DOMAINNAME"))
-	 (setq ange-ftp-generate-anonymous-password
-	       (concat (getenv "USER")"@"(getenv "DOMAINNAME")))))
-   (setq ange-ftp-auto-save 1)
-   ))
+(Init-safe-require 'dired)
 
+(or (Init-safe-require 'efs-auto) (Init-safe-require 'ange-ftp))
 
 ;;; ********************
 ;;; Load the default-dir.el package which installs fancy handling of
 ;;; the initial contents in the minibuffer when reading file names.
-
-;(condition-case nil
-;    (require 'default-dir)
-;  (error nil))
-
+;; #### but it seems to cause some breakage.
+;(Init-safe-require 'default-dir))
 
 ;;; ********************
 ;;; Put all of your autosave files in one place, instead of scattering
@@ -1235,9 +1207,9 @@ previous with \\[backward-sexp]."
 ;;; is fast fast fast!)
 ;;;
 ;;; Unfortunately, the code that implements this (auto-save.el) is
-;;; broken on Windows in 21.4 and earlier.
+;;; broken on Windows prior to 21.4.
 (unless (and (eq system-type 'windows-nt)
-	     (not (emacs-version>= 21 5)))
+	     (not (emacs-version>= 21 4)))
   (setq auto-save-directory (expand-file-name "~/.autosave/")
 	auto-save-directory-fallback auto-save-directory
 	auto-save-hash-p nil
@@ -1247,9 +1219,6 @@ previous with \\[backward-sexp]."
 	;; for better interactive response.
 	auto-save-interval 2000
 	)
-  ;; We load this afterwards because it checks to make sure the
-  ;; auto-save-directory exists (creating it if not) when it's loaded.
-  (require 'auto-save)
   )
 
 
@@ -1273,7 +1242,7 @@ previous with \\[backward-sexp]."
 ;;; because there are no other commands whose first three words begin with
 ;;; the letters `b', `c', and `a' respectively.
 ;;;
-(load-library "completer")
+(Init-safe-require 'completer)
 
 
 ;;; ********************
@@ -1287,7 +1256,7 @@ previous with \\[backward-sexp]."
 				   ; tell it not to assume that "binary" files
 				   ; are encrypted and require a password.
       )
-(require 'crypt)
+(Init-safe-require 'crypt)
 
 
 ;;; ********************
@@ -1295,9 +1264,11 @@ previous with \\[backward-sexp]."
 ;;; makes filling (e.g. using M-q) much much smarter about paragraphs
 ;;; that are indented and/or are set off with semicolons, dashes, etc.
 
-(require 'filladapt)
+(Init-safe-require 'filladapt)
 (setq-default filladapt-mode t)
-(add-hook 'c-mode-hook 'turn-off-filladapt-mode)
+(when (fboundp 'turn-off-filladapt-mode)
+  (add-hook 'c-mode-hook 'turn-off-filladapt-mode)
+  (add-hook 'outline-mode-hook 'turn-off-filladapt-mode))
 
 
 ;;; ********************
@@ -1324,7 +1295,7 @@ previous with \\[backward-sexp]."
 ;       (setq font-lock-use-default-fonts nil)
 ;       (setq font-lock-use-default-colors nil)
 
-       (require 'font-lock)
+       (Init-safe-require 'font-lock)
 
 ;       ;; Mess around with the faces a bit.  Note that you have
 ;       ;; to change the font-lock-use-default-* variables *before*
@@ -1360,10 +1331,12 @@ previous with \\[backward-sexp]."
 ;;; accurate as using full font-lock or fast-lock, but it's *much*
 ;;; faster.  No more annoying pauses when you load files.
 
-(add-hook 'font-lock-mode-hook 'turn-on-lazy-lock)
+(if (fboundp 'turn-on-lazy-lock)
+    (add-hook 'font-lock-mode-hook 'turn-on-lazy-lock))
+
 ;; I personally don't like "stealth mode" (where lazy-lock starts
 ;; fontifying in the background if you're idle for 30 seconds)
-;; because it takes too long to wake up again on my piddly Sparc 1+.
+;; because it takes too long to wake up again.
 (setq lazy-lock-stealth-time nil)
 
 
@@ -1377,8 +1350,7 @@ previous with \\[backward-sexp]."
 ;;; Send bug reports, enhancements etc to:
 ;;; David Hughes <ukchugd@ukpmr.cs.philips.nl>
 ;;;
-(cond (running-xemacs
-       (require 'func-menu)
+(cond ((and running-xemacs (Init-safe-require 'func-menu))
        (global-set-key '(shift f12) 'function-menu)
        (add-hook 'find-file-hooks 'fume-add-menubar-entry)
        (global-set-key "\C-cl" 'fume-list-functions)
@@ -1429,16 +1401,16 @@ previous with \\[backward-sexp]."
 ;;; resize-minibuffer-mode makes the minibuffer automatically
 ;;; resize as necessary when it's too big to hold its contents.
 
-(autoload 'resize-minibuffer-mode "rsz-minibuf" nil t)
-(resize-minibuffer-mode)
-(setq resize-minibuffer-window-exactly nil)
+(when (fboundp 'resize-minibuffer-mode)
+  (resize-minibuffer-mode)
+  (setq resize-minibuffer-window-exactly nil))
 
 
 ;;; ********************
 ;;; scroll-in-place is a package that keeps the cursor on the same line (and in the same column) when scrolling by a page using PgUp/PgDn.
 
-(require 'scroll-in-place)
-(turn-on-scroll-in-place)
+(if (Init-safe-require 'scroll-in-place)
+    (turn-on-scroll-in-place))
 
 
 ;;; ********************
diff --git a/etc/xemacs-ja.1 b/etc/xemacs-ja.1
index a31a535..b47f1e0 100644
--- a/etc/xemacs-ja.1
+++ b/etc/xemacs-ja.1
@@ -1,321 +1,378 @@
-.TH XEMACS 1 "1997 ǯ 3 ·î 11 Æü"
+.TH XEMACS 1 "2000-09-20"
 .UC 4
-.SH "̾Á°"
-xemacs \- ¼¡À¤Âå Emacs
-.SH "·Á¼°"
+.SH ̾Á°
+xemacs \- Emacs: The Next Generation
+.SH ½ñ¼°
 .B xemacs
 [
-.I <¥³¥Þ¥ó¥É¹Ô¥ª¥×¥·¥ç¥ó>
+.I ¥³¥Þ¥ó¥É¹Ô¥¹¥¤¥Ã¥Á
 ] [
-.I <¥Õ¥¡¥¤¥ë̾>...
+.I ¥Õ¥¡¥¤¥ë̾ ...
 ]
 .br
-.\"°Ê²¼¡¢bold ¤Ë¤¹¤Ù¤­¥³¥Þ¥ó¥É̾¤Ê¤É¤¬±Ñ¸ì¤Ç¤Ï italic ¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤Î¤Ç¡¢½¤Àµ¡£
-.SH "µ¡Ç½ÀâÌÀ"
-.B XEmacs
-¤Ï¡¢Free Software Foundation ¤Î Richard Stallman ¤Ë¤è¤Ã¤Æ½ñ¤«¤ì¤¿¤â¤Î¤Ç¡¢
-.B Emacs 
-¤È¤Î¸ß´¹À­¤òÊÝ»ý¤·¤¿¤Þ¤Þ¿¤¯¤Î²þÎɤ¬²Ã¤¨¤é¤ì¤¿¥Ð¡¼¥¸¥ç¥ó¤Ç¤¹¡£
-.B "GNU Emacs "
-¥Ð¡¼¥¸¥ç¥ó 19 ¤ÎÁá´ü¥ê¥ê¡¼¥¹¤ò¤â¤È¤Ë³«È¯¤µ¤ì¡¢
-.B "GNU Emacs "
-¤Î¸å³¥ê¥ê¡¼¥¹¤ÈƱ´ü¤¬¤È¤é¤ì¤Æ¤¤¤Þ¤¹¡£
-.PP
-.B XEmacs 
-¤Î¼ç¤Ê¥Þ¥Ë¥å¥¢¥ë¤Ï¡¢
-.B XEmacs 
-¥µ¥Ö¥·¥¹¥Æ¥à¤Î 1 ¤Ä¤Ç¤¢¤ë Info ¤ò»È¤Ã¤Æ¥ª¥ó¥é¥¤¥ó¤Ç»²¾È¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-´°À®¤µ¤ì¤¿ºÇ¿·¤Î¥Þ¥Ë¥å¥¢¥ë¤Ï¡¢¤½¤Á¤é¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤
-(¤¿¤À¤·¸½»þÅÀ¤Ç¤Ï¡¢Info ·Á¼°¥É¥­¥å¥á¥ó¥È¤Ï±Ñ¸ìÈǤΤߤ¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹)¡£
-Emacs Lisp »ÈÍÑÊýË¡¤Ë¤Ä¤¤¤Æ¤Î´°Á´¤Ê¥Þ¥Ë¥å¥¢¥ë¤È¤·¤Æ¤Ï
-¡ØXEmacs Lisp Programmer's Manual¡Ù¤ò¡¢
-¥ª¥ó¥é¥¤¥ó¤Ç»²¾È¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¤É¤Á¤é¤Î¥Þ¥Ë¥å¥¢¥ë¤â
-.B TeX
-½ñ¼°¥Ñ¥Ã¥±¡¼¥¸¤ò»ÈÍѤ¹¤ì¤Ð¡¢¤­¤ì¤¤¤Ë°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-.PP
-»ÈÍѤǤ­¤ë
-.B XEmacs
+.SH ÀâÌÀ
+.I XEmacs
+¤Ï¡¢Free Software Foundation¤Î Richard Stallman ¤Ë¤è¤Ã¤Æ½ñ¤«¤ì¤¿
+.I GNU Emacs
+¤È¸ß´¹¤Ç¡¢¤µ¤é¤Ë¿¤¯¤Î²þÁ±¤¬²Ã¤¨¤é¤ì¤¿
+.I Emacs
+¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤¹¡£¤â¤È¤â¤È¤Ï
+.I GNU Emacs ¤Î¥Ð¡¼¥¸¥ç¥ó 19 ¤ÎÁá´ü¥ê¥ê¡¼¥¹
+¤ò¸µ¤Ë³«È¯¤µ¤ì¡¢¤½¤Î¸å¤Ï
+.I GNU Emacs
+¤Î¸å³¥ê¥ê¡¼¥¹¤¬Åо줹¤ëÅÙ¤ËƱ´ü¤µ¤ì¤Æ¤­¤Þ¤·¤¿¡£
+.PP
+.I XEmacs
+¤Ë¤Ä¤¤¤Æ¤ÎÂè°ì¤Î¥É¥­¥å¥á¥ó¥È¤Ï
+.I XEmacs Reference Manual
+¤Ë¤¢¤ê
+.I XEmacs
+¤Î¥µ¥Ö¥·¥¹¥Æ¥à¤Ç¤¢¤ë Info ¤ò»ÈÍѤ·¤Æ¥ª¥ó¥é¥¤¥ó¤ÇÆɤळ¤È¤¬¤Ç¤­¤Þ¤¹¡£´°
+Á´¤ÇºÇ¿·¤Î¥É¥­¥å¥á¥ó¥È¤Ï¤½¤Á¤é¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£Emacs Lisp »ÈÍѤ˴Ø
+¤¹¤ë¤Î´°Á´¤Ê¥É¥­¥å¥á¥ó¥È¤È¤·¤Æ¤Ï
+.I XEmacs Lisp Programmer's Manual
+¤¬¥ª¥ó¥é¥¤¥ó¤ÇÍøÍѤǤ­¤Þ¤¹¡£¤É¤Á¤é¤Î¥Þ¥Ë¥å¥¢¥ë¤âʸ½ñÀ°·Á¥Ñ¥Ã¥±¡¼¥¸
+.I TeX
+¤ò»ÈÍѤ·¤Æ¤­¤ì¤¤¤Ë°õºþ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+.PP
+.I XEmacs
 ¤Îµ¡Ç½¤Ï¡¢¤Û¤«¤Î
-.B Emacs
-¥¨¥Ç¥£¥¿¤Ç¤Ç¤­¤ë¤¹¤Ù¤Æ¤Îµ¡Ç½¤¬´Þ¤Þ¤ì¤Æ¤ª¤ê¡¢
-ÊÔ½¸¥³¥Þ¥ó¥É¤Ï Lisp ¤Çµ­½Ò¤µ¤ì¤Æ¤¤¤ë¤¿¤á¡¢Íưפ˳ÈÄ¥¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-.PP
-.B XEmacs
-¤Ë¤Ï³ÈÄ¥ÂÐÏ÷¿¥Ø¥ë¥×µ¡Ç½¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢¤³¤Îµ¡Ç½¤ò»ÈÍѤ¹¤ë¤Ë¤Ï¡¢
-.B XEmacs
-¥¦¥£¥ó¥É¥¦¤È¥Ð¥Ã¥Õ¥¡¤Ë¤Ä¤¤¤Æ¤Î°·¤¤Êý¤òÃΤäƤ¤¤ë¤³¤È¤¬Á°Äó¤È¤Ê¤ê¤Þ¤¹¡£
-CTRL-h ¤Ç¥Ø¥ë¥×µ¡Ç½¤ò¼Â¹Ô¤·¤Þ¤¹¡£¡ÖXEmacs ¼«½¬½ñ(CTRL-h t)¡×¤Ï¡¢
-½é¿´¼Ô¤¬¿ôʬ´Ö¤Ç
-.B XEmacs
-¤Î´ðÁäòÃΤ뤳¤È¤¬¤Ç¤­¤ëÂÐÏ÷¿¤Î¥Á¥å¡¼¥È¥ê¥¢¥ë¤ò¸Æ¤Ó½Ð¤·¤Þ¤¹¡£
-¡ÖŬÀÚ¸¡º÷...(CTRL-h a)¡×¤Ï¡¢»ØÄꤷ¤¿µ¡Ç½¤ò¼Â¹Ô¤¹¤ë¥³¥Þ¥ó¥É¤ò
-õ¤¹¼ê½õ¤±¤ò¤·¤Þ¤¹¡£
-¡Ö¥­¡¼/¥Þ¥¦¥¹µ­½Ò...(CTRL-h k)¡×¤Ï¡¢»ØÄꤷ¤¿¥­¡¼Áàºî¤Î¼Â¹ÔÆâÍƤòɽ¼¨¤·¤Þ¤¹¡£
-¡Ö´Ø¿ôµ­½Ò...(CTRL-h f)¡×¤Ï¡¢»ØÄꤷ¤¿Ì¾Á°¤Î Lisp ´Ø¿ô¤òɽ¼¨¤·¤Þ¤¹¡£
-¤µ¤é¤Ë¡Ö¥­¡¼/¥Þ¥¦¥¹³ä¤êÅö¤Æ...(CTRL-h CTRL-k)¡×¤ò»ÈÍѤ¹¤ë¤È¡¢
-.B XEmacs 
-¥ê¥Õ¥¡¥ì¥ó¥¹¥Þ¥Ë¥å¥¢¥ë¾å¤Î¥­¡¼Áàºî¤ò»²¾È¤Ç¤­¡¢
-¡ÖElisp ´Ø¿ô...(CTRL-h CTRL-f)¡×¤ò»ÈÍѤ¹¤ë¤È¡¢
-¡ØXEmacs Lisp Programmer's Manual¡Ù¾å¤Î Lisp ´Ø¿ô¤ò»²¾È¤Ç¤­¤Þ¤¹¡£
-¥æ¡¼¥¶¡¼¤¬¥¦¥£¥ó¥É¥¦¥·¥¹¥Æ¥à¤ò»ÈÍѤ·¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢
-¤³¤ì¤é¤Î¥Ø¥ë¥×µ¡Ç½¤Ï¤¹¤Ù¤Æ¥Ø¥ë¥×¥á¥Ë¥å¡¼¤«¤é»ÈÍѤ¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-.PP
-Ê£¿ô¥Õ¥ì¡¼¥à(¥È¥Ã¥×¥ì¥Ù¥ë¥¦¥£¥ó¥É¥¦)¡¢¥á¥Ë¥å¡¼¥Ð¡¼¡¢¥Ä¡¼¥ë¥Ð¡¼¡¢
-¿åÊ¿¡¦¿âľ¥¹¥¯¥í¡¼¥ë¥Ð¡¼¡¢¥À¥¤¥¢¥í¥°¥Ü¥Ã¥¯¥¹¡¢³ÈÄ¥¥Þ¥¦¥¹µ¡Ç½
-¤Ê¤É¤ò»ý¤Ä X ¤Î¤è¤¦¤Ê¥¦¥£¥ó¥É¥¦¥·¥¹¥Æ¥à´Ä¶­²¼¤Ç¤Ï¡¢
-.B XEmacs
-¤Ï
-³ÈÄ¥ GUI(¥°¥é¥Õ¥£¥«¥ë¥æ¡¼¥¶¡¼¥¤¥ó¥¿¥Õ¥§¡¼¥¹)¤ò¥µ¥Ý¡¼¥È¤·¤Þ¤¹¡£
-.PP
-.B XEmacs 
-¤Ï¡¢Ê£¿ô¤Î¥Õ¥©¥ó¥È¤ä¥«¥é¡¼¡¢²ÄÊÑÉý¥Õ¥©¥ó¥È¡¢²ÄÊѹԴֳ֤ò
-´°Á´¤Ë¥µ¥Ý¡¼¥È¤·¤Æ¤ª¤ê¡¢
-¥Ô¥Ã¥¯¥¹¥Þ¥Ã¥×¤ò¥Ð¥Ã¥Õ¥¡¤Ë¼è¤ê¹þ¤à¤³¤È¤â²Äǽ¤Ç¤¹
-(¤³¤ì¤ÏÆäˡ¢W3 Web ¥Ö¥é¥¦¥¸¥ó¥°¥Ñ¥Ã¥±¡¼¥¸¤ä°ìÉô¤Î
-¥Ç¥Ð¥Ã¥¬¡¢¥¢¥¦¥È¥é¥¤¥óµ¡Ç½¤Î¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ËÍѤ¤¤é¤ì¤Þ¤¹)¡£
-.PP
-.B XEmacs 
-¤Î¡Ö¸µ¤ËÌ᤹¡×¤Ï¡¢¥Ð¥Ã¥Õ¥¡¤ËÈ¿±Ç¤µ¤ì¤¿¿ô¥¹¥Æ¥Ã¥×Á°¤Þ¤Ç¤ÎÊѹ¹¤ò
-¼è¤ê¾Ã¤¹¤³¤È¤¬¤Ç¤­¡¢ÊÔ½¸¤Î¥ß¥¹¤ò´Êñ¤Ë½¤Éü¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-.PP
-.B XEmacs 
-¤Ë¤Ï¡¢Â¿¤¯¤ÎÀìÍѥѥ屡¼¥¸¤¬ÍÑ°Õ¤µ¤ì¤Æ¤¤¤Þ¤¹¡£¥á¡¼¥ë¤ÎÆɤ߽Ф· (VM¡¢MH-E¡¢
-RMail) ¤äȯ¿® (Mail)¡¢¥Í¥Ã¥È¥Ë¥å¡¼¥¹¤ÎÆɤ߽Ф·¤ÈÅêÈ¡ (GNUS)¡¢
-World Wide Web ¤Î¥Ö¥é¥¦¥º (W3)¡¢¤¹¤Ù¤Æ¤Î¼çÍ×¤Ê¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤Ë
-¤Ç½ñ¤«¤ì¤¿¥½¡¼¥¹¥³¡¼¥É¤òÊÔ½¸¤¹¤ë¤¿¤á¤ÎÆò½¤µ¤ì¤¿¥â¡¼¥É¡¢
-¿¤¯¤Î¸À¸ìÍѤι½Ê¸¶¯Ä´É½¼¨ (Font-Lock)¡¢¥³¥ó¥Ñ¥¤¥ë (Compile)¡¢
-.B XEmacs
-¥¦¥£¥ó¥É¥¦Æâ¤ÇÆ°ºî¤¹¤ë¥µ¥Ö¥·¥§¥ë (Shell)¡¢¥¢¥¦¥È¥é¥¤¥óÊÔ½¸ (Outline)¡¢
-Lisp ¤Î¡ÖÆɤ߹þ¤ß¡¢É¾²Á¡¢É½¼¨¡×¥ë¡¼¥×¤Î¼Â¹Ô (Lisp-Interaction-Mode)¡¢
-¥²¡¼¥àÀº¿ÀʬÀÏ°å (Doctor) ¤Ê¤É¤Ç¤¹¡£
-.PP
-¾ÜºÙ¤Ê¥ê¥Õ¥¡¥ì¥ó¥¹¥Þ¥Ë¥å¥¢¥ë¤Ï¤¢¤ê¤Þ¤¹¤¬¡¢
-¾¤Î¥Ð¡¼¥¸¥ç¥ó¤Î Emacs ¤ò»ÈÍѤ·¤¿¤³¤È¤¬¤¢¤ì¤Ð¡¢
-¥Þ¥Ë¥å¥¢¥ë¤Ê¤·¤Ç¤âÌäÂê¤Ê¤¯Âбþ¤Ç¤­¤ë¤È»×¤ï¤ì¤Þ¤¹¡£
-½é¤á¤Æ Emacs ¤ò»ÈÍѤ¹¤ë¿Í¤Ç¤â¡¢¥Á¥å¡¼¥È¥ê¥¢¥ë¤ò³Ø½¬¤·¤¿¤ê¼«Æ°
-¥Þ¥Ë¥å¥¢¥ëµ¡Ç½¤òÍøÍѤ¹¤ë¤³¤È¤Ç¡¢¤¹¤°¤Ë´ðËܵ¡Ç½¤ò»È¤¦¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë
-¤Ê¤ë¤Ç¤·¤ç¤¦¡£
-.PP
-.SM "XEmacs ¥ª¥×¥·¥ç¥ó"
-.PP
-XEmacs ¤Ï¡¢X ¥¦¥£¥ó¥É¥¦¤¬Æ°ºî¤¹¤ë´Ä¶­²¼¤Ç¤Ï¡¢¤¹¤Ù¤Æ¤Îɸ½à X ¥Ä¡¼¥ë¥­¥Ã¥È¤Î
-¥³¥Þ¥ó¥É¥ª¥×¥·¥ç¥ó¤òǧ¼±¤·¤Þ¤¹¡£¤½¤ì¤Ë²Ã¤¨¤Æ¡¢°Ê²¼¤Î¥ª¥×¥·¥ç¥ó¤òǧ¼±
-¤·¤Þ¤¹
-(¥ª¥×¥·¥ç¥ó¤¬°ìÏ¢¤ÎÊ£¿ô¤Î½èÍý¤ò°ÕÌ£¤¹¤ë¾ì¹ç¤Ï¡¢»ØÄꤵ¤ì¤¿½ç¤Ë¼Â¹Ô¤µ¤ì¤Þ¤¹)¡£
-.TP
-.BI \-t " ¥Ç¥Ð¥¤¥¹Ì¾"
-»ÈÍÑÃæ¤Îɸ½àÆþ½ÐÎϤÎÂå¤ï¤ê¤Ë¡¢»ØÄꤵ¤ì¤¿¥Ç¥Ð¥¤¥¹¤ò»È¤¤¤Þ¤¹¡£¤³¤ì¤Ï
-.BR \-nw
-¥ª¥×¥·¥ç¥ó¤ò´Þ°Õ¤·¤Æ¤¤¤Þ¤¹¡£
+.I Emacs
+¥¨¥Ç¥£¥¿¤Îµ¡Ç½¤¹¤Ù¤Æ¤ò´Þ¤ó¤Ç¤¤¤Þ¤¹¡£¤Þ¤¿ÊÔ½¸¥³¥Þ¥ó¥É¤¬ Lisp ¤Ç½ñ¤«¤ì¤Æ
+¤¤¤ë¤¿¤á¡¢Íưפ˳ÈÄ¥¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+.PP
+.I XEmacs
+¤Ë¤ÏÂ絬ÌϤÊÂÐÏ÷¿¥Ø¥ë¥×µ¡Ç½¤¬È÷¤ï¤Ã¤Æ¤¤¤Þ¤¹¡£¤·¤«¤·¤³¤Îµ¡Ç½¤Ï¤¢¤Ê¤¿¤¬
+.I XEmacs
+¤Î¥¦¥¤¥ó¥É¥¦¤ä¥Ð¥Ã¥Õ¥¡¤Î°·¤¤Êý¤òÃΤäƤ¤¤ë¤³¤È¤ò²¾Äꤷ¤Æ¤¤¤Þ¤¹¡£Help 
+µ¡Ç½¤Ë¤Ï CTRL-h ¤ÇÆþ¤ê¤Þ¤¹¡£Help Tutorial (CTRL-h t) ¤Ï½é¿´¼Ô¤¬¿ôʬ´Ö
+¤Ç
+.I XEmacs
+¤Î´ðÁäò³Ø¤Ö¤³¤È¤¬¤Ç¤­¤ëÂÐÏ÷¿¥Á¥å¡¼¥È¥ê¥¢¥ë¤ò¸Æ¤Ó½Ð¤·¤Þ¤¹¡£Help
+Apropos (CTRL-h a) ¤Ïµ¡Ç½¤«¤é¥³¥Þ¥ó¥É¤òõ¤¹½õ¤±¤Ë¤Ê¤ê¤Þ¤¹¡£Help Key
+Binding (CTRL-h k) ¤Ï»ØÄê¤Î¥­¡¼Áàºî¤Î¸ú²Ì¤òÀâÌÀ¤·¤Þ¤¹¡£¤Þ¤¿ Help
+Function (CTRL-h f) ¤Ï̾Á°¤ò»ØÄꤵ¤ì¤¿ Lisp ´Ø¿ô¤ÎÀâÌÀ¤ò¤·¤Þ¤¹¡£¤µ¤é¤Ë 
+Lookup Key Binding (CTRL-h CTRL-k)¤ò»ÈÍѤ·¤Æ¥­¡¼Áàºî¤ò
+.I XEmacs Reference Manual
+¤«¤éõ¤¹¤³¤È¤â¡¢Lookup Function (CTRL-h CTRL-f) ¤Ë¤è¤Ã¤Æ Lisp ´Ø¿ô¤ò
+.I XEmacs Lisp Programmer's Manual
+¤«¤éõ¤¹¤³¤È¤â¤Ç¤­¤Þ¤¹¡£¤¢¤Ê¤¿¤¬¥¦¥¤¥ó¥É¥¦¥·¥¹¥Æ¥à¤ò»ÈÍѤ·¤Æ¤¤¤ë¤Ê¤é¤Ð¡¢
+¤³¤ì¤é¤¹¤Ù¤Æ¤Î¥Ø¥ë¥×µ¡Ç½(¤È¤µ¤é¤Ë¿¤¯¤Î¤â¤Î)¤¬ Help ¥á¥Ë¥å¡¼¤«¤éÍøÍѤÇ
+¤­¤Þ¤¹¡£
+.PP
+.I XEmacs
+¤Ë¤Ï
+.I X
+¤Î¤è¤¦¤Ê¥¦¥¤¥ó¥É¥¦¥·¥¹¥Æ¥à´Ä¶­²¼¤Ç¤Î¼Â¹Ô»þ¤Î¹­ÈÏ¤Ê GUI (graphical user
+interface) ¥µ¥Ý¡¼¥È¤¬¤¢¤ê¡¢¤³¤ì¤Ë¤ÏÊ£¿ô¸Ä¤Î¥Õ¥ì¡¼¥à(¥È¥Ã¥×¥ì¥Ù¥ë¤Î¥¦¥¤
+¥ó¥É¥¦)¡¢¥á¥Ë¥å¡¼¥Ð¡¼¡¢¥Ä¡¼¥ë¥Ð¡¼¡¢¿åÊ¿/¿âľ¥¹¥¯¥í¡¼¥ë¥Ð¡¼¡¢¥À¥¤¥¢¥í¥°
+¥Ü¥Ã¥¯¥¹¡¢¤µ¤Þ¤¶¤Þ¤Ê¾ìÌ̤ǤΥޥ¦¥¹¥µ¥Ý¡¼¥È¤Ê¤É¤¬´Þ¤Þ¤ì¤Þ¤¹¡£
+.PP
+.I XEmacs
+¤ÏÊ£¿ô¥Õ¥©¥ó¥È¡¢Â¿¿§¡¢²ÄÊÑÉý¥Õ¥©¥ó¥È¡¢²ÄÊѹâ¹Ô¤Ê¤É¤ò´°Á´¤Ë¥µ¥Ý¡¼¥È¤·¡¢
+¤Þ¤¿¥Ô¥¯¥¹¥Þ¥Ã¥×¤ò¥Ð¥Ã¥Õ¥¡Ãæ¤ËÁÞÆþ¤¹¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£(¤³¤Îµ¡Ç½¤Ï web 
+¥Ö¥é¥¦¥º¥Ñ¥Ã¥±¡¼¥¸ W3 ¤ä°ìÉô¤Î¥Ç¥Ð¥Ã¥¬¡¢¥¢¥¦¥È¥é¥¤¥ó¥¤¥ó¥¿¥Õ¥§¡¼¥¹¡¢¤½
+¤Î¾¤ÇÍøÍѤµ¤ì¤Æ¤¤¤Þ¤¹¡£)
+.PP
+.I XEmacs
+¤Î Undo ¤Ï¥Ð¥Ã¥Õ¥¡¤Ë²Ã¤¨¤é¤ì¤¿Ê£¿ô¥¹¥Æ¥Ã¥×¤Ë¤ï¤¿¤ëÊѹ¹¤â¼è¤ê¾Ã¤¹¤³¤È¤¬
+²Äǽ¤Ê¤¿¤á¡¢ÊÔ½¸¥ß¥¹¤ò´Êñ¤Ë½¤Éü¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+.PP
+.I XEmacs
+¤Ë¤Ï¿¤¯¤ÎÀìÍѥѥ屡¼¥¸¤¬¤¢¤ê¡¢¥á¡¼¥ë¤òÆɤó¤À¤ê(VM, HM-E, RMail)¡¢Á÷
+¿®¤·¤¿¤ê(Mail)¡¢Usenet ¤Î¥Ë¥å¡¼¥¹¤òÆɤ߽ñ¤­¤·¤¿¤ê(GNUS)¡¢World Wide
+Web ¤ò¥Ö¥é¥¦¥º¤·¤¿¤ê(W3)¡¢°ìÈÌŪ¤Ê¥×¥í¥°¥é¥ß¥ó¥°¸À¸ì¤¹¤Ù¤Æ¤Î¥½¡¼¥¹¥³¡¼
+¥É¤òÀìÍѥ⡼¥É¤ÇÊÔ½¸¤·¤¿¤ê¡¢Â¿¤¯¤Î¸À¸ì¤Ç¹½Ê¸¤Î¶¯Ä´É½¼¨¤ò¤·¤¿¤ê
+(Font-Lock)¡¢¥³¥ó¥Ñ¥¤¥ë¤·¤¿¤ê(Compile)¡¢
+.I XEmacs
+Ãæ¤Ç¥µ¥Ö¥·¥§¥ë¤òÁö¤é¤»¤¿¤ê(Shell)¡¢¥¢¥¦¥È¥é¥¤¥óÊÔ½¸¤·¤¿¤ê(Outline)¡¢
+Lisp ¤Î read-eval-print ¥ë¡¼¥×¤ò¼Â¹Ô¤·¤¿¤ê(Lisp-Interaction-Mode)¡¢¼«
+Æ°¥µ¥¤¥³¥»¥é¥Ô¡¼¤ò¤·¤¿¤ê(Doctor)¤Ç¤­¤Þ¤¹¡£
+.PP
+¥ê¥Õ¥¡¥ì¥ó¥¹¥Þ¥Ë¥å¥¢¥ë¤ÎÎ̤ÏËÄÂç¤Ç¤¹¤¬¡¢Â¾¤Î Emacsen ¤Î¥æ¡¼¥¶¤Ç¤¢¤ì¤Ð
+¥Þ¥Ë¥å¥¢¥ë¤Ê¤·¤Ç¤â¤Û¤È¤ó¤ÉÌäÂê¤Ê¤·¤Ë
+.I XEmacs
+¤Ë´·¤ì¤ë¤³¤È¤¬¤Ç¤­¤ë¤Ç¤·¤ç¤¦¡£½é¤á¤Æ Emacs ¤ò»ÈÍѤ¹¤ë¥æ¡¼¥¶¤Ç¤â¥Á¥å¡¼
+¥È¥ê¥¢¥ë¤ò³Ø½¬¤·¡¢¼«¸Ê¥É¥­¥å¥á¥ó¥Èµ¡Ç½¤ò»ÈÍѤ¹¤ë¤³¤È¤Ç´ðËܵ¡Ç½¤Ï¤«¤Ê¤ê
+µÞ®¤Ë»È¤¨¤ë¤è¤¦¤Ë¤Ê¤ë¤Ç¤·¤ç¤¦¡£
+.PP
+.SM XEmacs ¤Î¥ª¥×¥·¥ç¥ó
+.PP
+XEmacs ¤Ï X Windows ´Ä¶­¤Ç¼Â¹Ô¤µ¤ì¤Æ¤¤¤ë¤È¤­¤Ë¤Ï X Toolkit ¤Î¤¹¤Ù¤Æ¤Î
+ɸ½à¥³¥Þ¥ó¥É¹Ô¥ª¥×¥·¥ç¥ó¤ò¼õ¤±ÉÕ¤±¤Þ¤¹¡£¤½¤ì¤Ë²Ã¤¨¤Æ°Ê²¼¤Î¥ª¥×¥·¥ç¥ó¤¬
+Í­¸ú¤Ç¤¹(¥ª¥×¥·¥ç¥ó¤¬½èÍýÆ°ºî¤ÎϢ³¤ò°ÕÌ£¤¹¤ë¤È¤­¤Ë¤Ï¡¢¤½¤ì¤é¤Ï¸½¤ì¤¿
+½ç¤Ë½èÍý¤µ¤ì¤Þ¤¹):
+.PP
+XEmacs accepts all standard X Toolkit command line options when run in
+an X Windows environment.  In addition, the following options are accepted
+(when options imply a sequence of actions to perform, they are
+performed in the order encountered):
+.TP 8
+.BI \-t " file"
+stdin/stdout ¤ò»ÈÍѤ¹¤ëÂå¤ï¤ê¤Ë
+»ØÄê¤Î
+.I file
+¤òüËö¤È¤·¤Æ»ÈÍѤ·¤Þ¤¹¡£¤³¤ì¤Ï
+.B \-nw
+¤ò°Å¤Ë´Þ¤ß¤Þ¤¹¡£
 .TP
 .BI \-batch
-¥Ð¥Ã¥Á¥â¡¼¥É¤ÇÊÔ½¸¤ò¹Ô¤¤¤Þ¤¹¡£¥¨¥Ç¥£¥¿¤Ïɸ½à½ÐÎϤ˥á¥Ã¥»¡¼¥¸¤òÁ÷½Ð¤·¤Þ¤¹¡£
-¼Â¹Ô¥Õ¥¡¥¤¥ë¤ò»ØÄꤷ¤¿¤ê´Ø¿ô¤ò¸Æ¤Ó½Ð¤¹¾ì¹ç¤Ï¡¢É¬¤º
-.BR \-l
-¡¢
-.BR \-f
-¡¢
+¥Ð¥Ã¥Á¥â¡¼¥É¤ÇÊÔ½¸¤·¤Þ¤¹¡£¥¨¥Ç¥£¥¿¤Ï¥á¥Ã¥»¡¼¥¸¤ò stdout ¤ËÁ÷¤ê¤Þ¤¹¡£
+¥ª¥×¥·¥ç¥ó
+.BR \-l ¡¢
+.BR \-f ¡¢
+¤ª¤è¤Ó
 .B \-eval
-¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£
+¤ò»ÈÍѤ·¡¢¼Â¹Ô¤¹¤ë¥Õ¥¡¥¤¥ë¤È¸Æ¤Ó½Ð¤¹´Ø¿ô¤ò»ØÄꤹ¤ëɬÍפ¬¤¢¤ê¤Þ¤¹¡£
 .TP
-.B \-nw\ 
-¥¦¥£¥ó¥É¥¦¥·¥¹¥Æ¥àÆÃÍ­¤Îɽ¼¨ÍÑ¥³¡¼¥É¤Î»ÈÍѤò¤¹¤Ù¤Æ¶Ø»ß¤·¤Þ¤¹¡£
-¸½ºß¤Î TTY ¤ò»ÈÍѤ·¤Þ¤¹¡£
+.B \-nw
+°ìÀڤΥ¦¥¤¥ó¥É¥¦¥·¥¹¥Æ¥à¸ÇÍ­¤Îɽ¼¨¥³¡¼¥É¤òÍÞÀ©¤·¡¢¸½ºß¤Î TTY
+¤ò»ÈÍѤ·¤Þ¤¹¡£
 .TP
 .B \-debug\-init
-½é´ü²½¥Õ¥¡¥¤¥ë¤ÎÆɤ߹þ¤ßÃæ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤¿¾ì¹ç¡¢¥Ç¥Ð¥Ã¥¬¤òµ¯Æ°¤·¤Þ¤¹¡£
+½é´ü²½¥Õ¥¡¥¤¥ë¥í¡¼¥É»þ¤Ë¥¨¥é¡¼¤¬È¯À¸¤·¤¿¤È¤­¥Ç¥Ð¥Ã¥¬¤òµ¯Æ°¤·¤Þ¤¹¡£
 .TP
 .B \-unmapped
-½é´ü¥Õ¥ì¡¼¥à¤ò¥Þ¥Ã¥Ô¥ó¥°¤·¤Þ¤»¤ó¡£
+½é´ü¥Õ¥ì¡¼¥à¤ò³ä¤êÅö¤Æ¤Þ¤»¤ó¡£
 .TP
 .B \-no\-site\-file
-¥µ¥¤¥È¸ÇÍ­¤Î½é´ü²½¥Õ¥¡¥¤¥ë(site-init.el)¤òÆɤ߹þ¤ß¤Þ¤»¤ó¡£
-.TP
-.BR \-q "¡¢" \-no\-init\-file
-½é´ü²½¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤»¤ó¡£
-.TP
-.BI \-u " ¥æ¡¼¥¶¡¼Ì¾¡¢" \-user " ¥æ¡¼¥¶¡¼Ì¾"
-»ØÄꤷ¤¿¥æ¡¼¥¶¡¼¸ÇÍ­¤Î½é´ü²½¥Õ¥¡¥¤¥ë¤òÆɤ߹þ¤ß¤Þ¤¹¡£
-.TP
-.I ¥Õ¥¡¥¤¥ë̾ 
-»ØÄꤷ¤¿¥Õ¥¡¥¤¥ë¤òÊÔ½¸¤·¤Þ¤¹¡£
-.TP
-.BI \+ "¹ÔÈÖ¹æ"
-.I ¹ÔÈÖ¹æ 
-¤Ë»ØÄꤷ¤¿¹Ô¤Ë°ÜÆ°¤·¤Þ¤¹
-.br
-(+ Éä¹æ¤È¹ÔÈÖ¹æ¤Î´Ö¤Ë¶õÇòʸ»ú¤ÏÆþ¤ì¤Ê¤¤¤Ç¤¯¤À¤µ¤¤)¡£
-.TP
-.BR \-help "¡¢" \-flags "¡¢" \-?
-¥Ø¥ë¥×¥á¥Ã¥»¡¼¥¸¤ò½ÐÎϤ·¤Æ½ªÎ»¤·¤Þ¤¹¡£
-.TP
-.BR \-V "¡¢" \-version
-¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤ò½ÐÎϤ·¤Æ½ªÎ»¤·¤Þ¤¹¡£
-.TP
-.BI \-f " ´Ø¿ô̾¡¢ " \-funcall " ´Ø¿ô̾"
-.I "´Ø¿ô̾ "
-¤Ë»ØÄꤷ¤¿ Lisp ´Ø¿ô¤ò¼Â¹Ô¤·¤Þ¤¹¡£
-.TP
-.BI \-l " ¥Õ¥¡¥¤¥ë̾¡¢ " \-load " ¥Õ¥¡¥¤¥ë̾"
-.I ¥Õ¥¡¥¤¥ë̾
-¤Ë»ØÄꤷ¤¿¥Õ¥¡¥¤¥ëÃæ¤Î Lisp ¥³¡¼¥É¤òÆɤ߹þ¤ß¤Þ¤¹¡£
-.TP
-.BI \-eval " ¥Õ¥©¡¼¥à"
-.I ¥Õ¥©¡¼¥à
-¤Ë»ØÄꤷ¤¿ Lisp ¤Î¥Õ¥©¡¼¥à¤òɾ²Á¤·¤Þ¤¹¡£
-.TP
-.BI \-i " ¥Õ¥¡¥¤¥ë̾¡¢" \-insert " ¥Õ¥¡¥¤¥ë̾"
-¸½ºß¤Î¥Ð¥Ã¥Õ¥¡¤Ë¡¢
-.I ¥Õ¥¡¥¤¥ë̾
-¤Ë»ØÄꤷ¤¿¥Õ¥¡¥¤¥ë¤ò¼è¤ê¹þ¤ß¤Þ¤¹¡£
+¥µ¥¤¥È¸ÇÍ­¤Î½é´ü²½¥Õ¥¡¥¤¥ë(site-start.el)¤ò¥í¡¼¥É¤·¤Þ¤»¤ó¡£
+.TP
+.B \-q, \-no\-init\-file
+½é´ü²½¥Õ¥¡¥¤¥ë¤ò¥í¡¼¥É¤·¤Þ¤»¤ó¡£
+.TP
+.B \-no-early-packages
+½é´ü¥í¡¼¥É¥Ñ¥Ã¥±¡¼¥¸¤ò½èÍý¤·¤Þ¤»¤ó¡£
+.TP
+.B \-vanilla
+Ω¤Á¾å¤²»þ¤Ë°ìÀÚ¤Î;ʬ¤Ê¥Õ¥¡¥¤¥ë¤ò¥í¡¼¥É¤·¤Þ¤»¤ó¡£
+¥ª¥×¥·¥ç¥ó
+.BR \-q ¡¢
+.BR \-no-site-file ¡¢
+.B \-no-early-packages
+¤ÎÁȤ߹ç¤ï¤»¤ÈÅù²Á¤Ç¤¹¡£
+.TP
+.BI \-u " user, " \-user " user"
+.I user
+¤Î½é´ü²½¥Õ¥¡¥¤¥ë¤ò¥í¡¼¥É¤·¤Þ¤¹¡£
+.TP 8
+.I file
+.I file
+¤òÊÔ½¸¤·¤Þ¤¹¡£
+.TP
+.BI \+ number
+.I number
+¤Ç»ØÄꤵ¤ì¤¿¹Ô¤Ë°ÜÆ°¤·¤Þ¤¹¡£
+("+" Éä¹æ¤È¿ô»ú¤Î´Ö¤Ë¥¹¥Ú¡¼¥¹¤òÆþ¤ì¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£)
+.TP
+.B \-help
+¥Ø¥ë¥×¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤·½ªÎ»¤·¤Þ¤¹¡£
+.TP
+.B \-V, \-version,
+¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤·½ªÎ»¤·¤Þ¤¹¡£
+.TP
+.BI \-f " function, " \-funcall " function"
+Lisp ´Ø¿ô
+.I function
+¤ò¼Â¹Ô¤·¤Þ¤¹¡£
+.TP
+.BI \-l " file, " \-load " file"
+Lisp ¥³¡¼¥É¤ò¥Õ¥¡¥¤¥ë
+.I file
+¤«¤é¥í¡¼¥É¤·¤Þ¤¹¡£
+.TP
+.BI \-eval " form"
+Lisp ¼°
+.I form
+¤òɾ²Á¤·¤Þ¤¹¡£
+.TP
+.BI \-i " file, " \-insert " file"
+¥«¥ì¥ó¥È¥Ð¥Ã¥Õ¥¡¤Ë
+.I file
+¤òÁÞÆþ¤·¤Þ¤¹¡£
 .TP
 .B \-kill
-.B XEmacs
-¤ò½ªÎ»¤·¤Þ¤¹(
-.BR \-batch 
-¤ÇÍ­¸ú¤Ç¤¹)¡£
-.PP
-.SM "X ¤Ç¤Î XEmacs ¤Î»ÈÍÑ"
-.PP
-.B XEmacs
-¤Ï¡¢X ¥¦¥£¥ó¥É¥¦¥·¥¹¥Æ¥à¾å¤ÇÀµ¤·¤¯Æ°ºî¤¹¤ë¤è¤¦¤Ë³«È¯¤µ¤ì¤Æ¤­¤Þ¤·¤¿¡£
-X ¥¦¥£¥ó¥É¥¦¤Ç
-.B XEmacs
-¤òµ¯Æ°¤¹¤ë¤È¡¢¥Ç¥£¥¹¥×¥ì¥¤Æâ¤ËÆȼ«¤Î X ¥¦¥£¥ó¥É¥¦¤ò³«¤­¤Þ¤¹¡£
-¥æ¡¼¥¶¡¼¤Î¥ª¥ê¥¸¥Ê¥ë¤Î¥¦¥£¥ó¥É¥¦¤ò¤½¤Î¤Þ¤Þ»È¤¤Â³¤±¤ë¤³¤È¤¬¤Ç¤­¤ë¤è¤¦¤Ë¡¢
-¥¨¥Ç¥£¥¿¤Ï¥Ð¥Ã¥¯¥°¥é¥¦¥ó¥É¤Î¥¸¥ç¥Ö¤È¤·¤Æµ¯Æ°¤·¤¿¤Û¤¦¤¬¤è¤¤¤Ç¤·¤ç¤¦¡£
-.PP
-.B XEmacs
-¤Ï¡¢°Ê²¼¤Îɸ½à X ¥ª¥×¥·¥ç¥ó¤òÉÕ¤±¤Æµ¯Æ°¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+.I XEmacs
+¤ò½ªÎ»¤·¤Þ¤¹¡£
+.RB ( \-batch
+»ÈÍÑ»þ¤ËÌòΩ¤Á¤Þ¤¹¡£)
+.PP
+.SM XEmacs ¤ò X Windows ¤Ç»ÈÍѤ¹¤ë
+.PP
+.I XEmacs
+¤Ï X window system ¤Ç¤¦¤Þ¤¯Æ°ºî¤¹¤ë¤è¤¦¤ËÄ´À°¤µ¤ì¤Æ¤­¤Þ¤·¤¿¡£
+.I XEmacs
+¤¬ X windows ¤Ç¼Â¹Ô¤µ¤ì¤ë¤ÈÀìÍѤΠX
+¤Î¥¦¥¤¥ó¥É¥¦¤¬ºîÀ®¤µ¤ì¤½¤³¤Ëɽ¼¨¤¬¤µ¤ì¤Þ¤¹¡£
+.PP
+.I XEmacs
+¤Ï°Ê²¼¤Îɸ½à X ¥ª¥×¥·¥ç¥ó¤È¤È¤â¤Ëµ¯Æ°¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹:
+.TP
+.BI \-visual " <visualname><bitdepth>"
+XEmacs ¤¬»ÈÍѤò»î¤ß¤ë visual ¤òÁªÂò¤·¤Þ¤¹¡£
+.I <visualname>
+¤Ï "StaticColor"¡¢ "TrueColor"¡¢ "GrayScale"¡¢ "PseudoColor"¡¢
+"DirectColor" ¤Îʸ»úÎó¤Î¤¦¤Á¤Î°ì¤Ä¤Ç¤¢¤ê¡¢
+.I <bitdepth>
+¤Ï¥Ô¥¯¥»¥ëËè¤Î¥Ó¥Ã¥È¿ô¤Ç¤¹¡£
+(¤¿¤È¤¨¤Ð 24bit TrueColor ¤Î visual ¤Ë¤Ï "-visual TrueColor24"
+¤ò»ØÄꤷ¤Þ¤¹¡£)
+¾Ü¤·¤¯¤Ï
+.IR X (1)
+¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+.TP
+.B -privateColormap
+XEmacs ¤¬É½¼¨ÍѤ˥ץ饤¥Ù¡¼¥È¥«¥é¡¼¥Þ¥Ã¥×¤òºîÀ®¤·¡¢¤½¤ì¤ò»ÈÍѤ¹¤ë¤è¤¦
+¤ËÍ׵ᤷ¤Þ¤¹¡£¤³¤ì¤Ë¤è¤ê XEmacs¤Ï¥Ç¥Õ¥©¥ë¥È¤Î¥«¥é¡¼¥Þ¥Ã¥×¤ò»ÈÍѤ·¤Ê¤¯
+¤Ê¤ê¡¢Â¾¤Î¥¯¥é¥¤¥¢¥ó¥È¤Ë¤è¤ê¥«¥é¡¼¥Þ¥Ã¥×¤¬±Æ¶Á¤ò¼õ¤±¤ë¤³¤È¤¬¤Ê¤¯¤Ê¤ê¤Þ
+¤¹¤¬¡¢¤½¤ÎÂå¤ï¤ê¤Ë¥Õ¥©¡¼¥«¥¹¤¬°ÜÆ°¤¹¤ëºÝ¤ÏÌܤ¶¤ï¤ê¤Ê¥Õ¥ê¥Ã¥«¤¬È¯À¸¤·¤Þ
+¤¹¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¤¢¤Ê¤¿¤Î X ¥µ¡¼¥Ð¤¬ 24 bit visual¤ò¥µ¥Ý¡¼¥È¤·¤Æ¤¤
+¤Ê¤¤¤È¤­¤Ë¤Î¤ß»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤¡£
 .TP
 .BI \-geometry " ##x##+##+##"
-½é´ü¥¦¥£¥ó¥É¥¦¤Î¥¸¥ª¥á¥È¥ê¤ò»ØÄꤷ¤Þ¤¹¡£## ¤Ë¤Ï¡¢Éý(ʸ»ú¿ô)¡¢
-¹â¤µ(ʸ»ú¿ô)¡¢X ¥ª¥Õ¥»¥Ã¥È(¥Ô¥¯¥»¥ë¿ô)¡¢Y ¥ª¥Õ¥»¥Ã¥È(¥Ô¥¯¥»¥ë¿ô)
-¤ò¿ô»ú¤Ç»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
+½é´ü¥¦¥¤¥ó¥É¥¦¤Î¥¸¥ª¥á¥È¥ê¡¼¤ò»ØÄꤷ¤Þ¤¹¡£## ¤Ï¿ôÃͤǤ¢¤ê¡¢4¤Ä¤Î¿ôÃͤÏ
+¤½¤ì¤¾¤ìÉý(ʸ»ú¿ô)¡¢¹â¤µ(ʸ»ú¿ô)¡¢X ºÂɸ¤Î¥ª¥Õ¥»¥Ã¥È(¥Ô¥¯¥»¥ë)¡¢Y ºÂɸ
+¤Î¥ª¥Õ¥»¥Ã¥È(¥Ô¥¯¥»¥ë)¤ò¤¢¤é¤ï¤·¤Þ¤¹¡£
 .I ##x##
-¤ä
+¤¢¤ë¤¤¤Ï
 .I +##+##
-¤Ê¤É¤Î½ñ¼°¤ÎÉôʬ»ØÄê¤âÍ­¸ú¤Ç¤¹¡£(¥¸¥ª¥á¥È¥ê»ÅÍͤϡ¢É¸½à X ¥Õ¥©¡¼¥Þ¥Ã¥È¤Ë
-½àµò¤·¤Æ¤¤¤Þ¤¹¡£¾ÜºÙ¤Ï
-.BR X (1)
+¤È¤¤¤¦·Á¼°¤ÎÉôʬ»ØÄê¤âµö¤µ¤ì¤Þ¤¹¡£(¥¸¥ª¥á¥È¥ê¡¼¤Î»ÅÍÍ¤Ï X ¤Îɸ½à¥Õ¥©¡¼
+¥Þ¥Ã¥È¤Ë½¾¤Ã¤Æ¤¤¤Þ¤¹¡£¾ÜºÙ¤Ï
+.IR X (1)
 ¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£)
 .TP
 .B \-iconic
-µ¯Æ°»þ¤Î½é´ü¥¦¥£¥ó¥É¥¦¤ò¥¢¥¤¥³¥ó¤Çɽ¼¨¤·¤Þ¤¹¡£
-.TP
-.BI \-name " ¥×¥í¥°¥é¥à̾"
-¥æ¡¼¥¶¡¼¤Î X ¥ê¥½¡¼¥¹Æâ¤Ë¤¢¤ë¥Ç¥Õ¥©¥ë¥È¤ò»²¾È¤¹¤ë¤¿¤á¤Ë»ÈÍѤµ¤ì¤ë
-¥×¥í¥°¥é¥à̾¤ò»ØÄꤷ¤Þ¤¹¡£
-.TP
-.BI \-title " ¥¿¥¤¥È¥ë̾¡¢" \-T " ¥¿¥¤¥È¥ë̾¡¢" \-wn " ¥¿¥¤¥È¥ë̾"
-.B XEmacs
-¥¦¥£¥ó¥É¥¦¤Î¥¿¥¤¥È¥ë̾¤ò»ØÄꤷ¤Þ¤¹¡£
-.TP
-.BI \-d " ¥Ç¥£¥¹¥×¥ì¥¤Ì¾¡¢" \-display " ¥Ç¥£¥¹¥×¥ì¥¤Ì¾"
-.IR ¥Ç¥£¥¹¥×¥ì¥¤Ì¾
-¤Ë»ØÄꤷ¤¿¥Ç¥£¥¹¥×¥ì¥¤¾å¤Ë
-.B XEmacs
-¥¦¥£¥ó¥É¥¦¤òºîÀ®¤·¤Þ¤¹¡£
-¤³¤Î¥ª¥×¥·¥ç¥ó¤Ï¡¢¥³¥Þ¥ó¥É¹Ô¤ÇºÇ½é (ÀèƬ) ¤Ë»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£
-.TP
-.BI \-font " ¥Õ¥©¥ó¥È̾¡¢" \-fn " ¥Õ¥©¥ó¥È̾"
-.B XEmacs
-¥¦¥£¥ó¥É¥¦¤Î¥Õ¥©¥ó¥È¤È¤·¤Æ¡¢
-.I ¥Õ¥©¥ó¥È̾
-¤Ë»ØÄꤷ¤¿¥Õ¥©¥ó¥È¤ò»ÈÍѤ·¤Þ¤¹¡£X ¥Õ¥©¥ó¥È¤Ï 
-.B "/usr/lib/X11/fonts"
-¥Ç¥£¥ì¥¯¥È¥ê¤«¤éÁªÂò¤·¤Æ¤¯¤À¤µ¤¤¡£
-.B XEmacs
-¤Ï¡¢¸ÇÄêÉý¥Õ¥©¥ó¥È¤È²ÄÊÑÉý¥Õ¥©¥ó¥È¤Î¤É¤Á¤é¤Ç¤âÆ°ºî¤·¤Þ¤¹¤¬¡¢
-¸ÇÄêÉý¥Õ¥©¥ó¥È¤ò»ÈÍѤ¹¤ë¤³¤È¤ò¤ª´«¤á¤·¤Þ¤¹¡£
-.TP
-.BI \-scrollbar\-width " ¥Ô¥¯¥»¥ë¿ô"
+½é´ü¥¦¥¤¥ó¥É¥¦¤¬¥¢¥¤¥³¥ó²½¤µ¤ì¤Æ¸½¤ì¤Þ¤¹¡£
+.TP 8
+.BI \-name " name"
+¥æ¡¼¥¶¤Î X ¥ê¥½¡¼¥¹¤«¤é¥Ç¥Õ¥©¥ë¥ÈÃͤòõ¤¹¤È¤­¤Ë»ÈÍѤµ¤ì¤ë¡¢¤³¤Î¥×¥í¥°
+¥é¥à¤Î̾Á°¤ò»ØÄꤷ¤Þ¤¹¡£
+.TP
+.BI \-title " title, " \-T " title, " \-wn " title"
+¤³¤Î
+.I XEmacs
+¤Î¥¦¥¤¥ó¥É¥¦¤Ë³ä¤êÅö¤Æ¤é¤ì¤ë¥¿¥¤¥È¥ë¤ò»ØÄꤷ¤Þ¤¹¡£
+.TP
+.BI \-d " displayname, " \-display " displayname"
+.I XEmacs
+¤ò
+.I displayname
+¤Ç»ØÄꤷ¤¿¥Ç¥£¥¹¥×¥ì¥¤¾å¤ËºîÀ®¤·¤Þ¤¹¡£
+¥³¥Þ¥ó¥É¹Ô¤ÎºÇ½é(ÀèƬ)¤Î¥ª¥×¥·¥ç¥ó¤Ç¤Ê¤¯¤Æ¤Ï¤¤¤±¤Þ¤»¤ó¡£
+.TP
+.BI \-font " font, " \-fn " font"
+.I XEmacs
+¤Î¥¦¥¤¥ó¥É¥¦¥Õ¥©¥ó¥È¤ò
+.I font
+¤Ç»ØÄꤵ¤ì¤¿¥Õ¥©¥ó¥È¤Ë¥»¥Ã¥È¤·¤Þ¤¹¡£
+.I /usr/lib/X11/fonts
+¥Ç¥£¥ì¥¯¥È¥ê¤Ç¤µ¤Þ¤¶¤Þ¤Ê
+.I X
+¥Õ¥©¥ó¥È¤¬¸«¤Ä¤«¤ë¤È»×¤¤¤Þ¤¹¡£
+.I XEmacs
+¤Ï¸ÇÄêÉý¤È²ÄÊÑÉý¤Î¤É¤Á¤é¤Î¥Õ¥©¥ó¥È¤â»ÈÍѤǤ­¤Þ¤¹¤¬¡¢¤ª¤½¤é¤¯¸ÇÄêÉý¥Õ¥©
+¥ó¥È¤Î¤Û¤¦¤¬¸«±É¤¨¤¬¤è¤¤¤Ç¤·¤ç¤¦¡£
+.TP
+.BI \-scrollbar\-width " pixels"
 ¿âľ¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤ÎÉý¤ò»ØÄꤷ¤Þ¤¹¡£
 .TP
-.BI \-scrollbar\-height " ¥Ô¥¯¥»¥ë¿ô"
+.BI \-scrollbar\-height " pixels"
 ¿åÊ¿¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤Î¹â¤µ¤ò»ØÄꤷ¤Þ¤¹¡£
 .TP
-.BI \-bw " ¥Ô¥¯¥»¥ë¿ô¡¢ " \-borderwidth " ¥Ô¥¯¥»¥ë¿ô"
-.B XEmacs
-¥¦¥£¥ó¥É¥¦¤Î¶­³¦Éý¤ò»ØÄꤷ¤Þ¤¹¡£
-¥¦¥£¥ó¥É¥¦Î¾Â¦¤Î¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï 1 ¥Ô¥¯¥»¥ë¤Ç¤¹¡£
+.BI \-bw " pixels, " \-borderwidth " pixels"
+.I XEmacs
+¤Î¥¦¥¤¥ó¥É¥¦¤Î¥Ü¡¼¥À¡¼Éý¤ò
+.I pixels
+¤Ç»ØÄꤵ¤ì¤¿¥Ô¥¯¥»¥ë¿ô¤ËÀßÄꤷ¤Þ¤¹¡£
+¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï³Æ¥¦¥¤¥ó¥É¥¦Â¦ÌÌ¤Ë 1 ¥Ô¥¯¥»¥ë¤Ç¤¹¡£
 .TP
-.BI \-ib " ¥Ô¥¯¥»¥ë¿ô¡¢ " \-internal\-border\-width " ¥Ô¥¯¥»¥ë¿ô"
-¥Õ¥ì¡¼¥à¤Î¶­³¦¤È¥Æ¥­¥¹¥È¤È¤Î´Ö³Ö¤ò»ØÄꤷ¤Þ¤¹¡£
-¥¦¥£¥ó¥É¥¦Î¾Â¦¤Î¥Ç¥Õ¥©¥ë¥ÈÃÍ¤Ï 1 ¥Ô¥¯¥»¥ë¤Ç¤¹¡£
+.BI \-ib " pixels, " \-internal\-border\-width " pixels"
+¥Õ¥ì¡¼¥à¤Î¥Ü¡¼¥À¡¼¤È¥Æ¥­¥¹¥È¤Î´Ö¤ÎÉý¤ò¥Ô¥¯¥»¥ë¿ô¤Ç»ØÄꤷ¤Þ¤¹¡£
+¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï³Æ¥¦¥¤¥ó¥É¥¦Â¦ÌÌ¤Ë 1 ¥Ô¥¯¥»¥ë¤Ç¤¹¡£
 .TP
-.BI \-fg " ¥«¥é¡¼Ì¾¡¢ " \-foreground " ¥«¥é¡¼Ì¾"
-¥Æ¥­¥¹¥È¤Î¿§¤òÀßÄꤷ¤Þ¤¹¡£¥«¥é¡¼Ì¾¤Ë¤Ä¤¤¤Æ¤Ï¡¢
-.B "/usr/lib/X11/rgb.txt"
-¥Õ¥¡¥¤¥ëÃæ¤Î¥ê¥¹¥È¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
+.BI \-fg " color, " \-foreground " color"
+¥Æ¥­¥¹¥È¤Î¿§¤òÀßÄꤷ¤Þ¤¹¡£
+
+»ÈÍѤǤ­¤ë¿§¤Î̾Á°¤Î¥ê¥¹¥È¤Ï
+.I /usr/lib/X11/rgb.txt
+¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
 .TP
-.BI \-bg " ¥«¥é¡¼Ì¾¡¢ " \-background " ¥«¥é¡¼Ì¾"
-¥¦¥£¥ó¥É¥¦¤ÎÇطʤ理òÀßÄꤷ¤Þ¤¹¡£
+.BI \-bg " color, " \-background " color"
+¥¦¥¤¥ó¥É¥¦¤ÎÇØ·Ê¿§¤òÀßÄꤷ¤Þ¤¹¡£
 .TP
-.BI \-bd " ¥«¥é¡¼Ì¾¡¢ " \-bordercolor " ¥«¥é¡¼Ì¾"
-¥¦¥£¥ó¥É¥¦¶­³¦¤Î¿§¤òÀßÄꤷ¤Þ¤¹¡£
+.BI \-bd " color, " \-bordercolor " color"
+¥¦¥¤¥ó¥É¥¦¤Î¥Ü¡¼¥À¡¼¿§¤òÀßÄꤷ¤Þ¤¹¡£
 .TP
-.BI \-mc " ¥«¥é¡¼Ì¾"
+.BI \-mc " color"
 ¥Þ¥¦¥¹¥Ý¥¤¥ó¥¿¤Î¿§¤òÀßÄꤷ¤Þ¤¹¡£
 .TP
-.BI \-cr " ¥«¥é¡¼Ì¾"
+.BI \-cr " color"
 ¥Æ¥­¥¹¥È¥«¡¼¥½¥ë¤Î¿§¤òÀßÄꤷ¤Þ¤¹¡£
 .TP
-.BR \-rv "¡¢" \-reverse
-Á°·Ê¤ÈÇطʤ理òȿž¤·¤Þ¤¹(ȿžɽ¼¨)¡£
-¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ»¤º¤Ë¡¢
-Á°·Ê¿§¤ÈÇØ·Ê¿§¤òÌÀ¼¨Åª¤ËÀßÄꤹ¤ë¤³¤È¤ò¤ª´«¤á¤·¤Þ¤¹¡£
-.TP
-.BI \-xrm " °ú¿ô"
-¥³¥Þ¥ó¥É¹Ô¤ÇǤ°Õ¤Î¥ê¥½¡¼¥¹¤òÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-.B \.Xresource
-¤ä
-.B \.Xdefaults
-¥Õ¥¡¥¤¥ëÃæ¤Ë»ØÄꤵ¤ì¤ë¤Î¤ÈƱÍͤˡ¢
-.I °ú¿ô
-¤Ë»ØÄꤷ¤¿Ãͤ¬¥ê¥½¡¼¥¹¤È¤·¤Æ²ò¼á¤µ¤ì¤Þ¤¹¡£
-.PP
-¥æ¡¼¥¶¡¼¤Ï¡¢¤¿¤È¤¨¤Ð
-.B \.Xresources
-¤ä
-.B \.Xdefaults
-¥Õ¥¡¥¤¥ë¤Ç¡¢
-.B XEmacs 
-¥¦¥£¥ó¥É¥¦ÍѤΥ꥽¡¼¥¹¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤòÀßÄꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹(
-.BR xrdb (1)
-»²¾È)¡£
-½ñ¼°¤Ï°Ê²¼¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
+.B \-rv, \-reverse
+Á°·Ê¿§¤ÈÇØ·Ê¿§¤òȿž¤µ¤»¤Þ¤¹(ȿžɽ¼¨)¡£¤³¤Î¥ª¥×¥·¥ç¥ó¤ò»ÈÍѤ¹¤ëÂå¤ï¤ê
+¤Ë¡¢Á°·Ê¿§¤ÈÇØ·Ê¿§¤òÍÛ¤ËÀßÄꤹ¤ë¤³¤È¤ò¸¡Æ¤¤·¤Æ¤¯¤À¤µ¤¤¡£
+.TP
+.BI \-xrm " argument"
+¥³¥Þ¥ó¥É¥é¥¤¥ó¤«¤éǤ°Õ¤Î¥ê¥½¡¼¥¹¤òÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+.I argument
+¤Ï
+.I \.Xresources
+¥Õ¥¡¥¤¥ë¤ä
+.I \.Xdefaults
+¥Õ¥¡¥¤¥ë¤Ë¤¢¤ë¤è¤¦¤Ê¥ê¥½¡¼¥¹¤ÎÎóµó¤Ç¤¹¡£
+.PP
+.I XEmacs
+¤Î¥¦¥¤¥ó¥É¥¦¤Î¥ê¥½¡¼¥¹¡¢¤Ä¤Þ¤ê
+.I X
+¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤÏ
+.I \.Xresources
+¥Õ¥¡¥¤¥ë¤Þ¤¿¤Ï
+.I \.Xdefaults
+¥Õ¥¡¥¤¥ë(
+.IR xrdb (1)
+»²¾È)¤ÎÃæ¤Ç»ØÄꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
+°Ê²¼¤Î½ñ¼°¤ò»ÈÍѤ·¤Æ¤¯¤À¤µ¤¤:
 .IP
-\f3Emacs.\f2¥­¡¼¥ï¡¼¥É\f3:\f2ÃÍ\f1
+Emacs.keyword:value
 .PP
 ¤Þ¤¿¤Ï
 .IP
-\f3Emacs*EmacsFrame.\f2¥­¡¼¥ï¡¼¥É\f3:\f2ÃÍ\f1
+Emacs*EmacsFrame.keyword:value
 .PP
-¤Ç¤¹ (¤É¤Á¤é¤Î·Á¼°¤«¤Ï¡¢¥ê¥½¡¼¥¹¤Ë¤è¤ë)¡£
+¤³¤³¤Ç
+.I value
+¤Ï
+.I keyword
+¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤǤ¹¡£(¥ê¥½¡¼¥¹¤¦¤Á¤¢¤ë¤â¤Î¤ÏÁ°¼Ô¤Î½ñ¼°¤òɬÍפȤ·¡¢¤Þ¤¿
+¤¢¤ë¤â¤Î¤Ï¸å¼Ô¤Î½ñ¼°¤ò¤È¤ê¤Þ¤¹¡£)
 .PP
-°Ê²¼¤Î½ñ¼°¤ò»ÈÍѤ·¤Æ¡¢ÆÃÄê¤Î¥Õ¥ì¡¼¥à¤Î¥ê¥½¡¼¥¹¤òÀßÄꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
+¤Þ¤¿°Ê²¼¤Î½ñ¼°¤ò»ÈÍѤ·¤ÆÆÃÄê¤Î¥Õ¥ì¡¼¥à¤Î¥ê¥½¡¼¥¹¤òÀßÄꤹ¤ë¤³¤È¤â¤Ç¤­¤Þ¤¹¡£
 .IP
-\f3Emacs*\f2¥Õ¥ì¡¼¥à̾\f3.\f2¥­¡¼¥ï¡¼¥É\f3:\f2ÃÍ\f1
+Emacs*framename.keyword:value
 .PP
-(VM ¤Î¤è¤¦¤Ê´°À®¤µ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤Ï¡¢¤½¤ì¤é¤Î¥Õ¥ì¡¼¥à¤Ë¸ÇÍ­¤Î
-¥ê¥½¡¼¥¹Ì¾¤òÍ¿¤¨¤Þ¤¹¡£¤³¤Î¾ì¹ç¤Ï VM ¤Ë¤Ê¤ê¤Þ¤¹¡£)
+¤³¤³¤Ç
+.I framename
+¤Ï¤½¤ÎÆÃÄê¤Î¥Õ¥ì¡¼¥à¤Ë³ä¤êÅö¤Æ¤é¤ì¤¿¥ê¥½¡¼¥¹Ì¾¤Ç¤¹¡£(¤¢¤ë¼ï¤Î¥Ñ¥Ã¥±¡¼
+¥¸¡¢¤¿¤È¤¨¤Ð VM¤Ê¤É¤Ç¤Ï»ÈÍѤ¹¤ë¥Õ¥ì¡¼¥à¤ËÆȼ«¤Î¥ê¥½¡¼¥¹Ì¾¡¢¤³¤Î¾ì¹ç¤Ç
+¤¢¤ì¤Ð "VM" ¤òÍ¿¤¨¤Þ¤¹¡£)
 .PP
-.B XEmacs
-¤Ç¤Ï¡¢°Ê²¼¤Î¥­¡¼¥ï¡¼¥É¤ËÂФ¹¤ë¥Ç¥Õ¥©¥ë¥ÈÀßÄê¤ò¥æ¡¼¥¶¡¼¤¬¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-.TP
+.I XEmacs
+¤Ç¤Ï°Ê²¼¤Î¥­¡¼¥ï¡¼¥É¤Î¥Ç¥Õ¥©¥ë¥ÈÃͤòÀßÄꤹ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+.TP 8
 .B default.attributeFont (\fPclass\fB Face.AttributeFont)
-¥¦¥£¥ó¥É¥¦¤Î¥Æ¥­¥¹¥È¥Õ¥©¥ó¥È¤òÀßÄꤷ¤Þ¤¹¡£
+¥¦¥¤¥ó¥É¥¦¤Î¥Æ¥­¥¹¥È¥Õ¥©¥ó¥È¤òÀßÄꤷ¤Þ¤¹¡£
 .TP
 .B default.attributeForeground (\fPclass\fB Face.AttributeForeground)
-¥¦¥£¥ó¥É¥¦¥Æ¥­¥¹¥È¤Î¿§¤òÀßÄꤷ¤Þ¤¹¡£
+¥¦¥¤¥ó¥É¥¦¤Î¥Æ¥­¥¹¥È¿§¤òÀßÄꤷ¤Þ¤¹¡£
 .TP
 .B default.attributeBackground (\fPclass\fB Face.AttributeBackground)
-¥¦¥£¥ó¥É¥¦¤ÎÇØ·Ê¿§¤òÀßÄꤷ¤Þ¤¹¡£
+¥¦¥¤¥ó¥É¥¦¤ÎÇØ·Ê¿§¤òÀßÄꤷ¤Þ¤¹¡£
 .TP
-.B \fI¥Õ¥§¥¤¥¹\fB.attributeFont (\fPclass\fB Face.AttributeFont)
-¥Õ¥§¥¤¥¹Ì¾¤Î¥Õ¥©¥ó¥È¤òÀßÄꤷ¤Þ¤¹¡£
-¤è¤¯»ÈÍѤµ¤ì¤ë¥Õ¥§¥¤¥¹Ì¾¤ò¡¢°Ê²¼¤Ë¼¨¤·¤Þ¤¹¡£
+.B \fIface\fB.attributeFont (\fPclass\fB Face.AttributeFont)
+.I face
+¤Ç»ØÄꤵ¤ì¤¿Ì¾Á°¤Î¥Õ¥§¥¤¥¹¤Î¥Õ¥©¥ó¥È¤òÀßÄꤷ¤Þ¤¹¡£
+°ìÈÌŪ¤Ê¥Õ¥§¥¤¥¹Ì¾¤Ï°Ê²¼¤ÎÄ̤ê¤Ç¤¹¡£
 .PP
 .in +\w'right-margin'u+12n
 .ta \w'right-margin'u+4n
@@ -326,451 +383,416 @@ X 
 default	Ä̾ï¤Î¥Æ¥­¥¹¥È¡£
 .br
 .ti -\w'right-margin'u+4n
-bold	¥Ü¡¼¥ë¥É (ÂÀ»ú) ¥Æ¥­¥¹¥È¡£
+bold	ÂÀ»ú¤Î¥Æ¥­¥¹¥È¡£
 .br
 .ti -\w'right-margin'u+4n
-italic	¥¤¥¿¥ê¥Ã¥¯ (¼ÐÂÎ) ¥Æ¥­¥¹¥È¡£
+italic	¥¤¥¿¥ê¥Ã¥¯¥Æ¥­¥¹¥È¡£
 .br
 .ti -\w'right-margin'u+4n
-bold-italic	¥Ü¡¼¥ë¥É¥¤¥¿¥ê¥Ã¥¯¥Æ¥­¥¹¥È¡£
+bold-italic	ÂÀ»ú¤Î¥¤¥¿¥ê¥Ã¥¯¥Æ¥­¥¹¥È¡£
 .br
 .ti -\w'right-margin'u+4n
-modeline	¥â¡¼¥É¹Ô¥Æ¥­¥¹¥È¡£
+modeline	¥â¡¼¥É¥é¥¤¥ó¤Î¥Æ¥­¥¹¥È¡£
 .br
 .ti -\w'right-margin'u+4n
-zmacs-region	¥Þ¥¦¥¹ÁªÂò¤µ¤ì¤¿¥Æ¥­¥¹¥È¡£
+zmacs-region	¥Þ¥¦¥¹¤ÇÁªÂò¤µ¤ì¤¿¥Æ¥­¥¹¥È¡£
 .br
 .ti -\w'right-margin'u+4n
-highlight	¥Þ¥¦¥¹Ä̲á»þ¤Î¶¯Ä´¥Æ¥­¥¹¥È¡£
+highlight	¥Þ¥¦¥¹¤¬Ä̲ᤷ¤¿¤È¤­¤Î¶¯Ä´¤µ¤ì¤¿¥Æ¥­¥¹¥È¡£
 .br
 .ti -\w'right-margin'u+4n
-left-margin	º¸¥Þ¡¼¥¸¥óÆâ¤Î¥Æ¥­¥¹¥È¡£
+left-margin	º¸¥Þ¡¼¥¸¥ó¤Î¥Æ¥­¥¹¥È¡£
 .br
 .ti -\w'right-margin'u+4n
-right-margin	±¦¥Þ¡¼¥¸¥óÆâ¤Î¥Æ¥­¥¹¥È¡£
+right-margin	±¦¥Þ¡¼¥¸¥ó¤Î¥Æ¥­¥¹¥È¡£
 .br
 .ti -\w'right-margin'u+4n
-isearch	¸¡º÷»þ¤Î¶¯Ä´¥Æ¥­¥¹¥È¡£
+isearch	¥¤¥ó¥¯¥ê¥á¥ó¥¿¥ë¥µ¡¼¥ÁÃæ¤Î¶¯Ä´¤µ¤ì¤¿¥Æ¥­¥¹¥È¡£
 .br
 .ti -\w'right-margin'u+4n
-info-node	Info ¥á¥Ë¥å¡¼¤Î¥Æ¥­¥¹¥È¡£
+info-node	Info ¥á¥Ë¥å¡¼¥¢¥¤¥Æ¥à¤Î¥Æ¥­¥¹¥È¡£
 .br
 .ti -\w'right-margin'u+4n
-info-xref	Info Áê¸ß»²¾È¤Î¥Æ¥­¥¹¥È¡£
-.TP
-.B \fI¥Õ¥§¥¤¥¹\fB.attributeForeground(\f1class\fB Face.AttributeForeground)
-»ØÄê¥Õ¥§¥¤¥¹ÍѤÎÁ°·Ê¿§¤òÀßÄꤷ¤Þ¤¹¡£
-.TP
-.B \fI¥Õ¥§¥¤¥¹\fB.attributeBackground(\f1class\fB Face.AttributeBackground)
-»ØÄê¥Õ¥§¥¤¥¹ÍѤÎÇØ·Ê¿§¤òÀßÄꤷ¤Þ¤¹¡£
-.TP
-.B \fI¥Õ¥§¥¤¥¹\fB.attributeBackgroundPixmap
-.B (\f1class\fB Face.AttributeBackgroundPixmap)\f1
-.br
-»ØÄê¥Õ¥§¥¤¥¹ÍѤÎÇطʥԥ寥¹¥Þ¥Ã¥×¤òÀßÄꤷ¤Þ¤¹¡£
-.TP
-.B \fI¥Õ¥§¥¤¥¹\fB.attributeUnderline (\f1class\fB Face.AttributeUnderline)
-»ØÄê¥Õ¥§¥¤¥¹ÍѤβ¼Àþ¤Î̵ͭ¤ò·è¤á¤Þ¤¹¡£
-.TP
-.B reverseVideo (\f1class\fB ReverseVideo)
-.IR on 
-¤ËÀßÄꤵ¤ì¤¿¾ì¹ç¤Ï¡¢¥¦¥£¥ó¥É¥¦¤Ïȿžɽ¼¨¤·¤Þ¤¹¡£
-¤³¤Î¥ê¥½¡¼¥¹¤ò»ÈÍѤ»¤º¤Ë¡¢Á°·Ê¿§¤ÈÇØ·Ê¿§¤ò
-ÌÀ¼¨Åª¤ËÀßÄꤹ¤ë¤³¤È¤ò¤ª´«¤á¤·¤Þ¤¹¡£
+info-xref	Info ¤Î¥¯¥í¥¹¥ê¥Õ¥¡¥ì¥ó¥¹¤Î¥Æ¥­¥¹¥È¡£
+.TP 8
+.B \fIface\fB.attributeForeground (\fPclass\fB Face.AttributeForeground)
+.I face
+¤ÎÁ°·Ê¿§¤òÀßÄꤷ¤Þ¤¹¡£
+.TP 8
+.B \fIface\fB.attributeBackground (\fPclass\fB Face.AttributeBackground)
+.I face
+¤ÎÇØ·Ê¿§¤òÀßÄꤷ¤Þ¤¹¡£
+.TP 8
+.B \fIface\fB.attributeBackgroundPixmap (\fPclass\fB Face.AttributeBackgroundPixmap)
+.I face 
+¤ÎÇØ·Ê¥Ô¥¯¥¹¥Þ¥Ã¥×(ÅÀ²è)¤òÀßÄꤷ¤Þ¤¹¡£
+.TP 8
+.B \fIface\fB.attributeUnderline (\fPclass\fB Face.AttributeUnderline)
+.I face
+¤¬²¼Àþ¤Ä¤­¤«¡£
+.TP
+.B reverseVideo (\fPclass\fB ReverseVideo)
+.IR on
+¤ËÀßÄꤵ¤ì¤¿¤È¤­¤Ï¥¦¥¤¥ó¥É¥¦¤Ïȿžɽ¼¨¤µ¤ì¤Þ¤¹¡£
+¤³¤Î¥ê¥½¡¼¥¹¤ò»ÈÍѤ¹¤ëÂå¤ï¤ê¤ËÁ°·Ê¿§¡¢
+ÇØ·Ê¿§¤òÍۤ˻ØÄꤹ¤ë¤³¤È¤ò¸¡Æ¤¤·¤Æ¤¯¤À¤µ¤¤¡£
 .TP
 .B borderWidth (\fPclass\fB BorderWidth)
-¥¦¥£¥ó¥É¥¦¤Î¶­³¦Éý¤ò¥Ô¥¯¥»¥ë¿ô¤ÇÀßÄꤷ¤Þ¤¹¡£
+¥¦¥¤¥ó¥É¥¦¤Î¥Ü¡¼¥À¡¼Éý¤ò¥Ô¥¯¥»¥ë¿ô¤ÇÀßÄꤷ¤Þ¤¹¡£
 .TP
 .B internalBorderWidth (\fPclass\fB InternalBorderWidth)
-¥¦¥£¥ó¥É¥¦¤ÎÆ⦶­³¦Éý¤ò¥Ô¥¯¥»¥ë¿ô¤ÇÀßÄꤷ¤Þ¤¹¡£
+¥¦¥¤¥ó¥É¥¦¤ÎÆ⦥ܡ¼¥À¡¼Éý¤ò¥Ô¥¯¥»¥ë¿ô¤ÇÀßÄꤷ¤Þ¤¹¡£
 .TP
 .B borderColor (\fPclass\fB BorderColor)
-¥¦¥£¥ó¥É¥¦¶­³¦¤Î¿§¤òÀßÄꤷ¤Þ¤¹¡£
+¥¦¥¤¥ó¥É¥¦¤Î¥Ü¡¼¥À¡¼¤Î¿§¤òÀßÄꤷ¤Þ¤¹¡£
 .TP
 .B cursorColor (\fPclass\fB Foreground)
-¥¦¥£¥ó¥É¥¦¤Î¥Æ¥­¥¹¥È¥«¡¼¥½¥ë¤Î¿§¤òÀßÄꤷ¤Þ¤¹¡£
+¥¦¥¤¥ó¥É¥¦¤Î¥Æ¥­¥¹¥È¥«¡¼¥½¥ë¤Î¿§¤òÀßÄꤷ¤Þ¤¹¡£
 .TP
 .B pointerColor (\fPclass\fB Foreground)
-¥¦¥£¥ó¥É¥¦¤Î¥Þ¥¦¥¹¥«¡¼¥½¥ë¤Î¿§¤òÀßÄꤷ¤Þ¤¹¡£
+¥¦¥¤¥ó¥É¥¦¤Î¥Þ¥¦¥¹¥«¡¼¥½¥ë¤Î¿§¤òÀßÄꤷ¤Þ¤¹¡£
+.TP
+.B emacsVisual (\fPclass\fB EmacsVisual)
+.I XEmacs
+¤¬»ÈÍѤ·¤è¤¦¤È¤¹¤ë¥Ç¥Õ¥©¥ë¥È¤Î¥Ó¥¸¥å¥¢¥ë¤òÀßÄꤷ¤Þ¤¹¡£(¾å½Ò)
+.TP
+.B privateColormap (\fPclass\fB PrivateColormap)
+ÀßÄꤵ¤ì¤ë¤È
+.I XEmacs
+¤Ï¥×¥é¥¤¥Ù¡¼¥È¥«¥é¡¼¥Þ¥Ã¥×¤ò»ÈÍѤ·¤Þ¤¹¡£
 .TP
 .B geometry (\fPclass\fB Geometry)
-.B XEmacs
-¥¦¥£¥ó¥É¥¦¤Î¥¸¥ª¥á¥È¥ê¤òÀßÄꤷ¤Þ¤¹(¾å½Ò)¡£
+.I XEmacs
+¤Î¥¦¥¤¥ó¥É¥¦¤Î¥¸¥ª¥á¥È¥ê¡¼¤òÀßÄꤷ¤Þ¤¹¡£(¾å½Ò)
 .TP
 .B iconic (\fPclass\fB Iconic)
-on ¤ËÀßÄꤵ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ï¡¢
-.B XEmacs
-¥¦¥£¥ó¥É¥¦¤ÏºÇ½é¤Ë¥¢¥¤¥³¥ó²½¤µ¤ì¤Æɽ¼¨¤µ¤ì¤Þ¤¹¡£
+on ¤ËÀßÄꤹ¤ë¤È
+.I XEmacs
+¤ÏºÇ½é¥¢¥¤¥³¥ó¤È¤·¤Æɽ¼¨¤µ¤ì¤Þ¤¹¡£
 .TP
 .B menubar (\fPclass\fB Menubar)
-.B XEmacs
-¥¦¥£¥ó¥É¥¦¤Ë¥á¥Ë¥å¡¼¥Ð¡¼¤òɽ¼¨¤µ¤»¤ë¤«¤É¤¦¤«¤òÀßÄꤷ¤Þ¤¹¡£½é´üÃÍ¤Ï true ¤Ç¤¹¡£
+.I XEmacs
+¥¦¥¤¥ó¥É¥¦¤Ë¥á¥Ë¥å¡¼¥Ð¡¼¤¬¤Ä¤¯¤«¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï true ¤Ç¤¹¡£
 .TP
 .B initiallyUnmapped (\fPclass\fB InitiallyUnmapped)
-.B XEmacs
-¤¬µ¯Æ°»þ¤Ë¥¢¥ó¥Þ¥Ã¥×¤µ¤ì¤¿½é´ü¥Õ¥ì¡¼¥à¤ò»Ä¤¹¤«¤É¤¦¤«¤òÀßÄꤷ¤Þ¤¹¡£
+.I XEmacs
+µ¯Æ°»þ¤Ë½é´ü¥Õ¥ì¡¼¥à¤ò¥Þ¥Ã¥×¤·¤Ê¤¤¤Ç¤ª¤¯¤«¡£
 .TP
 .B barCursor (\fPclass\fB BarCursor)
-¥«¡¼¥½¥ë¤Î·Á¾õ¤ò¡¢È¢·¿¤Þ¤¿¤Ï¥Ð¡¼¤ËÀßÄꤷ¤Þ¤¹¡£
+¥«¡¼¥½¥ë¤Î·Á¾õ¤È¤·¤ÆÈ¢·¿¤ÎÂå¤ï¤ê¤Ë½ÄËÀ¤ò»ÈÍѤ¹¤ë¤«¡£
 .TP
 .B title (\fPclass\fB Title)
-.B XEmacs
-¥¦¥£¥ó¥É¥¦¤Î¥¿¥¤¥È¥ë̾¤òÀßÄꤷ¤Þ¤¹¡£
+.I XEmacs
+¤Î¥¦¥¤¥ó¥É¥¦¥¿¥¤¥È¥ë¤òÀßÄꤷ¤Þ¤¹¡£
 .TP
 .B iconName (\fPclass\fB Title)
-.B XEmacs
-¥¦¥£¥ó¥É¥¦¥¢¥¤¥³¥ó¤Î̾Á°¤òÀßÄꤷ¤Þ¤¹¡£
+.I XEmacs
+¥¦¥¤¥ó¥É¥¦¤Î¥¢¥¤¥³¥ó¤Î̾Á°¤òÀßÄꤷ¤Þ¤¹¡£
 .TP
 .B scrollBarWidth (\fPclass\fB ScrollBarWidth)
-¿âľ¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤ÎÉý¤ò¥Ô¥¯¥»¥ë¿ô¤ÇÀßÄꤷ¤Þ¤¹¡£
-Ãͤò 0 ¤Ë¤¹¤ë¤È¡¢¿âľ¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤Ïɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£
+¿âľ¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤ÎÉý¤ò¥Ô¥¯¥»¥ë¿ô¤ÇÀßÄꤷ¤Þ¤¹¡£Éý¤ò 0 ¤Ë¤¹¤ë¤È¿âľ¥¹
+¥¯¥í¡¼¥ë¥Ð¡¼¤Ïɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£
 .TP
 .B scrollBarHeight (\fPclass\fB ScrollBarHeight)
-¿åÊ¿¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤Î¹â¤µ¤ò¥Ô¥¯¥»¥ë¿ô¤ÇÀßÄꤷ¤Þ¤¹¡£
-Ãͤò 0 ¤Ë¤¹¤ë¤È¡¢¿åÊ¿¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤Ïɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£
+¿åÊ¿¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤Î¹â¤µ¤ò¥Ô¥¯¥»¥ë¿ô¤ÇÀßÄꤷ¤Þ¤¹¡£¹â¤µ¤ò 0 ¤Ë¤¹¤ë¤È¿å
+Ê¿¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤Ïɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£
 .TP
 .B scrollBarPlacement (\fPclass\fB ScrollBarPlacement)
-¿âľ¡¦¿åÊ¿¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤Î°ÌÃÖ¤òÀßÄꤷ¤Þ¤¹¡£"top-left"¡¢"bottom-left"¡¢ 
-"top-right"¡¢"bottom-right"¤Î¤¤¤º¤ì¤«¤òÁªÂò¤·¤Þ¤¹¡£
-¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï¡¢Motif ¤È Lucid ÍÑ¤Ë¤Ï "bottom-right" ¤¬¡¢
-Athena ÍÑ¤Ë¤Ï "buttom-left" ¤¬ÀßÄꤵ¤ì¤Æ¤¤¤Þ¤¹¡£
+¿âľ/¿åÊ¿¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤Î°ÌÃÖ¤òÀßÄꤷ¤Þ¤¹¡£Ê¸»úÎó "top-left"¡¢
+"bottom-left"¡¢ "top-right"¡¢"bottom-right" ¤Î¤¦¤Á°ì¤Ä¤ò»ØÄꤷ¤Þ¤¹¡£¥Ç
+¥Õ¥©¥ë¥ÈÃÍ¤Ï Motif ¤Þ¤¿¤Ï Lucid ¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤Ç¤Ï "bottom-right"¡¢
+Athena ¥¹¥¯¥í¡¼¥ë¥Ð¡¼¤Ç¤Ï "bottom-left" ¤Ç¤¹¡£
 .TP
 .B topToolBarHeight (\fPclass\fB TopToolBarHeight)
-¾åÉô¤Î¥Ä¡¼¥ë¥Ð¡¼¤Î¹â¤µ¤ò¥Ô¥¯¥»¥ë¿ô¤ÇÀßÄꤷ¤Þ¤¹¡£
-Ãͤò 0 ¤Ë¤¹¤ë¤È¡¢¥Ä¡¼¥ë¥Ð¡¼¤Ïɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£
+¾åÉô¥Ä¡¼¥ë¥Ð¡¼¤Î¹â¤µ¤ò¥Ô¥¯¥»¥ë¿ô¤ÇÀßÄꤷ¤Þ¤¹¡£0 ¤Î¤È¤­¾åÉô¥Ä¡¼¥ë¥Ð¡¼¤Ï
+ɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£
 .TP
 .B bottomToolBarHeight (\fPclass\fB BottomToolBarHeight)
-²¼Éô¥Ä¡¼¥ë¥Ð¡¼ ¤Î¹â¤µ¤ò¥Ô¥¯¥»¥ë¿ô¤ÇÀßÄꤷ¤Þ¤¹¡£
-Ãͤò 0 ¤Ë¤¹¤ë¤È¡¢²¼Éô¥Ä¡¼¥ë¥Ð¡¼¤Ïɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£
+²¼Éô¥Ä¡¼¥ë¥Ð¡¼¤Î¹â¤µ¤ò¥Ô¥¯¥»¥ë¿ô¤ÇÀßÄꤷ¤Þ¤¹¡£0 ¤Î¤È¤­²¼Éô¥Ä¡¼¥ë¥Ð¡¼¤Ï
+ɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£
 .TP
 .B leftToolBarWidth (\fPclass\fB LeftToolBarWidth)
-º¸Â¦¤Î¥Ä¡¼¥ë¥Ð¡¼¤ÎÉý¤ò¥Ô¥¯¥»¥ë¿ô¤ÇÀßÄꤷ¤Þ¤¹¡£
-Ãͤò 0 ¤Ë¤¹¤ë¤È¡¢º¸Â¦¤Î¥Ä¡¼¥ë¥Ð¡¼¤Ïɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£
+º¸¥Ä¡¼¥ë¥Ð¡¼¤ÎÉý¤ò¥Ô¥¯¥»¥ë¿ô¤ÇÀßÄꤷ¤Þ¤¹¡£0 ¤Î¤È¤­º¸¥Ä¡¼¥ë¥Ð¡¼¤Ïɽ¼¨¤µ
+¤ì¤Þ¤»¤ó¡£
 .TP
 .B rightToolBarWidth (\fPclass\fB RightToolBarWidth)
-±¦Â¦¤Î¥Ä¡¼¥ë¥Ð¡¼¤ÎÉý¤ò¥Ô¥¯¥»¥ë¿ô¤ÇÀßÄꤷ¤Þ¤¹¡£
-Ãͤò 0 ¤Ë¤¹¤ë¤È¡¢±¦Â¦¤Î¥Ä¡¼¥ë¥Ð¡¼¤Ïɽ¼¨¤µ¤ì¤Þ¤»¤ó¡£
+±¦¥Ä¡¼¥ë¥Ð¡¼¤ÎÉý¤ò¥Ô¥¯¥»¥ë¿ô¤ÇÀßÄꤷ¤Þ¤¹¡£0 ¤Î¤È¤­±¦¥Ä¡¼¥ë¥Ð¡¼¤Ïɽ¼¨¤µ
+¤ì¤Þ¤»¤ó¡£
 .TP
 .B topToolBarShadowColor (\fPclass\fB TopToolBarShadowColor)
-¥Ä¡¼¥ë¥Ð¡¼¤Î¾åÉô¥·¥ã¥É¥¦¤Î¿§¤òÀßÄꤷ¤Þ¤¹¡£
-(¤¹¤Ù¤Æ¤Î¥Ä¡¼¥ë¥Ð¡¼¤ËÍ­¸ú¡£¾åÉô¥Ä¡¼¥ë¥Ð¡¼°Ê³°¤Ë¤âÍ­¸ú¤Ç¤¹¡£)
+¥Ä¡¼¥ë¥Ð¡¼¤Î¾åÉô¥·¥ã¥É¡¼¿§¤òÀßÄꤷ¤Þ¤¹¡£
+(¥Õ¥ì¡¼¥à¾åÉô¤Î¥Ä¡¼¥ë¥Ð¡¼¤À¤±¤Ç¤Ï¤Ê¤¯¡¢
+¤¹¤Ù¤Æ¤Î¥Ä¡¼¥ë¥Ð¡¼¤ËŬÍѤµ¤ì¤Þ¤¹¡£)
 .TP
 .B bottomToolBarShadowColor (\fPclass\fB BottomToolBarShadowColor)
-¥Ä¡¼¥ë¥Ð¡¼¤Î²¼Éô¥·¥ã¥É¥¦¤Î¿§¤òÀßÄꤷ¤Þ¤¹¡£
-(¤¹¤Ù¤Æ¤Î¥Ä¡¼¥ë¥Ð¡¼¤ËÍ­¸ú¡£¾åÉô¥Ä¡¼¥ë¥Ð¡¼°Ê³°¤Ë¤âÍ­¸ú¤Ç¤¹¡£)
+¥Ä¡¼¥ë¥Ð¡¼¤Î²¼Éô¥·¥ã¥É¡¼¿§¤òÀßÄꤷ¤Þ¤¹¡£
+(¥Õ¥ì¡¼¥à²¼Éô¤Î¥Ä¡¼¥ë¥Ð¡¼¤À¤±¤Ç¤Ï¤Ê¤¯¡¢
+¤¹¤Ù¤Æ¤Î¥Ä¡¼¥ë¥Ð¡¼¤ËŬÍѤµ¤ì¤Þ¤¹¡£)
 .TP
 .B topToolBarShadowPixmap (\fPclass\fB TopToolBarShadowPixmap)
-¥Ä¡¼¥ë¥Ð¡¼¤Î¾åÉô¥·¥ã¥É¥¦¤Î¥Ô¥Ã¥¯¥¹¥Þ¥Ã¥×¤òÀßÄꤷ¤Þ¤¹¡£
-(¤¹¤Ù¤Æ¤Î¥Ä¡¼¥ë¥Ð¡¼¤ËÍ­¸ú¡£¾åÉô¥Ä¡¼¥ë¥Ð¡¼°Ê³°¤Ë¤âÍ­¸ú¤Ç¤¹¡£)
-ÀßÄꤵ¤ì¤Æ¤¤¤ì¤Ð¡¢¤³¤Î¥ê¥½¡¼¥¹¤ÏÂбþ¤¹¤ë¥«¥é¡¼¥ê¥½¡¼¥¹¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£
+¥Ä¡¼¥ë¥Ð¡¼¤Î¾åÉô¥·¥ã¥É¡¼¥Ô¥¯¥¹¥Þ¥Ã¥×¤òÀßÄꤷ¤Þ¤¹¡£
+(¥Õ¥ì¡¼¥à¾åÉô¤Î¥Ä¡¼¥ë¥Ð¡¼¤À¤±¤Ç¤Ï¤Ê¤¯¡¢
+¤¹¤Ù¤Æ¤Î¥Ä¡¼¥ë¥Ð¡¼¤ËŬÍѤµ¤ì¤Þ¤¹¡£)
+¤³¤Î¥ê¥½¡¼¥¹¤ÎÀßÄê¤ÏÂбþ¤¹¤ë¥·¥ã¥É¡¼¿§¥ê¥½¡¼¥¹¤ò¾å½ñ¤­¤·¤Þ¤¹¡£
 .TP
 .B bottomToolBarShadowPixmap (\fPclass\fB BottomToolBarShadowPixmap)
-¥Ä¡¼¥ë¥Ð¡¼¤Î²¼Éô¥·¥ã¥É¥¦¤Î¥Ô¥Ã¥¯¥¹¥Þ¥Ã¥×¤òÀßÄꤷ¤Þ¤¹¡£
-(¤¹¤Ù¤Æ¤Î¥Ä¡¼¥ë¥Ð¡¼¤ËÍ­¸ú¡£¾åÉô¥Ä¡¼¥ë¥Ð¡¼°Ê³°¤Ë¤âÍ­¸ú¤Ç¤¹¡£)
-ÀßÄꤵ¤ì¤Æ¤¤¤ì¤Ð¡¢¤³¤Î¥ê¥½¡¼¥¹¤ÏÂбþ¤¹¤ë¥«¥é¡¼¥ê¥½¡¼¥¹¤ò̵¸ú¤Ë¤·¤Þ¤¹¡£
+¥Ä¡¼¥ë¥Ð¡¼¤Î²¼Éô¥·¥ã¥É¡¼¥Ô¥¯¥¹¥Þ¥Ã¥×¤òÀßÄꤷ¤Þ¤¹¡£
+(¥Õ¥ì¡¼¥à²¼Éô¤Î¥Ä¡¼¥ë¥Ð¡¼¤À¤±¤Ç¤Ï¤Ê¤¯¡¢
+¤¹¤Ù¤Æ¤Î¥Ä¡¼¥ë¥Ð¡¼¤ËŬÍѤµ¤ì¤Þ¤¹¡£)
+¤³¤Î¥ê¥½¡¼¥¹¤ÎÀßÄê¤ÏÂбþ¤¹¤ë¥·¥ã¥É¡¼¿§¥ê¥½¡¼¥¹¤ò¾å½ñ¤­¤·¤Þ¤¹¡£
 .TP
 .B toolBarShadowThickness (\fPclass\fB ToolBarShadowThickness)
-¥Ä¡¼¥ë¥Ð¡¼¤ò°Ï¤à¥·¥ã¥É¥¦Ç»ÅÙ¤ò¥Ô¥¯¥»¥ë¿ô¤ÇÀßÄꤷ¤Þ¤¹¡£
+¥Ä¡¼¥ë¥Ð¡¼¤Î¥·¥ã¥É¡¼¤ÎÂÀ¤µ¤Î¥Ô¥¯¥»¥ë¿ô¡£
 .TP
 .B visualBell (\fPclass\fB VisualBell)
-¥¹¥¯¥ê¡¼¥óÅÀÌǤޤ¿¤Ï¥Ó¡¼¥×²»¤Î¤É¤Á¤é¤ò»ÈÍѤ¹¤ë¤«¤òÀßÄꤷ¤Þ¤¹¡£
+¥Ó¡¼¥×²»¤ÎÂå¤ï¤ê¤Ë²èÌ̤ò¥Õ¥é¥Ã¥·¥å¤µ¤»¤ë¤«¡£
 .TP
 .B bellVolume (\fPclass\fB BellVolume)
-¥Ó¡¼¥×²»¤Î²»Î̤òÀßÄꤷ¤Þ¤¹¡£ÀßÄêÈÏ°Ï¤Ï 0 ¤«¤é 100 ¤Ç¤¹¡£
+¥Ó¡¼¥×²»¤ÎÂ礭¤µ¤ò 0 ¤«¤é 100 ¤ÎÈϰϤǡ£
 .TP
 .B useBackingStore (\fPclass\fB UseBackingStore)
-.B XEmacs
-X ¥¦¥£¥ó¥É¥¦¤Î¥Ð¥Ã¥­¥ó¥°¥¹¥È¥¢Â°À­¤òÀßÄꤹ¤ë¤«¤É¤¦¤«¤ò·èÄꤷ¤Þ¤¹¡£
-¤³¤Î°À­¤òÀßÄꤹ¤ë¤È¡¢
-X ¥µ¡¼¥Ð¡¼¤¬»ÈÍѤ¹¤ë¥á¥â¥ê¡¼¤¬Â¿¤¯¤Ê¤ê¤Þ¤¹¤¬¡¢
-¥¹¥¯¥ê¡¼¥ó¤ò¹¹¿·¤¹¤ëºÝ¤Î X ¥È¥é¥Õ¥£¥Ã¥¯¤¬¾¯¤Ê¤¯¤Ê¤ê¤Þ¤¹¡£
-¤Þ¤¿¡¢¥â¥Ç¥àÀܳ¤Î¤è¤¦¤ÊÄ㮲óÀþ¤ò»È¤Ã¤¿
+.I XEmacs
+¤¬
+.I X
+¤Î¥¦¥¤¥ó¥É¥¦¤Ë¥Ð¥Ã¥­¥ó¥°¥¹¥È¥¢Â°À­¤ò¤Ä¤±¤ë¤«¡£¤³¤ì¤Ï
+.I X
+¥µ¡¼¥Ð¤Î¥á¥â¥ê¡¼»ÈÍÑÎ̤òÁý¤ä¤·¤Þ¤¹¤¬²èÌ̹¹¿·¤ËɬÍפÊ
+.I X
+¤Î¥È¥é¥Õ¥£¥Ã¥¯¤ÎÁíÎ̤ϸº¤ê¡¢
 .I X
-¥µ¡¼¥Ð¡¼¤È¤ÎÀܳ¤ËÍ­¸ú¤Ç¤¹¡£
+¤¬¥â¥Ç¥à¤Î¤è¤¦¤ÊÄãÂÓ°èÉý¤ÎÀܳ¤Ç»ÈÍѤµ¤ì¤Æ¤¤¤ë¾ì¹ç¤Ë¤ÏÍ­¸ú¤Ç¤¹¡£
 .TP
 .B textPointer (\fPclass\fB Cursor)
-¥Æ¥­¥¹¥È¾å¤Ë¥Þ¥¦¥¹¤¬¤¢¤ë¤È¤­¤Ë»ÈÍѤ¹¤ë¥«¡¼¥½¥ë¤òÀßÄꤷ¤Þ¤¹¡£
+¥Þ¥¦¥¹¤¬¥Æ¥­¥¹¥È¾å¤Ë¤¢¤ë¤È¤­¤Î¥«¡¼¥½¥ë¡£
 .TP
 .B selectionPointer (\fPclass\fB Cursor)
-¥Þ¥¦¥¹ÁªÂò¤µ¤ì¤¿¥Æ¥­¥¹¥ÈÈϰϾå¤Ë¥Þ¥¦¥¹¤¬¤¢¤ë¤È¤­¤Ë»ÈÍѤ¹¤ë
-¥«¡¼¥½¥ë¤òÀßÄꤷ¤Þ¤¹¡£
+¥Þ¥¦¥¹¤¬¥Þ¥¦¥¹ÁªÂò¤µ¤ì¤¿¥Æ¥­¥¹¥ÈÎΰè¾å¤Ë¤¢¤ë¤È¤­¤Î¥«¡¼¥½¥ë¡£
 .TP
 .B spacePointer (\fPclass\fB Cursor)
-¥Ð¥Ã¥Õ¥¡Æâ¤Î¶õÇò¥¹¥Ú¡¼¥¹¾å¤Ë¥Þ¥¦¥¹¤¬¤¢¤ë¤È¤­¤Ë(¤Ä¤Þ¤ê¡¢
-¹ÔËö¤ä¥Õ¥¡¥¤¥ë¤ÎºÇ¸å¤Ç) »ÈÍѤ¹¤ë¥«¡¼¥½¥ë¤òÀßÄꤷ¤Þ¤¹¡£
+¥Þ¥¦¥¹¤¬¥Ð¥Ã¥Õ¥¡Æâ¤Î¥Ö¥é¥ó¥¯¥¹¥Ú¡¼¥¹(¤¹¤Ê¤ï¤Á¹ÔËö°Ê¹ß¤Þ¤¿¤Ï¥Õ¥¡¥¤¥ëËö
+Èø°Ê¸å)¾å¤Ë¤¢¤ë¤È¤­¤Î¥«¡¼¥½¥ë¡£
 .TP
 .B modeLinePointer (\fPclass\fB Cursor)
-¥â¡¼¥É¥é¥¤¥ó¾å¤Ë¥Þ¥¦¥¹¤¬¤¢¤ë¤È¤­¤Ë»ÈÍѤ¹¤ë¥«¡¼¥½¥ë¤òÀßÄꤷ¤Þ¤¹¡£
+¥Þ¥¦¥¹¤¬¥â¡¼¥É¥é¥¤¥ó¾å¤Ë¤¢¤ë¤È¤­¤Î¥«¡¼¥½¥ë¡£
 .TP
 .B gcPointer (\fPclass\fB Cursor)
-¥¬¡¼¥Ù¥Ã¥¸¥³¥ì¥¯¥·¥ç¥óÃæ¤Ëɽ¼¨¤¹¤ë¥«¡¼¥½¥ë¤òÀßÄꤷ¤Þ¤¹¡£
+¥¬¥Ù¥Ã¥¸¥³¥ì¥¯¥·¥ç¥óÃæ¤Ëɽ¼¨¤µ¤ì¤ë¥Þ¥¦¥¹¥«¡¼¥½¥ë¡£
 .TP
 .B scrollbarPointer (\fPclass\fB Cursor)
-¥¹¥¯¥í¡¼¥ë¥Ð¡¼¾å¤Ë¥Þ¥¦¥¹¤¬¤¢¤ë¤È¤­¤Ë»ÈÍѤ¹¤ë¥«¡¼¥½¥ë¤òÀßÄꤷ¤Þ¤¹¡£
+¥Þ¥¦¥¹¤¬¥¹¥¯¥í¡¼¥ë¥Ð¡¼¾å¤Ë¤¢¤ë¤È¤­¤Î¥«¡¼¥½¥ë¡£
 .TP
 .B pointerColor (\fPclass\fB Foreground)
-¥Þ¥¦¥¹¥«¡¼¥½¥ë¤ÎÁ°·Ê¿§¤òÀßÄꤷ¤Þ¤¹¡£
+¥Þ¥¦¥¹¥«¡¼¥½¥ë¤ÎÁ°·Ê¿§¡£
 .TP
 .B pointerBackground (\fPclass\fB Background)
-¥Þ¥¦¥¹¥«¡¼¥½¥ë¤ÎÇØ·Ê¿§¤òÀßÄꤷ¤Þ¤¹¡£
+¥Þ¥¦¥¹¥«¡¼¥½¥ë¤ÎÇØ·Ê¿§¡£
 .PP
-.SM "¥Þ¥¦¥¹¤Î»ÈÍÑ"
+.SM ¥Þ¥¦¥¹¤Î»ÈÍÑ
 .PP
-°Ê²¼¤Î¥ê¥¹¥È¤Ï¡¢X11 ¤Ë¤ª¤±¤ë
-.B XEmacs
-¥¦¥£¥ó¥É¥¦¤Ç¤Î¡¢¥Þ¥¦¥¹¥Ü¥¿¥ó¤Î³ä¤êÅö¤Æ¤Ç¤¹¡£
+°Ê²¼¤Ï X11 ¤Ë¤ª¤±¤ë
+.I XEmacs
+¤Î¥¦¥¤¥ó¥É¥¦¤Ç¤Î¥Þ¥¦¥¹¥Ü¥¿¥ó¤Î³ä¤êÅö¤Æ¤Î¥ê¥¹¥È¤Ç¤¹¡£
 
 .in +\w'CTRL-SHIFT-middle'u+4n
 .ta \w'CTRL-SHIFT-middle'u+4n
 .ti -\w'CTRL-SHIFT-middle'u+4n
-¥Þ¥¦¥¹¥Ü¥¿¥ó       µ¡Ç½
+¥Þ¥¦¥¹¥Ü¥¿¥ó	µ¡Ç½
 .br
 .ti -\w'CTRL-SHIFT-middle'u+4n
-º¸                 ¥Ý¥¤¥ó¥È¤Î°ÌÃÖ·è¤á¤È¡¢¥Æ¥­¥¹¥È¤ÎÁªÂò¡£
+left	¥Ý¥¤¥ó¥È¤Î¥»¥Ã¥È¤Þ¤¿¤Ï¥Æ¥­¥¹¥ÈÁªÂò¡£
 .br
 .ti -\w'CTRL-SHIFT-middle'u+4n
-Ãæ±û               ¥Æ¥­¥¹¥È¤Î¥Ú¡¼¥¹¥È¡£
+middle	¥Æ¥­¥¹¥È¤ÎÄ¥¤ê¤Ä¤±¡£
 .br
 .ti -\w'CTRL-SHIFT-middle'u+4n
-±¦                 ¥ª¥×¥·¥ç¥ó¥á¥Ë¥å¡¼¤Î¥Ý¥Ã¥×¥¢¥Ã¥×
+right	¥ª¥×¥·¥ç¥ó¥á¥Ë¥å¡¼¤Î¥Ý¥Ã¥×¥¢¥Ã¥×¡£
 .br
 .ti -\w'CTRL-SHIFT-middle'u+4n
-SHIFT-º¸           ÁªÂòÈϰϤγÈÄ¥¡£
+SHIFT-left	ÁªÂòÈϰϤγÈÄ¥¡£
 .br
 .ti -\w'CTRL-SHIFT-middle'u+4n
-CTRL-º¸            ÁªÂò¤·¤¿ÆâÍƤò¥Ý¥¤¥ó¥È°ÌÃÖ¤ËÁÞÆþ¡£
+CTRL-left	ÁªÂò¤ò¤·¥Ý¥¤¥ó¥È¤ØÁÞÆþ¤¹¤ë¡£
 .br
 .ti -\w'CTRL-SHIFT-middle'u+4n
-CTRL-Ãæ±û          ¥Ý¥¤¥ó¥È¤Î°ÌÃÖ·è¤á¤È¤½¤Î°ÌÃ֤ǤΥƥ­¥¹¥È¤ÎÁªÂò¡£
+CTRL-middle	¥Ý¥¤¥ó¥È¤ò¥»¥Ã¥È¤·¡¢¤½¤³¤ØÁªÂò¥Æ¥­¥¹¥È¤ò°ÜÆ°¤¹¤ë¡£
 .br
 .ti -\w'CTRL-SHIFT-middle'u+4n
-CTRL-SHIFT-º¸      ÁªÂò¤·¤¿ÆâÍƤòºï½ü¤·¤½¤ÎÆâÍƤò¥Ý¥¤¥ó¥È°ÌÃÖ¤ËÁÞÆþ¡£
+CTRL-SHIFT-left	ÁªÂò¤·¡¢ÁªÂòÆâÍƤòºï½ü¤·¤Æ¥Ý¥¤¥ó¥È¤ØÁÞÆþ¤¹¤ë¡£
 .br
 .ti -\w'CTRL-SHIFT-middle'u+4n
-META-º¸            È¢·¿ÁªÂò¡£
-.SH "¥Õ¥¡¥¤¥ë"
-.LP
-Lisp ¥³¡¼¥É¤¬¡¢µ¯Æ°»þ¤Ë¥æ¡¼¥¶¡¼¤Î½é´ü²½¥Õ¥¡¥¤¥ë \fB$HOME/.emacs\fP ¤«¤é
-Æɤ߹þ¤Þ¤ì¤Þ¤¹¡£
-.LP
-\f3/usr/local/info\f1
-.br
-Info ʸ½ñ¥Ö¥é¥¦¥¶
-(
-.BR XEmacs 
-¤Î¥µ¥Ö¥·¥¹¥Æ¥à)¤Î»²¾È¤¹¤ë¥Õ¥¡¥¤¥ë¡£
-¡ØXEmacs Reference Manual¡Ù¤È¡ØXEmacs Lisp Programmer's Manual¡Ù
-¤Î´°Á´¤Ê¥Æ¥­¥¹¥È¤¬¡¢½êÄê¤Î³¬Áع½Â¤¤Ç¼ý¤á¤é¤ì¤Æ¤¤¤Þ¤¹¡£
-.LP
-\f3/usr/local/lib/xemacs-$VERSION/info\f1
-.br
-Info ¥Õ¥¡¥¤¥ë(¤³¤Î°ÌÃ֤ȤϤ«¤®¤é¤Ê¤¤)
-.LP
-\f3/usr/local/lib/xemacs-$VERSION/src\f1
-.br
-C ¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤È¥ª¥Ö¥¸¥§¥¯¥È¥Õ¥¡¥¤¥ë(¸ºß¤·¤Ê¤¤¾ì¹ç¤â¤¢¤ë)
-.LP
-\f3/usr/local/lib/xemacs-$VERSION/lisp/*\f1
-.br
-¿¤¯¤ÎÊÔ½¸¥³¥Þ¥ó¥É¤òÄêµÁ¤¹¤ë Lisp ¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤È¥³¥ó¥Ñ¥¤¥ëºÑ¤ß¥Õ¥¡¥¤¥ë¡£
-¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Ïµ¡Ç½¤ä¸Ä¡¹¤Î¥Ñ¥Ã¥±¡¼¥¸Ê̤˥µ¥Ö¥Ç¥£¥ì¥¯¥È¥êÆâ¤Ë
-ʬÎव¤ì¡¢ÃÖ¤«¤ì¤Æ¤¤¤Þ¤¹¡£¤¤¤¯¤Ä¤«¤Î¥Õ¥¡¥¤¥ë¤Ï
-Á°¤â¤Ã¤ÆÆɤ߹þ¤Þ¤ì¤Æ¤¤¤Þ¤¹¡£¤½¤ì°Ê³°¤Î¤â¤Î¤Ï¡¢»ÈÍÑ»þ¤Ë¤³¤ì¤é¤Î¥Ç¥£¥ì¥¯¥È¥ê¤«¤é¡¢
-¼«Æ°Åª¤ËÆɤ߹þ¤Þ¤ì¤Þ¤¹¡£
-.LP 
-\f3/usr/local/lib/xemacs-$VERSION/etc\f1
-.br
-¤¤¤¯¤Ä¤«¤Î¾ðÊó¥Õ¥¡¥¤¥ë¡¢¥Ô¥Ã¥¯¥¹¥Þ¥Ã¥×¥Õ¥¡¥¤¥ë¡¢
-¥Ñ¥Ã¥±¡¼¥¸¤Ë»ÈÍѤµ¤ì¤ë¥Ç¡¼¥¿¥Õ¥¡¥¤¥ë¤Ê¤É¡£
-.LP
-\f3/usr/local/lib/xemacs-$VERSION/$CONFIGURATION\f1
-.br
-XEmacs ¤Ë»ÈÍѤµ¤ì¤ë¤µ¤Þ¤¶¤Þ¤Ê¥×¥í¥°¥é¥à¥Õ¥¡¥¤¥ë¡£
-.LP
-\f3/usr/local/lib/xemacs-$VERSION/$CONFIGURATION/DOC\f1
-.br
-Lisp ¥×¥ê¥ß¥Æ¥£¥Ö (´ðËÜ´Ø¿ô) ¤È \fBXEmacs\fP ¤Ë¤¢¤é¤«¤¸¤á
-Æɤ߹þ¤Þ¤ì¤¿ Lisp ´Ø¿ô¤Î¥É¥­¥å¥á¥ó¥Èʸ»úÎó¡£
-¤³¤ì¤é¤Î¥Õ¥¡¥¤¥ë¤Ï¡¢\fBXEmacs\fP ËÜÂΤΥµ¥¤¥º¤ò¸º¤é¤¹¤¿¤á¤Ë¤³¤³¤ËÊÝ´É
-¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-.LP
-\f3/usr/local/lib/xemacs-$VERSION/etc/SERVICE\f1
-.br
-\fBXEmacs\fP ¥æ¡¼¥¶¡¼¤Î¤¿¤á¤Î¡¢³Ø½¬¡¢Êݼ顢°Ü¿¢¡¢
-¥«¥¹¥¿¥Þ¥¤¥º¤Ê¤É¤Î¤µ¤Þ¤¶¤Þ¤Ê¥µ¡¼¥Ó¥¹¤òÄ󶡤¹¤ë¿Í¡¹¤Ë¤Ä¤¤¤Æ¤Þ¤È¤á¤Æ¤¤¤Þ¤¹¡£
-.LP
-\f3/usr/local/lib/xemacs/lock\f1
-.br
-2 ¿Í¤Î¥æ¡¼¥¶¡¼¤¬ 1 ¤Ä¤Î¥Õ¥¡¥¤¥ë¤òƱ»þ¤Ë¹¹¿·¤Ç¤­¤Ê¤¤¤è¤¦¤Ë¡¢
-.BR XEmacs
-¤Ç¹¹¿·Ãæ¤Î¤¹¤Ù¤Æ¤Î¥Õ¥¡¥¤¥ë¤ËÂФ·¤Æ¤Ç¤­¤ë¥í¥Ã¥¯¥Õ¥¡¥¤¥ë¤òÊÝ»ý¤·¤Þ¤¹¡£
-.LP
-\f3/usr/local/lib/xemacs/site-lisp\f1
-.br
-¥í¡¼¥«¥ë¤ËºîÀ®¤¹¤ë Lisp ¥Õ¥¡¥¤¥ë¡£
-.LP
-\f3/usr/lib/X11/rgb.txt\f1
-.br
-Àµ¼°¤Î X ¥«¥é¡¼Ì¾¤¬¥ê¥¹¥È¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-.PP
-.SH "»ÈÍѾå¤Îα°ÕÅÀ¤ÈÌ䤤¹ç¤ï¤»Àè"
-.B XEmacs
-¤Ë´Ø¤¹¤ë¥Ð¥°¤ä½¤Àµ¤ÎÊó¹ðÀè¤È¤·¤Æ¡¢¤Þ¤¿½õ¸À¤òµá¤á¤ë°¸Àè¤È¤·¤Æ¡¢
-comp.emacs.xemacs ¥Ë¥å¡¼¥¹¥°¥ë¡¼¥×¤¬¤¢¤ê¤Þ¤¹¡£
-¤¿¤À¤·¡¢ÌäÂêÅÀ¤ò¥Ð¥°¤È¤·¤ÆÊó¹ð¤¹¤ëÁ°¤Ë¡¢
-ËÜÅö¤Ë¤½¤ì¤¬¥Ð¥°¤Ç¤¢¤ë¤«¡¢¸í²ò¤ä°Õ¿ÞŪ¤Êµ¡Ç½¤Ç¤Ï¤Ê¤¤¤«
-¤È¤¤¤¦¤³¤È¤ò¤ª³Î¤«¤á¤¯¤À¤µ¤¤¡£¥Ð¥°¥ì¥Ý¡¼¥È¤ÎÊýË¡¤ä»þ´ü¤Ë¤Ä¤¤¤Æ¤Ï¡¢
-¥ê¥Õ¥¡¥ì¥ó¥¹¥Þ¥Ë¥å¥¢¥ë(¤Þ¤¿¤Ï Into ¥·¥¹¥Æ¥à) ¤Î¸åȾ¶á¤¯¤¢¤ë
-¡ÖReporting XEmacs Bugs¡×¤È¤¤¤¦¾Ï¤ò¤ªÆɤߤ¯¤À¤µ¤¤¡£
-¤Þ¤¿¡¢Êó¹ð¤¹¤ë¥Ð¥°¥ì¥Ý¡¼¥È¤Ë¤Ï¡¢Æ°ºîÃæ¤Î
-.B XEmacs
-¤Î¥Ð¡¼¥¸¥ç¥óÈÖ¹æ¤È¤½¤ì¤¬Æ°ºî¤·¤Æ¤¤¤ë¥·¥¹¥Æ¥à¤òµ­Æþ¤·¤Æ¤¯¤À¤µ¤¤¡£
-ºÇ¸å¤Ë¡¢¥Ð¥°¤Î¸¶°ø¤È¤½¤ì¤¬È¯À¸¤·¤¿¾õ¶·¤ò¡¢¤Ç¤­¤ë¤À¤±¤½¤Î¤Þ¤ÞÊݸ¤·¤Æ¤ª¤¤¤Æ
-¤¯¤À¤µ¤¤¡£¤½¤ÎÊݸ¾õÂÖ¤¬Îɤ±¤ì¤Ð´Êñ¤Ë½¤Àµ¤Ç¤­¤ë²ÄǽÀ­¤¬¹â¤¯¤Ê¤ê¤Þ¤¹¡£
-¤Ç¤­¤ë¤À¤±¤´¶¨ÎϤò¤ª´ê¤¤¤·¤Þ¤¹¡£
+META-left	¶ë·ÁÁªÂò¤¹¤ë¡£
+.SH ¥Õ¥¡¥¤¥ë
+µ¯Æ°»þ¤Ë¥æ¡¼¥¶¤Î½é´ü²½¥Õ¥¡¥¤¥ë
+\fB$HOME/.emacs\fP
+¤«¤é Lisp ¤Î¥³¡¼¥É¤¬Æɤޤì¤Þ¤¹¡£
+
+/usr/local/info - ¥É¥­¥å¥á¥ó¥È¥Ö¥é¥¦¥¶¤Ç¤¢¤ë Info
+.RI ( XEmacs
+¤Î¥µ¥Ö¥·¥¹¥Æ¥à)¤¬»²¾È¤¹¤ë¤¿¤á¤Î¥Õ¥¡¥¤¥ë·²¡£
+.I XEmacs Reference Manual
+¤È
+.I XEmacs Lisp Programmer's Manual
+¤Î´°Á´¤Ê¥Æ¥­¥¹¥È¤Ï°·¤¤¤ä¤¹¤¤¥Ä¥ê¡¼¹½Â¤¤Ë¤Ê¤Ã¤Æ¼ý¤á¤é¤ì¤Æ¤¤¤Þ¤¹¡£
+
+/usr/local/lib/xemacs-$VERSION/info - Info ¤Î¥Õ¥¡¥¤¥ë¤ÏÂå¤ï¤ê¤Ë¤³¤³¤Ë
+¤¢¤ë¤«¤âÃΤì¤Þ¤»¤ó¡£
 
-¤³¤Î¥Ë¥å¡¼¥¹¥°¥ë¡¼¥×¤Ï¡¢xemacs@xemacs.org ¤È¤¤¤¦¥á¡¼¥ë¥ê¥¹¥È¤«¤é¤Îȯ¿®¡¢¼õ¿®¤ò
-ÁÐÊý¸þ¤Ë¹Ô¤¦¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£¥Í¥Ã¥È¥Ë¥å¡¼¥¹¤Ë´Êñ¤Ë¥¢¥¯¥»¥¹¤Ç¤­¤Ê¤¤¤è¤¦¤Ê¾ì¹ç¤Ï¡¢
-newsgroup ¤ËÂå¤ï¤Ã¤Æ¥á¡¼¥ë¥ê¥¹¥È¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤¹¡£¥á¡¼¥ë¥ê¥¹¥È¤Ø¤ÎÄɲÃ
-¤´´õ˾¤ÎÊý¤Ï¡¢xemacs-request@xemacs.org ¤Ø¥á¡¼¥ë¤ò¤ªÁ÷¤ê¤¯¤À¤µ¤¤¡£
-(ľÀܥꥹ¥È¤Ë¥á¡¼¥ë¤òÁ÷¿®¤·¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£)
+/usr/local/lib/xemacs-$VERSION/lisp/* -¤Û¤È¤ó¤É¤ÎÊÔ½¸¥³¥Þ¥ó¥É¤òÄêµÁ¤·
+¤Æ¤¤¤ë Lisp ¤Î¥½¡¼¥¹¥Õ¥¡¥¤¥ë¤È¥³¥ó¥Ñ¥¤¥ë¤µ¤ì¤¿¥Õ¥¡¥¤¥ë¡£¥Õ¥¡¥¤¥ë¤Ïµ¡Ç½
+¤Þ¤¿¤Ï¥Ñ¥Ã¥±¡¼¥¸Ê̤ËʬÎव¤ì¥µ¥Ö¥Ç¥£¥ì¥¯¥È¥ê¤Ëʬ¤±¤Æ¼ý¤á¤é¤ì¤Æ¤¤¤Þ¤¹¡£
+¤¤¤¯¤Ä¤«¤ÏÁ°¤â¤Ã¤Æ¥í¡¼¥É¤µ¤ì¡¢¤½¤Î¾¤Î¤â¤Î¤Ï»ÈÍÑ»þ¤Ë¤³¤ì¤é¤Î¥Ç¥£¥ì¥¯¥È
+¥ê¤«¤é¼«Æ°¥í¡¼¥É¤µ¤ì¤Þ¤¹¡£
 
-.B XEmacs
-¤ÎÊݼéôÅö¼Ô¤Ï¡¢Äê´üŪ¤Ë¥Ë¥å¡¼¥¹¥°¥ë¡¼¥×¤òÆɤó¤Ç¤¤¤Þ¤¹¡£¤½¤·¤ÆÊó¹ð¤µ¤ì¤¿
-¥Ð¥°¤ËÂФ·¤Æ¿×®¤Ë½¤Àµ¤ò¤¹¤ë¤è¤¦¤ËÅؤá¤Æ¤¤¤Þ¤¹¡£¤·¤«¤·¤Ê¤¬¤é¡¢¤¹¤Ù¤Æ¤Î
-¥á¥Ã¥»¡¼¥¸¤¬ÊݼéôÅö¼Ô¤«¤éÊÖÅú¤ò¼õ¤±¤ë¤³¤È¤¬¤Ç¤­¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£
-ÊݼéôÅö¼Ô°Ê³°¤Ë¿¿ô¤Î¿Í㤬¥Ë¥å¡¼¥¹¥°¥ë¡¼¥×¤òÆɤó¤Ç¤ª¤ê¡¢Ä̾ïÈà¤é¤«¤é¤â
-½Ð¤¯¤ï¤·¤¿ÌäÂê¤ò²ò·è¤¹¤ë¤¿¤á¤Î½õ¸À¤òÆÀ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+/usr/local/lib/xemacs-$VERSION/etc - ¾ðÊó¥Õ¥¡¥¤¥ë¡¢¥Ô¥¯¥¹¥Þ¥Ã¥×¥Õ¥¡¥¤
+¥ë¡¢¤¢¤ë¼ï¤Î¥Ñ¥Ã¥±¡¼¥¸¤Ë»ÈÍѤµ¤ì¤ë¤½¤Î¾¤Î¥Ç¡¼¥¿¥Õ¥¡¥¤¥ë¡¢¤Ê¤É¡£
 
-¥Ë¥å¡¼¥¹¥°¥ë¡¼¥×¤«¤éÆÀ¤é¤ì¤ë¾ðÊó°Ê¾å¤Ë¡¢¾ÜºÙ¤Ê¥µ¥Ý¡¼¥È¤¬É¬Íפʾì¹ç¤Ï¡¢
-SERVICE ¥Õ¥¡¥¤¥ë(¾å½Ò)¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-¤½¤Î¥Õ¥¡¥¤¥ë¤Ë¡¢Ã´Åö¼Ô¤¬¥ê¥¹¥È¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
+/usr/local/lib/xemacs-$VERSION/$CONFIGURATION - XEmacs ¤È¤È¤â¤Ë»ÈÍѤµ
+¤ì¤ë¤¤¤í¤¤¤í¤Ê¥×¥í¥°¥é¥à¡£
+
+/usr/local/lib/xemacs-$VERSION/$CONFIGURATION/DOC - \fIXEmacs\fP ¤Î 
+Lisp ¥×¥ê¥ß¥Æ¥£¥Ö¤È»öÁ°Æɤ߹þ¤ß Lisp ´Ø¿ô¤Î¥É¥­¥å¥á¥ó¥Èʸ»úÎ󤬴ޤޤì
+¤Þ¤¹¡£¤³¤ì¤é¤Ï \fIXEmacs\fP ËÜÂΤΥµ¥¤¥º¤ò¸º¤é¤¹¤¿¤á¤³¤³¤Ë³ÊǼ¤µ¤ì¤Æ¤¤
+¤Þ¤¹¡£
+
+/usr/local/lib/xemacs/site-lisp - ¥í¡¼¥«¥ë¤ÇÄ󶡤µ¤ì¤ë Lisp ¥Õ¥¡¥¤¥ë¡£
+
+.PP
+.SH ¥Ð¥°¤È¥Ø¥ë¥×
+.I XEmacs
+¤Î¥Ð¥°¤ä¤½¤Î½¤Àµ¤òÊó¹ð¤·¤¿¤ê½õ¸À¤òµá¤á¤¿¤ê¤¹¤ë¾ì½ê¤È¤·¤Æ¡¢¥Ë¥å¡¼¥¹¥°¥ë¡¼
+¥× comp.emacs.xemacs ¤¬¤¢¤ê¤Þ¤¹¡£¤·¤«¤·²¿¤«¤ò¥Ð¥°¤È¤·¤ÆÊó¹ð¤¹¤ëÁ°¤Ë¡¢
+¤½¤ì¤¬ËÜÅö¤Ë¥Ð¥°¤Ç¤¢¤ê¡¢¸í²ò¤ä°Õ¿ÞŪ¤Êµ¡Ç½¤Ç¤Ï¤Ê¤¤¤³¤È¤ò³Îǧ¤¹¤ë¤è¤¦¤Ë
+¤·¤Æ¤¯¤À¤µ¤¤¡£¥ê¥Õ¥¡¥ì¥ó¥¹¥Þ¥Ë¥å¥¢¥ë(¤Þ¤¿¤Ï Info ¥·¥¹¥Æ¥à)¤Î½ª¤ï¤ê¤Î¤Û
+¤¦¤Ë¤¢¤ë``Reporting XEmacs Bugs'' Àá¤òÆɤó¤Ç¤¯¤À¤µ¤¤¡£¥Ð¥°¥ì¥Ý¡¼¥È¤ò¤¤
+¤Ä¡¢¤É¤Î¤è¤¦¤Ë¤¹¤ë¤Î¤«¤Ë¤Ä¤¤¤Æ¤Î¥Ò¥ó¥È¤¬½ñ¤¤¤Æ¤¢¤ê¤Þ¤¹¡£¤Þ¤¿¡¢¤¢¤Ê¤¿¤Î
+¼Â¹Ô¤·¤Æ¤¤¤ë
+.I XEmacs
+¤Î¥Ð¡¼¥¸¥ç¥ó¤È¤½¤ì¤ò¼Â¹Ô¤·¤Æ¤¤¤ë¥·¥¹¥Æ¥à¤ò \fI¤¹¤Ù¤Æ¤Î\fR ¥Ð¥°¥ì¥Ý¡¼¥È
+¤Ë´Þ¤á¤ë¤è¤¦¤Ë¤·¤Æ¤¯¤À¤µ¤¤¡£ºÇ¸å¤Ë¡¢¥Ð¥°¤Î¸¶°ø¤äȯÀ¸¾ò·ï¤ò¤è¤êÆÃÄꤷ¤Æ
+¤ª¤¯¤³¤È¤¬¤Ç¤­¤ì¤Ð¡¢¤½¤ì¤À¤±¥Ð¥°¤¬½¤Àµ¤µ¤ì¤ä¤¹¤¯¤Ê¤ê¤Þ¤¹¡£¤Ç¤¹¤«¤é¤½¤¦
+¤¹¤ë¤³¤È¤Ë»þ´Ö¤ò¤«¤±¤Æ¤¯¤À¤µ¤¤¡£
 
-XEmacs ¤Î¥á¡¼¥ë¥ê¥¹¥È¤Ë¤Ä¤¤¤Æ¤Î¾ÜºÙ¤Ï¡¢
-.B /usr/local/lib/xemacs-$VERSION/etc/MAILINGLISTS
-¤Î¥Õ¥¡¥¤¥ë¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-.SH "ÈóÀ©Ìó»ö¹à"
-.PP
-.B XEmacs
-¤Ï¡¢¥Õ¥ê¡¼¤Î¥½¥Õ¥È¥¦¥§¥¢¤Ç¤¹¡£
-.B XEmacs 
-General Public License ¤Ë½Ò¤Ù¤é¤ì¤Æ¤¤¤ë¸Â¤ê¤Ë¤ª¤¤¤Æ¡¢¤À¤ì¤Ç¤â
-.B XEmacs 
-¤ä¤½¤ì¤ËÉտ路¤¿¤â¤Î¤Î¥³¥Ô¡¼¡¢¤ª¤è¤Ó¥ê¥Õ¥¡¥ì¥ó¥¹¥Þ¥Ë¥å¥¢¥ë¤Ëɽ¼¨¤µ¤ì¤Æ¤¤¤ë
-ÆâÍƤΥ³¥Ô¡¼¤ò¡¢Ç¤°Õ¤Î¿Í¤ËÄ󶡤¹¤ë¤³¤È¤¬µö¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-.PP
-.B XEmacs
-¤Ï¡¢UNIX ¥·¥¹¥Æ¥à¤ÎÇÛÉÛʪ¤È¤È¤â¤Ë¥Ñ¥Ã¥±¡¼¥¸¤µ¤ì¤ÆÄ󶡤µ¤ì¤ë¤³¤È¤¬¤¢¤ê¤Þ¤¹¤¬¡¢
-.B XEmacs
-¤Ï¾ï¤Ë¤½¤ì¤é¤Î¥·¥¹¥Æ¥à¤Ë´Ø¤¹¤ë¥é¥¤¥»¥ó¥¹¤ÎÈϰϳ°¤Ç¤¹¡£¤â¤·
-.B XEmacs 
-¤â¤½¤Î¥é¥¤¥»¥ó¥¹¤Ë´Þ¤Þ¤ì¤Æ¤¤¤ë¤È¤¹¤ì¤Ð¡¢¤½¤ì¤ÏÇÛÉÛµö²ÄÍ×¹à¤ËÈ¿¤·¤Þ¤¹¡£
-¤¤¤«¤Ê¤ë¿Í¤â
-.B XEmacs 
-¤ÎÇÛÉۤ˴ؤ·¤Æ¤Ï²¿¤ÎÀ©Ìó¤â¼õ¤±¤Æ¤Ï¤Ê¤é¤Ê¤¤¡¢¤È¤¤¤¦¤Î¤¬ 
-General Public License ¤ÎËÜÍè¤ÎÌÜŪ¤Ç¤¹¡£
-.SH "´ØÏ¢¹àÌÜ"
-.BR X (1),
-.BR xlsfonts (1),
-.BR xterm (1),
-.BR xrdb (1), 
-.BR emacs (1), 
-.BR vi (1)
-.SH "Ãø¼Ô"
-.PP
-.B XEmacs 
-¤Ï¡¢Chuck Thompson <cthomp@xemacs.org>¡¢Ben Wing <ben@xemacs.org>¡¢
-Jamie Zawinski <jwz@netscape.com>¡¢Richard Mlynarik <mly@adoc.xerox.com>¡¢
-Martin Buchholz <mrb@eng.sun.com> ¾¡¢¤Ë¤è¤Ã¤Æ½ñ¤«¤ì¤Þ¤·¤¿¡£
-Free Software Foundation ¤Î Richard Stallman ¤Î½ñ¤¤¤¿ 
-.B "GNU Emacs "
-¥Ð¡¼¥¸¥ç¥ó 
-.I 19 
-¤ÎÁá´ü¥Ð¡¼¥¸¥ç¥ó¤ò¤â¤È¤Ë¤·¤Æ¤¤¤Þ¤·¤¿¤¬¡¢
-.B GNU Emacs 
-¤¬»ÈÍѲÄǽ¤È¤Ê¤Ã¤¿¸å¤Ç¤Ï¡¢¤½¤Î¸å³¥ê¥ê¡¼¥¹¤ËƱ´ü¤µ¤ì¤Æ¤¤¤Þ¤¹¡£
-¤â¤È¤â¤È¤Ï¡¢(º£¤ä¸ºß¤·¤Ê¤¤) Lucid, Inc. ¤Ë¤è¤Ã¤Æ½ñ¤«¤ì¤¿¤â¤Î¤Ç¡¢
-.B "Lucid Emacs "
+comp.emacs.xemacs ¤Ï¥á¡¼¥ê¥ó¥°¥ê¥¹¥È xemacs@xemacs.org ¤ÈÁÐÊý¸þ¤Ë¥²¡¼
+¥È¥¦¥§¥¤¤µ¤ì¤Æ¤¤¤Þ¤¹¡£Usenet ¤Î¥Ë¥å¡¼¥¹¤Ø¤Î¼ê¤´¤í¤Ê¥¢¥¯¥»¥¹¼êÃʤ¬¤Ê¤¤
+¤Ê¤é¤ÐÂå¤ï¤ê¤Ë¤³¤Î¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤òÆɤळ¤È¤¬¤Ç¤­¤Þ¤¹¡£¥á¡¼¥ê¥ó¥°¥ê¥¹
+¥È¤Ø»²²Ã¤¹¤ë¤Ë¤Ï xemacs-request@xemacs.org ¤Ë¥á¡¼¥ë¤·¤Æ¤¯¤À¤µ¤¤¡£
+(xemacs@xemacs.org ¼«ÂΤˤÏÁ÷¤é¤Ê¤¤¤Ç¤¯¤À¤µ¤¤¡£)
+
+.I XEmacs
+¤Î¥á¥ó¥Æ¥Ê¤ÏÄê´üŪ¤Ë¥Ë¥å¡¼¥¹¥°¥ë¡¼¥×¤òÆɤߡ¢Êó¹ð¤µ¤ì¤¿¥Ð¥°¤ËÂФ·¤Æ¿×®
+¤Ê½¤Àµ¤ò¹Ô¤¦¤è¤¦¤ËÅؤá¤Æ¤¤¤Þ¤¹¡£¤·¤«¤·¤¹¤Ù¤Æ¤Î¥á¥Ã¥»¡¼¥¸¤ËÂФ·¤Æ¥á¥ó¥Æ
+¥Ê¤«¤éÊÖÅú¤¬¤¢¤ë¤ï¤±¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡£¥á¥ó¥Æ¥Ê°Ê³°¤Ë¤â¿¤¯¤Î¿Í¤¿¤Á¤¬¤½¤Î
+¥Ë¥å¡¼¥¹¥°¥ë¡¼¥×¤òÆɤó¤Ç¤¤¤Æ¡¢Ä̾Èà¤é¤«¤é¤¢¤Ê¤¿¤Î½Ð¤¯¤ï¤·¤¿ÌäÂê¤ò²ò
+·è¤¹¤ë¤¿¤á¤Î½õ¸À¤òÆÀ¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+
+¤â¤·¥Ë¥å¡¼¥¹¥°¥ë¡¼¥×¤ÇÆÀ¤é¤ì¤ë°Ê¾å¤Î¤è¤ê¸Ä¿ÍŪ¤Ê±ç½õ¤¬É¬ÍפǤ¢¤ì¤Ð¡¢
+SERVICE ¥Õ¥¡¥¤¥ë(¾å½Ò)¤Ë¤½¤Î¤è¤¦¤Ê¥µ¡¼¥Ó¥¹¤òÄ󶡤·¤Æ¤¤¤ë¿Í¤¿¤Á¤Î¥ê¥¹¥È
+¤¬¤¢¤ê¤Þ¤¹¡£
+
+XEmacs ¥á¡¼¥ê¥ó¥°¥ê¥¹¥È¤Ë¤Ä¤¤¤Æ¤Î¤è¤ê¾Ü¤·¤¤¾ðÊó¤Ï
+/usr/local/lib/xemacs-$VERSION/etc/MAILINGLISTS ¥Õ¥¡¥¤¥ë¤ò»²¾È¤·¤Æ¤¯¤À
+¤µ¤¤¡£
+
+.SH ÈóÀ©Ìó»ö¹à
+.PP
+.I XEmacs
+¤Ï¥Õ¥ê¡¼¤Ç¤¹¡£
+.I XEmacs
+General Public License ¤Ë½Ò¤Ù¤é¤ì¤Æ¤¤¤ë¾ò·ï²¼¤Ç¡¢Ã¯¤â¤¬Ç¤°Õ¤Î¿Í¤Ë
+.I XEmacs
+¤ÎÊ£À½¤òºÆÇÛÉÛ¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+.I XEmacs
+General Public License ¤Ï
+.I XEmacs
+¤Î¤¹¤Ù¤Æ¤Î¥³¥Ô¡¼¤ËÉտ路¤Æ¤ª¤ê¡¢¤Þ¤¿¥ê¥Õ¥¡¥ì¥ó¥¹¥Þ¥Ë¥å¥¢¥ëÃæ¤Ë¤â¸½¤ì¤Þ
+¤¹¡£
+.PP
+.I XEmacs
+¤ÎÊ£À½¤Ï»þ¤Ë¤Ï Unix ¥·¥¹¥Æ¥à¤Î¥Ç¥£¥¹¥È¥ê¥Ó¥å¡¼¥·¥ç¥ó¤Ë¥Ñ¥Ã¥±¡¼¥¸¤µ¤ì¤Æ
+Ä󶡤µ¤ì¤ë¤«¤â¤·¤ì¤Þ¤»¤ó¤¬¡¢
+.I XEmacs
+¤¬¤½¤¦¤·¤¿¥·¥¹¥Æ¥à¤Ë´Ø¤¹¤ë¤Ê¤ó¤é¤«¤Î¥é¥¤¥»¥ó¥¹¤ÎÂоݤˤâ´Þ¤Þ¤ì¤Æ¤·¤Þ¤¦
+¤³¤È¤Ï·è¤·¤Æ¤¢¤ê¤Þ¤»¤ó¡£¤â¤·
+.I XEmacs
+¤â¤½¤Î¥é¥¤¥»¥ó¥¹Âоݤ˴ޤޤì¤Æ¤¤¤ë¤Ê¤é¤Ð¡¢¤½¤ì¤ÏÇÛÉÛµö²Ä¾ò¹à¤Ë°ãÈ¿¤·¤Æ
+¤¤¤Þ¤¹¡£¼ÂºÝ¤Î¤È¤³¤í¡¢General Public License ¤ÎÂè°ì¤ÎÌÜŪ¤Ï
+.I XEmacs
+¤ÎºÆÇÛÉÛ¤Ë狼¤¬Â¾¤Î¾ò·ï¤ò¤Ä¤±²Ã¤¨¤ë¤³¤È¤ò¶Ø»ß¤¹¤ë¤Ë¤¢¤ë¤Î¤Ç¤¹¡£
+.SH »²¾È
+X(1), xlsfonts(1), xterm(1), xrdb(1), emacs(1), vi(1)
+.SH Ãø¼Ô
+.PP
+.I XEmacs
+¤Ï
+Steve Baur <steve@xemacs.org>¡¢
+Martin Buchholz <martin@xemacs.org>¡¢
+Richard Mlynarik <mly@adoc.xerox.com>¡¢
+Hrvoje Niksic <hniksic@xemacs.org>¡¢
+Chuck Thompson <cthomp@xemacs.org>¡¢
+Ben Wing <ben@xemacs.org>¡¢
+Jamie Zawinski <jwz@jwz.org>¡¢
+¤Û¤«Â¿¤¯¤Î¿Í¤¿¤Á¤Ë¤è¤ê½ñ¤«¤ì¤Þ¤·¤¿¡£
+.I XEmacs
+¤Ï Free Software Foundation ¤Î Richard Stallman <rms@gnu.org> ¤Ë¤è¤Ã¤Æ
+½ñ¤«¤ì¤¿
+.I GNU Emacs ¥Ð¡¼¥¸¥ç¥ó 19
+¤ÎÁá´ü¥Ð¡¼¥¸¥ç¥ó¤ò¸µ¤Ë³«È¯¤µ¤ì¡¢¤½¤Î¸å¤Ï
+.I GNU Emacs
+¤Î¸å³¥ê¥ê¡¼¥¹¤¬Åо줹¤ëÅÙ¤ËƱ´ü¤µ¤ì¤Æ¤­¤Þ¤·¤¿¡£¤â¤È¤â¤È¤Ï (º£¤Ç¤Ï¸ºß
+¤·¤Ê¤¤) Lucid, Inc. ¤Ë¤è¤ê½ñ¤«¤ì¤¿¤â¤Î¤Ç
+.I Lucid Emacs
 ¤È¸Æ¤Ð¤ì¤Æ¤¤¤Þ¤·¤¿¡£
 .PP
-Chuck Thompson ¤¬
-.B XEmacs
-¤ÎºÆɽ¼¨¤Î´ðËÜÉôʬ¤ò½ñ¤­¡¢
-.B XEmacs
-¤Î FTP ¤È WWW ¥µ¥¤¥È¤òÊÝ»ý¤·¡¢
-¥Ð¡¼¥¸¥ç¥ó 19.11 (
-.B XEmacs 
-¤È¤è¤Ð¤ì¤¿ºÇ½é¤Î¥ê¥ê¡¼¥¹) ¤«¤é¤¹¤Ù¤Æ¤Î
-.B XEmacs 
-¤Îµ¡Ç½¤¬¥ê¥ê¡¼¥¹¤µ¤ì¤Þ¤·¤¿¡£
-Ben Wing ¤Ï¡¢¥¢¥¸¥¢¸À¸ì¤Î¥µ¥Ý¡¼¥È¡¢¥ª¥ó¥é¥¤¥ó¥Þ¥Ë¥å¥¢¥ë (¥Þ¥Ë¥å¥¢¥ë
-¥Ú¡¼¥¸¤È¿¤¯¤Î FAQ ¤ò´Þ¤à)¡¢³°Éô¥¦¥£¥¸¥§¥Ã¥È¥³¡¼¥É¤ò½ñ¤­¡¢Äã¥ì¥Ù¥ë¤À¤Ã¤¿
-.B XEmacs 
-¥µ¥Ö¥·¥¹¥Æ¥à¤Î¿¤¯¤Î´ðËÜÉôʬ¤ò¶¯²½¤·¡¢½ñ¤­Ä¾¤·¤Þ¤·¤¿¡£
-Jamie Zawinski ¤Ï¡¢
-.B "Lucid Emacs "
-¤Î½é´ü¥Ð¡¼¥¸¥ç¥ó (19.0) ¤«¤éºÇ½ª¥Ð¡¼¥¸¥ç¥ó (19.10) ¤Þ¤Ç¤Î¤¹¤Ù¤Æ¤ò
-¥ê¥ê¡¼¥¹¤·¡¢¤³¤ì¤é¤¹¤Ù¤Æ¤Î¥ê¥ê¡¼¥¹¤Î¼ç¥³¡¼¥É¹×¸¥¼Ô¤Ç¤·¤¿¡£
-Richard Mlynarik ¤Ï¡¢
-.B XEmacs 
-Lisp ¥ª¥Ö¥¸¥§¥¯¥È³ä¤êÅö¤Æ¥·¥¹¥Æ¥à¤ò½ñ¤­Ä¾¤·¤È¡¢¥­¡¼¥Þ¥Ã¥×¥³¡¼¥É¤È
-¥ß¥Ë¥Ð¥Ã¥Õ¥¡¥³¡¼¥É¤Î½¤Àµ¡¢¤½¤·¤Æ
-.B XEmacs 
+Chuck Thompson ¤Ï
+.I XEmacs
+¤ÎºÆɽ¼¨¥¨¥ó¥¸¥ó¤ò½ñ¤­¡¢
+.I XEmacs
+¤Î FTP ¥µ¥¤¥È¤ª¤è¤Ó WWW ¥µ¥¤¥È¤òÊݼ餷¡¢
+.I XEmacs
+¤Î 19.11
+.RI ( XEmacs
+¤È¸Æ¤Ð¤ì¤¿ºÇ½é¤Î¥ê¥ê¡¼¥¹)°Ê¹ß¤Î¤¹¤Ù¤Æ¤Î¥ê¥ê¡¼¥¹¤ò¹Ô¤Ã¤Æ¤­¤Þ¤·¤¿¡£Ben
+Wing ¤Ï¥¢¥¸¥¢¸À¸ì¤Î¥µ¥Ý¡¼¥ÈÉôʬ¡¢¥ª¥ó¥é¥¤¥ó¥É¥­¥å¥á¥ó¥È(¤³¤Î man page 
+¤ä FAQ ¤Î¤Û¤È¤ó¤É¤ÎÉôʬ¤ò´Þ¤ß¤Þ¤¹)¡¢³°Éô¥¦¥£¥¸¥§¥Ã¥È¥³¡¼¥É¤ò½ñ¤­¡¢
+.I XEmacs
+¥µ¥Ö¥·¥¹¥Æ¥à¤Î´ðËÜÉôʬ¡¢Äã¥ì¥Ù¥ëÉôʬ¤Î¤Û¤È¤ó¤É¤Ë¼ê¤ò¤¤¤ì¡¢¤¢¤ë¤¤¤Ï½ñ¤­
+ľ¤·¤Þ¤·¤¿¡£Jamie Zawinski ¤Ï
+.I Lucid Emacs
+¤ÎºÇ½é(19.0)¤«¤éºÇ¸å(19.10)¤Þ¤Ç¤Î¤¹¤Ù¤Æ¤Î¥ê¥ê¡¼¥¹¤òÁ÷¤ê½Ð¤·¡¢¤Þ¤¿¤³¤ì
+¤é¤Î¥ê¥ê¡¼¥¹¤Ç¤ÎÂè°ì¤Î¥³¡¼¥É¹×¸¥¼Ô¤Ç¤·¤¿¡£Richard Mlynarik ¤Ï
+.I XEmacs
+¤Î Lisp ¥ª¥Ö¥¸¥§¥¯¥È³ä¤êÅö¤Æ¥·¥¹¥Æ¥à¤ò½ñ¤­Ä¾¤·¡¢¥­¡¼¥Þ¥Ã¥×¤È¥ß¥Ë¥Ð¥Ã¥Õ¥¡
+¤Î¥³¡¼¥É¤ò²þÎɤ·¡¢¤½¤·¤Æ
+.I XEmacs
 ¤È
-.B GNU Emacs 
-¥Ð¡¼¥¸¥ç¥ó
-.IR 19 
-¤Î½é´ü¤ÎƱ´ü¤ò¹Ô¤¤¤Þ¤·¤¿¡£
-.PP
-¤½¤Î¾¿¤¯¤Î¿Í¤â¡¢Â¿Âç¤Ê¹×¸¥¤ò³¤±¤Æ¤­¤Þ¤·¤¿¡£¾ÜºÙ¤ÊÆâÍÆ(Ê̤δÑÅÀ
-¤«¤é¸«¤¿ \fBXEmacs\fP ¤ÎŤ¤Îò»Ë¤äÁ¯ÌÀ¤Ê²èÁü¡¢\fBXEmacs\fP ¹×¸¥¼Ô¤¿¤Á
-¤Î¿Íʪ¾Ò²ð¤Ê¤É)¤Ë¤Ä¤¤¤Æ¤Ï¡¢
-¥Ø¥ë¥×¥á¥Ë¥å¡¼¤Î¡ÖXEmacs ¤Ë¤Ä¤¤¤Æ¡×¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£
-.SH "ÄɲþðÊó"
-\fBXEmacs\fP ¤ÎÄɲþðÊó¤Ë¤Ä¤¤¤Æ¤Ï¡¢
-¥Ø¥ë¥×¥á¥Ë¥å¡¼¤Î¡ÖXEmacs ¤Ë¤Ä¤¤¤Æ¡×(¾å½Ò)¤ò»²¾È¤¹¤ë¤«¡¢
-.B /usr/local/lib/xemacs-$VERSION/etc/NEWS
-¥Õ¥¡¥¤¥ë¤ò¤ªÆɤߤ¯¤À¤µ¤¤¡£¤Þ¤¿¤Ï Web ¥Ö¥é¥¦¥¶¤Ç
+.I GNU Emacs ¥Ð¡¼¥¸¥ç¥ó 19
+¤È¤ÎºÇ½é¤ÎƱ´ü¤ò¹Ô¤¤¤Þ¤·¤¿¡£
+.PP
+¤Û¤«¤Ë¤â¿¤¯¤Î¿Í¤¿¤Á¤¬ÆÃÉ®¤¹¤Ù¤­¹×¸¥¤ò¤·¤Æ¤­¤Þ¤·¤¿¡£\fIXEmacs\fP ¤Ë´Ø
+¤¹¤ëÊ£¿ô¤Î»ëÅÀ¤«¤é¤ÎŤ¤Îò»Ë¤ä¡¢\fIXEmacs\fP ¤Î¼çÍפʹ׸¥¼Ô¤Î¤­¤ì¤¤¤Ê
+²èÁü¤È¿Íʪ¾Ò²ð¤Ê¤É¤ò´Þ¤ó¤À¡¢¤è¤ê¾Ü¤·¤¤¾ðÊó¤Ï
+.I XEmacs About Page
+(Help ¥á¥Ë¥å¡¼¤Î About XEmacs ¥ª¥×¥·¥ç¥ó)¤Ç¸«¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
+.SH ÄɲþðÊó
+\fIXEmacs\fP ¤Ë¤Ä¤¤¤Æ¤Î¤µ¤é¤Ê¤ë¾ðÊó¤òÆÀ¤ë¤Ë¤Ï
+.I XEmacs About Page
+(¾å¤Ç¤Õ¤ì¤Æ¤¤¤Þ¤¹)¤ò¸«¤¿¤ê¡¢
+/usr/local/lib/xemacs-$VERSION/etc/NEWS ¤òÆɤó¤À¤ê¡¢
+¤¢¤ë¤¤¤Ï Web ¥Ö¥é¥¦¥¶¤Ç
 .PP
 http://www.xemacs.org/
 .PP
-¤ò»ØÄꤷ¤Æ¤¹¤ë¤È¡¢\fBXEmacs\fP ¤Ë¤Ä¤¤¤Æ¤ÎºÇ¿·¾ðÊó¤¬ÆÀ¤é¤ì¤Þ¤¹¡£
+¤«¤é \fIXEmacs\f ¤Ë¤Ä¤¤¤Æ¤ÎºÇ¿·¤Î¾ðÊó¤òÆÀ¤¿¤ê¤·¤Æ¤¯¤À¤µ¤¤¡£
 .PP
-.B XEmacs
-¤Ë¤Ä¤¤¤Æ¤Î FAQ (¤è¤¯¿Ò¤Í¤é¤ì¤ë¼ÁÌä) ¤â¡¢¤³¤Î URL ¤Ç¸«¤Ä¤±¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-\fBXEmacs\fP Æâ¤Î Info ¥·¥¹¥Æ¥à¤«¤é¤Ï¡¢»ÈÍѲÄǽ¤Êµì¥Ð¡¼¥¸¥ç¥ó¤Ë
-¥¢¥¯¥»¥¹¤¹¤ë¤³¤È¤â²Äǽ¤Ç¤¹¡£
+.I XEmacs
+FAQ (Frequently Asked Questions) ¤¬¤³¤Î Web ¥µ¥¤¥È¤Ç¸«¤Ä¤«¤ë¤Ç¤·¤ç¤¦¡£
+»þÂåÃÙ¤ì¤Ë¤Ê¤Ã¤Æ¤¤¤ë¤«¤â¤·¤ì¤Ê¤¤¥Ð¡¼¥¸¥ç¥ó¤Ê¤é¤Ð \fIXEmacs\fP Æâ¤Î
+Info ¥·¥¹¥Æ¥à¤Ç¤Ç¤â¥¢¥¯¥»¥¹¤Ç¤­¤Þ¤¹¡£
 .PP
-ºÇ¿·¥Ð¡¼¥¸¥ç¥ó¤Î \fBXEmacs\fP ¤Ï¡¢
-.B "ftp://ftp.xemacs.org/pub/xemacs/"
-¤Þ¤¿¤Ï¤ª¶á¤¯¤Î¥ß¥é¡¼¥µ¥¤¥È¤«¤éƿ̾ (anonymous) FTP ¤Ç
-¥À¥¦¥ó¥í¡¼¥É¤¹¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
-°Ê²¼¤Ë¥ß¥é¡¼¥µ¥¤¥È¤Î°ìÍ÷¤òµ­½Ò¤·¤Þ¤¹¡£
-¤¿¤À¤·¡¢¥ß¥é¡¼¥µ¥¤¥È¤¬Êѹ¹¤µ¤ì¤Æ¥¢¥¯¥»¥¹¤Ç¤­¤Ê¤¤¾ì¹ç¤â¤¢¤ê¤Þ¤¹¡£
+\fIXEmacs\fP ¤ÎºÇ¿·¤Î¥Ð¡¼¥¸¥ç¥ó¤Ïƿ̾(anonymous) FTP ¤Ç
 .PP
-ftp://ftp.ai.mit.edu/pub/xemacs/
-.br
-ftp://ftp.uu.net/systems/gnu/xemacs/
-.br
-ftp://ftp.sunet.se/pub/gnu/xemacs/
-.br
-ftp://ftp.cenatls.cena.dgac.fr/pub/Emacs/xemacs/
-.br
-ftp://liasun3.epfl.ch/pub/gnu/xemacs/
-.br
-ftp://ftp.th-darmstadt.de/pub/editors/xemacs/
-.br
-ftp://audrey.levels.unisa.edu.au/xemacs/
-.br
-ftp://sunsite.doc.ic.ac.uk/gnu/xemacs/
-.br
-ftp://ftp.ibp.fr/pub/emacs/xemacs/
-.br
-ftp://uiarchive.cso.uiuc.edu/pub/packages/xemacs/
-.br
-ftp://ftp.technion.ac.il/pub/unsupported/gnu/xemacs/
-.br
-ftp://thphys.irb.hr/pub/xemacs/
+ftp://ftp.xemacs.org/pub/xemacs/
 .PP
-¥ß¥é¡¼¥µ¥¤¥È¤ÎºÇ¿·¥ê¥¹¥È¤Ë¤Ä¤¤¤Æ¤Ï¡¢Web ¥µ¥¤¥È¤ò¤´Í÷¤¯¤À¤µ¤¤¡£
-
+¤Þ¤¿¤Ï¤¢¤Ê¤¿¤Î¶á¤¯¤Î¥ß¥é¡¼¥µ¥¤¥È¤«¤é¥À¥¦¥ó¥í¡¼¥É¤Ç¤­¤Þ¤¹¡£
+¥ß¥é¡¼¥µ¥¤¥È¤Ï XEmacs ¤ÎÇÛÉÛÃæ¤Ë¤¢¤ë etc/FTP ¥Õ¥¡¥¤¥ë¤Ë¥ê¥¹¥È¤µ¤ì¡¢
+¤Þ¤¿ Web ¥µ¥¤¥È¤«¤é¤âºÇ¿·¤Î¥ß¥é¡¼¥µ¥¤¥È°ìÍ÷¤ò¸«¤ë¤³¤È¤¬¤Ç¤­¤Þ¤¹¡£
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 6f18a15..e5f8566 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,12 @@
+2001-07-28  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.4 "Artificial Intelligence" is released.
+
+2001-04-17  Isaac Hollander  <ysh@mindspring.com>
+
+	* gnuserv.c (setup_table): fix 2 signed/unsigned mismatches
+	* gnuslib.c (connect_to_internet_server): fix signed/unsigned mismatch
+
 2001-05-17  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.4.3 "Academic Rigor" is released.
diff --git a/lib-src/gnuserv.c b/lib-src/gnuserv.c
index 34b933b..27a9869 100644
--- a/lib-src/gnuserv.c
+++ b/lib-src/gnuserv.c
@@ -597,6 +597,7 @@ setup_table (void)
   char hostname[HOSTNAMSZ];
   unsigned int host_addr;
   int i, hosts=0;
+  int t;
 
   /* Make sure every entry is null */
   for (i=0; i<TABLE_SIZE; i++)
@@ -604,13 +605,14 @@ setup_table (void)
 
   gethostname(hostname,HOSTNAMSZ);
 
-  if ((host_addr = internet_addr(hostname)) == -1)
-    {
+  if ((t = internet_addr(hostname)) == -1)  {
       fprintf(stderr,"%s: unable to find %s in /etc/hosts or from YP",
 	      progname,hostname);
       exit(1);
-    } /* if */
-
+  } else  {
+    host_addr = t;
+  } /* if */
+  
 #ifdef AUTH_MAGIC_COOKIE
 
   server_xauth = XauGetAuthByAddr (FamilyInternet,
@@ -629,12 +631,15 @@ setup_table (void)
   if (((file_name = getenv("GNU_SECURE")) != NULL &&    /* security file  */
        (host_file = fopen(file_name,"r")) != NULL))	/* opened ok */
     {
-      while ((fscanf(host_file,"%s",hostname) != EOF))	/* find a host */
-	if ((host_addr = internet_addr(hostname)) != -1)/* get its addr */
+      while ((fscanf(host_file,"%s",hostname) != EOF))	{ /* find a host */
+	t = internet_addr(hostname);
+	if (t != -1)/* get its addr */
 	  {
+	    host_addr = t;
 	    add_host(host_addr);				/* add the addr */
 	    hosts++;
 	  }
+      }
       fclose(host_file);
     } /* if */
 
diff --git a/lib-src/gnuslib.c b/lib-src/gnuslib.c
index f0226e6..ba5a96c 100644
--- a/lib-src/gnuslib.c
+++ b/lib-src/gnuslib.c
@@ -320,6 +320,8 @@ connect_to_internet_server (char *serverhost, unsigned short port)
   struct sockaddr_in peeraddr_in;	/* for peer socket address */
   char buf[512];                        /* temporary buffer */
 
+  int t;
+
   /* clear out address structures */
   memset((char *)&peeraddr_in,0,sizeof(struct sockaddr_in));
   
@@ -327,10 +329,12 @@ connect_to_internet_server (char *serverhost, unsigned short port)
   peeraddr_in.sin_family = AF_INET;
 
   /* look up the server host's internet address */
-  if ((peeraddr_in.sin_addr.s_addr = internet_addr(serverhost)) == -1) {
+  if ((t = internet_addr(serverhost)) == -1) {
     fprintf(stderr,"%s: unable to find %s in /etc/hosts or from YP\n",
 	    progname,serverhost);
     exit(1);
+  } else {
+    peeraddr_in.sin_addr.s_addr = t;
   }; /* if */
   
   if (port == 0) {
diff --git a/lisp/.cvsignore b/lisp/.cvsignore
index c7d7e3f..41f4d7b 100644
--- a/lisp/.cvsignore
+++ b/lisp/.cvsignore
@@ -1,2 +1,6 @@
 ChangeLog.font-menu
 finder-inf.el
+auto-autoloads.el
+custom-load.el
+auto-autoloads.el
+custom-load.el
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2514dd5..b853ba6 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,119 @@
+2001-07-28  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.4 "Artificial Intelligence" is released.
+
+2001-07-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mule/kinsoku.el (kinsoku-bol-p): Work with ascii and non-ascii
+	mixed text.
+	(kinsoku-eol-p): Ditto.
+
+2001-07-09  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* mule/kinsoku.el (kinsoku-ascii-eol, kinsoku-gb-bol,
+	kinsoku-gb-eol, kinsoku-big5-bol, kinsoku-big5-eol): Assign
+	characters as the category `s' or `e' correctly.
+
+2001-06-06  Alexey Mahotkin  <alexm@hsys.msk.ru>
+
+	* mule/cyrillic.el: Uncomment definition of ccl-encode-koi8-r-font.
+
+2001-06-14  Alexey Mahotkin  <alexm@hsys.msk.ru>
+
+	* mule/cyrillic.el:  Set up case table.
+
+2001-06-08  Mike Sperber <mike@xemacs.org>
+
+	* files.el (save-some-buffers-1): Don't zap the help window right
+	after `map-y-or-n-p' has popped it up.
+
+2001-06-15  Nick Pakoulin  <npak@ispras.ru>
+
+	* help.el (frob-help-extents): Require 'hyper-apropos for faces.
+
+2001-07-18  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* specifier.el: define-specifier-tag 'gtk.
+
+2001-05-12  Ben Wing  <ben@xemacs.org>
+
+	* find-paths.el (paths-find-recursive-path):
+	fix error with null EXCLUDE-REGEXP.
+	
+	* font-lock.el (font-lock-mode):
+	fix problem reported by hrvoje with buffers starting with a space.
+	
+2001-05-06  Ben Wing  <ben@xemacs.org>
+
+	* dialog.el (make-dialog-box):
+	* menubar-items.el (default-menubar):
+	* printer.el (generic-print-buffer):
+	* printer.el (generic-print-region):
+	implement printing the selection when it's selected.
+
+2001-04-18  Didier Verna  <didier@xemacs.org>
+
+	* cus-edit.el (Custom-reset-standard): reset to standard settings
+	not only when the buffer's :custom-state is 'modified, but also
+	when it is 'set or 'saved.
+
+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-09  Danny Colascione  <qtmstr@optonline.net>
+
+	* menubar.el (popup-mode-menu): Make it work with
+	popup-menu-titles turned off.
+	
+2001-04-24  Hrvoje Niksic  <hniksic@arsdigita.com>
+
+	* about.el (about-mailto-link): Use compose-mail for sending mail.
+
+2001-07-14  Sean MacLennan  <seanm@storm.ca>
+
+	* package-admin.el (package-install-hook): New.
+	(package-delete-hook): New.
+	(package-admin-add-single-file-package): Use package-delete-hook.
+
+	* package-get.el (package-get): Use package-install-hook.
+
+2001-06-26  Robert Pluim  <rpluim@bigfoot.com>
+
+	* package-ui.el (pui-install-selected-packages): reverse the lists
+	of packages so that they get handled in the same order as they
+	were selected.
+
+2001-06-26  Robert Pluim  <rpluim@bigfoot.com>
+
+	* packages.el (locate-library): Use read-library-name for completion.
+
+2001-05-21  Martin Buchholz  <martin@xemacs.org>
+
+	* byte-optimize.el (=): `=' is not a binary predicate!
+	Fix incorrect optimization: (= 0 0 (random 2)) ==> 0 or 1.
+	Use byte-optimize-predicate, not byte-optimize-binary-predicate,
+
+2001-05-20  Martin Buchholz  <martin@xemacs.org>
+
+	* bytecomp.el (byte-compile-arithcompare):
+	Only optimize (= x) ==> t if byte-compile-delete-errors is not nil.
+
+2001-06-03  William M. Perry  <wmperry@gnu.org>
+
+	* dialog-gtk.el (popup-builtin-open-dialog): Don't forget to
+	return the filename selected by the user!
+
+2001-05-31  William M. Perry  <wmperry@gnu.org>
+
+	* font-menu.el: Avoid arithmetic with 'nil' when using the font menu
+	in XEmacs/GTK.
+
+2001-05-29  Alexey Mahotkin  <alexm@hsys.msk.ru>
+
+	* coding.el: Tiny typo fixed.
+
 2001-05-17  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.4.3 "Academic Rigor" is released.
@@ -572,6 +688,13 @@
 
 	* XEmacs 21.2.42 "Poseidon" is released.
 
+2001-01-12  Nick V. Pakoulin  <npak@ispras.ru>
+
+	* cl-macs.el (cl-upcase-arg): New function.
+	(cl-function-arglist): New function.
+	(cl-transform-lambda): Automatically add CL-style lambda list to
+	documentation string using functions above.
+
 2001-01-12  Andy Piper  <andy@xemacs.org>
 
 	* package-get.el (package-get-custom): call
diff --git a/lisp/about.el b/lisp/about.el
index f24468b..31bf273 100644
--- a/lisp/about.el
+++ b/lisp/about.el
@@ -243,12 +243,16 @@
 		 :tag (or text-to-insert url)
 		 url))
 
-;; Insert a mailto: link in the buffer.
+;; Insert a mail link in the buffer.
 (defun about-mailto-link (address)
-  (about-url-link
-   (concat "mailto:" address) address
-   (concat "Send mail to " address)
-   ))
+  (lexical-let ((address address))
+    (widget-create 'link
+		   :tag address
+		   :button-prefix ""
+		   :button-suffix ""
+		   :action (lambda (widget &optional event)
+			     (compose-mail address))
+		   :help-echo (format "Send mail to %s" address))))
 
 ;; Attach a face to a string, in order to be inserted into the buffer.
 ;; Make sure that the extent is duplicable, but unique.  Returns the
@@ -1220,7 +1224,7 @@ xxML and hairy script languages !)  and the Scheme language.\n"))
     (pelegri
      (widget-insert
       "\
-I did my my PhD at UCB and a postdoc at CSL/PARC.  I joined Sun in 1990,
+I did my PhD at UCB and a postdoc at CSL/PARC.  I joined Sun in 1990,
 spent some time in DevPro (that is when I made my contribution to
 XEmacs) and joined JavaSoft in fall '95, where I've been the lead for
 several JSP-related specifications and JAX-RPC.  I'm currently the Web
diff --git a/lisp/byte-optimize.el b/lisp/byte-optimize.el
index dad9de8..c84fd23 100644
--- a/lisp/byte-optimize.el
+++ b/lisp/byte-optimize.el
@@ -704,7 +704,7 @@
 ;;; is not a marker or if it appears in other arithmetic).
 
 ;;; But this degree of paranoia is normally unjustified, so optimize unless
-;;; the user has done (declaim (safety 3)).  Implemented in bytecomp.el.
+;;; the user has done (declaim (optimize (safety 3))).  See bytecomp.el.
 
 (defun byte-optimize-plus (form)
   (byte-optimize-predicate (byte-optimize-delay-constants-math form 1 '+)))
@@ -855,13 +855,13 @@
 (put 'max 'byte-optimizer 'byte-optimize-associative-math)
 (put 'min 'byte-optimizer 'byte-optimize-associative-math)
 
-(put '=   'byte-optimizer 'byte-optimize-binary-predicate)
 (put 'eq  'byte-optimizer 'byte-optimize-binary-predicate)
 (put 'eql 'byte-optimizer 'byte-optimize-binary-predicate)
 (put 'equal   'byte-optimizer 'byte-optimize-binary-predicate)
 (put 'string= 'byte-optimizer 'byte-optimize-binary-predicate)
 (put 'string-equal 'byte-optimizer 'byte-optimize-binary-predicate)
 
+(put '=   'byte-optimizer 'byte-optimize-predicate)
 (put '<   'byte-optimizer 'byte-optimize-predicate)
 (put '>   'byte-optimizer 'byte-optimize-predicate)
 (put '<=  'byte-optimizer 'byte-optimize-predicate)
diff --git a/lisp/bytecomp.el b/lisp/bytecomp.el
index 2fd75be..f468eeb 100644
--- a/lisp/bytecomp.el
+++ b/lisp/bytecomp.el
@@ -3142,7 +3142,9 @@ If FORM is a lambda or a macro, byte-compile it as a function."
 (defun byte-compile-arithcompare (form)
   (case (length (cdr form))
     (0 (byte-compile-subr-wrong-args form "1 or more"))
-    (1 (byte-compile-constant t))
+    (1 (if byte-compile-delete-errors
+	   (byte-compile-constant t)
+	 (byte-compile-normal-call form)))
     (2 (byte-compile-two-args form))
     (t (byte-compile-normal-call form))))
 
diff --git a/lisp/coding.el b/lisp/coding.el
index 3cc7fbe..d00f7b4 100644
--- a/lisp/coding.el
+++ b/lisp/coding.el
@@ -50,7 +50,7 @@ There are three of such tables, `file-coding-system-alist',
 TARGET-TYPE specifies which of them to modify.
 If it is `file', it affects `file-coding-system-alist' (which see).
 If it is `process', it affects `process-coding-system-alist' (which see).
-If it is `network', it affects `network-codign-system-alist' (which see).
+If it is `network', it affects `network-coding-system-alist' (which see).
 
 REGEXP is a regular expression matching a target of I/O operation.
 The target is a file name if TARGET-TYPE is `file', a program name if
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 5de0795..12ae67f 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -612,7 +612,7 @@ when the action is chosen.")
   (interactive)
   (let ((children custom-options))
     (mapc (lambda (child)
-	    (when (eq (widget-get child :custom-state) 'modified)
+	    (when (memq (widget-get child :custom-state) '(modified set saved))
 	      (widget-apply child :custom-reset-standard)))
 	  children)))
 
diff --git a/lisp/dialog-gtk.el b/lisp/dialog-gtk.el
index 5cf81c1..aaca803 100644
--- a/lisp/dialog-gtk.el
+++ b/lisp/dialog-gtk.el
@@ -69,7 +69,8 @@
     (gtk-widget-show-all widget)
     (gtk-main)
     (if (not clicked-ok)
-	(signal 'quit nil))))
+	(signal 'quit nil)
+      filename)))
 
 (defalias 'popup-builtin-save-as-dialog 'popup-builtin-open-dialog)
 
diff --git a/lisp/dialog.el b/lisp/dialog.el
index aae2d92..5755389 100644
--- a/lisp/dialog.el
+++ b/lisp/dialog.el
@@ -189,12 +189,10 @@ The keywords allowed for `general' are
 
 :spec
   The widget spec -- anything that can be passed to `make-glyph'.
-
 :title
   The title of the frame.
 :parent
   The frame is made a child of this frame (defaults to the selected frame).
-
 :properties
   Additional properties of the frame, as well as `dialog-frame-plist'.
 
@@ -276,31 +274,42 @@ The keywords allowed are
   An 'msprinter device.
 :print-settings
   A printer settings object.
+:allow-selection
+  t or nil -- whether the \"Selection\" button is enabled (defaults to nil).
+:allow-pages
+  t or nil -- whether the \"Pages\" button and associated edit controls
+  are enabled (defaults to t).
+:selected-page-button
+  `all', `selection', or `pages' -- which page button is initially
+  selected.
 
-Exactly one of these keywords must be given.
+Exactly one of :device and :print-settings must be given.
 
 The function brings up the Print dialog, where the user can
 select a different printer and/or change printer options.  Connection
 name can change as a result of selecting a different printer device.  If
 a device is specified, then changes are stored into the settings object
 currently selected into that printer.  If a settings object is supplied,
-then changes are recorded into it, and, it it is selected into a
+then changes are recorded into it, and, it is selected into a
 printer, then changes are propagated to that printer 
 too.
 
 Return value is nil if the user has canceled the dialog.  Otherwise, it
 is a new plist, with the following properties:
-  name       Printer device name, even if unchanged by the user.
-  from-page  First page to print, 1-based. If not specified by the user,
-             then this value is not included in the plist.
-  to-page    Last page to print, inclusive, 1-based. If not specified by
-             the user, then this value is not included in the plist.
-  copies     Number of copies to print.  Always returned.
+  name                   Printer device name, even if unchanged by the user.
+  from-page              First page to print, 1-based.  Returned if
+                         `selected-page-button' is `pages'.
+                         user, then this value is not included in the plist.
+  to-page                Last page to print, inclusive, 1-based.  Returned if
+                         `selected-page-button' is `pages'.
+  copies                 Number of copies to print.  Always returned.
+  selected-page-button   Which page button was selected (`all', `selection',
+                         or `pages').
 
 The DEVICE is destroyed and an error is signaled in case of
 initialization problem with the new printer.
 
-See also the `page-setup' and `print-setup' dialog boxes.
+See also the `page-setup' dialog box type.
 
 ---------------------------------------------------------------------------
 
@@ -329,7 +338,7 @@ can select a different printer and/or change printer options.
 Connection name can change as a result of selecting a different printer
 device.  If a device is specified, then changes are stored into the
 settings object currently selected into that printer.  If a settings
-object is supplied, then changes are recorded into it, and, it it is
+object is supplied, then changes are recorded into it, and, it is
 selected into a printer, then changes are propagated to that printer
 too.
 
@@ -346,42 +355,7 @@ into the print-settings or device object.
 The DEVICE is destroyed and an error is signaled in case of
 initialization problem with the new printer.
 
-See also the `print' and `print-setup' dialogs.
-
----------------------------------------------------------------------------
-
-For type `print-setup':
-
-This invokes the Windows standard Print Setup dialog.
-This dialog is usually invoked when the user selects the Printer Setup
-command.
-
-The keywords allowed are
-
-:device
-  An 'msprinter device.
-:print-settings
-  A printer settings object.
-
-Exactly one of these keywords must be given.
-
-The function brings up the Print Setup dialog, where the user
-can select a different printer and/or change printer options.
-Connection name can change as a result of selecting a different printer
-device.  If a printer is specified, then changes are stored into the
-settings object currently selected into that printer.  If a settings
-object is supplied, then changes are recorded into it, and, it it is
-selected into a printer, then changes are propagated to that printer
-too.
-
-Return value is nil if the user has canceled the dialog.  Otherwise, it
-is a new plist, with the following properties:
-  name       Printer device name, even if unchanged by the user.
-
-The printer device is destroyed and an error is signaled if new printer
-is selected by the user, but cannot be initialized.
-
-See also the `print' and `page-setup' dialogs.
+See also the `print' dialog box type.
 
 ---------------------------------------------------------------------------
 
diff --git a/lisp/files.el b/lisp/files.el
index 8aee89c..d987bcb 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2424,38 +2424,43 @@ Optional second argument EXITING means ask about certain non-file buffers
 ;; XEmacs - do not use queried flag
 (defun save-some-buffers-1 (arg exiting switch-buffer)
   (let* ((switched nil)
+	 (last-buffer nil)
 	 (files-done
 	  (map-y-or-n-p
 	   (lambda (buffer)
-	     (and (buffer-modified-p buffer)
-		  (not (buffer-base-buffer buffer))
-		  ;; XEmacs addition:
-		  (not (symbol-value-in-buffer 'save-buffers-skip buffer))
-		  (or
-		   (buffer-file-name buffer)
-		   (and exiting
-			(progn
-			  (set-buffer buffer)
-			  (and buffer-offer-save (> (buffer-size) 0)))))
-		  (if arg
-		      t
-		    ;; #### We should provide a per-buffer means to
-		    ;; disable the switching.  For instance, you might
-		    ;; want to turn it off for buffers the contents of
-		    ;; which is meaningless to humans, such as
-		    ;; `.newsrc.eld'.
-		    (when switch-buffer
-		      (unless (one-window-p)
-			(delete-other-windows))
-		      (setq switched t)
-		      ;; #### Consider using `display-buffer' here for 21.1!
-		      ;;(display-buffer buffer nil (selected-frame)))
-		      (switch-to-buffer buffer t))
-		    (if (buffer-file-name buffer)
-			(format "Save file %s? "
-				(buffer-file-name buffer))
-		      (format "Save buffer %s? "
-			      (buffer-name buffer))))))
+	     (prog1
+		 (and (buffer-modified-p buffer)
+		      (not (buffer-base-buffer buffer))
+		      ;; XEmacs addition:
+		      (not (symbol-value-in-buffer 'save-buffers-skip buffer))
+		      (or
+		       (buffer-file-name buffer)
+		       (and exiting
+			    (progn
+			      (set-buffer buffer)
+			      (and buffer-offer-save (> (buffer-size) 0)))))
+		      (if arg
+			  t
+			;; #### We should provide a per-buffer means to
+			;; disable the switching.  For instance, you might
+			;; want to turn it off for buffers the contents of
+			;; which is meaningless to humans, such as
+			;; `.newsrc.eld'.
+			(when (and switch-buffer
+				   ;; map-y-or-n-p is displaying help
+				   (not (eq last-buffer buffer)))
+			  (unless (one-window-p)
+			    (delete-other-windows))
+			  (setq switched t)
+			  ;; #### Consider using `display-buffer' here for 21.1!
+			  ;;(display-buffer buffer nil (selected-frame)))
+			  (switch-to-buffer buffer t))
+			(if (buffer-file-name buffer)
+			    (format "Save file %s? "
+				    (buffer-file-name buffer))
+			  (format "Save buffer %s? "
+				  (buffer-name buffer)))))
+	       (setq last-buffer buffer)))
 	   (lambda (buffer)
 	     (set-buffer buffer)
 	     (condition-case ()
diff --git a/lisp/find-paths.el b/lisp/find-paths.el
index cc16201..c8848b5 100644
--- a/lisp/find-paths.el
+++ b/lisp/find-paths.el
@@ -69,7 +69,8 @@ from the search."
 		     (directory-files directory nil "^[^.-]")))
 		  (reverse-dirs '()))
 	      (while raw-entries
-		(if (null (string-match exclude-regexp (car raw-entries)))
+		(if (not (and exclude-regexp
+			      (string-match exclude-regexp (car raw-entries))))
 		    (setq reverse-dirs
 			  (cons (expand-file-name (car raw-entries) directory)
 				reverse-dirs)))
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 71c7a33..693b57c 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -904,15 +904,12 @@ See the variable `font-lock-keywords' for customization."
 			  font-lock-maximum-size
 			(cdr (or (assq major-mode font-lock-maximum-size)
 				 (assq t font-lock-maximum-size))))))
-    ;; Font-lock mode will refuse to turn itself on if in batch mode, or if
-    ;; the current buffer is "invisible".  The latter is because packages
-    ;; sometimes put their temporary buffers into some particular major mode
-    ;; to get syntax tables and variables and whatnot, but we don't want the
-    ;; fact that the user has font-lock-mode on a mode hook to slow these
-    ;; things down.
-    (if (or noninteractive (eq (aref (buffer-name) 0) ?\ ))
-	(setq on-p nil))
-    (if (equal (buffer-name) " *Compiler Input*") ; hack for bytecomp...
+    ;; Font-lock mode will refuse to turn itself on if in batch mode
+    ;; to avoid potential (probably not actual, though) slowdown.  We
+    ;; used to try to "be nice" by avoiding doing this in temporary
+    ;; buffers.  But with the deferral code we don't need this, and it
+    ;; definitely screws some things up.
+    (if (noninteractive)
 	(setq on-p nil))
     (cond (on-p
 	   (make-local-hook 'after-change-functions)
diff --git a/lisp/font-menu.el b/lisp/font-menu.el
index 80b78dc..22829be 100644
--- a/lisp/font-menu.el
+++ b/lisp/font-menu.el
@@ -160,12 +160,12 @@ the last entry in the menu."
 
 (defvar font-menu-preferred-resolution
   (make-specifier-and-init 'generic '((global ((mswindows) . ":")
-					      ((x) . "*-*"))) t)
+					      ((x gtk) . "*-*"))) t)
   "Preferred horizontal and vertical font menu resolution (e.g. \"75:75\").")
 
 (defvar font-menu-size-scaling
   (make-specifier-and-init 'integer '((global ((mswindows) . 1)
-					      ((x) . 10))) t)
+					      ((x gtk) . 10))) t)
   "Scale factor used in defining font sizes.")
 
 ;; only call XListFonts (and parse) once per device.
diff --git a/lisp/help.el b/lisp/help.el
index a764234..cb09d8a 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -1183,6 +1183,7 @@ part of the documentation of internal subroutines."
 			 (documentation sym t))))
 	  (when (or var fun)
 	    (let ((ex (make-extent b e)))
+	      (require 'hyper-apropos)
 	      (set-extent-property ex 'mouse-face 'highlight)
 	      (set-extent-property ex 'help-symbol sym)
 	      (set-extent-property ex 'face 'hyper-apropos-hyperlink)
diff --git a/lisp/keydefs.el b/lisp/keydefs.el
index cbece4f..ec4b6cb 100644
--- a/lisp/keydefs.el
+++ b/lisp/keydefs.el
@@ -156,6 +156,10 @@ Keymap for characters following C-c.")
 (define-key global-map (vector help-char) 'help-command)
 (define-key global-map 'help 'help-command)
 (define-key global-map 'f1 'help-command)
+;; This is a failsafe mechanism, esp. on TTY's, in case the terminal is
+;; somewhat broken and f1 keys can't work, and backspace is redefined to
+;; do backspace.
+(define-key global-map '(meta ??) 'help-command)
 
 ;; FSFmacs indent.el
 
diff --git a/lisp/lisp-mode.el b/lisp/lisp-mode.el
index 254ad36..00f8c30 100644
--- a/lisp/lisp-mode.el
+++ b/lisp/lisp-mode.el
@@ -674,7 +674,7 @@ of the start of the containing expression."
     (parse-partial-sexp (point) calculate-lisp-indent-last-sexp 0 t)
     (if (and (elt state 2)
              (not (looking-at "\\sw\\|\\s_")))
-        ;; car of form doesn't seem to be a a symbol
+        ;; car of form doesn't seem to be a symbol
         (progn
           (if (not (> (save-excursion (forward-line 1) (point))
                       calculate-lisp-indent-last-sexp))
diff --git a/lisp/menubar-items.el b/lisp/menubar-items.el
index 499d150..75abd1b 100644
--- a/lisp/menubar-items.el
+++ b/lisp/menubar-items.el
@@ -147,8 +147,9 @@ which will not be used as accelerators."
        :active (or (valid-specifier-tag-p 'msprinter)
 		   (and (not (eq system-type 'windows-nt))
 			(fboundp 'lpr-region)))
-       :suffix (if put-buffer-names-in-file-menu (concat (buffer-name) "...")
-		 "...")]
+       :suffix (if (region-active-p) "Selection..."
+		 (if put-buffer-names-in-file-menu (concat (buffer-name) "...")
+		   "..."))]
       ,@(unless (eq system-type 'windows-nt)
 	  '(["Prett%_y-Print" ps-print-buffer-with-faces
 	     :active (fboundp 'ps-print-buffer-with-faces)
diff --git a/lisp/menubar.el b/lisp/menubar.el
index 917b49c..71e4399 100644
--- a/lisp/menubar.el
+++ b/lisp/menubar.el
@@ -544,10 +544,10 @@ button was clicked."
 	      (setq mode-filters (nreverse mode-filters))
 	      ;; If mode-filters contains a keyword already present in
 	      ;; `global-popup-menu', you will probably lose.
-	      (append (and popup-menu-titles
-			   (cond (mode-title (list mode-title))
-				 (global-title (list global-title))
-				 (t "")))
+	      (append (cond ((not popup-menu-titles) (list ""))
+			    (mode-title (list mode-title))
+			    (global-title (list global-title))
+			    (t (list "")))
 		      mode-filters
 		      context-menu-items
 		      (and context-menu-items mode-items '("---"))
diff --git a/lisp/mule/cyrillic.el b/lisp/mule/cyrillic.el
index 610dce0..a7bc3cb 100644
--- a/lisp/mule/cyrillic.el
+++ b/lisp/mule/cyrillic.el
@@ -137,11 +137,11 @@
 ;; `iso-8-1' is not correct, but XEmacs doesn't have a `ccl' category
 (coding-system-put 'koi8-r 'category 'iso-8-1)
 
-;; (define-ccl-program ccl-encode-koi8-font
-;;   `(0
-;;     ((r1 |= 128)
-;;      (r1 = r1 ,cyrillic-koi8-r-encode-table)))
-;;   "CCL program to encode Cyrillic chars to KOI font.")
+(define-ccl-program ccl-encode-koi8-r-font
+   `(0
+     ((r1 |= 128)
+      (r1 = r1 ,cyrillic-koi8-r-encode-table)))
+   "CCL program to encode Cyrillic chars to koi8-r font.")
 
 ;; (setq font-ccl-encoder-alist
 ;;       (cons (cons "koi8" ccl-encode-koi8-font) font-ccl-encoder-alist))
@@ -337,4 +337,69 @@
 		  (documentation . "Support for Cyrillic ALTERNATIVNYJ."))
  '("Cyrillic"))
 
+;;
+;; Setup case table
+;;
+
+;; FIXME: this defun is cut-and-pasted from mule/latin.el
+(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))))
+
+(setup-case-pairs
+ 'cyrillic-iso8859-5
+ '(
+   (176 208)				;cyrillic letter a
+   (167 247)				;cyrillic letter yi
+   (205 237)				;cyrillic letter e
+   (174 254)				;cyrillic letter short u
+   (177 209)				;cyrillic letter be
+   (197 229)				;cyrillic letter ha
+   (184 216)				;cyrillic letter i
+   (180 212)				;cyrillic letter de
+   (198 230)				;cyrillic letter tse
+   (206 238)				;cyrillic letter yu
+   (190 222)				;cyrillic letter o
+   (168 248)				;cyrillic letter je
+   (202 234)				;cyrillic letter hard sign
+   (199 231)				;cyrillic letter che
+   (164 244)				;cyrillic letter ukrainian ie
+   (162 242)				;cyrillic letter dje
+   (179 211)				;cyrillic letter ghe
+   (195 227)				;cyrillic letter u
+   (191 223)				;cyrillic letter pe
+   (163 243)				;cyrillic letter gje
+   (194 226)				;cyrillic letter te
+   (172 252)				;cyrillic letter kje
+   (178 210)				;cyrillic letter ve
+   (169 249)				;cyrillic letter lje
+   (200 232)				;cyrillic letter sha
+   (170 250)				;cyrillic letter nje
+   (183 215)				;cyrillic letter ze
+   (165 245)				;cyrillic letter dze
+   (203 235)				;cyrillic letter yeru
+   (201 233)				;cyrillic letter shcha
+   (182 214)				;cyrillic letter zhe
+   (175 255)				;cyrillic letter dzhe
+   (196 228)				;cyrillic letter ef
+   (186 218)				;cyrillic letter ka
+   (204 236)				;cyrillic letter soft sign
+   (181 213)				;cyrillic letter ie
+   (187 219)				;cyrillic letter el
+   (188 220)				;cyrillic letter em
+   (189 221)				;cyrillic letter en
+   (171 251)				;cyrillic letter tshe
+   (192 224)				;cyrillic letter er
+   (161 241)				;cyrillic letter io
+   (166 246)				;cyrillic letter byelorussian-ukrainian i
+   (193 225)				;cyrillic letter es
+   (185 217)				;cyrillic letter short i
+   (207 239)				;cyrillic letter ya
+   ))
+
+;; This is our utility function; we don't want it in the dumped XEmacs.
+
+(fmakunbound 'setup-case-pairs)
+
 ;;; cyrillic.el ends here
diff --git a/lisp/mule/kinsoku.el b/lisp/mule/kinsoku.el
index 94cf414..c6f342d 100644
--- a/lisp/mule/kinsoku.el
+++ b/lisp/mule/kinsoku.el
@@ -172,7 +172,7 @@
 ;; kinsoku ascii
 (loop for char in (string-to-char-list kinsoku-ascii-bol)
       do (modify-category-entry char ?s))
-(loop for char in kinsoku-ascii-eol
+(loop for char in (string-to-char-list kinsoku-ascii-eol)
       do (modify-category-entry char ?e))
 ;; kinsoku-jis
 (loop for char in (string-to-char-list kinsoku-jis-bol)
@@ -180,14 +180,14 @@
 (loop for char in (string-to-char-list kinsoku-jis-eol)
       do (modify-category-entry char ?e))
 ;; kinsoku-gb
-(loop for char in kinsoku-gb-bol
+(loop for char in (string-to-char-list kinsoku-gb-bol)
       do (modify-category-entry char ?s))
-(loop for char in kinsoku-gb-eol
+(loop for char in (string-to-char-list kinsoku-gb-eol)
       do (modify-category-entry char ?e))
 ;; kinsoku-big5
-(loop for char in kinsoku-big5-bol
+(loop for char in (string-to-char-list kinsoku-big5-bol)
       do (modify-category-entry char ?s))
-(loop for char in kinsoku-big5-eol
+(loop for char in (string-to-char-list kinsoku-big5-eol)
       do (modify-category-entry char ?e))
 
 (defun kinsoku-bol-p ()
@@ -195,14 +195,21 @@
 Uses category \'s\' to check.
 point$B$G2~9T$9$k$H9TF,6XB'$K?($l$k$+$I$&$+$r$+$($9!#(B
 $B9TF,6XB'J8;z$O(B\'s\'$B$N(Bcategory$B$G;XDj$9$k!#(B"
-  (let ((ch (char-after)))
-    (if (and ch
+  (let ((before (char-before))
+	(after (char-after)))
+    (if (and after
 	     (or
-	      (and kinsoku-ascii (char-in-category-p ch ?a))
-	      (and kinsoku-jis (char-in-category-p ch ?j))
-	      (and kinsoku-gb (char-in-category-p ch ?c))
-	      (and kinsoku-big5 (char-in-category-p ch ?t))))
-	(char-in-category-p ch ?s)
+	      (and kinsoku-ascii (char-in-category-p after ?a))
+	      (and kinsoku-jis (or (char-in-category-p after ?j)
+				   (and before
+					(char-in-category-p before ?j))))
+	      (and kinsoku-gb (or (char-in-category-p after ?c)
+				  (and before
+				       (char-in-category-p before ?c))))
+	      (and kinsoku-big5 (or (char-in-category-p after ?t)
+				    (and before
+					 (char-in-category-p before ?t))))))
+	(char-in-category-p after ?s)
       nil)))
 
 (defun kinsoku-eol-p ()
@@ -210,14 +217,21 @@ point$B$G2~9T$9$k$H9TF,6XB'$K?($l$k$+$I$&$+$r$+$($9!#(B
 Uses category \'e\' to check.
 point$B$G2~9T$9$k$H9TKv6XB'$K?($l$k$+$I$&$+$r$+$($9!#(B
 $B9TKv6XB'J8;z$O(B\'s\'$B$N(Bcategory$B$G;XDj$9$k!#(B"
-  (let ((ch (char-before)))
-    (if (and ch
+  (let ((before (char-before))
+	(after (char-after)))
+    (if (and before
 	     (or
-	      (and kinsoku-ascii (char-in-category-p ch ?a))
-	      (and kinsoku-jis (char-in-category-p ch ?j))
-	      (and kinsoku-gb (char-in-category-p ch ?c))
-	      (and kinsoku-big5 (char-in-category-p ch ?t))))
-	(char-in-category-p ch ?e)
+	      (and kinsoku-ascii (char-in-category-p before ?a))
+	      (and kinsoku-jis (or (char-in-category-p before ?j)
+				   (and after
+					(char-in-category-p after ?j))))
+	      (and kinsoku-gb (or (char-in-category-p before ?c)
+				  (and after
+				       (char-in-category-p after ?c))))
+	      (and kinsoku-big5 (or (char-in-category-p before ?t)
+				    (and after
+					 (char-in-category-p after ?t))))))
+	(char-in-category-p before ?e)
       nil)))
 
 (defvar kinsoku-extend-limit nil
diff --git a/lisp/package-admin.el b/lisp/package-admin.el
index d13a853..925f6de 100644
--- a/lisp/package-admin.el
+++ b/lisp/package-admin.el
@@ -104,6 +104,16 @@ is already implicit, as `looking-at' is used.  Filenames can,
 unfortunately, contain spaces, so be careful in constructing any
 regexps.")
 
+(defvar package-install-hook nil
+  "*List of hook functions to be called when a new package is successfully
+installed. The hook function is passed two arguments: the package name, and
+the install directory.")
+
+(defvar package-delete-hook nil
+  "*List of hook functions to be called when a package is deleted. The
+hook is called *before* the package is deleted. The hook function is passed
+two arguments: the package name, and the install directory.")
+
 ;;;###autoload
 (defun package-admin-add-single-file-package (file destdir &optional pkg-dir)
   "Install a single file Lisp package into XEmacs package hierarchy.
@@ -402,6 +412,7 @@ PACKAGE is a symbol, not a string."
   (let ( (tmpbuf " *pkg-manifest*") manifest-file package-lispdir dirs file)
     (setq pkg-topdir (package-admin-get-install-dir package pkg-topdir))
     (setq manifest-file (package-admin-get-manifest-file pkg-topdir package))
+    (run-hook-with-args 'package-delete-hook package pkg-topdir)
     (if (file-exists-p manifest-file)
 	(progn
 	  ;; The manifest file exists!  Use it to delete the old distribution.
@@ -428,7 +439,7 @@ PACKAGE is a symbol, not a string."
 		  ;; Make sure that the file is writable.
 		  ;; (This is important under MS Windows.)
 		  ;; I do not know why it important under MS Windows but
-		  ;;    1. It bombs out out when the file does not exist. This can be condition-cased
+		  ;;    1. It bombs out when the file does not exist. This can be condition-cased
 		  ;;    2. If I removed the write permissions, I do not want XEmacs to just ignore them.
 		  ;;       If it wants to, XEmacs may ask, but that is about all
 		  ;; (set-file-modes file 438) ;; 438 -> #o666
diff --git a/lisp/package-get.el b/lisp/package-get.el
index 954d099..8498bfc 100644
--- a/lisp/package-get.el
+++ b/lisp/package-get.el
@@ -865,6 +865,7 @@ successfully installed but errors occurred during initialization, or
 	      (if (package-get-init-package (package-admin-get-lispdir
 					     install-dir package))
 		  (progn
+		    (run-hook-with-args 'package-install-hook package install-dir)
 		    (message "Added package `%s'" package)
 		    (sit-for 0)
 		    )
@@ -950,7 +951,7 @@ Returns the modified PACKAGE-LIST.  Any missing fields are created."
 (defun package-get-staging-dir (filename)
   "Return a good place to stash FILENAME when it is retrieved.
 Use `package-get-dir' for directory to store stuff.
-Creates `package-get-dir'  it it doesn't exist."
+Creates `package-get-dir'  if it doesn't exist."
   (interactive "FPackage filename: ")
   (if (not (file-exists-p package-get-dir))
       (make-directory package-get-dir))
diff --git a/lisp/package-ui.el b/lisp/package-ui.el
index 1c5bc13..5509cde 100644
--- a/lisp/package-ui.el
+++ b/lisp/package-ui.el
@@ -373,7 +373,7 @@ and whether or not it is up-to-date."
 	(mapcar (lambda (pkg)
 		  (package-admin-delete-binary-package
 		   pkg (package-admin-get-install-dir pkg nil)))
-		pui-deleted-packages)
+		(nreverse pui-deleted-packages))
 	(message "Packages deleted"))))
 	 
   (let ( (tmpbuf "*Packages-To-Install*") do-install)
@@ -411,7 +411,7 @@ and whether or not it is up-to-date."
 				(if (not (package-get pkg nil nil
                                                       pui-package-install-dest-dir))
 				    (throw 'done nil)))
-			      pui-selected-packages)
+			      (nreverse pui-selected-packages))
 		      t)
 		    (progn
 		      (pui-list-packages)
diff --git a/lisp/packages.el b/lisp/packages.el
index 07832ce..e0b8fdb 100644
--- a/lisp/packages.el
+++ b/lisp/packages.el
@@ -190,7 +190,7 @@ to the specified name LIBRARY.
 
 If the optional third arg PATH is specified, that list of directories
 is used instead of `load-path'."
-  (interactive (list (read-string "Locate library: ")
+  (interactive (list (read-library-name "Locate library: ")
                      nil nil
                      t))
   (let ((result
diff --git a/lisp/printer.el b/lisp/printer.el
index 8245398..7d343eb 100644
--- a/lisp/printer.el
+++ b/lisp/printer.el
@@ -253,18 +253,29 @@ display of the print dialog box.
 
 If BUFFER is nil or omitted, the current buffer is used."
   (interactive (list nil (not current-prefix-arg)))
-  (if (or (not (valid-specifier-tag-p 'msprinter))
-	  (not display-print-dialog))
-      (generic-print-region (point-min buffer) (point-max buffer) buffer)
-    (let* ((d (Printer-get-device))
-	   (props (condition-case err
-		      (make-dialog-box 'print :device d)
-		    (error
-		     (Printer-clear-device)
-		     (signal (car err) (cdr err))))))
-      (and props (generic-print-region (point-min buffer)
-				       (point-max buffer) buffer
-				       d props)))))
+  (let* ((print-region (and (interactive-p) (region-active-p)))
+	 (start (if print-region (region-beginning) (point-min buffer)))
+	 (end (if print-region (region-end) (point-max buffer))))
+    (if (or (not (valid-specifier-tag-p 'msprinter))
+	    (not display-print-dialog))
+	(generic-print-region start end buffer)
+      (let* ((d (Printer-get-device))
+	     (props (condition-case err
+			(make-dialog-box 'print :device d
+					 :allow-selection print-region
+					 :selected-page-button
+					 (if print-region 'selection 'all))
+		      (error
+		       (Printer-clear-device)
+		       (signal (car err) (cdr err))))))
+	(and props
+	     (let ((really-print-region
+		    (eq (plist-get props 'selected-page-button) 'selection)))
+	       (generic-print-region (if really-print-region start
+				       (point-min buffer))
+				     (if really-print-region end
+				       (point-max buffer))
+				     buffer d props)))))))
 
 (defun generic-print-region (start end &optional buffer print-device props)
   "Print region using a printing method appropriate to the O.S. being run.
@@ -295,131 +306,141 @@ Recognized properties are the same as those in `make-dialog-box':
              the end.
   copies     Number of copies to print.  If omitted, one copy is printed."
   (cond ((valid-specifier-tag-p 'msprinter)
-	 (let (d f header-buffer footer-buffer)
-	   (setq buffer (decode-buffer buffer))
-	   (unwind-protect
-	       (progn
-		 (setq d (or print-device (Printer-get-device)))
-		 (setq f (make-frame
-			  (list* 'name (concat
+	 ;; loop, printing one copy of document per loop.  kill and
+	 ;; re-create the frame each time so that we eject the piece
+	 ;; of paper at the end even if we're printing more than one
+	 ;; page per sheet of paper.
+	 (let ((copies (plist-get props 'copies 1)))
+	   (while (> copies 0)
+	     (let (d f header-buffer footer-buffer)
+	       (setq buffer (decode-buffer buffer))
+	       (unwind-protect
+		   (with-current-buffer buffer
+		     (save-restriction
+		       (narrow-to-region start end)
+		       (setq d (or print-device (Printer-get-device)))
+		       (setq f (make-frame
+				(list* 'name
+				       (concat
 					(substitute ?_ ?. (buffer-name buffer))
 					" - XEmacs")
-				 '(menubar-visible-p
-				   nil
-				   has-modeline-p nil
-				   default-toolbar-visible-p nil
-				   default-gutter-visible-p nil
-				   minibuffer none
-				   modeline-shadow-thickness 0
-				   vertical-scrollbar-visible-p nil
-				   horizontal-scrollbar-visible-p nil))
-			  d))
-		 (let* ((w (frame-root-window f))
-			(vertdpi (cdr (device-system-metric d 'device-dpi)))
-			(pixel-vertical-clip-threshold (/ vertdpi 2))
-			(from-page (plist-get props 'from-page 1))
-			(to-page (plist-get props 'to-page))
-			(copies (plist-get props 'copies 1))
-			(context (make-Print-context
-				  :start-time (current-time)
-				  ;; #### bogus! we need accessors for
-				  ;; print-settings objects.
-				  :printer-name
-				  (or (plist-get props 'name)
-				      printer-name
-				      (mswindows-get-default-printer))))
-			header-window
-			footer-window)
-
-		   (when printer-page-header
-		     (let ((window-min-height 2))
-		       (setq header-window w)
-		       (setq w (split-window w 2)))
-		     (setq header-buffer (generate-new-buffer " *header*"))
-		     (set-window-buffer header-window header-buffer))
-
-		   (when printer-page-footer
-		     (let ((window-min-height 2))
-		       (setq footer-window
-			     (split-window w (- (window-height w) 2))))
-		     (setq footer-buffer (generate-new-buffer " *footer*"))
-		     (set-window-buffer footer-window footer-buffer))
-
-		   (setf (Print-context-window context) w)
-
-		   ;; loop, printing one copy of document per loop
-		   (while (> copies 0)
-		     (let ((last-end 0) ; bufpos at end of previous page
-			   reached-end  ; t if we've reached the end of the
+				       '(menubar-visible-p
+					 nil
+					 has-modeline-p nil
+					 default-toolbar-visible-p nil
+					 default-gutter-visible-p nil
+					 minibuffer none
+					 modeline-shadow-thickness 0
+					 vertical-scrollbar-visible-p nil
+					 horizontal-scrollbar-visible-p nil))
+				d))
+		       (let* ((w (frame-root-window f))
+			      (vertdpi
+			       (cdr (device-system-metric d 'device-dpi)))
+			      (pixel-vertical-clip-threshold (/ vertdpi 2))
+			      (from-page (plist-get props 'from-page 1))
+			      (to-page (plist-get props 'to-page))
+			      (context (make-Print-context
+					:start-time (current-time)
+					;; #### bogus! we need accessors for
+					;; print-settings objects.
+					:printer-name
+					(or (plist-get props 'name)
+					    printer-name
+					    (mswindows-get-default-printer))))
+			      header-window
+			      footer-window)
+
+			 (when printer-page-header
+			   (let ((window-min-height 2))
+			     (setq header-window w)
+			     (setq w (split-window w 2)))
+			   (setq header-buffer
+				 (generate-new-buffer " *header*"))
+			   (set-window-buffer header-window header-buffer))
+
+			 (when printer-page-footer
+			   (let ((window-min-height 2))
+			     (setq footer-window
+				   (split-window w (- (window-height w) 2))))
+			   (setq footer-buffer
+				 (generate-new-buffer " *footer*"))
+			   (set-window-buffer footer-window footer-buffer))
+
+			 (setf (Print-context-window context) w)
+
+			 (let ((last-end 0) ; bufpos at end of previous page
+			       reached-end ; t if we've reached the end of the
 					; text we're printing
-			   (pageno 1))
-		       (set-window-buffer w buffer)
-		       (set-window-start w start)
-
-		       ;; loop, printing one page per loop
-		       (while (and (not reached-end)
-				   ;; stop at end of region of text or
-				   ;; outside of ranges of pages given
-				   (or (not to-page) (<= pageno to-page)))
-
-			 (setf (Print-context-pageno context) pageno)
-
-			 ;; only actually print the page if it's in the
-			 ;; range.
-			 (when (>= pageno from-page)
-			   (when printer-page-header
-			     (with-current-buffer header-buffer
-			       (erase-buffer)
-			       (generate-header-line printer-page-header
-						     context)
-			       (goto-char (point-min))
-			       (set-window-start header-window (point-min))))
-
-			   (when printer-page-footer
-			     (with-current-buffer footer-buffer
-			       (erase-buffer)
-			       (insert "\n")
-			       (generate-header-line printer-page-footer
-						     context)
-			       (goto-char (point-min))
-			       (set-window-start footer-window (point-min))))
-
-			   (redisplay-frame f t)
-			   (print-job-eject-page f)
-			   )
-			 ;; but use the GUARANTEE argument to `window-end'
-			 ;; so that we get the right value even if we
-			 ;; didn't do a redisplay.
-			 (let ((this-end (window-end w t))
-			       (pixvis (window-last-line-visible-height w)))
-			   ;; in case we get stuck somewhere, bow out
-			   ;; rather than printing an infinite number of
-			   ;; pages.  #### this will fail with an image
-			   ;; bigger than an entire page.  but we really
-			   ;; need this check here.  we should be more
-			   ;; clever in our check, to deal with this case.
-			   (if (or (= this-end last-end)
-				   ;; #### fuckme!  window-end returns a value
-				   ;; outside of the valid range of buffer
-				   ;; positions!!!
-				   (>= this-end end))
-			       (setq reached-end t)
-			     (setq last-end this-end)
-			     (set-window-start w this-end)
-			     (if pixvis
-				 (save-selected-window
-				   (select-window w)
-				   ;; #### scroll-down should take a
-				   ;; window arg.
-				   (let ((window-pixel-scroll-increment
-					  pixvis))
-				     (scroll-down 1))))))
-			 (setq pageno (1+ pageno))))
-		     (setq copies (1- copies)))))
-	     (and f (delete-frame f))
-	     (and header-buffer (kill-buffer header-buffer))
-	     (and footer-buffer (kill-buffer footer-buffer))
-	     )))
+			       (pageno 1))
+			   (set-window-buffer w buffer)
+			   (set-window-start w start)
+
+			   ;; loop, printing one page per loop
+			   (while (and (not reached-end)
+				       ;; stop at end of region of text or
+				       ;; outside of ranges of pages given
+				       (or (not to-page) (<= pageno to-page)))
+
+			     (setf (Print-context-pageno context) pageno)
+
+			     ;; only actually print the page if it's in the
+			     ;; range.
+			     (when (>= pageno from-page)
+			       (when printer-page-header
+				 (with-current-buffer header-buffer
+				   (erase-buffer)
+				   (generate-header-line printer-page-header
+							 context)
+				   (goto-char (point-min))
+				   (set-window-start header-window
+						     (point-min))))
+
+			       (when printer-page-footer
+				 (with-current-buffer footer-buffer
+				   (erase-buffer)
+				   (insert "\n")
+				   (generate-header-line printer-page-footer
+							 context)
+				   (goto-char (point-min))
+				   (set-window-start footer-window
+						     (point-min))))
+
+			       (redisplay-frame f t)
+			       (print-job-eject-page f)
+			       )
+			     ;; but use the GUARANTEE argument to `window-end'
+			     ;; so that we get the right value even if we
+			     ;; didn't do a redisplay.
+			     (let ((this-end (window-end w t))
+				   (pixvis
+				    (window-last-line-visible-height w)))
+			       ;; in case we get stuck somewhere, bow out
+			       ;; rather than printing an infinite number of
+			       ;; pages.  #### this will fail with an image
+			       ;; bigger than an entire page.  but we really
+			       ;; need this check here.  we should be more
+			       ;; clever in our check, to deal with this case.
+			       (if (or (= this-end last-end)
+				       ;; #### fuckme!  window-end returns a
+				       ;; value outside of the valid range of
+				       ;; buffer positions!!!
+				       (>= this-end end))
+				   (setq reached-end t)
+				 (setq last-end this-end)
+				 (set-window-start w this-end)
+				 (if pixvis
+				     (with-selected-window w
+				       ;; #### scroll-down should take a
+				       ;; window arg.
+				       (let ((window-pixel-scroll-increment
+					      pixvis))
+					 (scroll-down 1))))))
+			     (setq pageno (1+ pageno))))))
+		     (and f (delete-frame f))
+		     (and header-buffer (kill-buffer header-buffer))
+		     (and footer-buffer (kill-buffer footer-buffer)))))
+	     (setq copies (1- copies)))))
 	((and (not (eq system-type 'windows-nt))
 	      (fboundp 'lpr-region))
 	 (lpr-region buffer))
diff --git a/lisp/specifier.el b/lisp/specifier.el
index 08b037e..fb26c2e 100644
--- a/lisp/specifier.el
+++ b/lisp/specifier.el
@@ -600,6 +600,8 @@ detail in the doc string for `current-display-table'."
 (or (valid-specifier-tag-p 'mswindows)
     (define-specifier-tag 'mswindows (lambda (dev)
 				       (eq (device-type dev) 'mswindows))))
+(or (valid-specifier-tag-p 'gtk)
+    (define-specifier-tag 'gtk (lambda (dev) (eq (device-type dev) 'gtk))))
 
 ;; Add special tag for use by initialization code.  Code that
 ;; sets up default specs should use this tag.  Code that needs to
diff --git a/lisp/startup.el b/lisp/startup.el
index d885baa..66524d2 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -794,11 +794,11 @@ directory which will load the relocated initialization code.")
   (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 --git a/lisp/update-elc.el b/lisp/update-elc.el
index 777017a..1fda28d 100644
--- a/lisp/update-elc.el
+++ b/lisp/update-elc.el
@@ -160,7 +160,7 @@
   )
 
 (setq update-elc-files-to-compile (append update-elc-files-to-compile
-					  processed))
+					  (nreverse processed)))
 
 ;; (print (prin1-to-string update-elc-files-to-compile))
 
diff --git a/lwlib/ChangeLog b/lwlib/ChangeLog
index fad83ef..771b09b 100644
--- a/lwlib/ChangeLog
+++ b/lwlib/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-28  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.4 "Artificial Intelligence" is released.
+
 2001-05-17  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.4.3 "Academic Rigor" is released.
diff --git a/man/ChangeLog b/man/ChangeLog
index b22f04e..323fcab 100644
--- a/man/ChangeLog
+++ b/man/ChangeLog
@@ -1,3 +1,106 @@
+2001-07-28  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.4 "Artificial Intelligence" is released.
+
+2001-06-06  Alexey Mahotkin  <alexm@hsys.msk.ru>
+
+	* xemacs/mule.texi: Typo fixes and describe CCL and fonts.
+	* lispref/mule.texi: Typo fixes and describe set-charset-registry.
+
+2001-05-30  Ben Wing  <ben@xemacs.org>
+
+	* xemacs-faq.texi (Top):
+	* xemacs-faq.texi (MS Windows):
+	* xemacs-faq.texi (Q6.0.1):
+	* xemacs-faq.texi (Q6.0.2):
+	* xemacs-faq.texi (Q6.0.3):
+	* xemacs-faq.texi (Q6.0.4):
+	* xemacs-faq.texi (Q6.1.1):
+	* xemacs-faq.texi (Q6.1.4):
+	* xemacs-faq.texi (Q6.1.5):
+	* xemacs-faq.texi (Q6.1.6):
+	* xemacs-faq.texi (Q6.2.1):
+	* xemacs-faq.texi (Q6.2.2):
+	* xemacs-faq.texi (Q6.3.1):
+	* xemacs-faq.texi (Q6.3.2):
+	* xemacs-faq.texi (Q6.3.3):
+	* xemacs-faq.texi (Q6.4.1):
+	* xemacs-faq.texi (Current Events):
+	Major rewrite.
+	Update all MS Windows info to current.
+	Redo section 6.1 almost completely.
+	Incorporate sections 1 and 2 of Hrvoje's FAQ.
+
+2001-05-16  Ben Wing  <ben@xemacs.org>
+
+	* xemacs-faq.texi (Top):
+	* xemacs-faq.texi (Installation):
+	* xemacs-faq.texi (Q2.1.15):
+	* xemacs-faq.texi (Q2.1.18):
+	* xemacs-faq.texi (Q2.1.19):
+	document how to debug X errors
+	
+2001-06-24  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* xemacs/programs.texi: Add node name (Top) to Ebrowse xref.
+
+2001-07-02  Adrian Aichner  <adrian@xemacs.org>
+
+	* xemacs-faq.texi (Q1.0.14): Update information following a
+	request by Tom Mostyn.
+
+2001-07-02  Adrian Aichner  <adrian@xemacs.org>
+
+	* lispref\windows.texi (Window Configurations): Fix typos.
+	* lispref\x-windows.texi (Resources): Ditto.
+	* internals\internals.texi (XEmacs From the Inside): Ditto.
+	* emodules.texi (Initialization Mode): Ditto.
+	* xemacs-faq.texi (Q6.3.2): Ditto.
+
+2001-06-10  Ben Wing  <ben@xemacs.org>
+
+	* xemacs-faq.texi (Q1.0.10):
+	* xemacs-faq.texi (Q1.0.11):
+	* xemacs-faq.texi (Q1.0.12):
+	Update sections on Windows and MacOS availability.
+
+2001-06-08  Ben Wing  <ben@xemacs.org>
+
+	* xemacs-faq.texi (Top):
+	* xemacs-faq.texi (MS Windows):
+	* xemacs-faq.texi (Q6.2.1):
+	* xemacs-faq.texi (Q6.2.2):
+	* xemacs-faq.texi (Q6.2.3):
+	* xemacs-faq.texi (Q6.2.4):
+	* xemacs-faq.texi (Q6.2.5):
+	* xemacs-faq.texi (Q6.3.1):
+	* xemacs-faq.texi (Q6.3.2):
+	* xemacs-faq.texi (Q6.3.3):
+	* xemacs-faq.texi (Q6.3.4):
+	* xemacs-faq.texi (Q6.4.1):
+	* xemacs-faq.texi (Q6.4.2):
+	* xemacs-faq.texi (Current Events):
+	* xemacs-faq.texi (Q7.0.1):
+	* xemacs-faq.texi (Q7.0.2):
+	* xemacs-faq.texi (Q7.0.3):
+	* xemacs-faq.texi (Q7.0.4):
+	* xemacs-faq.texi (Q7.0.5):
+	* xemacs-faq.texi (Q7.0.6):
+	Merge in the rest of Hrvoje's Windows FAQ.  Redo section 7
+	to update current reality and add condensed versions of
+	new changes for 21.1 and 21.4. (Not quite done for 21.4.)
+	Lots more Windows updates.
+
+2001-05-29  Alexey Mahotkin  <alexm@hsys.msk.ru>
+
+	* xemacs/custom.texi: Documented keyboard shortcut.
+	* xemacs/mule.texi: Updated to match reality; tiny fixes.
+
+2001-06-02  Simon Josefsson  <simon@josefsson.org>
+
+	* man/internals.texi (Techniques for XEmacs Developers): Fix
+	typo in ./configure line.
+
 2001-05-17  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.4.3 "Academic Rigor" is released.
diff --git a/man/emodules.texi b/man/emodules.texi
index b1b250a..538a72a 100644
--- a/man/emodules.texi
+++ b/man/emodules.texi
@@ -653,17 +653,17 @@ The above @file{Makefile} is, in fact, complete, and would compile the
 sample module, and optionally install it.  The @code{--mod-location}
 argument to @code{ellcc} will produce, on the standard output, the base
 location of the @value{emacs} module directory.  Each sub-directory of that
-directory is automatically searched for for modules when they are loaded
-with @code{load-module}.  An alternative location would be
-@file{/usr/local/lib/xemacs/site-modules}.  That path can change
-depending on the options the person who compiled @value{emacs} chose, so you
-can always determine the correct site location using the
-@code{--mod-site-location} option.  This directory is treated the same
-way as the main module directory.  Each sub-directory within it is
-searched for a given module when the user attempts to load it.  The
-valid extensions that the loader attempts to use are @file{.so},
-@file{.ell} and @file{.dll}.  You can use any of these extensions,
-although @file{.ell} is the preferred extension.
+directory is automatically searched for modules when they are loaded with
+@code{load-module}.  An alternative location would be
+@file{/usr/local/lib/xemacs/site-modules}.  That path can change depending
+on the options the person who compiled @value{emacs} chose, so you can
+always determine the correct site location using the
+@code{--mod-site-location} option.  This directory is treated the same way
+as the main module directory.  Each sub-directory within it is searched for
+a given module when the user attempts to load it.  The valid extensions that
+the loader attempts to use are @file{.so}, @file{.ell} and @file{.dll}.  You
+can use any of these extensions, although @file{.ell} is the preferred
+extension.
 
 @node Link Mode, Other ellcc options, Initialization Mode, Using ellcc
 @section Link Mode
diff --git a/man/internals/internals.texi b/man/internals/internals.texi
index 0c2a707..1314398 100644
--- a/man/internals/internals.texi
+++ b/man/internals/internals.texi
@@ -1332,7 +1332,7 @@ The redisplay mechanism is responsible for making sure that windows and
 frames are displayed correctly.  It is periodically told (by the event
 loop) to actually ``do its job'', i.e. snoop around and see what the
 current state of the environment (mostly of the currently-existing
-windows, frames, and buffers) is, and make sure that that state matches
+windows, frames, and buffers) is, and make sure that state matches
 what's actually displayed.  It keeps lots and lots of information around
 (such as what is actually being displayed currently, and what the
 environment was last time it checked) so that it can minimize the work
@@ -3092,7 +3092,7 @@ Did you make sure you didn't introduce any new compiler warnings?
 Before submitting a patch, please try compiling at least once with
 
 @example
-configure --with-mule --with-union-type --error-checking=all
+configure --with-mule --use-union-type --error-checking=all
 @end example
 
 Here are things to know when you create a new source file:
diff --git a/man/lispref/mule.texi b/man/lispref/mule.texi
index 9483964..4f7422e 100644
--- a/man/lispref/mule.texi
+++ b/man/lispref/mule.texi
@@ -442,14 +442,19 @@ This function returns the CCL program, if any, for converting
 position codes of characters in @var{charset} into font indices.
 @end defun
 
-  The only property of a charset that can currently be set after
-the charset has been created is the CCL program.
+  The two properties of a charset that can currently be set after the
+charset has been created are the CCL program and the font registry.
 
 @defun set-charset-ccl-program charset ccl-program
 This function sets the @code{ccl-program} property of @var{charset} to
 @var{ccl-program}.
 @end defun
 
+@defun set-charset-registry charset registry
+This function sets the @code{registry} property of @var{charset} to
+@var{registry}.
+@end defun
+
 @node Predefined Charsets, , Charset Property Functions, Charsets
 @subsection Predefined Charsets
 
@@ -501,8 +506,8 @@ chinese-cns11643-7       94x94 M  0  l2r CNS11643.1
 ethiopic                 94x94 2  0  l2r Ethio
 ascii-r2l                94    B  0  r2l ISO8859-1
 ipa                      96    0  1  l2r MuleIPA
-vietnamese-lower         96    1  1  l2r VISCII1.1
-vietnamese-upper         96    2  1  l2r VISCII1.1
+vietnamese-viscii-lower  96    1  1  l2r VISCII1.1
+vietnamese-viscii-upper  96    2  1  l2r VISCII1.1
 @end example
 
 For all of the above charsets, the dimension and number of columns are
diff --git a/man/lispref/windows.texi b/man/lispref/windows.texi
index b05616e..73ac18c 100644
--- a/man/lispref/windows.texi
+++ b/man/lispref/windows.texi
@@ -1850,10 +1850,10 @@ configuration instead of a window configuration.  @xref{Frame
 Configurations}.
 
 @defun current-window-configuration &optional frame
-This function returns a new object representing the current current
-window configuration of @var{frame}, namely the number of windows, their
-sizes and current buffers, which window is the selected window, and for
-each window the displayed buffer, the display-start position, and the
+This function returns a new object representing the current window
+configuration of @var{frame}, namely the number of windows, their sizes
+and current buffers, which window is the selected window, and for each
+window the displayed buffer, the display-start position, and the
 positions of point and the mark.  An exception is made for point in the
 current buffer, whose value is not saved.
 
diff --git a/man/lispref/x-windows.texi b/man/lispref/x-windows.texi
index 04a521d..fa65f24 100644
--- a/man/lispref/x-windows.texi
+++ b/man/lispref/x-windows.texi
@@ -130,7 +130,7 @@ object that the database is searched for.
 
 @item
 The fourth arg is the locale to search for the resources on, and can
-currently be a a buffer, a frame, a device, or the symbol @code{global}.
+currently be a buffer, a frame, a device, or the symbol @code{global}.
 If omitted, it defaults to @code{global}.
 
 @item
diff --git a/man/xemacs-faq.texi b/man/xemacs-faq.texi
index 09db48d..70c82d9 100644
--- a/man/xemacs-faq.texi
+++ b/man/xemacs-faq.texi
@@ -7,7 +7,7 @@
 @finalout
 @titlepage
 @title XEmacs FAQ
-@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2001/04/16 09:24:44 $
+@subtitle Frequently asked questions about XEmacs @* Last Modified: $Date: 2001/07/25 07:46:06 $
 @sp 1
 @author Tony Rossini <rossini@@biostat.washington.edu>
 @author Ben Wing <ben@@xemacs.org>
@@ -169,7 +169,7 @@ Trouble Shooting:
 * Q2.1.15::     How to debug an XEmacs problem with a debugger.
 * Q2.1.16::     XEmacs crashes in @code{strcat} on HP/UX 10.
 * Q2.1.17::     @samp{Marker does not point anywhere}.
-* Q2.1.18::     [This question intentionally left blank]
+* Q2.1.18::     XEmacs is outputting lots of X errors.
 * Q2.1.19::     XEmacs does not follow the local timezone.
 * Q2.1.20::     @samp{Symbol's function definition is void: hkey-help-show.}
 * Q2.1.21::     [This question intentionally left blank]
@@ -378,37 +378,47 @@ XEmacs on MS Windows
 
 General Info:
 * Q6.0.1::      What is the status of the XEmacs port to Windows?
-* Q6.0.2::      What flavors of MS Windows are supported?
+* Q6.0.2::      What flavors of MS Windows are supported?  The list name implies NT only.
 * Q6.0.3::      Are binaries available?
-* Q6.0.4::      Can I build XEmacs on MS Windows with support for X or Cygwin?
-
+* Q6.0.4::      Can I build XEmacs on MS Windows with X support?  Do I need to?
+* Q6.0.5::      I'd like to help out.  What do I do?
+* Q6.0.6::      What are Cygwin and MinGW, and do I need them to run XEmacs?
+* Q6.0.7::      What exactly are all the different ways to build XEmacs under Windows?
+ 
 Building XEmacs on MS Windows:
-* Q6.1.1::      I decided to run with X.  Where do I get an X server?
-* Q6.1.2::      What compiler do I need to compile XEmacs?
-* Q6.1.3::      How do I compile for the native port?
-* Q6.1.4::      How do I compile for the X port?
-* Q6.1.5::      How do I compile for Cygnus' Cygwin?
-* Q6.1.6::      What do I need for Cygwin?
+* Q6.1.1::      What compiler/libraries do I need to compile XEmacs?
+* Q6.1.2::      How do I compile the native port?
+* Q6.1.3::      What do I need for Cygwin?
+* Q6.1.4::      How do I compile under Cygwin?
+* Q6.1.5::      How do I compile using MinGW (aka @samp{the -mno-cygwin flag to gcc})?
+* Q6.1.6::      I decided to run with X.  Where do I get an X server?
+* Q6.1.7::      How do I compile with X support?
 
 Customization and User Interface:
-* Q6.2.1::      How will the port cope with differences in the Windows user interface?
+* Q6.2.1::      How does the port cope with differences in the Windows user interface?
 * Q6.2.2::      How do I change fonts in XEmacs on MS Windows?
 * Q6.2.3::      Where do I put my @file{init.el}/@file{.emacs} file?
+* Q6.2.4::      How do I get Windows Explorer to associate a file type with XEmacs?
+* Q6.2.5::      Is it possible to print from XEmacs?
+  
 
 Miscellaneous:
-* Q6.3.1::      Will XEmacs rename all the win32-* symbols to w32-*?
+* Q6.3.1::      Does XEmacs rename all the @samp{win32-*} symbols to @samp{w32-*}?
 * Q6.3.2::      What are the differences between the various MS Windows emacsen?
-* Q6.3.3::      What is the porting team doing at the moment?
+* Q6.3.3::      XEmacs 21.1 on Windows used to spawn an ugly console window on every startup.  Has that been fixed?
+* Q6.3.4::      What is the porting team doing at the moment?
 
 Troubleshooting:
-* Q6.4.1::      XEmacs won't start on Windows. (NEW)
+* Q6.4.1::      XEmacs won't start on Windows.
+* Q6.4.2::      Why do I get a blank toolbar on Windows 95?
 
 Current Events:
-
-* Q7.0.1::      What is new in 20.2?
-* Q7.0.2::      What is new in 20.3?
-* Q7.0.3::      What is new in 20.4?
-* Q7.0.4::      Procedural changes in XEmacs development.
+* Q7.0.1::      What new features will be in XEmacs soon?
+* Q7.0.2::      What's new in XEmacs 21.4?
+* Q7.0.3::      What's new in XEmacs 21.1?
+* Q7.0.4::      What's new in XEmacs 20.4?
+* Q7.0.5::      What's new in XEmacs 20.3?
+* Q7.0.6::      What's new in XEmacs 20.2?
 @end detailmenu
 @end menu
 
@@ -653,7 +663,8 @@ Screen snapshots are available in the WWW version of the FAQ.
 @node Q1.0.10, Q1.0.11, Q1.0.9, Introduction
 @unnumberedsubsec Q1.0.10: Is there a port of XEmacs to Microsoft ('95 or NT)?
 
-Yes, @xref{MS Windows}.
+Yes.  XEmacs can be built under MS Windows and is fully-featured and
+actively developed.  See @ref{MS Windows}.
 
 @node Q1.0.11, Q1.0.12, Q1.0.10, Introduction
 @unnumberedsubsec Q1.0.11: Is there a port of XEmacs to the Macintosh?
@@ -666,9 +677,18 @@ Yes, @xref{MS Windows}.
 @c For the MacOS, there is a port of
 @c @uref{ftp://ftp.cs.cornell.edu/pub/parmet/, Emacs 18.59}.
 
-Yes, there is a port of XEmacs 19.14, tested on MacOS 7.6.1 and MacOS
-8.5.1 by @email{pjarvis@@ispchannel.com, Pitts Jarvis}.  It's available
-at @uref{http://homepage.mac.com/pjarvis/xemacs.html}.
+Yes.
+
+XEmacs 21.5 (perhaps 21.4 also?) works on MacOS X, although it certainly
+will not feel very much like a Mac application as it has no Mac-specific
+code in it.
+
+There is also a port of XEmacs 19.14 that works on all recent versions
+of MacOS, from 8.1 through MacOS X, by @email{pjarvis@@ispchannel.com,
+Pitts Jarvis}.  It runs in an equivalent of TTY mode only (one single
+Macintosh window, 25 colors), but has a large number of Mac-specific
+additions.  It's available at
+@uref{http://homepage.mac.com/pjarvis/xemacs.html}.
 
 @node Q1.0.12, Q1.0.13, Q1.0.11, Introduction
 @unnumberedsubsec Q1.0.12: Is there a port of XEmacs to NextStep?
@@ -688,8 +708,9 @@ No, but Alexander Nikolaev <avn_1251@@mail.ru> is working on it.
 Pre-printed manuals are not available.  If you are familiar with
 TeX, you can generate your own manual from the XEmacs sources.
 
-HTML and Postscript versions of XEmacs manuals may be available from the
-XEmacs web site in the future.  Send requests to @email{faq@@xemacs.org}.
+HTML and Postscript versions of XEmacs manuals are available from the
+XEmacs web site at
+@uref{http://www.xemacs.org/Documentation/index.html}.
 
 @node Q1.1.1, Q1.1.2, Q1.0.14, Introduction
 @unnumberedsec 1.1: Policies
@@ -1224,7 +1245,7 @@ Trouble Shooting:
 * Q2.1.15::     How to debug an XEmacs problem with a debugger.
 * Q2.1.16::     XEmacs crashes in @code{strcat} on HP/UX 10.
 * Q2.1.17::     @samp{Marker does not point anywhere}.
-* Q2.1.18::     [This question intentionally left blank]
+* Q2.1.18::     XEmacs is outputting lots of X errors.
 * Q2.1.19::     XEmacs does not follow the local timezone.
 * Q2.1.20::     @samp{Symbol's function definition is void: hkey-help-show.}
 * Q2.1.21::     [This question intentionally left blank]
@@ -1647,7 +1668,7 @@ your system administrator.
 
 It's possible that a core file didn't get produced, in which case you're
 out of luck.  Go complain to your system administrator and tell him not
-to disable core files by default.  Also @xref{Q2.1.15}, for tips and
+to disable core files by default.  Also see @ref{Q2.1.15}, for tips and
 techniques for dealing with a debugger.
 
 When making a problem report make sure that:
@@ -2014,12 +2035,13 @@ Here are some hints:
 @itemize @bullet
 @item
 First of all, if the crash is at all reproducible, consider very
-strongly recompiling your XEmacs with debugging symbols, with no
-optimization, and with the configure options @samp{--debug=yes} and
-@samp{--error-checking=all}.  This will make your XEmacs run somewhat
-slower but make it a lot more likely to catch the problem earlier
-(closer to its source), and a lot easier to determine what's going on
-with a debugger.
+strongly recompiling your XEmacs with debugging symbols and with no
+optimization (e.g. with GCC use the compiler flags @samp{-g -O0} --
+that's an "oh" followed by a zero), and with the configure options
+@samp{--debug=yes} and @samp{--error-checking=all}.  This will make your
+XEmacs run somewhat slower but make it a lot more likely to catch the
+problem earlier (closer to its source), and a lot easier to determine
+what's going on with a debugger.
 
 @item
 If you're able to run XEmacs under a debugger and reproduce the crash
@@ -2040,6 +2062,10 @@ If XEmacs is hitting some weird Lisp error that's causing it to crash
 declared static in eval.c.
 
 @item
+If XEmacs is outputting lots of X errors, put a breakpoint on
+@code{x_error_handler()}; that will tell you which call is causing them.
+
+@item
 Internally, you will probably see lots of variables that hold objects of
 type @code{Lisp_Object}.  These are exactly what they appear to be,
 i.e. references to Lisp objects.  Printing them out with the debugger
@@ -2219,7 +2245,11 @@ Upgrade your Gnus.
 @end enumerate
 
 @node Q2.1.18, Q2.1.19, Q2.1.17, Installation
-@unnumberedsubsec Q2.1.18: removed
+@unnumberedsubsec Q2.1.18: XEmacs is outputting lots of X errors.
+
+If this is happening, we would very much like to know what's causing
+them.  To find this out, see @ref{Q2.1.15}.  Try to get both a C and Lisp
+backtrace, and send them to @email{xemacs-beta@@xemacs.org}.
 
 @node Q2.1.19, Q2.1.20, Q2.1.18, Installation
 @unnumberedsubsec Q2.1.19: XEmacs does not follow the local timezone.
@@ -2324,7 +2354,7 @@ the toolbar button or select the menu item), nothing (or an error)
 happens.  The simplest explanation is that you are missing a package
 that is essential to you.  You can either track it down and install it
 (there is a list of packages and brief descriptions of their contents in
-@file{etc/PACKAGES}), or install the `Sumo Tarball' (see @pxref{Q2.0.14}).
+@file{etc/PACKAGES}), or install the `Sumo Tarball' (@pxref{Q2.0.14}).
 
 @c #### should xref to XEmacs manual here
 
@@ -3000,7 +3030,7 @@ left to @code{gnuclient}, though.
 Yes.  Use @code{gnuclient -nw}. (Prior to 20.3, use the @code{gnuattach}
 program supplied with XEmacs instead.)
 
-Also @xref{Q5.0.12}.
+Also see @ref{Q5.0.12}.
 
 @node Q3.5.1, Q3.5.2, Q3.4.2, Customization
 @unnumberedsec 3.5: The Keyboard
@@ -3095,7 +3125,7 @@ get around this, try the following:
 (global-set-key 'redirected-delete 'foo)
 @end lisp
 
-Also @xref{Q3.5.10}.
+Also see @ref{Q3.5.10}.
 
 @node Q3.5.5, Q3.5.6, Q3.5.4, Customization
 @unnumberedsubsec Q3.5.5: Scrolling one line at a time.
@@ -3235,7 +3265,7 @@ Customize. Select from the @code{Options} menu
 @code{Advanced (Customize)->Emacs->Editing->Basics->Delete Key Deletes Forward} or
 type @kbd{M-x customize @key{RET} editing-basics @key{RET}}.
 
-Also @xref{Q3.5.4}.
+Also see @ref{Q3.5.4}.
 
 @node Q3.5.10, Q3.5.11, Q3.5.9, Customization
 @unnumberedsubsec Q3.5.10: Can I turn on @dfn{sticky} modifier keys?
@@ -3712,7 +3742,7 @@ Put this in your @code{.emacs}:
 
 @strong{Warning: This command turns off all region highlighting.}
 
-Also @xref{Q3.10.1}.
+Also see @ref{Q3.10.1}.
 
 @node Q3.10.5,  , Q3.10.4, Customization
 @unnumberedsubsec Q3.10.5: The region disappears when I hit the end of buffer while scrolling.
@@ -5842,70 +5872,174 @@ port of XEmacs.
 
 @menu
 
-General Info
+General Info:
 * Q6.0.1::      What is the status of the XEmacs port to Windows?
 * Q6.0.2::      What flavors of MS Windows are supported?
 * Q6.0.3::      Where are the XEmacs on MS Windows binaries?
-* Q6.0.4::      Can I build XEmacs on MS Windows with support for X or Cygwin?
-
+* Q6.0.4::      Can I build XEmacs on MS Windows with X support?  Do I need to?
+* Q6.0.5::      I'd like to help out.  What do I do?
+* Q6.0.6::      What are Cygwin and MinGW, and do I need them to run XEmacs?
+* Q6.0.7::      What exactly are all the different ways to build XEmacs under Windows?
+  
 Building XEmacs on MS Windows
-* Q6.1.1::      I decided to run with X.  Where do I get an X server?
-* Q6.1.2::      What compiler do I need to compile XEmacs?
-* Q6.1.3::      How do I compile for the native port?
-* Q6.1.4::      How do I compile for the X port?
-* Q6.1.5::      How do I compile for Cygnus' Cygwin?
-* Q6.1.6::      What do I need for Cygwin?
-
+* Q6.1.1::      What compiler/libraries do I need to compile XEmacs?
+* Q6.1.2::      How do I compile the native port?
+* Q6.1.3::      What do I need for Cygwin?
+* Q6.1.4::      How do I compile under Cygwin?
+* Q6.1.5::      How do I compile using MinGW (aka @samp{the -mno-cygwin flag to gcc})?
+* Q6.1.6::      I decided to run with X.  Where do I get an X server?
+* Q6.1.7::      How do I compile with X support?
+  
 Customization and User Interface
-* Q6.2.1::      How will the port cope with differences in the Windows user interface?
+* Q6.2.1::      How does the port cope with differences in the Windows user interface?
 * Q6.2.2::      How do I change fonts in XEmacs on MS Windows?
 * Q6.2.3::      Where do I put my @file{init.el}/@file{.emacs} file?
-
+* Q6.2.4::      How do I get Windows Explorer to associate a file type with XEmacs?
+* Q6.2.5::      Is it possible to print from XEmacs?
+  
 Miscellaneous
-* Q6.3.1::      Will XEmacs rename all the win32-* symbols to w32-*?
+* Q6.3.1::      Does XEmacs rename all the win32-* symbols to w32-*?
 * Q6.3.2::      What are the differences between the various MS Windows emacsen?
-* Q6.3.3::      What is the porting team doing at the moment?
+* Q6.3.3::      XEmacs 21.1 on Windows used to spawn an ugly console window on every startup.  Has that been fixed?
+* Q6.3.4::      What is the porting team doing at the moment?
 
 Troubleshooting:
-* Q6.4.1::      XEmacs won't start on Windows. (NEW)
-
+* Q6.4.1::      XEmacs won't start on Windows.
+* Q6.4.2::      Why do I get a blank toolbar on Windows 95?
 @end menu
 
 @node Q6.0.1, Q6.0.2, MS Windows, MS Windows
 @unnumberedsec 6.0: General Info
 @unnumberedsubsec Q6.0.1: What is the status of the XEmacs port to Windows?
 
-Is XEmacs really getting ported to MS Windows?  What is the status of the port?
+Is XEmacs really ported to MS Windows?  What is the status of the port?
+
+Beginning with release 21.0, XEmacs has worked under MS Windows.  A
+group of dedicated developers actively maintains and improves the
+Windows-specific portions of the code.  The mailing list at
+@email{xemacs-nt@@xemacs.org} is dedicated to that effort (please use
+the -request address to subscribe). (Despite its name, XEmacs actually
+works on all versions of Windows.)
 
-Yes, a group of volunteers actively works on making XEmacs code base
-cleanly compile and run on MS Windows operating systems.  The mailing
-list at @email{xemacs-nt@@xemacs.org} is dedicated to that effort
-(please use the -request address to subscribe).
+As of May 2001, XEmacs on MS Windows is stable and full-featured, and
+has been so for a year or more -- in fact, some features, such as
+printing, actually work better on Windows than native Unix.  However,
+the internationalization (Mule) support does not work -- although this
+is being actively worked on.
 
-At this time, XEmacs on MS Windows is stable and full-featured.
-However, the internationalization (Mule) support does not work --
-although this is being actively worked on.
 
 @node Q6.0.2, Q6.0.3, Q6.0.1, MS Windows
 @unnumberedsubsec Q6.0.2: What flavors of MS Windows are supported?  The list name implies NT only.
 
-The list name is misleading, as XEmacs will support Windows 95, Windows
-98, Windows NT, Windows 2000, Windows ME, Windows XP, and all newer
-versions of Windows.  The MS Windows-specific code is based on Microsoft
-Win32 API, and will not work on MS Windows 3.x or on MS-DOS.
+The list name is misleading, as XEmacs supports and has been compiled on
+Windows 95, Windows 98, Windows NT, Windows 2000, Windows ME, Windows
+XP, and all newer versions of Windows.  The MS Windows-specific code is
+based on Microsoft Win32 API, and will not work on MS Windows 3.x or on
+MS-DOS.
+
+XEmacs also supports the Cygwin and MinGW development and runtime
+environments, where it also uses native Windows code for graphical
+features.
 
 
 @node Q6.0.3, Q6.0.4, Q6.0.2, MS Windows
 @unnumberedsubsec Q6.0.3: Are binaries available?
 
-Binaries are available at
-@uref{ftp://ftp.xemacs.org/pub/xemacs/binaries/win32/} for the native MS
-Windows version.
+Binaries are available at @uref{http://www.xemacs.org/Download/win32/}
+for the native and Cygwin MS Windows versions of 21.4, and the native
+version of 21.1.
+
+The 21.4 binaries use a modified version of the Cygwin installer.  Run
+the provided @file{setup.exe}, and follow the instructions.
 
-@node Q6.0.4, Q6.1.1, Q6.0.3, MS Windows
-@unnumberedsubsec Q6.0.4: Can I build XEmacs on MS Windows with support for X or Cygwin?
 
-Yes.  XEmacs can be built in several ways in the MS Windows environment.
+@node Q6.0.4, Q6.0.5, Q6.0.3, MS Windows
+@unnumberedsubsec Q6.0.4: Can I build XEmacs on MS Windows with X support?  Do I need to?
+
+Yes, you can, but no you do not need to.  In fact, we recommend that you
+use a native-GUI version unless you have a specific need for an X
+version.
+
+@node Q6.0.5, Q6.0.6, Q6.0.4, MS Windows
+@unnumberedsubsec Q6.0.5: I'd like to help out.  What do I do?
+
+It depends on the knowledge and time you possess.  If you are a
+programmer, try to build XEmacs and see if you can improve it.
+Windows-specific improvements like integration with established
+Windows environments are especially sought after.
+
+Otherwise, you can still help by downloading the binaries, using
+XEmacs as your everyday editor and reporting bugs you find to the
+mailing list.
+
+Another area where we need help is the documentation: We need good
+documentation for building XEmacs and for using it.  This FAQ is a
+small step in that direction.
+
+@node Q6.0.6, Q6.0.7, Q6.0.5, MS Windows
+@unnumberedsubsec Q6.0.6: What are Cygwin and MinGW, and do I need them to run XEmacs?
+
+To answer the second part of the question: No, you, you don't need
+Cygwin or MinGW to build or to run XEmacs.  But if you have them and
+want to use them, XEmacs supports these environments.
+
+(One important reason to support Cygwin is that it lets the MS Windows
+developers test out their code in a Unix environment without actually
+having to have a Unix machine around.  For this reason alone, Cygwin
+support is likely to remain supported for a long time in XEmacs.  Same
+goes for the X support under Cygwin, for the same reasons.  MinGW
+support, on the other hand, depends on volunteers to keep it up to date;
+but this is generally not hard.)
+
+Cygwin is a set of tools providing Unix-like API on top of Win32.
+It makes it easy to port large Unix programs without significant
+changes to their source code.  It is a development environment as well
+as a runtime environment.
+
+When built with Cygwin, XEmacs supports all display types -- TTY, X &
+Win32 GUI, and can be built with support for all three simultaneously.
+If you build with Win32 GUI support then the Cygwin version uses the
+majority of the Windows-specific code, which is mostly related to
+display.  If you want to build with X support you need X libraries (and
+an X server to display XEmacs on); see @ref{Q6.1.4}.  TTY and Win32 GUI
+require no additional libraries beyond what comes standard with Cygwin.
+
+The advantages of the Cygwin version are that it integrates well with
+the Cygwin environment for existing Cygwin users; uses configure so
+building with different features is very easy; and actively supports X &
+TTY.  Furthermore, the entire Cygwin environment and compiler are free,
+whereas Visual C++ costs money.
+
+The disadvantage is that it requires the whole Cygwin environment,
+whereas the native port requires only a suitable MS Windows compiler.
+Also, it follows the Unix filesystem and process model very closely
+(some will undoubtedly view this as an advantage).
+
+See @uref{http://sources.redhat.com/cygwin/} for more information on
+Cygwin.
+
+MinGW is a collection of header files and import libraries that allow
+one to use GCC under the Cygwin environment to compile and produce
+exactly the same native Win32 programs that you can using Visual C++.
+Programs compiled with MinGW make use of the standard Microsoft runtime
+library @file{MSVCRT.DLL}, present on all Windows systems, and look,
+feel, and act like a standard Visual-C-produced application. (The only
+difference is the compiler.) This means that, unlike a
+standardly-compiled Cygwin application, no extra runtime support
+(e.g. Cygwin's @file{cygwin1.dll}) is required.  This, along with the
+fact that GCC is free (and works in a nice Unix-y way in a nice Unix-y
+environment, for those die-hard Unix hackers out there), is the main
+advantage of MinGW.  It is also potentially faster than Cygwin because
+it has less overhead when calling Windows, but you lose the POSIX
+emulation layer, which makes Unix programs harder to port. (But this is
+irrelevant for XEmacs since it's already ported to Win32.)
+
+See @uref{http://www.mingw.org/} for more information on MinGW.
+
+@node Q6.0.7, Q6.1.1, Q6.0.6, MS Windows
+@unnumberedsubsec Q6.0.7: What exactly are all the different ways to build XEmacs under Windows?
+
+XEmacs can be built in several ways in the MS Windows environment.
 
 The standard way is what we call the "native" port.  It uses the Win32
 API and has no connection with X whatsoever -- it does not require X
@@ -5914,80 +6048,60 @@ port is the most reliable version and provides the best graphical
 support.  Almost all development is geared towards this version, and
 there is little reason not to use it.
 
-You can also build XEmacs "X" port---it requires X libraries to build
-and an X server to run.  Internally it uses the Xt event loop and makes
-use of X toolkits.  Its look is quite un-Windowsy, and it is not well
-maintained, but it is being kept around for the time being because it
-has a long history.
+The second way to build is the Cygwin port.  It takes advantage of
+Cygnus emulation library under Win32.  @xref{Q6.0.6}, for more
+information.
 
-There is also a third special case, the Cygwin port.  It takes
-advantage of Cygnus emulation library under Win32, which enables it to
-reuse much of the Unix XEmacs code base, such as processes and network
-support, or internal select() mechanisms.
+A third way is the MinGW port.  It uses the Cygwin environment to build
+but does not require it at runtime.  @xref{Q6.0.6}, for more
+information.
 
-Cygwin port supports all display types---TTY, X & MS GUI, and can be
-built with support for all three.  If you build with MS GUI support
-then the Cygwin version uses the majority of the msw code, which is
-mostly related to display.  If you want to build with X support you
-need X libraries.  If you want to build with TTY support you need
-ncurses.  MS GUI requires no additional libraries.
-
-The advantages of the Cygwin version are that it integrates well with
-Cygwin environment for existing Cygwin users; uses configure so building
-with different features is very easy; and has process support in X &
-tty.
+Finally, you might also be able to build the non-Cygwin, non-MinGW "X"
+port.  This was actually the first version of XEmacs that ran under MS
+Windows, and although the code is still in XEmacs, it's essentially
+orphaned and it's unlikely it will compile without a lot of work.  If
+you want an MS Windows versin of XEmacs that supports X, use the Cygwin
+version. (The X support there is actively maintained, so that Windows
+developers can test the X support in XEmacs.)
 
-The disadvantage is that it requires several Unix utilities and the
-whole Cygwin environment, whereas the native port requires only a
-suitable MS Windows compiler.  Also, it follows the Unix filesystem and
-process model very closely (some will undoubtedly view this as an
-advantage).
 
-@node Q6.1.1, Q6.1.2, Q6.0.4, MS Windows
+@node Q6.1.1, Q6.1.2, Q6.0.7, MS Windows
 @unnumberedsec 6.1: Building XEmacs on MS Windows
-@unnumberedsubsec Q6.1.1: I decided to run with X.  Where do I get an X server?
-
-Pointers to X servers can be found at
-@iftex
-@*
-@end iftex
-@uref{http://dao.gsfc.nasa.gov/software/grads/win32/X11R6.3/};
-
-look for "Where to get an X server".  Also note that, although the above
-page talks about Cygnus gnu-win32 (Cygwin), the information on X servers
-is Cygwin-independent.  You don't have to be running/using Cygwin to use
-these X servers, and you don't have to compile XEmacs under Cygwin to
-use XEmacs with these X servers.  An "X port" XEmacs compiled under
-Visual C++ will work with these X servers (as will XEmacs running on a
-Unix box, redirected to the server running on your PC).
+@unnumberedsubsec Q6.1.1: What compiler/libraries do I need to compile XEmacs?
 
+You need Visual C++ 4.2, 5.0, or 6.0 for the native version. (We have
+some beta testers currently trying to compile with VC.NET, aka version
+7.0, but we can't yet report complete success.) For the Cygwin and MinGW
+versions, you need the Cygwin environment, which comes with GCC, the
+compiler used for those versions.  @xref{Q6.0.6}, for more information
+on Cygwin and MinGW.
 
 @node Q6.1.2, Q6.1.3, Q6.1.1, MS Windows
-@unnumberedsubsec Q6.1.2: What compiler do I need to compile XEmacs?
-
-You need Visual C++ 4.2, 5.0, or 6.0, with the exception of the Cygwin
-port, which uses Gcc.  There is also a MINGW32 port of XEmacs (using
-Gcc, but using native libraries rather than the Cygwin libraries).  ####
-More information about this should be provided.
+@unnumberedsubsec Q6.1.2: How do I compile the native port?
 
+Please read the file @file{nt/README} in the XEmacs distribution, which
+contains the full description.
 
 @node Q6.1.3, Q6.1.4, Q6.1.2, MS Windows
-@unnumberedsubsec Q6.1.3: How do I compile for the native port?
+@unnumberedsubsec Q6.1.3: What do I need for Cygwin?
 
-Please read the file @file{nt/README} in the XEmacs distribution, which
-contains the full description.
+You can find the Cygwin tools and compiler at:
 
+@uref{http://sources.redhat.com/cygwin/}
 
-@node Q6.1.4, Q6.1.5, Q6.1.3, MS Windows
-@unnumberedsubsec Q6.1.4: How do I compile for the X port?
+Click on the @samp{Install now!} link, which will download a file
+@file{setup.exe}, which you can use to download everything else. (You
+will need to pick a mirror site; @samp{mirrors.rcn.net} is probably the
+best.) You should go ahead and install everything -- you'll get various
+ancillary libraries that XEmacs needs or likes, e.g. XPM, PNG, JPEG,
+TIFF, etc.
 
-Again, it is described in @file{nt/README} in some detail.  Basically, you
-need to get X11 libraries from ftp.x.org, and compile them.  If the
-precompiled versions are available somewhere, I don't know of it.
+If you want to compile under X, you will also need the X libraries; see
+@ref{Q6.1.6}.
 
 
-@node Q6.1.5, Q6.1.6, Q6.1.4, MS Windows
-@unnumberedsubsec Q6.1.5: How do I compile for Cygnus' Cygwin?
+@node Q6.1.4, Q6.1.5, Q6.1.3, MS Windows
+@unnumberedsubsec Q6.1.4: How do I compile under Cygwin?
 
 Similar as on Unix; use the usual `configure' and `make' process.
 Some problems to watch out for:
@@ -5998,8 +6112,7 @@ make sure HOME is set. This controls where you
 @file{init.el}/@file{.emacs} file comes from;
 
 @item
-CYGWIN needs to be set to tty for process support work. e.g. CYGWIN=tty;
-(use CYGWIN32=tty under b19 and older.)
+CYGWIN needs to be set to tty for process support to work, e.g. CYGWIN=tty;
 
 @item
 picking up some other grep or other UNIX-like tools can kill configure;
@@ -6009,95 +6122,120 @@ static heap too small, adjust @file{src/sheap-adjust.h} to a more positive
 number;
 
 @item
-The Cygwin version doesn't understand @file{//machine/path} type paths so you
-will need to manually mount a directory of this form under a unix style
-directory for a build to work on the directory.
+(Unconfirmed) The Cygwin version doesn't understand
+@file{//machine/path} type paths so you will need to manually mount a
+directory of this form under a unix style directory for a build to work
+on the directory;
 
-@end itemize
+@item
+If you're building @strong{WITHOUT} X11, don't forget to change symlinks
+@file{/usr/lib/libXpm.a} and @file{/usr/lib/libXpm.dll.a} to point to
+the non-X versions of these libraries.  By default they point to the X
+versions.  So:
 
-@node Q6.1.6, Q6.2.1, Q6.1.5, MS Windows
-@unnumberedsubsec Q6.1.6: What do I need for Cygwin?
+@example
+/usr/lib/libXpm.a     -> /usr/lib/libXpm-noX.a
+/usr/lib/libXpm.dll.a -> /usr/lib/libXpm-noX.dll.a
+@end example
 
-You can find the Cygwin tools and compiler at:
 
-@uref{http://sourceware.cygnus.com/cygwin/}
+@item
+Other problems are listed in the @file{PROBLEMS} file, in the top-level
+directory of the XEmacs sources.
 
-You will need version b19 or later.
-The latest current version is 1.1.1.
-Other common versions you will see are b20.1.
+@end itemize
 
-Another location, one of the mirror sites of the site just mentioned,
-is usually a last faster:
 
-@uref{ftp://ftp.freesoftware.com/pub/sourceware/cygwin/}
+@node Q6.1.5, Q6.1.6, Q6.1.4, MS Windows
+@unnumberedsubsec Q6.1.5: How do I compile using MinGW (aka @samp{the -mno-cygwin flag to gcc})?
 
-You can obtain the latest version (currently 1.1.1) from the
-@samp{latest/} subdirectory of either of the above two just-mentioned
-URL's.
+Similar to the method for Unix.  Things to remember:
 
-@strong{WARNING: The version of GCC supplied under @samp{latest/}, as of
-June 6th, 2000, does not appear to work.  It generates loads of spurious
-preprocessor warnings and errors, which makes it impossible to compile
-XEmacs with it.}
+@itemize @bullet
+@item
+Specify the target host on the command line for @file{./configure}, e.g.
+@samp{./configure i586-pc-mingw32}.
 
-You will also need the X libraries.  You can get them on the XEmacs FTP
-site at
+@item
+Be sure that your build directory is mounted such that it has the
+same path either as a cygwin path (@file{/build/xemacs}) or as a Windows
+path (@file{c:\build\xemacs}).
 
-@uref{ftp://ftp.xemacs.org/pub/xemacs/aux/cygwin/}
+@item
+Build @samp{gcc -mno-cygwin} versions of the extra libs, i.e. @file{libpng},
+@file{compface}, etc.
 
-You will find b19 and b20 versions of the X libraries, plus b19 and b20
-versions of stuff that should go into @samp{/usr/local/}, donated by
-Andy Piper.  This includes pre-built versions of various graphics libraries,
-such as PNG, JPEG, TIFF, and XPM. (Remember, GIF support is built-in to
-XEmacs.)
+@item
+Specify the target location of the extra libs on the command line
+to @file{configure}, e.g.
+@samp{./configure --site-prefixes=/build/libs i586-pc-mingw32}.
+@end itemize
 
-(X libraries for v1 and beyond of Cygwin can be found on the Cygwin site
-itself -- look in the @samp{xfree/} subdirectory.)
 
-@emph{NOTE:} There are two versions of the XPM library provided in
-Andy's packets.  Once is for building with X support, and the other for
-building without.  The X version should work if you're building with
-both X and Windows support.  The two files are called @file{libXpm-X.a}
-and @file{libXpm-noX.a} respectively, and you must symlink the
-appropriate one to @file{libXpm.a}. @strong{CAREFUL:} By default, the
-non-X version is symlinked in.  If you then configure XEmacs with X,
-you won't run into problems until you start compiling @file{events.c},
-at which point you'll get strange and decidedly non-obvious errors.
+@node Q6.1.6, Q6.1.7, Q6.1.5, MS Windows
+@unnumberedsubsec Q6.1.6: I decided to run with X.  Where do I get an X server?
 
-Please see @uref{http://www.xemacs.freeserve.co.uk/} (Andy Piper's home
-page) for more information.
+As of May 2001, we are recommending that you use the port of XFree86 to
+Cygwin.  This has recently stabilized, and will undoubtedly soon make
+most other MS Windows X servers obsolete.  It is what the Windows
+developers use to test the MS Windows X support.
 
-BTW There are also libraries at
-@iftex
-@*
-@end iftex
-@uref{http://dao.gsfc.nasa.gov/software/grads/win32/X11R6.3/}, but
-these are not b19 compatible, and may in fact be native-compiled.
+To install, go to @uref{http://xfree86.cygwin.com/}.  There is a
+detailed description on that site of exactly how to install it.  This
+installation also provides the libraries, include files, and other stuff
+needed for development; a large collection of internationalized fonts;
+the standard X utilities (xterm, twm, etc.) -- in a word, the works.
 
+NOTE: As of late May 2001, there is a bug in the file
+@file{startxwin.bat}, used to start X Windows.  It passes the option
+@samp{-engine -4} to the X server, which is bogus -- you need to edit
+the file and change it to @samp{-engine 4}.
 
-@node Q6.2.1, Q6.2.2, Q6.1.6, MS Windows
-@unnumberedsec 6.2: Customization and User Interface
-@unnumberedsubsec Q6.2.1: How will the port cope with differences in the Windows user interface?
 
-XEmacs (and Emacs in general) UI is pretty
-different from what is expected of a typical MS Windows program.  How will
-the MS Windows port cope with it?
+@node Q6.1.7, Q6.2.1, Q6.1.6, MS Windows
+@unnumberedsubsec Q6.1.7: How do I compile with X support?
+
+To compile under Cygwin, all you need to do is install XFree86
+(@pxref{Q6.1.6}).  Once installed, @file{configure} should automatically
+find the X libraries and compile with X support.
+
+As noted above, the non-Cygwin X support is basically orphaned, and
+probably won't work.  But if it want to try, it's described in
+@file{nt/README} in some detail.  Basically, you need to get X11
+libraries from ftp.x.org, and compile them.  If the precompiled versions
+are available somewhere, we don't know of it.
 
-Fortunately, Emacs is also one of the most configurable editor beasts
-in the world.  The MS Windows "look and feel" (mark via shift-arrow,
-self-inserting deletes region, etc.) can be easily configured via
-various packages distributed with XEmacs.  The `pending-delete'
-package is an example of such a utility.
 
-In future versions, some of these packages might be turned on by
+@node Q6.2.1, Q6.2.2, Q6.1.7, MS Windows
+@unnumberedsec 6.2: Customization and User Interface
+@unnumberedsubsec Q6.2.1: How does the port cope with differences in the Windows user interface?
+
+XEmacs (and Emacs in general) UI is pretty different from what is
+expected of a typical MS Windows program.  How does the MS Windows port
+cope with it?
+
+As a general rule, we follow native MS Windows conventions as much as
+possible.  In cases where there's a clear UI conflict, we currently use
+normal Unix XEmacs behavior by default, but make sure the MS Windows
+"look and feel" (mark via shift-arrow, self-inserting deletes region,
+Alt selects menu items, etc.) is easily configurable (respectively:
+using the variable @code{shifted-motion-keys-select-region} in 21.4 and
+above [it's in fact the default in these versions], or the
+@file{pc-select} package; using the @file{pending-del} package; and
+setting the variable @code{menu-accelerator-enabled} to
+@code{menu-force} in 21.4 and above).  In fact, if you use the sample
+@file{init.el} file as your init file, you will get all these behaviors
+automatically turned on.
+
+In future versions, some of these features might be turned on by
 default in the MS Windows environment.
 
 
 @node Q6.2.2, Q6.2.3, Q6.2.1, MS Windows
 @unnumberedsubsec Q6.2.2: How do I change fonts in XEmacs on MS Windows?
 
-In 21.2.*, use the font menu.  In 21.1.*, you can change font
-manually. For example:
+In 21.4 and above, use the font menu.  In all versions, you can change
+font manually. For example:
 
 @display
     (set-face-font 'default "Lucida Console:Regular:10")
@@ -6105,41 +6243,115 @@ manually. For example:
 @end display
 
 
-@node Q6.2.3, Q6.3.1, Q6.2.2, MS Windows
+@node Q6.2.3, Q6.2.4, Q6.2.2, MS Windows
 @unnumberedsubsec Q6.2.3: Where do I put my @file{init.el}/@file{.emacs} file?
 
 @file{init.el} is the name of the init file starting with 21.4, and is
 located in the subdirectory @file{.xemacs/} of your home directory.  In
 prior versions, the init file is called @file{.emacs} and is located in
 your home directory.  Your home directory under Windows is determined by
-the HOME environment variable.  If this is not set, it defaults to
-`C:\'.
+the @samp{HOME} environment variable.  If this is not set, it defaults to
+@samp{C:\}.
 
-@node Q6.3.1, Q6.3.2, Q6.2.3, MS Windows
-@unnumberedsec 6.3: Miscellaneous
-@unnumberedsubsec Q6.3.1: Will XEmacs rename all the win32-* symbols to w32-*?
+To set this variable, modify @file{AUTOEXEC.BAT} under Windows 95/98, or
+select @samp{Control Panel->System->Advanced->Environment Variables...}
+under Windows NT/2000.
+
+
+@node Q6.2.4, Q6.2.5, Q6.2.3, MS Windows
+@unnumberedsubsec Q6.2.4: How do I get Windows Explorer to associate a file type with XEmacs?
+
+@unnumberedsubsubsec Associating a new file type with XEmacs.
+
+In Explorer select @samp{View/Options/File Types}, press @samp{[New
+Type...]} and fill in the dialog box, e.g.:
+
+@example
+        Description of type:    Emacs Lisp source
+        Associated extension:   el
+        Content Type (MIME):    text/plain
+@end example
+
+then press @samp{[New...]} and fill in the @samp{Action} dialog box as
+follows:
+
+@example
+        Action:
+        Open
 
-In his flavor of Emacs 20, Richard Stallman has renamed all the win32-*
-symbols to w32-*.  Will XEmacs do the same?
+        Application used to perform action:
+        D:\Full\path\for\xemacs.exe "%1"
 
-We consider such a move counter-productive, thus we will not use the
-`w32' prefix.  However, we do recognize that Win32 name is little more
-than a marketing buzzword (will it be Win64 in the next release?), so
-we decided not to use it.  Using `windows-' would be wrong because the
-term is too generic, which is why we settled on a compromise
-`mswindows' term.
+        [x] Use DDE
 
-Thus all the XEmacs variables and functions directly related to Win32
-are prefixed `mswindows-'.  The user-variables shared with NT Emacs
-will be provided as compatibility aliases.
+        DDE Message:
+        open("%1")
 
-Architectural note: We believe that there should be a very small number
-of window-systems-specific variables, and we provide generic interfaces
-whenever possible.  Thus, most of the equivalents of GNU Emacs `w32-*'
-functions and variables (as well as the corresponding `x-*' versions)
-are non-window-system-specific in XEmacs, and the issue of `mswindows-*'
-vs. `w32-*' does not come up much.
+        Application:
+        <leave blank>
 
+        DDE Application Not Running:
+        <leave blank>
+
+        Topic:
+        <leave blank>
+@end example
+
+@unnumberedsubsubsec Associating an existing file type with XEmacs.
+
+In Explorer select @samp{View/Options/File Types}.  Click on the file
+type in the list and press @samp{[Edit...]}.  If the file type already
+has an @samp{Open} action, double click on it and fill in the
+@samp{Action} dialog box as described above; otherwise create a new
+action.
+
+If the file type has more than one action listed, you probably want to
+make the @samp{Open} action that you just edited the default by clicking on
+it and pressing @samp{Set Default}.
+
+Note for Windows 2000 users: Under Windows 2000, get to @samp{File Types}
+using @samp{Control Panel->Folder Options->File Types}.
+
+
+@node Q6.2.5, Q6.3.1, Q6.2.4, MS Windows
+@unnumberedsubsec Q6.2.5: Is it possible to print from XEmacs?
+
+As of 21.4, printing works on Windows, using simply @samp{File->Print},
+and can be configured with @samp{File->Page Setup}.
+
+Prior to 21.4, there is no built-in support, but there are some clever
+hacks out there.  If you know how, please let us know and we'll put it
+here.
+
+
+@node Q6.3.1, Q6.3.2, Q6.2.5, MS Windows
+@unnumberedsec 6.3: Miscellaneous
+@unnumberedsubsec Q6.3.1: Does XEmacs rename all the @samp{win32-*} symbols to @samp{w32-*}?
+
+In his flavor of Emacs 20, Richard Stallman has renamed all the @samp{win32-*}
+symbols to @samp{w32-*}.  Does XEmacs do the same?
+
+We consider such a move counter-productive, thus we do not use the
+@samp{w32} prefix. (His rather questionable justification was that he
+did not consider Windows to be a "winning" platform.) However, the name
+@samp{Win32} is not particularly descriptive outside the Windows world,
+and using just @samp{windows-} would be too generic.  So we chose a
+compromise, the prefix @samp{mswindows-} for Windows-related variables
+and functions.
+
+Thus all the XEmacs variables and functions directly related to either
+the Windows GUI or OS are prefixed @samp{mswindows-} (except for a
+couple of debugging variables, prefixed @samp{debug-mswindows-}).  From
+an architectural perspective, however, we believe that this is mostly a
+non-issue because there should be a very small number of
+window-systems-specific variables anyway.  Whenever possible, we try to
+provide generic interfaces that apply to all window systems.
+
+@c not true:
+@c The user variables
+@c that share functionality with existing NT Emacs variables are be named
+@c with our convention, but we provide the GNU Emacs names as
+@c compatibility aliases.
 
 @node Q6.3.2, Q6.3.3, Q6.3.1, MS Windows
 @unnumberedsubsec Q6.3.2: What are the differences between the various MS Windows emacsen?
@@ -6152,28 +6364,44 @@ Here is a recount of various Emacs versions running on MS Windows:
 @itemize @bullet
 
 @item
-Win-Emacs
+XEmacs
 
 @itemize @minus
 
 @item
-Win-Emacs is a port of Lucid Emacs 19.6 to MS Windows using X
-compatibility libraries.  Win-Emacs has been written by Ben Wing.  The
-MS Windows code has not made it back to Lucid Emacs, which left Win-Emacs
-pretty much dead for our purposes.  Win-Emacs used to be available at
-Pearlsoft, but not anymore, since Pearlsoft went out of business.
+Beginning with XEmacs 19.12, XEmacs' architecture was redesigned
+in such a way to allow clean support of multiple window systems.  At
+this time the TTY support was added, making X and TTY the first two
+"window systems" XEmacs supported.  The 19.12 design is the basis for
+the current native MS Windows code.
+
+@item
+Some time during 1997, David Hobley (soon joined by Marc Paquette)
+imported some of the NT-specific portions of GNU Emacs, making XEmacs
+with X support compile under Windows NT, and creating the "X" port.
+
+@item
+Several months later, Jonathan Harris sent out initial patches to use
+the Win32 API, thus creating the native port.  Since then, various
+people have contributed, including Kirill M. Katsnelson (contributed
+support for menubars, subprocesses and network, as well as loads of
+other code), Andy Piper (ported XEmacs to Cygwin environment,
+contributed Windows unexec, Windows-specific glyphs and toolbars code,
+and more), Ben Wing (loads of improvements; currently the most active MS
+Windows developer), Jeff Sparkes (contributed scrollbars support) and
+many others.
 @end itemize
 
 @item
-GNU Emacs for DOS
+U Emacs for DOS
 
 @itemize @minus
 
 @item
-GNU Emacs features support for MS-DOS and DJGPP (D.J. Delorie's DOS
-port of Gcc).  Such an Emacs is heavily underfeatured, because it does
+GNU Emacs features support for MS-DOS and DJGPP (D. J. Delorie's DOS
+port of GCC).  Such an Emacs is heavily underfeatured, because it does
 not supports long file names, lacks proper subprocesses support, and
-is far too big compared to typical DOS editors.
+is far too big compared with typical DOS editors.
 @end itemize
 
 @item
@@ -6184,7 +6412,7 @@ GNU Emacs compiled with Win32
 @item
 Starting with version 19.30, it has been possible to compile GNU Emacs
 under MS Windows using the DJGPP compiler and X libraries.  The result
-is is very similar to GNU Emacs compiled under MS DOS, only it
+is very similar to GNU Emacs compiled under MS DOS, except that it
 supports longer file names, etc.  This "port" is similar to the "X"
 flavor of XEmacs on MS Windows.
 @end itemize
@@ -6195,9 +6423,9 @@ NT Emacs
 @itemize @minus
 
 @item
-NT Emacs is a version of GNU Emacs modified to compile and run under
-MS MS Windows 95 and NT using the native Win32 API.  As such, it is close
-in spirit to the XEmacs "native" port.
+NT Emacs is a version of GNU Emacs modified to compile and run under MS
+Windows 95 and NT using the native Win32 API.  As such, it is close in
+spirit to the XEmacs "native" port.
 
 @item
 NT Emacs has been written by Geoff Voelker, and more information can be
@@ -6206,45 +6434,103 @@ found at
 @*
 @end iftex
 @uref{http://www.cs.washington.edu/homes/voelker/ntemacs.html}.
-
 @end itemize
 
 @item
-XEmacs
+Win-Emacs
 
 @itemize @minus
 
 @item
-Beginning with XEmacs 19.12, XEmacs' architecture has been redesigned
-in such a way to allow clean support of multiple window systems.  At
-this time the TTY support was added, making X and TTY the first two
-"window systems" XEmacs supported.  The 19.12 design is the basis for
-the current native MS Windows code.
+Win-Emacs was a port of Lucid Emacs 19.6 to MS Windows using X
+compatibility libraries.  Win-Emacs was written by Ben Wing.  The MS
+Windows code never made it back to Lucid Emacs, and its creator (Pearl
+Software) has long since gone out of business.
+@end itemize
 
 @item
-Some time during 1997, David Hobley (soon joined by Marc Paquette)
-imported some of the NT-specific portions of GNU Emacs, making XEmacs
-with X support compile under Windows NT, and creating the "X" port.
+GNU Emacs for DOS
 
-@item
-Several months later, Jonathan Harris sent out initial patches to use
-the Win32 API, thus creating the native port.  Since then, various
-people have contributed, including Kirill M. Katsnelson (contributed
-support for menubars, subprocesses and network, as well as loads of
-other code), Andy Piper (ported XEmacs to Cygwin environment,
-contributed Windows unexec, Windows-specific glyphs and toolbars code,
-and more), Jeff Sparkes (contributed scrollbars support) and many
-others.
+@itemize @minus
 
+@item
+GNU Emacs features support for MS-DOS and DJGPP (D.J. Delorie's DOS
+port of Gcc).  Such an Emacs is heavily underfeatured, because it does
+not support long file names, lacks proper subprocesses support, and
+is far too big compared to typical DOS editors.
 @end itemize
 
+@item
+GNU Emacs compiled with Win32
+
+@itemize @minus
+
+@item
+Starting with version 19.30, it has been possible to compile GNU Emacs
+under MS Windows using the DJGPP compiler and X libraries.  The result
+is is very similar to GNU Emacs compiled under MS DOS, only it
+supports longer file names, etc.  This "port" is similar to the "X"
+flavor of XEmacs on MS Windows.
 @end itemize
 
+@end itemize
 
-@node Q6.3.3, Q6.4.1, Q6.3.2, MS Windows
-@unnumberedsubsec Q6.3.3: What is the porting team doing at the moment?
 
-(as of March 2001)
+@node Q6.3.3, Q6.3.4, Q6.3.2, MS Windows
+@unnumberedsubsec Q6.3.3: XEmacs 21.1 on Windows used to spawn an ugly console window on every startup.  Has that been fixed?
+
+Yes.
+
+The console was there because @file{temacs} (and in turn, @file{xemacs})
+was a console application, and Windows typically creates a new
+console for a console process unless the creating process requests that
+one isn't created.  This used to be fixed with @file{runemacs}, a small
+Windows application that existed merely to start @file{xemacs}, stating
+that it didn't want a console.
+
+XEmacs 21.4 fixes this cleanly by the virtue of being a true "GUI"
+application.  The explanation of what that means is included for
+educational value.
+
+When building an application to be run in a Win32 environment, you must
+state which sub-system it is to run in.  Valid subsystems include
+"console" and "gui".  The subsystem you use affects the run time
+libraries linked into your application, the start up function that is
+run before control is handed over to your application, the entry point
+to your program, and how Windows normally invokes your program. (Console
+programs automatically get a console created for them at startup if
+their stdin/stdout don't point anywhere useful, which is the case when
+run from the GUI.  This is a stupid design, of course -- instead, the
+console should get created only when the first I/O actually occurs!
+GUI programs have an equally stupid design: When called from
+@file{CMD.EXE}/@file{COMMAND.COM}, their stdin/stdout will be set to
+point nowhere useful, even though the command shell has its own
+stdin/stdout.  It's as if someone who had learned a bit about stdio but
+had no actual knowledge of interprocess communication designed the
+scheme; unfortunately, the whole process-communication aspect of the
+Win32 API is equally badly designed.) For example, the entry point for a
+console app is "main" (which is what you'd expect for a C/C++ program),
+but the entry point for a "gui" app is "WinMain".  This confuses and
+annoys a lot of programmers who've grown up on Unix systems, where the
+kernel doesn't really care whether your application is a gui program or
+not.
+
+For reasons not altogether clear, and are lost in the mists of time and
+tradition, XEmacs on Win32 started out as a console application, and
+therefore a console was automatically created for it. (It may have been
+made a console application partly because a console is needed in some
+circumstances, especially under Win95, to interrupt, terminate, or send
+signals to a child process, and because of the bogosity mentioned above
+with GUI programs and the standard command shell.  Currently, XEmacs
+just creates and immediately hides a console when necessary, and
+works around the "no useful stdio" problem by creating its own console
+window as necessary to display messages in.)
+
+
+@node Q6.3.4, Q6.4.1, Q6.3.3, MS Windows
+@unnumberedsubsec Q6.3.4: What is the porting team doing at the moment?
+
+(as of June 2001)
 
 The porting team is continuing work on the MS Windows-specific code.
 Major projects are the development of Mule (internationalization)
@@ -6252,66 +6538,334 @@ support for Windows and the improvement of the widget support (better
 support for dialog boxes, buttons, edit fields, and similar UI
 elements).
 
-@node Q6.4.1, ,Q6.3.3, MS Windows
+
+@node Q6.4.1, Q6.4.2, Q6.3.4, MS Windows
 @unnumberedsec 6.3: Troubleshooting
-@unnumberedsubsec Q6.4.1 XEmacs won't start on Windows. (NEW)
+@unnumberedsubsec Q6.4.1 XEmacs won't start on Windows.
 
 XEmacs relies on a process called "dumping" to generate a working
 executable. Under MS-Windows this process effectively fixes the memory
 addresses of information in the executable. When XEmacs starts up it tries
 to reserve these memory addresses so that the dumping process can be
-reversed - putting the information back at the correct addresses.
-Unfortunately some .dlls (For instance the soundblaster driver) occupy
+reversed -- putting the information back at the correct addresses.
+Unfortunately some .DLLs (for instance the soundblaster driver) occupy
 memory addresses that can conflict with those needed by the dumped XEmacs
 executable. In this instance XEmacs will fail to start without any
 explanation. Note that this is extremely machine specific.
 
 21.1.10 includes a fix for this that makes more intelligent guesses
 about which memory addresses will be free, and this should cure the
-problem for most people.  Unfortunately, no binary is yet available for
-this version.  Check back periodically at
+problem for most people.  21.4 implements "portable dumping", which
+eliminates the problem altogether.  We recommend you use the 21.4
+binaries, but you can use the 21.1 binaries if you are very paranoid
+about stability.  @xref{Q6.0.3}.
 
-@uref{ftp://ftp.xemacs.org/pub/xemacs/binaries/}.
+@node Q6.4.2, , Q6.4.1, MS Windows
+@unnumberedsubsec Q6.4.2 Why do I get a blank toolbar on Windows 95?
 
-21.2 implements "portable dumping" which will eliminate the problem
-altogether.  You might have better luck with the 21.2 beta binary,
-available at
-
-@uref{ftp://ftp.xemacs.org/pub/xemacs/beta/binaries/}.
+You need at least version 4.71 of the system file @file{comctl32.dll}.
+The updated version is supplied with Internet Explorer 4 and later but if
+you are avoiding IE you can also download it from the Microsoft web
+site.  Go into support and search for @file{comctl32.dll}.  The download
+is a self-installing executable.
 
 
 @node Current Events,  , MS Windows, Top
 @unnumbered 7 What the Future Holds
 
 This is part 7 of the XEmacs Frequently Asked Questions list.  This
-section will change monthly, and contains any interesting items that have
-transpired over the previous month.  If you are reading this from the
-XEmacs distribution, please see the version on the Web or archived at the
-various FAQ FTP sites, as this file is surely out of date.
+section will change frequently, and (in theory) should contain any
+interesting items that have transpired recently. (But in practice it's
+not getting updated like this.)
+
+This section also contains descriptions of the new features in all the
+recent releases of XEmacs.  For the most part, the information below is
+a synopsis of the more complete information that can be found in the
+file @file{NEWS} in the @file{etc} directory of the XEmacs distribution.
+You can view this file in XEmacs using @kbd{C-h n} or the @samp{Help}
+menu.
+
+Information on older versions of XEmacs can be find in @file{ONEWS} in
+the same directory, or @file{OONEWS} for really old versions.
+
 
 @menu
-* Q7.0.1::      What is new in 20.2?
-* Q7.0.2::      What is new in 20.3?
-* Q7.0.3::      What is new in 20.4?
-* Q7.0.4::      Procedural changes in XEmacs development.
+* Q7.0.1::      What new features will be in XEmacs soon?
+* Q7.0.2::      What's new in XEmacs 21.4?
+* Q7.0.3::      What's new in XEmacs 21.1?
+* Q7.0.4::      What's new in XEmacs 20.4?
+* Q7.0.5::      What's new in XEmacs 20.3?
+* Q7.0.6::      What's new in XEmacs 20.2?
 @end menu
 
 @node Q7.0.1, Q7.0.2, Current Events, Current Events
 @unnumberedsec 7.0: Changes
-@unnumberedsubsec Q7.0.1: What is new in 20.2?
+@unnumberedsubsec Q7.0.1: What new features will be in XEmacs soon?
 
-The biggest changes in 20.2 include integration of EFS (the next
-generation of ange-ftp) and AUC Tex (the Emacs subsystem that includes a
-major mode for editing Tex and LaTeX, and a lot of other stuff).  Many
-bugs from 20.0 have been fixed for this release.  20.2 also contains a
-new system for customizing XEmacs options, invoked via @kbd{M-x
-customize}.
-
-XEmacs 20.2 is the development release (20.0 was beta), and is no longer
-considered unstable.
+Not yet written.
 
 @node Q7.0.2, Q7.0.3, Q7.0.1, Current Events
-@unnumberedsubsec Q7.0.2: What is new in 20.3?
+@unnumberedsubsec Q7.0.2: What's new in XEmacs 21.4?
+
+21.4 was the "stable" version of the 21.2 series, which was considered
+"experimental" throughout its life; thus there were no "official"
+releases at all.  In essence, XEmacs is now following the "alternating"
+scheme of Linux, where at any point there are at least two different
+development branches, one "stable" and one "experimental".  Periodic
+releases happen in both branches, but those in the experimental branch
+are not tested as well, and there's no guarantee they will work at all.
+The experiemental branch is open to any and all code that's acceptable
+to the developers; the stable branch, however, is in general limited
+only to bug fixes, and all contributions are carefully reviewed to make
+sure they will increase and not decrease stability.
+
+21.3 never existed at all; it was decided to follow the Linux scheme
+exactly, where odd-numbered series are experimental and even-numbered
+ones stable.
+
+The following lists summarizes the essential changes made in this
+version.  For a fuller list, see the @file{NEWS} in the @file{etc}
+directory of the XEmacs distribution, or use @kbd{C-h n} or the
+@samp{Help} menu to view this file inside of XEmacs.
+
+@unnumberedsubsubsec User-visible changes
+
+@itemize @bullet
+
+@item
+The delete key now deletes forward by default.
+@item
+Shifted motion keys now select text by default.
+@item
+You can now build XEmacs with support for GTK+ widget set.
+@item
+~/.xemacs/init.el is now the preferred location for the init
+file. (XEmacs now supports a `~/.xemacs/init.el' startup file. Custom
+file will move to ~/.xemacs/custom.el.)
+@item
+Much-improved sample init.el, showing how to use many useful features.
+@item
+XEmacs support for menu accelerators has been much improved.
+@item
+Default menubar improvements. (Default menubar has many new commands and
+better organization.  The font-menu is now available under MS Windows.)
+@item
+Dialog box improvements, including a real file dialog box. (XEmacs now has a proper file dialog box under MS Windows (and GTK)!  The old clunky file dialog box is improved.  Keyboard traversal now works correctly in MS Windows dialog boxes.  There is a Search dialog box available from Edit->Find...)
+@item
+New buffer tabs.
+@item
+There is a new MS Windows installer, netinstall, ported from Cygwin.
+@item
+The subprocess quote-handling mechanism under Windows is much improved.
+@item
+Printing support now available under MS Windows.
+@item
+Selection improvements. (Kill and yank now interact with the clipboard under Windows.  MS Windows support for selection is now much more robust.  Motif selection support is now more correct (but slower).)
+@item
+Mail spool locking now works correctly.
+@item
+International support changes. (The default coding-priority-list is now
+safer.  International keysyms are now supported under X.  MS Windows
+1251 code page now supported.  Czech, Thai, Cyrillic-KOI8, Vietnamese,
+Ethiopic now supported.  Proper support for words in Latin 3 and Latin
+4.)
+@item
+Help buffers contain hyperlinks, and other changes.
+@item
+The modeline's text is now scrollable.
+@item
+The mouse wheel under MS Windows now functions correctly.
+@item
+Interactive searching and matching case improvements. (Incremental search will now highlight all visible matches.  Interactive searches always respect uppercase characters.)
+@item
+Rectangle functions rewritten to avoid inserting extra spaces.
+@item
+New command `kill-entire-line' that always kills the entire line.
+@item
+Default values correctly stored in minibuffer histories.
+@item
+You can now create "indirect buffers", like in GNU Emacs.
+@item
+Pixel-based scrolling has been implemented.
+@item
+Operation progress can be displayed using graphical widgets.
+@item
+User names following a tilde can now be completed at file name prompts.
+@item
+XEmacs can now play sound using Enlightenment Sound Daemon (ESD).
+@item
+X-Face support is now available under MS Windows.
+@item
+The PostgreSQL Relational Database Management System is now supported.
+@item
+Indentation no longer indents comments that begin at column zero.
+@item
+Face and variable settings can have comments in Customize.
+@item
+New locations for early package hierarchies.
+@item
+The `auto-save' library has been greatly improved.
+@item
+New variable `mswindows-alt-by-itself-activates-menu'.
+@item
+Other init-file-related changes. (Init file in your home directory may be called `.emacs.el'.  New command-line switches -user-init-file and -user-init-directory.)
+@item
+Etags changes.  See @file{NEWS} for full details.
+@end itemize
+
+@unnumberedsubsubsec Lisp and internal changes
+
+Not yet written.
+
+@itemize @bullet
+@end itemize
+
+@node Q7.0.3, Q7.0.4, Q7.0.2, Current Events
+@unnumberedsubsec Q7.0.3: What's new in XEmacs 21.1?
+
+21.1 was the "stable" version of "experimental" 21.0 series.
+@xref{Q7.0.2}.
+
+The following lists summarizes the essential changes made in this
+version.  For a fuller list, see the @file{NEWS} in the @file{etc}
+directory of the XEmacs distribution, or use @kbd{C-h n} or the
+@samp{Help} menu to view this file inside of XEmacs.
+
+@unnumberedsubsubsec User-visible changes
+
+@itemize @bullet
+
+@item
+XEmacs is now supported under Microsoft Windows 95/98 and Windows NT
+operating systems.  To discuss Windows-specific issues, subscribe to the
+mailing list at @email{xemacs-nt-request@@xemacs.org}.
+
+@item
+XEmacs has been unbundled into constituent installable packages.
+
+@item
+@strong{Other notable changes}: The @samp{Options} menu has been ported to
+Custom; XEmacs now is able to choose X visuals and use private
+colormaps; You can drag the vertical divider of "horizontally"
+(side-by-side) split windows.
+
+@item
+@strong{Building changes}: XEmacs can be built with support for 31-bit Lisp
+integers and 32-bit pointers (previously, it was 28-bit integers and
+pointers); XEmacs can be built with LDAP support; @file{dir} files can be
+removed in the Info subsystem, and will be regenerated on-the-fly.
+
+@item
+@strong{New packages}: @file{imenu}, @file{popper}, @file{gdb-highlight}
+
+@item
+@strong{Package changes}: Many changes to @file{cc-mode}, @file{gnus},
+@file{gnuclient}.  See @file{NEWS} for full details.
+
+@item
+@strong{New commands, variables and functions}:
+@code{center-to-window-line} (like @code{recenter} but doesn't force a
+redisplay); variable @code{user-full-name} (customize what your full
+name looks like in mail); @kbd{M-x customize-changed-options} (customize
+options whose default values changes because you upgraded your XEmacs);
+@kbd{M-x add-log-convert} (converts an old-style ChangeLog buffer to
+new-style); @kbd{M-x zap-up-to-char} (like @code{zap-to-char} but
+doesn't delete the char searched for); commands to store, retrieve and
+increment numbers in registers, useful for macros.
+
+@item
+@strong{Changes to commands, variables, and functions}: @kbd{M-x
+query-replace} and friends operate only on the region when it's active;
+@code{echo-keystrokes} can now be a floating-point number; @kbd{M-.}
+searches exact tag matches before inexact ones; function
+@code{user-full-name} with no arguments returns the var
+@code{user-full-name}; a prefix arg to @kbd{M-:} and @kbd{C-h c} inserts
+the result in the current buffer.
+ 
+@item
+@strong{Other changes}: Under X, new application class @samp{XEmacs};
+byte-compilation of user-specs now works.
+
+@item
+@strong{XEmacs/Mule (internationalization) changes}: Mule support now
+works on TTY's; Egg/SJ3 input method now officially supported (Quail and
+Egg/Skk already available through LEIM since 20.3); localized Japanese
+menubars if XEmacs is built with the right support.
+
+@end itemize
+
+@unnumberedsubsubsec Lisp and internal changes
+
+@itemize @bullet
+
+@item
+@strong{Specifier changes}: The window locale now has a higher
+precedence than the buffer locale when instantiating; new macro
+@code{let-specifier}; new specifiers
+@code{vertical-scrollbar-visible-p}, horizontal-scrollbar-visible-p',
+@code{scrollbar-on-left-p}, @code{scrollbar-on-top-p},
+@code{vertical-divider-always-visible-p},
+@code{vertical-divider-shadow-thickness},
+@code{vertical-divider-line-width}, @code{vertical-divider-spacing};
+specifiers and symbols whose value is a specifier allowed as modeline
+specifications.
+
+@item
+@strong{Frame focus changes}: @code{focus-follows-mouse} works like FSF,
+prevents any attempt to permanently change the selected frame; new
+function @code{focus-frame} sets the window system focus a frame; new
+special forms @code{save-selected-frame} and @code{with-selected-frame}.
+
+@item
+@strong{Window function changes}: @code{select-window} now has optional
+argument @var{NORECORD} to inhibit recording a buffer change;
+@code{vertical-motion} now correctly handles optional @var{WINDOW}
+argument and has new optional argument @var{PIXELS}, to have the
+returned values be in pixels; new function
+@code{vertical-motion-pixels}; new functions
+@code{window-text-area-pixel-@{width,height,edges@}}; new functions
+@code{shrink-window-pixels} and @code{enlarge-window-pixels}; new
+function @code{window-displayed-text-pixel-height}.
+
+@item
+@strong{Other function changes}: Arithmetic comparison functions
+@code{<}, @code{>}, @code{=}, @code{/=} now accept a variable number of
+arguments; hashtables now have a consistent read/print syntax; keyword
+symbols cannot be set to a value other than themselves; @code{concat} no
+longer accepts integer arguments; new function @code{string}, like
+@code{list}, @code{vector}, etc.; new function @code{temp-directory}
+(OS-independent way to get a temp directory); @code{load-average} has
+optional argument @var{USE-FLOATS}; @code{make-event} implemented
+completely; new function @code{function-interactive} (returns a
+function's interactive spec); new functions @code{lmessage},
+@code{lwarn} (printf-like versions of @code{display-wessage},
+@code{display-warning}); new keyword @code{:version} to
+@code{defcustom}.
+
+@item
+@strong{Performance}: when the new GNU Malloc aka Doug Lea Malloc is
+available, it will be used (better performance on libc6 Linux systems);
+tracking line-numbers in modeline is now efficient; profiling records a
+call-count of all called functions, retrievable through
+@code{profile-call-count-results}.
+
+@item
+@strong{Startup and path searching}: code to assemble paths at startup
+rewritten for new package system; new function @code{split-path} (splits
+by @code{path-separator}); @code{Info-default-directory-list} obsolete,
+use @code{Info-directory-list} instead; site-lisp is deprecated and no
+longer on the load-path by default.
+
+@end itemize
+
+@node Q7.0.4, Q7.0.5, Q7.0.3, Current Events
+@unnumberedsubsec Q7.0.4: What's new in XEmacs 20.4?
+
+XEmacs 20.4 is a bugfix release with no user-visible changes.
+@c Filled in from NEWS file of 20.5-b33
+
+@node Q7.0.5, Q7.0.6, Q7.0.4, Current Events
+@unnumberedsubsec Q7.0.5: What's new in XEmacs 20.3?
 
 XEmacs 20.3 was released in November 1997. It contains many bugfixes,
 and a number of new features, including Autoconf 2 based configuration,
@@ -6330,45 +6884,20 @@ the default) is definitely faster than XEmacs 19.16.
 XEmacs 20.3 is the first non-beta v20 release, and will be the
 basis for all further development.
 
-@node Q7.0.3, Q7.0.4, Q7.0.2, Current Events
-@unnumberedsubsec Q7.0.3: What's new in XEmacs 20.4?
-
-XEmacs 20.4 is a bugfix release with no user-visible changes.
-@c Filled in from NEWS file of 20.5-b33
-
-
-@node Q7.0.4,  , Q7.0.3, Current Events
-@unnumberedsubsec Q7.0.4: Procedural changes in XEmacs development.
-
-@enumerate
-@item
-Discussion about the development of XEmacs occurs on the xemacs-beta
-mailing list.  Subscriptions to this list will now be fully automated
-instead of being handled by hand.  Send a mail message to
-@email{xemacs-beta-request@@xemacs.org} with @samp{subscribe} as the
-BODY of the message to join the list.  Please note this is a developers
-mailing list for people who have an active interest in the development
-process.
+@node Q7.0.6, , Q7.0.5, Current Events
+@unnumberedsubsec Q7.0.6: What's new in XEmacs 20.2?
 
-The discussion of NT XEmacs development is taking place on a separate
-mailing list.  Send mail to
-@iftex
-@*
-@end iftex
-@email{xemacs-nt-request@@xemacs.org} to
-subscribe.
-
-@item
-Due to the long development cycle in between releases, it has been
-decided that intermediate versions will be made available in source only
-form for the truly interested.
+The biggest changes in 20.2 include integration of EFS (the next
+generation of ange-ftp) and AUC Tex (the Emacs subsystem that includes a
+major mode for editing Tex and LaTeX, and a lot of other stuff).  Many
+bugs from 20.0 have been fixed for this release.  20.2 also contains a
+new system for customizing XEmacs options, invoked via @kbd{M-x
+customize}.
 
-XEmacs 19.16 was the last 19 release, basically consisting of 19.15 plus
-the collected bugfixes.
+XEmacs 20.2 is the development release (20.0 was beta), and is no longer
+considered unstable.
 
-@item
-As of December 1996, @email{steve@@xemacs.org, Steve Baur} has become
-the lead maintainer of XEmacs.
-@end enumerate
+For older news, see the file @file{ONEWS} in the @file{etc} directory of
+the XEmacs distribution.
 
 @bye
diff --git a/man/xemacs/custom.texi b/man/xemacs/custom.texi
index 543f93c..608c2cc 100644
--- a/man/xemacs/custom.texi
+++ b/man/xemacs/custom.texi
@@ -179,7 +179,8 @@ except where explicitly stated, affects only the current Emacs session.
 @findex customize
 @cindex customization buffer
   A convenient way to find the user option variables that you want to
-change, and then change them, is with @kbd{M-x customize}.  This command
+change, and then change them, is with @kbd{M-x customize} (or use a
+keyboard shortcut, @kbd{C-h C}.  This command
 creates a @dfn{customization buffer} with which you can browse through
 the Emacs user options in a logically organized structure, then edit and
 set their values.  You can also use the customization buffer to save
@@ -203,8 +204,8 @@ structure as of yet, but we are adding the rest.)
 @dfn{groups} to help you find them.  Groups are collected into bigger
 groups, all the way up to a master group called @code{Emacs}.
 
-  @kbd{M-x customize} creates a customization buffer that shows the
-top-level @code{Emacs} group and the second-level groups immediately
+  @kbd{M-x customize} (or @kbd{C-h C}) creates a customization buffer that
+shows the top-level @code{Emacs} group and the second-level groups immediately
 under it.  It looks like this, in part:
 
 @smallexample
diff --git a/man/xemacs/mule.texi b/man/xemacs/mule.texi
index 1eaa18b..f88923d 100644
--- a/man/xemacs/mule.texi
+++ b/man/xemacs/mule.texi
@@ -13,8 +13,9 @@
 @cindex IPA
 @cindex Japanese
 @cindex Korean
+@cindex Cyrillic
 @cindex Russian
-  If you compile XEmacs with mule option, it supports a wide variety of
+  If you compile XEmacs with Mule option, it supports a wide variety of
 world scripts, including Latin script, as well as Arabic script,
 Simplified Chinese script (for mainland of China), Traditional Chinese
 script (for Taiwan and Hong-Kong), Greek script, Hebrew script, IPA
@@ -29,6 +30,7 @@ Enhancement to GNU Emacs'').
 * Language Environments::   Setting things up for the language you use.
 * Input Methods::           Entering text characters not on your keyboard.
 * Select Input Method::     Specifying your choice of input methods.
+* Mule and Fonts::          Additional font-related issues
 * Coding Systems::          Character set conversion when you read and
                               write files, and so on.
 * Recognize Coding::        How XEmacs figures out which conversion to use.
@@ -70,7 +72,7 @@ to world scripts, coding systems, and input methods.
 @cindex language environments
 
   All supported character sets are supported in XEmacs buffers if it is
-compile with mule; there is no need to select a particular language in
+compiled with Mule; there is no need to select a particular language in
 order to display its characters in an XEmacs buffer.  However, it is
 important to select a @dfn{language environment} in order to set various
 defaults.  The language environment really represents a choice of
@@ -89,8 +91,10 @@ current when you use this command, because the effects apply globally to
 the XEmacs session.  The supported language environments include:
 
 @quotation
-Chinese-BIG5, Chinese-CNS, Chinese-GB, Cyrillic-ISO, English, Ethiopic,
-Greek, Japanese, Korean, Latin-1, Latin-2, Latin-3, Latin-4, Latin-5.
+ASCII, Chinese-BIG5, Chinese-GB, Croatian, Cyrillic-ALT, Cyrillic-ISO, 
+Cyrillic-KOI8, Cyrillic-Win, Czech, English, Ethiopic, French, German,
+Greek, Hebrew, IPA, Japanese, Korean, Latin-1, Latin-2, Latin-3, Latin-4,
+Latin-5, Norwegian, Polish, Romanian, Slovenian, Thai-XTIS, Vietnamese.
 @end quotation
 
   Some operating systems let you specify the language you are using by
@@ -187,7 +191,7 @@ the partial sequence is highlighted in the buffer.  If
 characters to type next is displayed in the echo area (but not when you
 are in the minibuffer).
 
-@node Select Input Method, Coding Systems, Input Methods, Mule
+@node Select Input Method, Mule and Fonts, Input Methods, Mule
 @section Selecting an Input Method
 
 @table @kbd
@@ -249,7 +253,71 @@ the command @kbd{M-x quail-set-keyboard-layout}.
 list-input-methods}.  The list gives information about each input
 method, including the string that stands for it in the mode line.
 
-@node Coding Systems, Recognize Coding, Select Input Method, Mule
+@node Mule and Fonts, Coding Systems, Select Input Method, Mule
+@section Mule and Fonts
+@cindex fonts
+@cindex font registry
+@cindex font encoding
+@cindex CCL programs
+
+(This section is X11-specific.)
+
+Text in XEmacs buffers is displayed using various faces.  In addition to
+specifying properties of a face, such as font and color, there are some
+additional properties of Mule charsets that are used in text.
+
+There is currently two properties of a charset that could be adjusted by
+user: font registry and so called @dfn{ccl-program}.
+
+Font registry is a regular expression matching the font registry field
+for this character set.  For example, both the @code{ascii} and
+@w{@code{latin-iso8859-1}} charsets use the registry @code{"ISO8859-1"}.
+This field is used to choose an appropriate font when the user gives a
+general font specification such as @w{@samp{-*-courier-medium-r-*-140-*}},
+i.e. a 14-point upright medium-weight Courier font.
+
+You can set font registry for a charset using
+@samp{set-charset-registry} function in one of your startup files.  This
+function takes two arguments: character set (as a symbol) and font
+registry (as a string).
+
+E.@w{ }g., for Cyrillic texts Mule uses @w{@code{cyrillic-iso8859-5}}
+charset with @samp{"ISO8859-5"} as a default registry, and we want to
+use @samp{"koi8-r"} instead, because fonts in that encoding are
+installed on our system.  Use:
+
+@example
+(set-charset-registry 'cyrillic-iso8859-5 "koi8-r")
+@end example
+
+(Please note that you probably also want to set font registry for
+@samp{ascii} charset so that mixed English/Cyrillic texts be displayed
+using the same font.)
+
+"CCL-programs" are a little special-purpose scripts defined within
+XEmacs or in some package.  Those scripts allow XEmacs to use fonts that
+are in different encoding from the encoding that is used by Mule for
+text in buffer.  Returning to the above example, we need to somehow tell
+XEmacs that we have different encodings of fonts and text and so it
+needs to convert characters between those encodings when displaying.
+That's what @samp{set-charset-ccl-program} function is used for.  There
+are quite a few various CCL programs defined within XEmacs, and there is
+no comprehensive list of them, so you currently have to consult sources.
+@c FIXME: there must be a list of CCL programs
+
+We know that there is a CCL program called @samp{ccl-encode-koi8-r-font}
+that is used exactly for needed purpose: to convert characters between
+@samp{ISO8859-5} encoding and @samp{koi8-r}.  Use:
+
+@example
+(set-charset-ccl-program 'cyrillic-iso8859-5 'ccl-encode-koi8-r-font)
+@end example
+
+There are several more uses for CCL programs, not related to fonts, but
+those uses are not described here.
+
+
+@node Coding Systems, Recognize Coding, Mule and Fonts, Mule
 @section Coding Systems
 @cindex coding systems
 
@@ -282,11 +350,15 @@ Describe the coding systems currently in use.
 
 @item M-x list-coding-systems
 Display a list of all the supported coding systems.
+
+@item C-u M-x list-coding-systems
+Display comprehensive list of specific details of all supported coding
+systems.
 @end table
 
-@kindex C-h C
+@kindex C-x @key{RET} C
 @findex describe-coding-system
-  The command @kbd{C-h C} (@code{describe-coding-system}) displays
+  The command @kbd{C-x RET C} (@code{describe-coding-system}) displays
 information about particular coding systems.  You can specify a coding
 system name as argument; alternatively, with an empty argument, it
 describes the coding systems currently selected for various purposes,
@@ -435,7 +507,8 @@ Specify coding system @var{coding} for the immediately following
 command.
 
 @item C-x @key{RET} k @var{coding} @key{RET}
-Use coding system @var{coding} for keyboard input.
+Use coding system @var{coding} for keyboard input.  (This feature is
+non-functional and is temporarily disabled.)
 
 @item C-x @key{RET} t @var{coding} @key{RET}
 Use coding system @var{coding} for terminal output.
@@ -518,6 +591,8 @@ the sequences that are translated are typically sequences of ASCII
 printing characters.  Coding systems typically translate sequences of
 non-graphic characters.
 
+(This feature is non-functional and is temporarily disabled.)
+
 @kindex C-x RET p
 @findex set-buffer-process-coding-system
   The command @kbd{C-x @key{RET} p} (@code{set-buffer-process-coding-system})
diff --git a/man/xemacs/programs.texi b/man/xemacs/programs.texi
index 5ee3f5c..9ec4993 100644
--- a/man/xemacs/programs.texi
+++ b/man/xemacs/programs.texi
@@ -1033,7 +1033,7 @@ recorded is called a @dfn{tag}.
 @cindex class browser, C++
 @cindex Ebrowse
 The Ebrowse is a separate facility tailored for C++, with tags and a
-class browser.  @xref{,,, ebrowse, Ebrowse User's Manual}.
+class browser.  @xref{Top,,, ebrowse, Ebrowse User's Manual}.
 
 @menu
 * Tag Syntax::		Tag syntax for various types of code and text files.
diff --git a/netinstall/ChangeLog b/netinstall/ChangeLog
index dd80f06..e499752 100644
--- a/netinstall/ChangeLog
+++ b/netinstall/ChangeLog
@@ -1,3 +1,12 @@
+2001-07-28  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.4 "Artificial Intelligence" is released.
+
+2001-05-17  Andy Piper  <andy@xemacs.org>
+
+	* win32.h:
+	* win32.h (NOCOMATTRIBUTE): sync with latest cygwin version.
+
 2001-05-17  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.4.3 "Academic Rigor" is released.
@@ -244,5 +253,5 @@
 
 	* all: port from cygwin setup.
 
-%%% $Id: ChangeLog,v 1.2.2.8 2001/05/17 14:59:49 stephent Exp $
-$Revision: 1.2.2.8 $
+%%% $Id: ChangeLog,v 1.2.2.9 2001/07/25 07:43:33 stephent Exp $
+$Revision: 1.2.2.9 $
diff --git a/netinstall/win32.h b/netinstall/win32.h
index d1ee070..0e9677d 100644
--- a/netinstall/win32.h
+++ b/netinstall/win32.h
@@ -21,24 +21,14 @@
 #ifndef _MINI_WIN32_
 #define _MINI_WIN32_
 
-#define _UNION_NAME(x)
-#define _STRUCT_NAME(x)
 #define NOCOMATTRIBUTE
 
 #include <stdarg.h>
-#ifdef WIN32_NATIVE
-/* MSVC is barking with the list above, something else is missing, so
-   I'm using <windows.h> and lean-n-mean. FP, 2000-23-12 */
+
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
-#endif
-#include <windef.h>
-#include <basetyps.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
-#include <wininet.h>
-#include <winreg.h>
 
+#include <wininet.h>
 #include <windowsx.h>
 
 /* Cope with native win32 & mingw differences.  Written by F. Popineau
diff --git a/nt/ChangeLog b/nt/ChangeLog
index b421562..f953df0 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,26 @@
+2001-07-28  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.4 "Artificial Intelligence" is released.
+
+2001-07-18  Paul Krause  <pkrause@soundbite.com>
+
+	* xemacs.mak (DEPEND): defined(_) isn't a reliable method for
+	detecting if perl is from cygwin. Check $OSNAME as a backup.
+
+2001-06-12  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* xemacs.mak (HAVE_ZLIB): New, defaults to HAVE_PNG.
+	(USE_MINITAR): Default to HAVE_ZLIB.
+	(MSW_LIBS): Add comctl32.lib if HAVE_WIDGETS.
+	(mostlyclean, nicenclean, distclean, versionclean): Only one target
+	per invocation of $(DEL); don't use unneeded switches (WinME support).
+
+2001-05-23  Ben Wing  <ben@xemacs.org>
+
+	* xemacs.mak (installation):
+	call `ver' to get the exact os version and put it in the
+	installation; suggestion from adrian.
+
 2001-05-17  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.4.3 "Academic Rigor" is released.
diff --git a/nt/xemacs.mak b/nt/xemacs.mak
index 745e063..87ab685 100644
--- a/nt/xemacs.mak
+++ b/nt/xemacs.mak
@@ -46,6 +46,8 @@ XEMACSDIRSTRING=$(MAKEDIRSTRING:\\nt=)
 
 
 # Define a variable for the 'del' command to use
+# N.B. Windows Millenium Edition's ERASE can only handle one target (file or
+# wildcard) per invocation.  Make sure each use has only one target!
 DEL=-del
 
 # Program name and version
@@ -120,6 +122,9 @@ HAVE_XPM=0
 !if !defined(HAVE_PNG)
 HAVE_PNG=0
 !endif
+!if !defined(HAVE_ZLIB)
+HAVE_ZLIB=$(HAVE_PNG)
+!endif
 !if !defined(HAVE_TIFF)
 HAVE_TIFF=0
 !endif
@@ -160,7 +165,7 @@ QUICK_BUILD=0
 USE_UNION_TYPE=0
 !endif
 !if !defined(USE_MINITAR)
-USE_MINITAR=1
+USE_MINITAR=$(HAVE_ZLIB)
 !endif
 !if !defined(USE_MINIMAL_TAGBITS)
 USE_MINIMAL_TAGBITS=0
@@ -322,7 +327,7 @@ DEPEND=0
 # much backslash quoting.  This does not happen, of course, with a non-
 # Cygwin Perl, so in that circumstance, you'd be screwed and would have
 # to fix this Makefile to not have a special Cygwin case.
-! if defined(_)
+! if defined(_) || [perl -e "exit 1 if $$^O == 'cygwin';"]==1
 !  if [perl -p -e "s/^\\x23if defined(.+)/!if defined$$1/; s/^\\x23e/!e/;" \
 	-e "s/([\\s=^])([\\w\\d\\.\\-^]+\\.[ch^])/$$1$(SRC:\=\\\\)\\\\$$2/g;" \
 	-e "s/^(.+)\\.o:(.+)/$(OUTDIR:\=\\\\)\\\\$$1.obj:$$2/;" \
@@ -423,7 +428,6 @@ MSW_LIBS=$(MSW_LIBS) "$(COMPFACE_DIR)\libcompface.lib"
 MSW_DEFINES=$(MSW_DEFINES) -DHAVE_TOOLBARS
 MSW_TOOLBAR_SRC=$(SRC)\toolbar.c $(SRC)\toolbar-msw.c
 MSW_TOOLBAR_OBJ=$(OUTDIR)\toolbar.obj $(OUTDIR)\toolbar-msw.obj
-MSW_LIBS=$(MSW_LIBS) comctl32.lib
 !endif
 !if $(HAVE_DIALOGS)
 MSW_DEFINES=$(MSW_DEFINES) -DHAVE_DIALOGS
@@ -433,6 +437,9 @@ MSW_DIALOG_OBJ=$(OUTDIR)\dialog.obj $(OUTDIR)\dialog-msw.obj
 !if $(HAVE_WIDGETS)
 MSW_DEFINES=$(MSW_DEFINES) -DHAVE_WIDGETS
 !endif
+!if $(HAVE_TOOLBARS) || $(HAVE_WIDGETS)
+MSW_LIBS=$(MSW_LIBS) comctl32.lib
+!endif
 !if $(HAVE_NATIVE_SOUND)
 MSW_DEFINES=$(MSW_DEFINES) -DHAVE_NATIVE_SOUND
 !endif
@@ -501,6 +508,7 @@ XEMACS_INCLUDES=\
  $(SRC)\Emacs.ad.h \
  $(SRC)\paths.h
 
+# #### Copying is cheap, we should just force these
 $(SRC)\config.h:	config.h
 	copy config.h $(SRC)
 
@@ -1432,34 +1440,56 @@ install:	all
 
 mostlyclean:
 	$(DEL) $(XEMACS)\Installation
-	$(DEL) $(OUTDIR)\*.lib $(OUTDIR)\*.obj $(OUTDIR)\*.pdb
-	$(DEL) $(OUTDIR)\*.res $(OUTDIR)\*.sbr
-	$(DEL) $(SRC)\*.exe $(SRC)\*.map $(SRC)\*.bsc $(SRC)\*.pdb
-	$(DEL) $(LIB_SRC)\*.exe $(LIB_SRC)\*.obj $(LIB_SRC)\*.pdb
+	$(DEL) $(OUTDIR)\*.lib
+	$(DEL) $(OUTDIR)\*.obj
+	$(DEL) $(OUTDIR)\*.pdb
+	$(DEL) $(OUTDIR)\*.res
+	$(DEL) $(OUTDIR)\*.sbr
+	$(DEL) $(SRC)\*.exe
+	$(DEL) $(SRC)\*.map
+	$(DEL) $(SRC)\*.bsc
+	$(DEL) $(SRC)\*.pdb
+	$(DEL) $(LIB_SRC)\*.exe
+	$(DEL) $(LIB_SRC)\*.obj
+	$(DEL) $(LIB_SRC)\*.pdb
 	$(DEL) $(LIB_SRC)\*.res
 
 clean: mostlyclean versionclean
 	$(DEL) $(XEMACS)\TAGS
 
 nicenclean: clean
-	$(DEL) $(NT)\*.bak $(NT)\*.orig $(NT)\*.rej $(NT)\*.tmp
-	$(DEL) $(LIB_SRC)\*.bak $(LIB_SRC)\*.orig $(LIB_SRC)\*.rej
+	$(DEL) $(NT)\*.bak
+	$(DEL) $(NT)\*.orig
+	$(DEL) $(NT)\*.rej
+	$(DEL) $(NT)\*.tmp
+	$(DEL) $(LIB_SRC)\*.bak
+	$(DEL) $(LIB_SRC)\*.orig
+	$(DEL) $(LIB_SRC)\*.rej
 	$(DEL) $(LIB_SRC)\*.tmp
-	$(DEL) $(SRC)\*.bak $(SRC)\*.orig $(SRC)\*.rej $(SRC)\*.tmp
-	$(DEL) /s $(LISP)\*.bak $(LISP)\*.orig $(LISP)\*.rej $(LISP)\*.tmp
+	$(DEL) $(SRC)\*.bak
+	$(DEL) $(SRC)\*.orig
+	$(DEL) $(SRC)\*.rej
+	$(DEL) $(SRC)\*.tmp
+	$(DEL) $(LISP)\*.bak
+	$(DEL) $(LISP)\*.orig
+	$(DEL) $(LISP)\*.rej
+	$(DEL) $(LISP)\*.tmp
 
 ## This is used in making a distribution.
 ## Do not use it on development directories!
 distclean: nicenclean
-	$(DEL) $(SRC)\config.h $(SRC)\paths.h $(SRC)\Emacs.ad.h
-	$(DEL) $(LIB_SRC)\$(CONFIG_VALUES)
+	$(DEL) $(SRC)\config.h
+	$(DEL) $(SRC)\paths.h
+	$(DEL) $(SRC)\Emacs.ad.h
+	$(DEL) $(CONFIG_VALUES)
 	$(DEL) $(INFODIR)\*.info*
-	$(DEL) /s /q $(LISP)\*.elc
+	$(DEL) $(LISP)\*.elc
 
 realclean: distclean
 
 versionclean:
-	$(DEL) $(SRC)\xemacs.exe $(LIB_SRC)\DOC
+	$(DEL) $(SRC)\xemacs.exe
+	$(DEL) $(LIB_SRC)\DOC
 
 #not sure about those wildcards.  DOS wildcards are stupid compared to Unix,
 #and could end up deleting *everything* instead of just backup files or
@@ -1475,7 +1505,9 @@ depend:
 $(XEMACS)\Installation::	installation
 
 installation::
-	@type > $(XEMACS)\Installation <<
+	@echo OS version:>$(XEMACS)\Installation
+	@ver >> $(XEMACS)\Installation
+	@type >> $(XEMACS)\Installation <<
 !if defined(OS)
 OS: $(OS)
 !endif
diff --git a/src/.cvsignore b/src/.cvsignore
index 54f7656..cbba8e9 100644
--- a/src/.cvsignore
+++ b/src/.cvsignore
@@ -18,3 +18,4 @@ Xpm.dll
 temacs.bsc
 temacs.pdb
 temacs.map
+xemacs.opt
diff --git a/src/ChangeLog b/src/ChangeLog
index 7ff5ba3..4da413d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,206 @@
+2001-07-28  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.4 "Artificial Intelligence" is released.
+
+2001-07-22  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* event-msw.c (mswindows_wnd_proc): Add GC debugging assert.
+
+2001-07-22  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* config.h.in (IPV6_CANONICALIZE): New #define for --with-ipv6-lookup.
+	* process-unix.c (unix_canonicalize_host_name):
+	sysdep.c (init_system_name):
+	Use it to conditionally support IPv6 canonicalization.
+
+2001-05-31  Paul Stodghill  <stodghil@cs.cornell.edu>
+
+	* event-msw.c:
+	Cygwin does not define WM_IME_xxx. Modify the #if's accordingly.
+
+2001-05-19  Paul Krause  <paulkrause1@mediaone.net>
+
+	* scrollbar-msw.c: Fixes a crash that occurs on Windows when an
+	attempt is made to scroll when no scroll bar is available.
+
+2001-04-19  Glynn Clements  <glynn.clements@virgin.net>
+
+	* input-method-motif.c (XIM_delete_frame): New callback.
+	(XIM_init_frame): Register it.  (Reapplied by SJT, it somehow
+	got deleted from 21.4.3.)
+
+2001-06-01  Ben Wing  <ben@xemacs.org>
+
+	* nt.c (mswindows_utime):
+	* nt.c (close_file_data):
+	fix off-by-one-indirection error.
+
+2001-05-29  Adrian Aichner  <adrian@xemacs.org>
+
+	* fileio.c: Include nt.h.  Remove lisp_string_set_file_times()
+	because set_file_times() now takes Lisp_Object path, instead of
+	char*.
+	* nt.c: Include buffer.h.
+	* nt.c (convert_from_time_t): New.
+	* nt.c (mswindows_utime): New.  Use utime, since SetFileTime does
+	not set mtime correctly.
+	* nt.h: Declare mswindows_utime().
+	* sysdep.c (set_file_times): set_file_times() now takes Lisp_Object
+	path, instead of char*.
+	* systime.h: Include <sys/utime.h> on WIN32_NATIVE.
+
+2001-05-30  Ben Wing  <ben@xemacs.org>
+
+	For 21.4:
+
+	(Stephen, just take all event-msw.c patches.  This includes
+	the "iconify" fix below.)
+
+	* event-msw.c:
+	* event-msw.c (mswindows_dequeue_dispatch_event):
+	* event-msw.c (assert):
+	* event-msw.c (emacs_mswindows_quit_p):
+	* event-msw.c (debug_mswin_messages):
+	* event-msw.c (debug_output_mswin_message):
+	* event-msw.c (vars_of_event_mswindows):
+	Fix yet more problems with C-g handling.
+	Implement debug-mswindows-events.
+	
+2001-05-24  Kirill 'Big K' Katsnelson  <kkm@dtmx.com>
+
+	* event-msw.c (WM_DROPFILES): Use correct type for OLE characters.
+	
+2001-05-23  Ben Wing  <ben@xemacs.org>
+
+	* event-msw.c (winsock_writer):
+	* event-msw.c (winsock_closer):
+	prior kludgy code was clobbering the buffer, thinking it was
+	"unused" space to store an unneeded return value; instead, use
+	the variable we've already got staring us in the face.
+
+2001-05-17  Andy Piper  <andy@xemacs.org>
+
+	* sysfile.h: don't assume that file attributes are boolean
+
+2001-05-23  Ben Wing  <ben@xemacs.org>
+
+	* device-msw.c (msprinter_init_device):
+	signal an error rather than crash with an unavailable network
+	printer (from Mike Alexander).
+	
+	* event-msw.c:
+	* event-msw.c (struct winsock_stream):
+	* event-msw.c (winsock_writer):
+	* event-msw.c (winsock_closer):
+	* event-msw.c (make_winsock_stream_1):
+	cleanup headers.  fix (hopefully) an error with data corruption
+	when sending to a network connection.
+
+	* fileio.c (Fexpand_file_name): Fix evil code that attempts
+	to handle the ~user prefix by (a) always assuming we're referencing
+	ourselves and not even verifying the user -- hence any file with
+	a tilde as its first char is invalid! (b) if there wasn't a slash
+	following the filename, the pointer was set *past* the end of
+	file and we started reading from uninitialized memory.  Now we
+	simply treat these as files, always.
+
+	* buffer.c (common_init_complex_vars_of_buffer): comment change.
+	
+2001-05-19  Ben Wing  <ben@xemacs.org>
+
+	* eval.c: doc comment about gcpro'ing in record_unwind_protect.
+
+	* process-nt.c:
+	* process-nt.c (vars_of_process_nt):
+	remove unused mswindows-quote-process-args.  rec for 21.4.
+	
+2001-05-12  Ben Wing  <ben@xemacs.org>
+
+	* event-msw.c (mswindows_dde_callback):
+	* event-msw.c (mswindows_wnd_proc):
+	eliminate cygwin warnings.
+
+2001-05-06  Ben Wing  <ben@xemacs.org>
+
+	* console-msw.h:
+	* device-msw.c:
+	* device-msw.c (print_dialog_worker):
+	* device-msw.c (mswindows_handle_print_dialog_box):
+	* device-msw.c (syms_of_device_mswindows):
+	* dialog-msw.c (mswindows_make_dialog_box_internal):
+	* general-slots.h:
+	implement printing the selection when it's selected.
+
+2001-05-20  Drazen Kacar  <dave@arsdigita.com>
+
+	* glyphs-gtk.c (gtk_resource_instantiate): C++ comment -> #if 0
+
+2001-05-11  Yoshiki Hayashi  <yoshiki@xemacs.org>
+
+	* lisp.h (EMACS_INT_MAX): This should be one bit less since
+	EMACS_INT is signed.
+
+2001-04-15  Michael Lausch  <mla@1012surf.net>
+
+	* scrollbar-gtk.c (gtk_create_scrollbar_instance): Call
+	gtk_widget_request_size() to give scrollbar >0 width for
+	GTK >1.2.8.
+
+2001-05-30  William M. Perry  <wmperry@gnu.org>
+
+	* event-gtk.c: Check for buttons as modifier keys.
+
+2001-05-25  Craig Lanning  <CraigL@Knology.net>
+
+	* s\mingw32.h:
+	Properly find MinGW's <process.h> inside Cygwin's restructured
+	include directories.  Don't try to include <cygwin/version.h>
+	since we are dropping support for MinGW in versions of Cygwin
+	earlier than b21.
+	* nt.c:
+	Drop support for MinGW in versions of Cygwin before b21.
+	* sysdep.c:
+	Properly find MinGW's <process.h> inside Cygwin's restructured
+	include directories.
+	* syswindows.h:
+	Drop support for MinGW in versions of Cygwin before b21.
+	* unexcw.c:
+	Even though a.out.h is no longer detected by configure, allow
+	MinGW to use it until we figure out how to do the job with Win32.
+
+2001-07-11  Matt Tucker  <tuck@whistlingfish.net>
+
+	* syntax.c (find_start_of_comment):
+	Fix `unbalanced parentheses' bug when dealing with mixed comment
+	styles in c++/java/etc. mode
+
+2001-05-29  Mike Alexander  <mta@arbortext.com>
+
+	* console-msw.h (FRAME_MSPRINTER_CHARHEIGHT): Unswap
+	FRAME_MSPRINTER_CHARWIDTH and FRAME_MSPRINTER_CHARHEIGHT
+
+2001-05-17  Andrew Begel  <abegel@eecs.berkeley.edu>
+
+	* lrecord.h (INIT_EXTERNAL_LRECORD_IMPLEMENTATION): Add needed cast.
+
+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-05-27  Karl M. Hegbloom  <karlheg@hegbloom.net>
+
+	* event-stream.c (is_scrollbar_event): add missing semicolon
+
+2001-05-22  Isaac Hollander  <ysh@mindspring.com>
+
+	* Makefile.in.in: Use TAR macro instead of hardcoding
+	  tar.  Allows use of GNU tar instead of system tar
+
+2001-05-27  Karl M. Hegbloom  <karlheg@hegbloom.net>
+
+	* event-stream.c (is_scrollbar_event): add missing semicolon
+
 2001-05-17  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.4.3 "Academic Rigor" is released.
diff --git a/src/Makefile.in.in b/src/Makefile.in.in
index 4e86817..43381b7 100644
--- a/src/Makefile.in.in
+++ b/src/Makefile.in.in
@@ -53,6 +53,7 @@ RECURSIVE_MAKE=@RECURSIVE_MAKE@
 
 SHELL=/bin/sh
 RM = rm -f
+TAR = tar
 
 lispdir = ${srcdir}/../lisp/
 moduledir = ${srcdir}/../modules/
@@ -758,8 +759,8 @@ install: ${PROGNAME}
 		done; \
 		test -d s && hdrtars="$$hdrtars s/*"; \
 		test -d m && hdrtars="$$hdrtars m/*"; \
-		test -n "$$hdrtars" && (tar cf - $$hdrtars) | \
-			(cd ${archlibdir}/include && umask 022 && tar xf -); \
+		test -n "$$hdrtars" && (${TAR} cf - $$hdrtars) | \
+			(cd ${archlibdir}/include && umask 022 && ${TAR} xf -); \
 		chmod 755 ${archlibdir}/include; \
 		test -d ${archlibdir}/include/s && \
 		  chmod 755 ${archlibdir}/include/s; \
diff --git a/src/buffer.c b/src/buffer.c
index abf70fb..58c7994 100644
--- a/src/buffer.c
+++ b/src/buffer.c
@@ -2504,7 +2504,9 @@ common_init_complex_vars_of_buffer (void)
 
     /* #### Warning: 1<<31 is the largest number currently allowable
        due to the XINT() handling of this value.  With some
-       rearrangement you can get 3 more bits. */
+       rearrangement you can get 3 more bits.
+
+       #### 3 more?  34 bits???? -ben */
   }
 }
 
diff --git a/src/config.h.in b/src/config.h.in
index 5b54e68..9bea302 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -374,6 +374,9 @@ void *alloca ();
 
 #undef NLIST_STRUCT
 
+/* Do IPv6 hostname canonicalization before IPv4 in getaddrinfo()? */
+#undef IPV6_CANONICALIZE
+
 /* Compile in support for SOCKS? */
 #undef HAVE_SOCKS
 
diff --git a/src/console-msw.h b/src/console-msw.h
index 7d63746..8d8e3f9 100644
--- a/src/console-msw.h
+++ b/src/console-msw.h
@@ -273,8 +273,8 @@ struct msprinter_frame
 #define FRAME_MSPRINTER_BOTTOM_MARGIN(f) (FRAME_MSPRINTER_DATA (f)->bottom_margin)
 #define FRAME_MSPRINTER_JOB_STARTED(f)	 (FRAME_MSPRINTER_DATA (f)->job_started)
 #define FRAME_MSPRINTER_PAGE_STARTED(f)	 (FRAME_MSPRINTER_DATA (f)->page_started)
-#define FRAME_MSPRINTER_CHARWIDTH(f)	 (FRAME_MSPRINTER_DATA (f)->charheight)
-#define FRAME_MSPRINTER_CHARHEIGHT(f)	 (FRAME_MSPRINTER_DATA (f)->charwidth)
+#define FRAME_MSPRINTER_CHARWIDTH(f)	 (FRAME_MSPRINTER_DATA (f)->charwidth)
+#define FRAME_MSPRINTER_CHARHEIGHT(f)	 (FRAME_MSPRINTER_DATA (f)->charheight)
 #define FRAME_MSPRINTER_PIXLEFT(f)	 (FRAME_MSPRINTER_DATA (f)->pix_left)
 #define FRAME_MSPRINTER_PIXTOP(f)	 (FRAME_MSPRINTER_DATA (f)->pix_top)
 
@@ -376,8 +376,6 @@ Lisp_Object mswindows_handle_print_dialog_box (struct frame *f,
 					       Lisp_Object keys);
 Lisp_Object mswindows_handle_page_setup_dialog_box (struct frame *f,
 						    Lisp_Object keys);
-Lisp_Object mswindows_handle_print_setup_dialog_box (struct frame *f,
-						     Lisp_Object keys);
 int mswindows_get_default_margin (Lisp_Object prop);
 
 void mswindows_register_popup_frame (Lisp_Object frame);
diff --git a/src/device-msw.c b/src/device-msw.c
index 17a2a25..c1bc745 100644
--- a/src/device-msw.c
+++ b/src/device-msw.c
@@ -26,6 +26,7 @@ Boston, MA 02111-1307, USA.  */
    Original authors: Jamie Zawinski and the FSF
    Rewritten by Ben Wing and Chuck Thompson.
    Rewritten for mswindows by Jonathan Harris, November 1997 for 21.0.
+   Print support added by Kirill Katsnelson, July 2000.
 */
 
 
@@ -66,6 +67,11 @@ Lisp_Object Vmswindows_get_true_file_attributes;
 Lisp_Object Qinit_pre_mswindows_win, Qinit_post_mswindows_win;
 Lisp_Object Qdevmodep;
 
+static Lisp_Object Q_allow_selection;
+static Lisp_Object Q_allow_pages;
+static Lisp_Object Q_selected_page_button;
+static Lisp_Object Qselected_page_button;
+
 static Lisp_Object allocate_devmode (DEVMODE* src_devmode, int do_copy,
 				     char* src_name, struct device *d);
 
@@ -674,11 +680,9 @@ decode_devmode (Lisp_Object dev)
 
 /*
  * DEV can be either a printer or devmode
- * PRINT_P is non-zero for the Print dialog, zero for the
- *         Page Setup dialog
  */
 static Lisp_Object
-print_dialog_worker (Lisp_Object dev, int print_p)
+print_dialog_worker (Lisp_Object dev, DWORD flags)
 {
   Lisp_Devmode *ldm = decode_devmode (dev);
   PRINTDLG pd;
@@ -687,8 +691,7 @@ print_dialog_worker (Lisp_Object dev, int print_p)
   pd.lStructSize = sizeof (pd);
   pd.hwndOwner = mswindows_get_selected_frame_hwnd ();
   pd.hDevMode = devmode_to_hglobal (ldm);
-  pd.Flags = (PD_NOSELECTION | PD_USEDEVMODECOPIESANDCOLLATE
-	      | (print_p ? 0 : PD_PRINTSETUP));
+  pd.Flags = flags | PD_USEDEVMODECOPIESANDCOLLATE;
   pd.nMinPage = 0;
   pd.nMaxPage = 0xFFFF;
 
@@ -708,21 +711,24 @@ print_dialog_worker (Lisp_Object dev, int print_p)
 
     /* Do consing in reverse order.
        Number of copies */
-    if (print_p)
-      result = Fcons (Qcopies, Fcons (make_int (pd.nCopies), result));
+    result = Fcons (Qcopies, Fcons (make_int (pd.nCopies), result));
 
     /* Page range */
-    if (print_p && (pd.Flags & PD_PAGENUMS))
+    if (pd.Flags & PD_PAGENUMS)
       {
 	result = Fcons (Qto_page, Fcons (make_int (pd.nToPage), result));
 	result = Fcons (Qfrom_page, Fcons (make_int (pd.nFromPage), result));
+	result = Fcons (Qselected_page_button, Fcons (Qpages, result));
       }
+    else if (pd.Flags & PD_SELECTION)
+      result = Fcons (Qselected_page_button, Fcons (Qselection, result));
+    else
+      result = Fcons (Qselected_page_button, Fcons (Qall, result));
 
     /* Device name */
-    result = Fcons (Qname,
-		    Fcons (build_ext_string (ldm->printer_name,
-					     Qmswindows_tstr),
-			   result));
+    result = Fcons (Qname, Fcons (build_ext_string (ldm->printer_name,
+						    Qmswindows_tstr),
+				  result));
     UNGCPRO;
 
     global_free_2_maybe (pd.hDevNames, pd.hDevMode);
@@ -731,9 +737,10 @@ print_dialog_worker (Lisp_Object dev, int print_p)
 }
 
 Lisp_Object
-mswindows_handle_print_setup_dialog_box (struct frame *f, Lisp_Object keys)
+mswindows_handle_print_dialog_box (struct frame *f, Lisp_Object keys)
 {
   Lisp_Object device = Qunbound, settings = Qunbound;
+  DWORD flags = PD_NOSELECTION;
 
   {
     EXTERNAL_PROPERTY_LIST_LOOP_3 (key, value, keys)
@@ -748,36 +755,25 @@ mswindows_handle_print_setup_dialog_box (struct frame *f, Lisp_Object keys)
 	    CHECK_DEVMODE (value);
 	    settings = value;
 	  }
-	else
-	  syntax_error ("Unrecognized print-dialog keyword", key);
-      }
-  }
-
-  if ((UNBOUNDP (device) && UNBOUNDP (settings)) ||
-      (!UNBOUNDP (device) && !UNBOUNDP (settings)))
-    syntax_error ("Exactly one of :device and :printer-settings must be given",
-		  keys);
-
-  return print_dialog_worker (!UNBOUNDP (device) ? device : settings, 0);
-}
-
-Lisp_Object
-mswindows_handle_print_dialog_box (struct frame *f, Lisp_Object keys)
-{
-  Lisp_Object device = Qunbound, settings = Qunbound;
-
-  {
-    EXTERNAL_PROPERTY_LIST_LOOP_3 (key, value, keys)
-      {
-	if (EQ (key, Q_device))
+	else if (EQ (key, Q_allow_pages))
 	  {
-	    device = wrap_device (decode_device (value));
-	    CHECK_MSPRINTER_DEVICE (device);
+	    if (NILP (value))
+	      flags |= PD_NOPAGENUMS;
 	  }
-	else if (EQ (key, Q_printer_settings))
+	else if (EQ (key, Q_allow_selection))
 	  {
-	    CHECK_DEVMODE (value);
-	    settings = value;
+	    if (!NILP (value))
+	      flags &= ~PD_NOSELECTION;
+	  }
+	else if (EQ (key, Q_selected_page_button))
+	  {
+	    if (EQ (value, Qselection))
+	      flags |= PD_SELECTION;
+	    else if (EQ (value, Qpages))
+	      flags |= PD_PAGENUMS;
+	    else if (!EQ (value, Qall))
+	      invalid_argument ("Invalid value for :selected-page-button",
+				value);
 	  }
 	else
 	  syntax_error ("Unrecognized print-dialog keyword", key);
@@ -789,7 +785,7 @@ mswindows_handle_print_dialog_box (struct frame *f, Lisp_Object keys)
     syntax_error ("Exactly one of :device and :printer-settings must be given",
 		  keys);
 
-  return print_dialog_worker (!UNBOUNDP (device) ? device : settings, 1);
+  return print_dialog_worker (!UNBOUNDP (device) ? device : settings, flags);
 }
 
 int
@@ -1291,8 +1287,13 @@ syms_of_device_mswindows (void)
   DEFSUBR (Fmswindows_get_default_printer);
   DEFSUBR (Fmswindows_printer_list);
 
-  defsymbol (&Qinit_pre_mswindows_win, "init-pre-mswindows-win");
-  defsymbol (&Qinit_post_mswindows_win, "init-post-mswindows-win");
+  DEFKEYWORD (Q_allow_selection);
+  DEFKEYWORD (Q_allow_pages);
+  DEFKEYWORD (Q_selected_page_button);
+  DEFSYMBOL (Qselected_page_button);
+
+  DEFSYMBOL (Qinit_pre_mswindows_win);
+  DEFSYMBOL (Qinit_post_mswindows_win);
 }
 
 void
diff --git a/src/dialog-msw.c b/src/dialog-msw.c
index 62c70e2..b9234e3 100644
--- a/src/dialog-msw.c
+++ b/src/dialog-msw.c
@@ -681,8 +681,6 @@ mswindows_make_dialog_box_internal (struct frame* f, Lisp_Object type,
     return mswindows_handle_print_dialog_box (f, keys);
   else if (EQ (type, Qpage_setup))
     return mswindows_handle_page_setup_dialog_box (f, keys);
-  else if (EQ (type, Qprint_setup))
-    return mswindows_handle_print_setup_dialog_box (f, keys);
   else
     signal_type_error (Qunimplemented, "Dialog box type", type);
   return Qnil;
diff --git a/src/dired-msw.c b/src/dired-msw.c
index 73c5d10..a652937 100644
--- a/src/dired-msw.c
+++ b/src/dired-msw.c
@@ -428,9 +428,8 @@ switches do not contain `d', so that a full listing is expected.
        (file, switches, wildcard, full_directory_p))
 {
   Lisp_Object		result, handler, wildpat, fns, basename;
-  char			*filename;
   char			*switchstr;
-  int			len, nfiles, i;
+  int			nfiles, i;
   int			hide_system, hide_dot, reverse, display_size;
   WIN32_FIND_DATA	*files, **sorted_files;
   enum mswindows_sortby	sort_by;
@@ -495,28 +494,11 @@ switches do not contain `d', so that a full listing is expected.
 	    }
 	}
 
-      /*
-       * Sometimes we get ".../foo* /" as FILE (without the space).
-       * While the shell and `ls' don't mind, we certainly do,
-       * because it makes us think there is no wildcard, only a
-       * directory name.
-       */
-      if (!NILP(Fstring_match(build_string("[[?*]"), file, Qnil, Qnil)))
-	{
-	  wildcard = Qt;
-	  filename = XSTRING_DATA(file);
-	  len = strlen(filename);
-	  if (len > 0 && (filename[len - 1] == '\\' ||
-			  filename[len - 1] == '/'))
-	    {
-	      filename[len - 1] = '\0';
-	    }
-	  file = build_string(filename);
-	}
       if (!NILP(wildcard))
 	{
 	  Lisp_Object	newfile;
 
+	  file = Fdirectory_file_name (file);
 	  basename = Ffile_name_nondirectory(file);
 	  fns = intern("wildcard-to-regexp");
 	  wildpat = call1(fns, basename);
diff --git a/src/eval.c b/src/eval.c
index 00d15e9..b4622b1 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -4926,6 +4926,9 @@ specbind_magic (Lisp_Object symbol, Lisp_Object value)
   Fset (symbol, value);
 }
 
+/* Note: As long as the unwind-protect exists, its arg is automatically
+   GCPRO'd. */
+
 void
 record_unwind_protect (Lisp_Object (*function) (Lisp_Object arg),
                        Lisp_Object arg)
diff --git a/src/event-gtk.c b/src/event-gtk.c
index 66bba28..d9360e3 100644
--- a/src/event-gtk.c
+++ b/src/event-gtk.c
@@ -1253,6 +1253,26 @@ gtk_event_to_emacs_event (struct frame *frame, GdkEvent *gdk_event, struct Lisp_
 	if (*state & gd->HyperMask)  modifiers |= XEMACS_MOD_HYPER;
 	if (*state & gd->AltMask)    modifiers |= XEMACS_MOD_ALT;
 
+	{
+	  int numero_de_botao = -1;
+
+	  if (!key_event_p)
+	    numero_de_botao = gdk_event->button.button;
+
+	  /* the button gets noted either in the button or the modifiers
+	     field, but not both. */
+	  if (numero_de_botao != 1 && (*state & GDK_BUTTON1_MASK))
+	    modifiers |= XEMACS_MOD_BUTTON1;
+	  if (numero_de_botao != 2 && (*state & GDK_BUTTON2_MASK))
+	    modifiers |= XEMACS_MOD_BUTTON2;
+	  if (numero_de_botao != 3 && (*state & GDK_BUTTON3_MASK))
+	    modifiers |= XEMACS_MOD_BUTTON3;
+	  if (numero_de_botao != 4 && (*state & GDK_BUTTON4_MASK))
+	    modifiers |= XEMACS_MOD_BUTTON4;
+	  if (numero_de_botao != 5 && (*state & GDK_BUTTON5_MASK))
+	    modifiers |= XEMACS_MOD_BUTTON5;
+	}	
+
 	/* Ignore the Caps_Lock key if:
 	   - any other modifiers are down, so that Caps_Lock doesn't
 	   turn C-x into C-X, which would suck.
@@ -1373,7 +1393,13 @@ gtk_event_to_emacs_event (struct frame *frame, GdkEvent *gdk_event, struct Lisp_
         if (mask & gd->MetaMask)	modifiers |= XEMACS_MOD_META;
         if (mask & gd->SuperMask)	modifiers |= XEMACS_MOD_SUPER;
         if (mask & gd->HyperMask)	modifiers |= XEMACS_MOD_HYPER;
-        if (mask & gd->AltMask)	modifiers |= XEMACS_MOD_ALT;
+        if (mask & gd->AltMask)		modifiers |= XEMACS_MOD_ALT;
+        if (mask & GDK_BUTTON1_MASK)	modifiers |= XEMACS_MOD_BUTTON1;
+        if (mask & GDK_BUTTON2_MASK)	modifiers |= XEMACS_MOD_BUTTON2;
+        if (mask & GDK_BUTTON3_MASK)	modifiers |= XEMACS_MOD_BUTTON3;
+        if (mask & GDK_BUTTON4_MASK)	modifiers |= XEMACS_MOD_BUTTON4;
+        if (mask & GDK_BUTTON5_MASK)	modifiers |= XEMACS_MOD_BUTTON5;
+
         /* Currently ignores Shift_Lock but probably shouldn't
            (but it definitely should ignore Caps_Lock). */
         emacs_event->event.motion.modifiers = modifiers;
diff --git a/src/event-msw.c b/src/event-msw.c
index 38bd589..4745a66 100644
--- a/src/event-msw.c
+++ b/src/event-msw.c
@@ -49,31 +49,31 @@ Boston, MA 02111-1307, USA.  */
 # include "dragdrop.h"
 #endif
 
+#include "buffer.h"
 #include "device.h"
 #include "events.h"
-#include "frame.h"
-#include "buffer.h"
 #include "faces.h"
+#include "frame.h"
 #include "lstream.h"
+#include "objects-msw.h"
 #include "process.h"
 #include "redisplay.h"
 #include "select.h"
+#include "sysdep.h"
 #include "window.h"
+
+#include "sysfile.h"
 #include "sysproc.h"
-#include "syswait.h"
 #include "systime.h"
-#include "sysdep.h"
-#include "objects-msw.h"
+#include "syswait.h"
 
 #include "events-mod.h"
+
 #ifdef HAVE_MSG_SELECT
-#include "sysfile.h"
 #include "console-tty.h"
 #elif defined(CYGWIN)
 typedef unsigned int SOCKET;
 #endif
-#include <io.h>
-#include <errno.h>
 
 #if !(defined(CYGWIN) || defined(MINGW))
 # include <shlobj.h>	/* For IShellLink */
@@ -154,6 +154,9 @@ Fixnum mswindows_mouse_button_tolerance;
 
 #ifdef DEBUG_XEMACS
 Fixnum debug_mswindows_events;
+
+static void debug_output_mswin_message (HWND hwnd, UINT message_,
+					WPARAM wParam, LPARAM lParam);
 #endif
 
 /* This is the event signaled by the event pump.
@@ -666,7 +669,7 @@ struct winsock_stream
   LPARAM user_data;		/* Any user data stored in the stream object */
   SOCKET s;			/* Socket handle (which is a Win32 handle)   */
   OVERLAPPED ov;		/* Overlapped I/O structure		     */
-  void* buffer;			/* Buffer. Allocated for input stream only   */
+  void* buffer;			/* Buffer.                                   */
   unsigned long bufsize;	/* Number of bytes last read		     */
   unsigned long bufpos;		/* Position in buffer for next fetch	     */
   unsigned int error_p :1;	/* I/O Error seen			     */
@@ -776,18 +779,24 @@ winsock_writer (Lstream *stream, const unsigned char *data,
   if (size == 0)
     return 0;
 
-  {
-    ResetEvent (str->ov.hEvent);
-
-    /* Docs indicate that 4th parameter to WriteFile can be NULL since this is
-     * an overlapped operation. This fails on Win95 with winsock 1.x so we
-     * supply a spare address which is ignored by Win95 anyway. Sheesh. */
-    if (WriteFile ((HANDLE)str->s, data, size, (LPDWORD)&str->buffer, &str->ov)
-	|| GetLastError() == ERROR_IO_PENDING)
-      str->pending_p = 1;
-    else
-      str->error_p = 1;
-  }
+  ResetEvent (str->ov.hEvent);
+
+  /* According to WriteFile docs, we must hold onto the data we pass to it
+     and not make any changes until it finishes -- which may not be until
+     the next time we get here, since we use asynchronous I/O.  We have
+     in fact seen data loss as a result of not doing this. */
+  str->buffer = xrealloc (str->buffer, size);
+  memcpy (str->buffer, data, size);
+
+  /* According to MSDN WriteFile docs, the fourth parameter cannot be NULL
+     on Win95 even when doing an overlapped operation, as we are, where
+     the return value through that parameter is not meaningful. */
+  if (WriteFile ((HANDLE)str->s, str->buffer, size, &str->bufsize,
+		 &str->ov)
+      || GetLastError() == ERROR_IO_PENDING)
+    str->pending_p = 1;
+  else
+    str->error_p = 1;
 
   return str->error_p ? -1 : size;
 }
@@ -806,8 +815,11 @@ winsock_closer (Lstream *lstr)
   if (str->pending_p)
     WaitForSingleObject (str->ov.hEvent, INFINITE);
 
-  if (lstr->flags & LSTREAM_FL_READ)
-    xfree (str->buffer);
+  if (str->buffer)
+    {
+      xfree (str->buffer);
+      str->buffer = 0;
+    }
 
   CloseHandle (str->ov.hEvent);
   return 0;
@@ -827,14 +839,10 @@ make_winsock_stream_1 (SOCKET s, LPARAM param, const char *mode)
   Lstream *lstr = Lstream_new (lstream_winsock, mode);
   struct winsock_stream *str = WINSOCK_STREAM_DATA (lstr);
 
+  xzero (*str);
   str->s = s;
-  str->blocking_p = 0;
-  str->error_p = 0;
-  str->eof_p = 0;
-  str->pending_p = 0;
   str->user_data = param;
 
-  xzero (str->ov);
   str->ov.hEvent = CreateEvent (NULL, TRUE, FALSE, NULL);
 
   if (lstr->flags & LSTREAM_FL_READ)
@@ -1045,14 +1053,11 @@ mswindows_dequeue_dispatch_event (void)
 			 &mswindows_s_dispatch_event_queue_tail :
 			 &mswindows_u_dispatch_event_queue_tail);
 
-  sevt = XEVENT(event);
+  sevt = XEVENT (event);
   if (sevt->event_type == key_press_event
       && (sevt->event.key.modifiers & FAKE_MOD_QUIT))
-    {
-      sevt->event.key.modifiers &=
-	~(FAKE_MOD_QUIT | FAKE_MOD_QUIT_CRITICAL);
-      --mswindows_quit_chars_count;
-    }
+    sevt->event.key.modifiers &=
+      ~(FAKE_MOD_QUIT | FAKE_MOD_QUIT_CRITICAL);
 
   return event;
 }
@@ -1674,9 +1679,9 @@ mswindows_dde_callback (UINT uType, UINT uFmt, HCONV hconv,
 	    return DDE_FNOTPROCESSED;
 
 #ifdef CYGWIN
-	  filename = alloca (cygwin32_win32_to_posix_path_list_buf_size (cmd) + 5);
+	  filename = alloca (cygwin_win32_to_posix_path_list_buf_size (cmd) + 5);
 	  strcpy (filename, "file:");
-	  cygwin32_win32_to_posix_path_list (cmd, filename+5);
+	  cygwin_win32_to_posix_path_list (cmd, filename+5);
 #else
 	  dostounix_filename (cmd);
 	  filename = alloca (strlen (cmd)+6);
@@ -2062,7 +2067,19 @@ mswindows_wnd_proc (HWND hwnd, UINT message_, WPARAM wParam, LPARAM lParam)
   /* Not perfect but avoids crashes. There is potential for wierd
      behavior here. */
   if (gc_in_progress)
-    goto defproc;
+    {
+      mswindows_output_console_string ("Window procedure called during GC???????\n", 41);
+      /* Yes, this assert always triggers in a --debug XEmacs.  But
+	 --debug=no is default in the stable branches.
+         #### How about patch in <200106081225.IAA31075@gwyn.tux.org>? */
+      assert (!gc_in_progress);
+      goto defproc;
+    }
+
+#ifdef DEBUG_XEMACS
+  if (debug_mswindows_events)
+    debug_output_mswin_message (hwnd, message_, wParam, lParam);
+#endif /* DEBUG_XEMACS */
 
   assert (!GetWindowLong (hwnd, GWL_USERDATA));
   switch (message_)
@@ -2098,13 +2115,8 @@ mswindows_wnd_proc (HWND hwnd, UINT message_, WPARAM wParam, LPARAM lParam)
 	int should_set_keymap = 0;
 
 #ifdef DEBUG_XEMACS
-	if (debug_mswindows_events)
-	  {
-	    stderr_out ("%s wparam=%d lparam=%d\n",
-			message_ == WM_KEYUP ? "WM_KEYUP" : "WM_SYSKEYUP",
-			wParam, (int)lParam);
-	    output_alt_keyboard_state ();
-	  }
+	if (debug_mswindows_events > 2)
+	  output_alt_keyboard_state ();
 #endif /* DEBUG_XEMACS */
 
 	mswindows_handle_sticky_modifiers (wParam, lParam, 0, 1);
@@ -2155,13 +2167,8 @@ mswindows_wnd_proc (HWND hwnd, UINT message_, WPARAM wParam, LPARAM lParam)
 	int sticky_changed;
 
 #ifdef DEBUG_XEMACS
-	if (debug_mswindows_events)
-	  {
-	    stderr_out ("%s wparam=%d lparam=%d\n",
-			message_ == WM_KEYDOWN ? "WM_KEYDOWN" : "WM_SYSKEYDOWN",
-			wParam, (int)lParam);
-	    output_alt_keyboard_state ();
-	  }
+	if (debug_mswindows_events > 2)
+	  output_alt_keyboard_state ();
 #endif /* DEBUG_XEMACS */
 
 	GetKeyboardState (keymap_orig);
@@ -2256,6 +2263,16 @@ mswindows_wnd_proc (HWND hwnd, UINT message_, WPARAM wParam, LPARAM lParam)
 		int mods_with_quit = mods;
 		WPARAM ch = tranmsg.wParam;
 
+#ifdef DEBUG_XEMACS
+		if (debug_mswindows_events)
+		  {
+		    stderr_out ("-> ");
+		    debug_output_mswin_message (tranmsg.hwnd, tranmsg.message,
+						tranmsg.wParam,
+						tranmsg.lParam);
+		  }
+#endif /* DEBUG_XEMACS */
+
 		/* If a quit char with no modifiers other than control and
 		   shift, then mark it with a fake modifier, which is removed
 		   upon dequeueing the event */
@@ -2274,7 +2291,7 @@ mswindows_wnd_proc (HWND hwnd, UINT message_, WPARAM wParam, LPARAM lParam)
 		    mods_with_quit |= FAKE_MOD_QUIT;
 		    if (mods_with_shift & XEMACS_MOD_SHIFT)
 		      mods_with_quit |= FAKE_MOD_QUIT_CRITICAL;
-		    ++mswindows_quit_chars_count;
+		    mswindows_quit_chars_count++;
 		  }
 		else if (potential_accelerator && !got_accelerator &&
 			 mswindows_char_is_accelerator (frame, ch))
@@ -2604,6 +2621,33 @@ mswindows_wnd_proc (HWND hwnd, UINT message_, WPARAM wParam, LPARAM lParam)
       mswindows_handle_paint (XFRAME (mswindows_find_frame (hwnd)));
       break;
 
+    case WM_WINDOWPOSCHANGED:
+      /* This is sent before WM_SIZE; in fact, the processing of this
+	 by DefWindowProc() sends WM_SIZE.  But WM_SIZE is not sent when
+	 a window is hidden (make-frame-invisible), so we need to process
+	 this and update the state flags. */
+      {
+	fobj = mswindows_find_frame (hwnd);
+	frame = XFRAME (fobj);
+	if (IsIconic (hwnd))
+	  {
+	    FRAME_VISIBLE_P (frame) = 0;
+	    FRAME_ICONIFIED_P (frame) = 1;
+	  }
+	else if (IsWindowVisible (hwnd))
+	  {
+	    FRAME_VISIBLE_P (frame) = 1;
+	    FRAME_ICONIFIED_P (frame) = 0;
+	  }
+	else
+	  {
+	    FRAME_VISIBLE_P (frame) = 0;
+	    FRAME_ICONIFIED_P (frame) = 0;
+	  }	    
+
+	return DefWindowProc (hwnd, message_, wParam, lParam);
+      }
+
     case WM_SIZE:
       /* We only care about this message if our size has really changed */
       if (wParam==SIZE_RESTORED || wParam==SIZE_MAXIMIZED || wParam==SIZE_MINIMIZED)
@@ -2622,7 +2666,6 @@ mswindows_wnd_proc (HWND hwnd, UINT message_, WPARAM wParam, LPARAM lParam)
 	  if (wParam==SIZE_MINIMIZED)
 	    {
 	      /* Iconified */
-	      FRAME_VISIBLE_P (frame) = 0;
 	      mswindows_enqueue_magic_event (hwnd, XM_UNMAPFRAME);
 	    }
 	  else
@@ -2658,7 +2701,6 @@ mswindows_wnd_proc (HWND hwnd, UINT message_, WPARAM wParam, LPARAM lParam)
 		{
 		  if (!msframe->sizing && !FRAME_VISIBLE_P (frame))
 		    mswindows_enqueue_magic_event (hwnd, XM_MAPFRAME);
-		  FRAME_VISIBLE_P (frame) = 1;
 
 		  if (!msframe->sizing || mswindows_dynamic_frame_resize)
 		    redisplay ();
@@ -2960,14 +3002,14 @@ mswindows_wnd_proc (HWND hwnd, UINT message_, WPARAM wParam, LPARAM lParam)
 		    if (psl->lpVtbl->QueryInterface (psl, &IID_IPersistFile,
 						     &ppf) == S_OK)
 		      {
-			WORD wsz[MAX_PATH];
+			OLECHAR wsz[PATH_MAX];
 			WIN32_FIND_DATA wfd;
-			LPSTR resolved = (char *) xmalloc (MAX_PATH+1);
+			LPSTR resolved = (char *) xmalloc (PATH_MAX+1);
 
-			MultiByteToWideChar (CP_ACP,0, fname, -1, wsz, MAX_PATH);
+			MultiByteToWideChar (CP_ACP,0, fname, -1, wsz, PATH_MAX);
 
 			if ((ppf->lpVtbl->Load (ppf, wsz, STGM_READ) == S_OK) &&
-			    (psl->lpVtbl->GetPath (psl, resolved, MAX_PATH,
+			    (psl->lpVtbl->GetPath (psl, resolved, PATH_MAX,
 						   &wfd, 0)==S_OK))
 			  {
 			    xfree (fname);
@@ -2984,9 +3026,9 @@ mswindows_wnd_proc (HWND hwnd, UINT message_, WPARAM wParam, LPARAM lParam)
 #endif
 
 #ifdef CYGWIN
-	    filename = xmalloc (cygwin32_win32_to_posix_path_list_buf_size (fname) + 5);
+	    filename = xmalloc (cygwin_win32_to_posix_path_list_buf_size (fname) + 5);
 	    strcpy (filename, "file:");
-	    cygwin32_win32_to_posix_path_list (fname, filename+5);
+	    cygwin_win32_to_posix_path_list (fname, filename+5);
 #else
 	    filename = (char *)xmalloc (len+6);
 	    strcat (strcpy (filename, "file:"), fname);
@@ -3473,6 +3515,7 @@ emacs_mswindows_quit_p (void)
   if (mswindows_in_modal_loop)
     return;
 
+  mswindows_quit_chars_count = 0;
   /* Drain windows queue.  This sets up number of quit characters in
      the queue. */
   mswindows_drain_windows_queue ();
@@ -3487,7 +3530,7 @@ emacs_mswindows_quit_p (void)
       match_against.event_type = key_press_event;
       match_against.event.key.modifiers = FAKE_MOD_QUIT;
 
-      while (mswindows_quit_chars_count-- > 0)
+      while (mswindows_quit_chars_count > 0)
 	{
 	  emacs_event = mswindows_cancel_dispatch_event (&match_against);
 	  assert (!NILP (emacs_event));
@@ -3497,6 +3540,7 @@ emacs_mswindows_quit_p (void)
 	    critical_p = 1;
 
 	  Fdeallocate_event (emacs_event);
+	  mswindows_quit_chars_count--;
 	}
 
       Vquit_flag = critical_p ? Qcritical : Qt;
@@ -3632,6 +3676,318 @@ debug_process_finalization (Lisp_Process *p)
 }
 #endif
 
+#ifdef DEBUG_XEMACS
+
+struct mswin_message_debug
+{
+  int mess;
+  char *string;
+};
+
+#define FROB(val) { val, #val, },
+
+struct mswin_message_debug debug_mswin_messages[] =
+{
+FROB (WM_NULL)
+FROB (WM_CREATE)
+FROB (WM_DESTROY)
+FROB (WM_MOVE)
+FROB (WM_SIZE)
+
+FROB (WM_ACTIVATE)
+
+FROB (WM_SETFOCUS)
+FROB (WM_KILLFOCUS)
+FROB (WM_ENABLE)
+FROB (WM_SETREDRAW)
+FROB (WM_SETTEXT)
+FROB (WM_GETTEXT)
+FROB (WM_GETTEXTLENGTH)
+FROB (WM_PAINT)
+FROB (WM_CLOSE)
+FROB (WM_QUERYENDSESSION)
+FROB (WM_QUIT)
+FROB (WM_QUERYOPEN)
+FROB (WM_ERASEBKGND)
+FROB (WM_SYSCOLORCHANGE)
+FROB (WM_ENDSESSION)
+FROB (WM_SHOWWINDOW)
+FROB (WM_WININICHANGE)
+#if(WINVER >= 0x0400)
+FROB (WM_SETTINGCHANGE)
+#endif /* WINVER >= 0x0400 */
+
+FROB (WM_DEVMODECHANGE)
+FROB (WM_ACTIVATEAPP)
+FROB (WM_FONTCHANGE)
+FROB (WM_TIMECHANGE)
+FROB (WM_CANCELMODE)
+FROB (WM_SETCURSOR)
+FROB (WM_MOUSEACTIVATE)
+FROB (WM_CHILDACTIVATE)
+FROB (WM_QUEUESYNC)
+
+FROB (WM_GETMINMAXINFO)
+
+FROB (WM_PAINTICON)
+FROB (WM_ICONERASEBKGND)
+FROB (WM_NEXTDLGCTL)
+FROB (WM_SPOOLERSTATUS)
+FROB (WM_DRAWITEM)
+FROB (WM_MEASUREITEM)
+FROB (WM_DELETEITEM)
+FROB (WM_VKEYTOITEM)
+FROB (WM_CHARTOITEM)
+FROB (WM_SETFONT)
+FROB (WM_GETFONT)
+FROB (WM_SETHOTKEY)
+FROB (WM_GETHOTKEY)
+FROB (WM_QUERYDRAGICON)
+FROB (WM_COMPAREITEM)
+#if(WINVER >= 0x0500)
+FROB (WM_GETOBJECT)
+#endif /* WINVER >= 0x0500 */
+FROB (WM_COMPACTING)
+FROB (WM_COMMNOTIFY)
+FROB (WM_WINDOWPOSCHANGING)
+FROB (WM_WINDOWPOSCHANGED)
+
+FROB (WM_POWER)
+
+FROB (WM_COPYDATA)
+FROB (WM_CANCELJOURNAL)
+
+#if(WINVER >= 0x0400)
+FROB (WM_NOTIFY)
+FROB (WM_INPUTLANGCHANGEREQUEST)
+FROB (WM_INPUTLANGCHANGE)
+FROB (WM_TCARD)
+FROB (WM_HELP)
+FROB (WM_USERCHANGED)
+FROB (WM_NOTIFYFORMAT)
+
+FROB (WM_CONTEXTMENU)
+FROB (WM_STYLECHANGING)
+FROB (WM_STYLECHANGED)
+FROB (WM_DISPLAYCHANGE)
+FROB (WM_GETICON)
+FROB (WM_SETICON)
+#endif /* WINVER >= 0x0400 */
+
+FROB (WM_NCCREATE)
+FROB (WM_NCDESTROY)
+FROB (WM_NCCALCSIZE)
+FROB (WM_NCHITTEST)
+FROB (WM_NCPAINT)
+FROB (WM_NCACTIVATE)
+FROB (WM_GETDLGCODE)
+FROB (WM_SYNCPAINT)
+FROB (WM_NCMOUSEMOVE)
+FROB (WM_NCLBUTTONDOWN)
+FROB (WM_NCLBUTTONUP)
+FROB (WM_NCLBUTTONDBLCLK)
+FROB (WM_NCRBUTTONDOWN)
+FROB (WM_NCRBUTTONUP)
+FROB (WM_NCRBUTTONDBLCLK)
+FROB (WM_NCMBUTTONDOWN)
+FROB (WM_NCMBUTTONUP)
+FROB (WM_NCMBUTTONDBLCLK)
+
+/* FROB (WM_KEYFIRST) */
+FROB (WM_KEYDOWN)
+FROB (WM_KEYUP)
+FROB (WM_CHAR)
+FROB (WM_DEADCHAR)
+FROB (WM_SYSKEYDOWN)
+FROB (WM_SYSKEYUP)
+FROB (WM_SYSCHAR)
+FROB (WM_SYSDEADCHAR)
+FROB (WM_KEYLAST)
+
+#if(WINVER >= 0x0400) && !defined(CYGWIN)
+FROB (WM_IME_STARTCOMPOSITION)
+FROB (WM_IME_ENDCOMPOSITION)
+FROB (WM_IME_COMPOSITION)
+FROB (WM_IME_KEYLAST)
+#endif /* WINVER >= 0x0400 */
+
+FROB (WM_INITDIALOG)
+FROB (WM_COMMAND)
+FROB (WM_SYSCOMMAND)
+FROB (WM_TIMER)
+FROB (WM_HSCROLL)
+FROB (WM_VSCROLL)
+FROB (WM_INITMENU)
+FROB (WM_INITMENUPOPUP)
+FROB (WM_MENUSELECT)
+FROB (WM_MENUCHAR)
+FROB (WM_ENTERIDLE)
+#if(WINVER >= 0x0500)
+FROB (WM_MENURBUTTONUP)
+FROB (WM_MENUDRAG)
+FROB (WM_MENUGETOBJECT)
+FROB (WM_UNINITMENUPOPUP)
+FROB (WM_MENUCOMMAND)
+#endif /* WINVER >= 0x0500 */
+
+
+FROB (WM_CTLCOLORMSGBOX)
+FROB (WM_CTLCOLOREDIT)
+FROB (WM_CTLCOLORLISTBOX)
+FROB (WM_CTLCOLORBTN)
+FROB (WM_CTLCOLORDLG)
+FROB (WM_CTLCOLORSCROLLBAR)
+FROB (WM_CTLCOLORSTATIC)
+
+
+/* FROB (WM_MOUSEFIRST) */
+FROB (WM_MOUSEMOVE)
+FROB (WM_LBUTTONDOWN)
+FROB (WM_LBUTTONUP)
+FROB (WM_LBUTTONDBLCLK)
+FROB (WM_RBUTTONDOWN)
+FROB (WM_RBUTTONUP)
+FROB (WM_RBUTTONDBLCLK)
+FROB (WM_MBUTTONDOWN)
+FROB (WM_MBUTTONUP)
+FROB (WM_MBUTTONDBLCLK)
+
+#if (_WIN32_WINNT >= 0x0400) || (_WIN32_WINDOWS > 0x0400)
+FROB (WM_MOUSEWHEEL)
+FROB (WM_MOUSELAST)
+#else
+FROB (WM_MOUSELAST)
+#endif /* if (_WIN32_WINNT < 0x0400) */
+
+FROB (WM_PARENTNOTIFY)
+FROB (WM_ENTERMENULOOP)
+FROB (WM_EXITMENULOOP)
+
+#if(WINVER >= 0x0400)
+FROB (WM_NEXTMENU)
+
+FROB (WM_SIZING)
+FROB (WM_CAPTURECHANGED)
+FROB (WM_MOVING)
+FROB (WM_POWERBROADCAST)
+
+FROB (WM_DEVICECHANGE)
+
+#endif /* WINVER >= 0x0400 */
+
+FROB (WM_MDICREATE)
+FROB (WM_MDIDESTROY)
+FROB (WM_MDIACTIVATE)
+FROB (WM_MDIRESTORE)
+FROB (WM_MDINEXT)
+FROB (WM_MDIMAXIMIZE)
+FROB (WM_MDITILE)
+FROB (WM_MDICASCADE)
+FROB (WM_MDIICONARRANGE)
+FROB (WM_MDIGETACTIVE)
+
+
+FROB (WM_MDISETMENU)
+FROB (WM_ENTERSIZEMOVE)
+FROB (WM_EXITSIZEMOVE)
+FROB (WM_DROPFILES)
+FROB (WM_MDIREFRESHMENU)
+
+
+#if(WINVER >= 0x0400) && !defined(CYGWIN)
+FROB (WM_IME_SETCONTEXT)
+FROB (WM_IME_NOTIFY)
+FROB (WM_IME_CONTROL)
+FROB (WM_IME_COMPOSITIONFULL)
+FROB (WM_IME_SELECT)
+FROB (WM_IME_CHAR)
+#endif /* WINVER >= 0x0400 */
+#if(WINVER >= 0x0500)
+FROB (WM_IME_REQUEST)
+#endif /* WINVER >= 0x0500 */
+#if(WINVER >= 0x0400) && !defined(CYGWIN)
+FROB (WM_IME_KEYDOWN)
+FROB (WM_IME_KEYUP)
+#endif /* WINVER >= 0x0400 */
+
+
+#if(_WIN32_WINNT >= 0x0400)
+FROB (WM_MOUSEHOVER)
+FROB (WM_MOUSELEAVE)
+#endif /* _WIN32_WINNT >= 0x0400 */
+
+FROB (WM_CUT)
+FROB (WM_COPY)
+FROB (WM_PASTE)
+FROB (WM_CLEAR)
+FROB (WM_UNDO)
+FROB (WM_RENDERFORMAT)
+FROB (WM_RENDERALLFORMATS)
+FROB (WM_DESTROYCLIPBOARD)
+FROB (WM_DRAWCLIPBOARD)
+FROB (WM_PAINTCLIPBOARD)
+FROB (WM_VSCROLLCLIPBOARD)
+FROB (WM_SIZECLIPBOARD)
+FROB (WM_ASKCBFORMATNAME)
+FROB (WM_CHANGECBCHAIN)
+FROB (WM_HSCROLLCLIPBOARD)
+FROB (WM_QUERYNEWPALETTE)
+FROB (WM_PALETTEISCHANGING)
+FROB (WM_PALETTECHANGED)
+FROB (WM_HOTKEY)
+
+#if(WINVER >= 0x0400)
+FROB (WM_PRINT)
+FROB (WM_PRINTCLIENT)
+
+FROB (WM_HANDHELDFIRST)
+FROB (WM_HANDHELDLAST)
+
+FROB (WM_AFXFIRST)
+FROB (WM_AFXLAST)
+#endif /* WINVER >= 0x0400 */
+
+FROB (WM_PENWINFIRST)
+FROB (WM_PENWINLAST)
+};
+
+#undef FROB
+
+static void
+debug_output_mswin_message (HWND hwnd, UINT message_, WPARAM wParam,
+			    LPARAM lParam)
+{
+  Lisp_Object frame = mswindows_find_frame (hwnd);
+  int i;
+  char *str = 0;
+  /* struct mswin_message_debug *i_hate_cranking_out_code_like_this; */
+
+  for (i = 0; i < countof (debug_mswin_messages); i++)
+    {
+      if (debug_mswin_messages[i].mess == message_)
+	{
+	  str = debug_mswin_messages[i].string;
+	  break;
+	}
+    }
+
+  if (str)
+    stderr_out ("%s", str);
+  else
+    stderr_out ("%x", message_);
+
+  if (debug_mswindows_events > 1)
+    {
+      stderr_out (" wparam=%d lparam=%d hwnd=%x frame: ",
+		  wParam, (int) lParam, (unsigned int) hwnd);
+      debug_print (frame);
+    }
+  else
+    stderr_out ("\n");
+}
+
+#endif /* DEBUG_XEMACS */
+
 /************************************************************************/
 /*                            initialization                            */
 /************************************************************************/
@@ -3691,13 +4047,12 @@ vars_of_event_mswindows (void)
 
 #ifdef DEBUG_XEMACS
   DEFVAR_INT ("debug-mswindows-events", &debug_mswindows_events /*
-If non-zero, display debug information about Windows events that XEmacs sees.
+If non-zero, display debug information about Windows messages that XEmacs sees.
 Information is displayed in a console window.  Currently defined values are:
 
-1 == non-verbose output
-2 == verbose output
-
-#### Unfortunately, not yet implemented.
+1 == non-verbose output (just the message name)
+2 == verbose output (all parameters)
+3 == even more verbose output (extra debugging info)
 */ );
   debug_mswindows_events = 0;
 #endif
diff --git a/src/event-stream.c b/src/event-stream.c
index b390e52..644eba2 100644
--- a/src/event-stream.c
+++ b/src/event-stream.c
@@ -3785,8 +3785,8 @@ is_scrollbar_event (Lisp_Object event)
 	  EQ (fun, Qscrollbar_to_right) ||
 	  EQ (fun, Qscrollbar_horizontal_drag));
 #else
-  return 0
-#endif
+  return 0;
+#endif /* HAVE_SCROLLBARS */
 }
 
 static void
diff --git a/src/fileio.c b/src/fileio.c
index e73a205..fcd78b0 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -54,6 +54,7 @@ Boston, MA 02111-1307, USA.  */
 #endif /* HPUX */
 
 #ifdef WIN32_NATIVE
+#include "nt.h"
 #define IS_DRIVE(x) isalpha (x)
 /* Need to lower-case the drive letter, or else expanded
    filenames will sometimes compare inequal, because
@@ -980,23 +981,11 @@ See also the function `substitute-in-file-name'.
 	  memcpy (o, (char *) nm, p - nm);
 	  o [p - nm] = 0;
 
-	  /* #### marcpa's syncing note: FSF uses getpwnam even on NT,
-	     which does not work.  The following works only if ~USER
-	     names the user who runs this instance of XEmacs.  While
-	     NT is single-user (for the moment) you still can have
-	     multiple user profiles users defined, each with its HOME.
-	     Therefore, the following should be reworked to handle
-	     this case.  */
-#ifdef  WIN32_NATIVE
-	  /* Now if the file given is "~foo/file" and HOME="c:/", then
-	     we want the file to be named "c:/file" ("~foo" becomes
-	     "c:/").  The variable o has "~foo", so we can use the
-	     length of that string to offset nm.  August Hill, 31 Aug
-	     1998.  */
-	  newdir = (Bufbyte *) get_home_directory();
-	  dostounix_filename (newdir);
-	  nm += strlen(o) + 1;
-#else  /* not WIN32_NATIVE */
+	  /* #### While NT is single-user (for the moment) you still
+	     can have multiple user profiles users defined, each with
+	     its HOME.  So maybe possibly we should think about handling
+	     ~user. --ben */
+#ifndef WIN32_NATIVE
 #ifdef CYGWIN
 	  if ((user = user_login_name (NULL)) != NULL)
 	    {
@@ -1676,16 +1665,6 @@ barf_or_query_if_file_exists (Lisp_Object absname, const char *querystring,
   return;
 }
 
-/* A slightly higher-level interface than `set_file_times' */
-static int
-lisp_string_set_file_times (Lisp_Object filename,
-			    EMACS_TIME atime, EMACS_TIME mtime)
-{
-  char *ext_filename;
-  LISP_STRING_TO_EXTERNAL (filename, ext_filename, Qfile_name);
-  return set_file_times (ext_filename, atime, mtime);
-}
-
 DEFUN ("copy-file", Fcopy_file, 2, 4,
        "fCopy file: \nFCopy %s to file: \np\nP", /*
 Copy FILENAME to NEWNAME.  Both args must be strings.
@@ -1823,7 +1802,7 @@ A prefix arg makes KEEP-TIME non-nil.
 	    EMACS_TIME atime, mtime;
 	    EMACS_SET_SECS_USECS (atime, st.st_atime, 0);
 	    EMACS_SET_SECS_USECS (mtime, st.st_mtime, 0);
-	    if (lisp_string_set_file_times (newname, atime, mtime))
+	    if (set_file_times (newname, atime, mtime))
 	      report_file_error ("I/O error", list1 (newname));
 	  }
 	chmod ((const char *) XSTRING_DATA (newname),
diff --git a/src/general-slots.h b/src/general-slots.h
index 78bcf49..87915ac 100644
--- a/src/general-slots.h
+++ b/src/general-slots.h
@@ -184,13 +184,13 @@ SYMBOL (Qorientation);
 SYMBOL_KEYWORD (Q_orientation);
 SYMBOL (Qother);
 SYMBOL (Qpage_setup);
+SYMBOL (Qpages);
 SYMBOL (Qpeer);
 SYMBOL (Qpointer);
 SYMBOL (Qpopup);
 SYMBOL (Qportrait);
 SYMBOL (Qprepend);
 SYMBOL (Qprint);
-SYMBOL (Qprint_setup);
 SYMBOL (Qprinter);
 SYMBOL_KEYWORD (Q_printer_settings);
 SYMBOL (Qprocess);
@@ -212,6 +212,7 @@ SYMBOL (Qright_margin);
 SYMBOL (Qsearch);
 SYMBOL (Qselected);
 SYMBOL_KEYWORD (Q_selected);
+SYMBOL (Qselection);
 SYMBOL (Qset_glyph_image);
 SYMBOL (Qsignal);
 SYMBOL (Qsimple);
diff --git a/src/glyphs-gtk.c b/src/glyphs-gtk.c
index ce6e345..69e59e1 100644
--- a/src/glyphs-gtk.c
+++ b/src/glyphs-gtk.c
@@ -1576,13 +1576,15 @@ gtk_resource_instantiate (Lisp_Object image_instance, Lisp_Object instantiator,
 
   type = resource_symbol_to_type (resource_type);
 
-  //   if (dest_mask & IMAGE_POINTER_MASK && type == IMAGE_POINTER_MASK)
-  //     iitype = IMAGE_POINTER;
-  //   else if (dest_mask & IMAGE_COLOR_PIXMAP_MASK)
-  //     iitype = IMAGE_COLOR_PIXMAP;
-  //   else 
-  //     incompatible_image_types (instantiator, dest_mask,
-  // 			      IMAGE_COLOR_PIXMAP_MASK | IMAGE_POINTER_MASK);
+#if 0
+  if (dest_mask & IMAGE_POINTER_MASK && type == IMAGE_POINTER_MASK)
+    iitype = IMAGE_POINTER;
+  else if (dest_mask & IMAGE_COLOR_PIXMAP_MASK)
+    iitype = IMAGE_COLOR_PIXMAP;
+  else 
+    incompatible_image_types (instantiator, dest_mask,
+			      IMAGE_COLOR_PIXMAP_MASK | IMAGE_POINTER_MASK);
+#endif
 
   /* mess with the keyword info we were provided with */
   gtk_initialize_pixmap_image_instance (ii, 1, type);
diff --git a/src/input-method-motif.c b/src/input-method-motif.c
index a05e055..f51e4e7 100644
--- a/src/input-method-motif.c
+++ b/src/input-method-motif.c
@@ -94,6 +94,13 @@ XIM_init_device (struct device *d)
   /* Nothing to do */
 }
 
+/* Callback for the deleting frame. */
+static void
+XIM_delete_frame (Widget w, XtPointer client_data, XtPointer call_data)
+{
+  XmImUnregister ((Widget) client_data);
+}
+
 void
 XIM_init_frame (struct frame *f)
 {
@@ -152,6 +159,8 @@ XIM_init_frame (struct frame *f)
 		   NULL);
 
   XmFontListEntryFree (&fontlistEntry);
+
+  XtAddCallback (w, XmNdestroyCallback, XIM_delete_frame, (XtPointer) w);
 }
 
 void
diff --git a/src/lisp.h b/src/lisp.h
index 8b2b8cc..4aee0e1 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -585,7 +585,7 @@ enum Lisp_Type
 
 #define INT_VALBITS (BITS_PER_EMACS_INT - INT_GCBITS)
 #define VALBITS (BITS_PER_EMACS_INT - GCBITS)
-#define EMACS_INT_MAX ((EMACS_INT) ((1UL << INT_VALBITS) -1UL))
+#define EMACS_INT_MAX ((EMACS_INT) ((1UL << (INT_VALBITS - 1)) -1UL))
 #define EMACS_INT_MIN (-(EMACS_INT_MAX) - 1)
 
 #ifdef USE_UNION_TYPE
diff --git a/src/lrecord.h b/src/lrecord.h
index 3934b5f..bdf1c9e 100644
--- a/src/lrecord.h
+++ b/src/lrecord.h
@@ -495,7 +495,7 @@ extern Lisp_Object (*lrecord_markers[]) (Lisp_Object);
 
 #define INIT_EXTERNAL_LRECORD_IMPLEMENTATION(type) do {			\
   lrecord_type_##type = lrecord_type_count++;				\
-  lrecord_##type.lrecord_type_index = lrecord_type_##type;		\
+  lrecord_##type.lrecord_type_index = (enum lrecord_type) lrecord_type_##type; \
   INIT_LRECORD_IMPLEMENTATION(type);					\
 } while (0)
 
diff --git a/src/nt.c b/src/nt.c
index 1afa11a..2eac6d0 100644
--- a/src/nt.c
+++ b/src/nt.c
@@ -28,6 +28,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 #define getwd _getwd
 #include "lisp.h"
 #undef getwd
+#include "buffer.h"
 
 #include "systime.h"
 #include "syssignal.h"
@@ -1177,12 +1178,11 @@ sys_rename (const char * oldname, const char * newname)
 #endif /* 0 */
 
 static FILETIME utc_base_ft;
+static long double utc_base;
 static int init = 0;
 
 #if 0
 
-static long double utc_base;
-
 time_t
 convert_time (FILETIME ft)
 {
@@ -1216,11 +1216,6 @@ convert_time (FILETIME ft)
 }
 #else
 
-#if defined(MINGW) && CYGWIN_VERSION_DLL_MAJOR <= 21
-#define LowPart u.LowPart
-#define HighPart u.HighPart
-#endif
-
 static LARGE_INTEGER utc_base_li;
 
 time_t
@@ -2242,6 +2237,83 @@ mswindows_executable_type (const char * filename, int * is_dos_app,
   close_file_data (&executable);
 }
 
+static void
+convert_from_time_t (time_t time, FILETIME * pft)
+{
+  long double tmp;
+
+  if (!init)
+    {
+      /* Determine the delta between 1-Jan-1601 and 1-Jan-1970. */
+      SYSTEMTIME st;
+
+      st.wYear = 1970;
+      st.wMonth = 1;
+      st.wDay = 1;
+      st.wHour = 0;
+      st.wMinute = 0;
+      st.wSecond = 0;
+      st.wMilliseconds = 0;
+
+      SystemTimeToFileTime (&st, &utc_base_ft);
+      utc_base = (long double) utc_base_ft.dwHighDateTime
+	* 4096 * 1024 * 1024 + utc_base_ft.dwLowDateTime;
+      init = 1;
+    }
+
+  /* time in 100ns units since 1-Jan-1601 */
+  tmp = (long double) time * 1e7 + utc_base;
+  pft->dwHighDateTime = (DWORD) (tmp / (4096.0 * 1024 * 1024));
+  pft->dwLowDateTime = (DWORD) (tmp - (4096.0 * 1024 * 1024) *
+                                pft->dwHighDateTime);
+}
+
+int
+mswindows_utime (Lisp_Object path, struct utimbuf *times)
+{
+  struct utimbuf deftime;
+#if 0
+  HANDLE fh;
+#endif
+  static FILETIME mtime;
+  static FILETIME atime;
+  Extbyte *filename;
+
+  if (times == NULL)
+    {
+      deftime.modtime = deftime.actime = time (NULL);
+      times = &deftime;
+    }
+
+  LISP_STRING_TO_EXTERNAL (path, filename, Qmswindows_tstr);
+  /* APA: SetFileTime fails to set mtime correctly (always 1-Jan-1970) */
+#if 0
+  /* Need write access to set times.  */
+  fh = CreateFile (filename, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE,
+		   0, OPEN_EXISTING, 0, NULL);
+  if (fh)
+    {
+      convert_from_time_t (times->actime, &atime);
+      convert_from_time_t (times->modtime, &mtime);
+      if (!SetFileTime (fh, NULL, &atime, &mtime))
+	{
+	  CloseHandle (fh);
+	  errno = EACCES;
+	  return -1;
+	}
+      CloseHandle (fh);
+    }
+  else
+    {
+      errno = EINVAL;
+      return -1;
+    }
+  return 0;
+#else
+  return utime (filename, times);
+#endif
+}
+
 /* Close the system structures associated with the given file.  */
 void
 close_file_data (file_data *p_file)
diff --git a/src/nt.h b/src/nt.h
index 1362d92..6432878 100644
--- a/src/nt.h
+++ b/src/nt.h
@@ -105,6 +105,7 @@ extern LPBYTE nt_get_resource (char * key, LPDWORD type);
 
 void set_process_dir (const char * dir);
 time_t convert_time (FILETIME ft);
+int mswindows_utime (Lisp_Object path, struct utimbuf *times);
 
 extern void init_ntproc (void);
 extern void term_ntproc (int unused);
diff --git a/src/process-nt.c b/src/process-nt.c
index 21e17c3..34da238 100644
--- a/src/process-nt.c
+++ b/src/process-nt.c
@@ -56,10 +56,6 @@ struct nt_process_data
   HWND hwnd; /* console window */
 };
 
-/* Control how args are quoted to ensure correct parsing by child
-   process. */
-Lisp_Object Vmswindows_quote_process_args;
-
 /* Control whether create_child causes the process to inherit Emacs'
    console window, or be given a new one of its own.  The default is
    nil, to allow multiple DOS programs to run on Win95.  Having separate
@@ -1383,20 +1379,6 @@ syms_of_process_nt (void)
 void
 vars_of_process_nt (void)
 {
-  DEFVAR_LISP ("mswindows-quote-process-args",
-	       &Vmswindows_quote_process_args /*
-Non-nil enables quoting of process arguments to ensure correct parsing.
-Because Windows does not directly pass argv arrays to child processes,
-programs have to reconstruct the argv array by parsing the command
-line string.  For an argument to contain a space, it must be enclosed
-in double quotes or it will be parsed as multiple arguments.
-
-If the value is a character, that character will be used to escape any
-quote characters that appear, otherwise a suitable escape character
-will be chosen based on the type of the program (normal or Cygwin).
-*/ );								  
-  Vmswindows_quote_process_args = Qt;
-
   DEFVAR_LISP ("mswindows-start-process-share-console",
 	       &Vmswindows_start_process_share_console /*
 When nil, new child processes are given a new console.
diff --git a/src/process-unix.c b/src/process-unix.c
index ec93385..df7e824 100644
--- a/src/process-unix.c
+++ b/src/process-unix.c
@@ -1587,7 +1587,11 @@ unix_canonicalize_host_name (Lisp_Object host)
 
   xzero (hints);
   hints.ai_flags = AI_CANONNAME;
+#ifdef IPV6_CANONICALIZE
   hints.ai_family = AF_UNSPEC;
+#else
+  hints.ai_family = PF_INET;
+#endif
   hints.ai_socktype = SOCK_STREAM;
   hints.ai_protocol = 0;
   LISP_STRING_TO_EXTERNAL (host, ext_host, Qnative);
diff --git a/src/s/mingw32.h b/src/s/mingw32.h
index c027d39..3e56d9e 100644
--- a/src/s/mingw32.h
+++ b/src/s/mingw32.h
@@ -133,13 +133,10 @@ Boston, MA 02111-1307, USA.  */
 
 #ifndef NOT_C_CODE
 #include <stdlib.h>
-#include <mingw/process.h>
+#include <../mingw/process.h>
 #define mkdir __mkdir
 #include <dir.h>
 #undef mkdir
-#ifdef HAVE_CYGWIN_VERSION_H
-#include <cygwin/version.h>
-#endif
 
 /* IO calls that are emulated or shadowed */
 #define pipe    sys_pipe
@@ -192,11 +189,6 @@ uid_t geteuid (void);
 gid_t getgid (void);
 gid_t getegid (void);
 
-#if CYGWIN_VERSION_DLL_MAJOR <= 21
-#define _ftime ftime
-#define _timeb timeb
-#endif
-
 /* Stuff that gets set wrongly or otherwise */
 #define HAVE_SETITIMER
 #define HAVE_GETTIMEOFDAY
diff --git a/src/scrollbar-gtk.c b/src/scrollbar-gtk.c
index c7247ff..ba76d43 100644
--- a/src/scrollbar-gtk.c
+++ b/src/scrollbar-gtk.c
@@ -103,6 +103,14 @@ gtk_create_scrollbar_instance (struct frame *f, int vertical,
   gtk_object_set_data (GTK_OBJECT (adj), "xemacs::sb_instance", instance);
 
   sb = GTK_SCROLLBAR (vertical ? gtk_vscrollbar_new (adj) : gtk_hscrollbar_new (adj));
+  /* With gtk version > 1.2.8 the gtk code does not call
+     gtk_widget_request_size() on the newly created scrollbars
+     anymore (catering to theme engines).
+     #### Maybe it is better to postpone this call to just before
+     gtk_widget_show() is called on the scrollbar? */
+#if GTK_MAJOR_VERSION == 1 && GTK_MINOR_VERSION == 2 && GTK_BINARY_AGE > 8
+  gtk_widget_size_request(GTK_WIDGET(sb), &(GTK_WIDGET(sb)->requisition));
+#endif  
   SCROLLBAR_GTK_WIDGET (instance) = GTK_WIDGET (sb);
 
   gtk_signal_connect (GTK_OBJECT (adj),"value-changed",
diff --git a/src/scrollbar-msw.c b/src/scrollbar-msw.c
index d323d9a..403a1dd 100644
--- a/src/scrollbar-msw.c
+++ b/src/scrollbar-msw.c
@@ -114,7 +114,13 @@ mswindows_update_scrollbar_instance_values (struct window *w,
 					    int new_scrollbar_y)
 {
   int pos_changed = 0;
-  int vert = GetWindowLong (SCROLLBAR_MSW_HANDLE (sb), GWL_STYLE) & SBS_VERT;
+  long styles = GetWindowLong (SCROLLBAR_MSW_HANDLE (sb), GWL_STYLE);
+  int vert = styles & SBS_VERT;
+
+  if (styles == 0) {
+    mswindows_output_last_error("GetWindowLong");
+    return;
+  }
 
 #if 0
   stderr_out ("[%d, %d], page = %d, pos = %d, inhibit = %d\n", new_minimum, new_maximum,
@@ -176,12 +182,16 @@ mswindows_handle_scrollbar_event (HWND hwnd, int code, int pos)
   struct frame *f;
   Lisp_Object win, frame;
   struct scrollbar_instance *sb;
-  SCROLLINFO scrollinfo;
-  int vert = GetWindowLong (hwnd, GWL_STYLE) & SBS_VERT;
-  int value;
+  long styles = GetWindowLong (hwnd, GWL_STYLE);
+  int vert = styles & SBS_VERT;
+
+  if (styles == 0) {
+    mswindows_output_last_error("GetWindowLong");
+    return;
+  }
 
   sb = (struct scrollbar_instance *)GetWindowLong (hwnd, GWL_USERDATA);
-  win = real_window (sb->mirror, 1);
+  win = real_window ((sb==NULL) ? GetFocus() : sb->mirror, 1);
   frame = XWINDOW (win)->frame;
   f = XFRAME (frame);
 
@@ -226,10 +236,13 @@ mswindows_handle_scrollbar_event (HWND hwnd, int code, int pos)
 
     case SB_THUMBTRACK:
     case SB_THUMBPOSITION:
-      scrollinfo.cbSize = sizeof(SCROLLINFO);
-      scrollinfo.fMask = SIF_ALL;
-      GetScrollInfo (hwnd, SB_CTL, &scrollinfo);
-      vertical_drag_in_progress = vert;
+      {
+	int pos;
+	SCROLLINFO scrollinfo;
+	scrollinfo.cbSize = sizeof(SCROLLINFO);
+	scrollinfo.fMask = SIF_ALL;
+	GetScrollInfo (hwnd, SB_CTL, &scrollinfo);
+	vertical_drag_in_progress = vert;
 #ifdef VERTICAL_SCROLLBAR_DRAG_HACK
       if (vert && (scrollinfo.nTrackPos > scrollinfo.nPos))
         /* new buffer position =
@@ -237,7 +250,7 @@ mswindows_handle_scrollbar_event (HWND hwnd, int code, int pos)
 	 *   ((text remaining in buffer at start of drag) *
 	 *    (amount that the thumb has been moved) /
 	 *    (space that remained past end of the thumb at start of drag)) */
-	value = (int)
+	pos = (int)
 	  (scrollinfo.nPos
 	   + (((double)
 	      (scrollinfo.nMax - scrollinfo.nPos)
@@ -246,16 +259,17 @@ mswindows_handle_scrollbar_event (HWND hwnd, int code, int pos)
 	  - 2;	/* ensure that the last line doesn't disappear off screen */
       else
 #endif
-        value = scrollinfo.nTrackPos;
+        pos = scrollinfo.nTrackPos;
       mswindows_enqueue_misc_user_event
 	(frame,
 	 vert ? Qscrollbar_vertical_drag : Qscrollbar_horizontal_drag,
-	 Fcons (win, make_int (value)));
+	 Fcons (win, make_int (pos)));
+      }
       break;
 
     case SB_ENDSCROLL:
 #ifdef VERTICAL_SCROLLBAR_DRAG_HACK
-      if (vertical_drag_in_progress)
+      if (vertical_drag_in_progress && sb)
 	/* User has just dropped the thumb - finally update it */
 	SetScrollInfo (SCROLLBAR_MSW_HANDLE (sb), SB_CTL,
 		       &SCROLLBAR_MSW_INFO (sb), TRUE);
diff --git a/src/search.c b/src/search.c
index 45f00e3..50d2a6b 100644
--- a/src/search.c
+++ b/src/search.c
@@ -2245,6 +2245,11 @@ the buffer to be used for syntax-table and case-table lookup and
 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 @@ and you do not need to specify it.
   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 @@ and you do not need to specify it.
     }
   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 @@ and you do not need to specify it.
 
   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 --git a/src/syntax.c b/src/syntax.c
index 5c493ab..3388e6d 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -678,7 +678,8 @@ find_start_of_comment (struct buffer *buf, Bufpos from, Bufpos stop,
 		  {
 		    code = Sendcomment;
 		    styles_match_p =
-		      SYNTAX_CODES_COMMENT_MASK_END (prev_syncode, syncode);
+		      SYNTAX_CODES_COMMENT_MASK_END (prev_syncode, syncode)
+		      & mask;
 		    from--;
 		    UPDATE_SYNTAX_CACHE_BACKWARD (from);
 		    c = BUF_FETCH_CHAR (buf, from);
@@ -701,7 +702,8 @@ find_start_of_comment (struct buffer *buf, Bufpos from, Bufpos stop,
 		  {
 		    code = Scomment;
 		    styles_match_p =
-		      SYNTAX_CODES_COMMENT_MASK_START (prev_syncode, syncode);
+		      SYNTAX_CODES_COMMENT_MASK_START (prev_syncode, syncode)
+		      & mask;
 		    from--;
 		    UPDATE_SYNTAX_CACHE_BACKWARD (from);
 		    c = BUF_FETCH_CHAR (buf, from);
diff --git a/src/sysdep.c b/src/sysdep.c
index 54e1bf2..ff64273 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -33,7 +33,7 @@ Boston, MA 02111-1307, USA.  */
 
 #ifdef WIN32_NATIVE
 #ifdef MINGW
-#include <mingw/process.h>
+#include <../mingw/process.h>
 #else
 /* <process.h> should not conflict with "process.h", as per ANSI definition.
    This is not true with visual c though. The trick below works with
@@ -2337,7 +2337,11 @@ init_system_name (void)
 
 	xzero (hints);
 	hints.ai_flags = AI_CANONNAME;
+#ifdef IPV6_CANONICALIZE
 	hints.ai_family = AF_UNSPEC;
+#else
+	hints.ai_family = PF_INET;
+#endif
 	hints.ai_socktype = SOCK_STREAM;
 	hints.ai_protocol = 0;
 	if (!getaddrinfo (hostname, NULL, &hints, &res))
@@ -3342,17 +3346,26 @@ gettimeofday (struct timeval *tp, struct timezone *tzp)
    access to those functions goes through the following. */
 
 int
-set_file_times (char *filename, EMACS_TIME atime, EMACS_TIME mtime)
+set_file_times (Lisp_Object path, EMACS_TIME atime, EMACS_TIME mtime)
 {
-#if defined (HAVE_UTIME)
+#if defined (WIN32_NATIVE)
+  struct utimbuf utb;
+  utb.actime = EMACS_SECS (atime);
+  utb.modtime = EMACS_SECS (mtime);
+  return mswindows_utime (path, &utb);
+#elif defined (HAVE_UTIME)
   struct utimbuf utb;
+  Extbyte *filename;
   utb.actime = EMACS_SECS (atime);
   utb.modtime = EMACS_SECS (mtime);
+  LISP_STRING_TO_EXTERNAL (path, filename, Qfile_name);
   return utime (filename, &utb);
 #elif defined (HAVE_UTIMES)
   struct timeval tv[2];
+  Extbyte *filename;
   tv[0] = atime;
   tv[1] = mtime;
+  LISP_STRING_TO_EXTERNAL (path, filename, Qfile_name);
   return utimes (filename, tv);
 #else
   /* No file times setting function available. */
diff --git a/src/sysfile.h b/src/sysfile.h
index b00e9c4..25c009d 100644
--- a/src/sysfile.h
+++ b/src/sysfile.h
@@ -178,7 +178,7 @@ Boston, MA 02111-1307, USA.  */
 #define lstat xemacs_stat
 #endif
 
-#if !S_IRUSR
+#ifndef S_IRUSR
 # if S_IREAD
 #  define S_IRUSR S_IREAD
 # else
@@ -186,7 +186,7 @@ Boston, MA 02111-1307, USA.  */
 # endif
 #endif
 
-#if !S_IWUSR
+#ifndef S_IWUSR
 # if S_IWRITE
 #  define S_IWUSR S_IWRITE
 # else
@@ -194,7 +194,7 @@ Boston, MA 02111-1307, USA.  */
 # endif
 #endif
 
-#if !S_IXUSR
+#ifndef S_IXUSR
 # if S_IEXEC
 #  define S_IXUSR S_IEXEC
 # else
diff --git a/src/systime.h b/src/systime.h
index 2a56a89..b4497c4 100644
--- a/src/systime.h
+++ b/src/systime.h
@@ -63,10 +63,16 @@ void gettimeofday (struct timeval *, struct timezone *);
 
 #endif /* WIN32_NATIVE */
 
+/* struct utimbuf */
+
 #ifdef HAVE_UTIME
 # include <utime.h>
 #endif
 
+#ifdef WIN32_NATIVE
+# include <sys/utime.h>
+#endif
+
 #if defined(HAVE_TZNAME) && !defined(WIN32_NATIVE) && !defined(CYGWIN)
 #ifndef tzname		/* For SGI.  */
 extern char *tzname[];	/* RS6000 and others want it this way.  */
@@ -228,7 +234,9 @@ do {								\
 #define EMACS_SET_SECS_USECS(time, secs, usecs) 		\
   (EMACS_SET_SECS (time, secs), EMACS_SET_USECS (time, usecs))
 
-int set_file_times (char *filename, EMACS_TIME atime, EMACS_TIME mtime);
+#ifdef emacs
+int set_file_times (Lisp_Object path, EMACS_TIME atime, EMACS_TIME mtime);
+#endif
 
 void get_process_times (double *user_time, double *system_time,
 			double *real_time);
diff --git a/src/syswindows.h b/src/syswindows.h
index 0b505cb..eee6fa9 100644
--- a/src/syswindows.h
+++ b/src/syswindows.h
@@ -57,8 +57,7 @@ Boston, MA 02111-1307, USA.  */
 
 #include <windows.h>
 
-#if (defined (CYGWIN) || defined(MINGW)) && \
-	CYGWIN_VERSION_DLL_MAJOR < 21
+#if defined (CYGWIN) && CYGWIN_VERSION_DLL_MAJOR < 21
 extern BOOL WINAPI DdeFreeStringHandle(DWORD,HSZ);
 extern BOOL WINAPI PlaySound(LPCSTR,HMODULE,DWORD);
 #define stricmp strcasecmp
diff --git a/src/unexcw.c b/src/unexcw.c
index eced85b..1b8ad08 100644
--- a/src/unexcw.c
+++ b/src/unexcw.c
@@ -37,7 +37,7 @@ Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 
 #define PERROR(arg) perror(arg);exit(-1) 
 
-#ifndef HAVE_A_OUT_H
+#if !defined(HAVE_A_OUT_H) && !defined(WIN32_NATIVE)
 unexec (char *, char *, void *, void *,	void *)
 {
   PERROR("cannot unexec() a.out.h not installed");
@@ -47,7 +47,12 @@ unexec (char *, char *, void *, void *,	void *)
 #ifndef MAX_PATH
 #define MAX_PATH 260
 #endif
+
+#ifdef MINGW
+#include <../../include/a.out.h>
+#else
 #include <a.out.h>
+#endif
 
 #define ALLOC_UNIT 0xFFFF
 #define ALLOC_MASK ~((unsigned long)(ALLOC_UNIT))
diff --git a/tests/ChangeLog b/tests/ChangeLog
index a5269f9..7b13a29 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,12 @@
+2001-07-28  Stephen J. Turnbull  <stephen@xemacs.org>
+
+	* XEmacs 21.4.4 "Artificial Intelligence" is released.
+
+2001-05-29  Martin Buchholz  <martin@xemacs.org>
+
+	* automated/mule-tests.el:
+	Avoid test failure if (temp-directory) is a symlink.
+
 2001-05-17  Stephen J. Turnbull  <stephen@xemacs.org>
 
 	* XEmacs 21.4.3 "Academic Rigor" is released.
diff --git a/tests/automated/mule-tests.el b/tests/automated/mule-tests.el
index 6348a51..4d962b3 100644
--- a/tests/automated/mule-tests.el
+++ b/tests/automated/mule-tests.el
@@ -293,7 +293,9 @@ the Assert macro checks for correctness."
   ;;---------------------------------------------------------------
   (let* ((scaron (make-char 'latin-iso8859-2 57))
 	 (latin2-string (make-string 4 scaron))
-	 (prefix (concat (file-name-as-directory (temp-directory)) latin2-string))
+	 (prefix (concat (file-name-as-directory
+			  (file-truename (temp-directory)))
+			 latin2-string))
 	 (name1 (make-temp-name prefix))
 	 (name2 (make-temp-name prefix))
 	 (file-name-coding-system 'iso-8859-2))
diff --git a/version.sh b/version.sh
index 473848f..1f9c914 100644
--- a/version.sh
+++ b/version.sh
@@ -2,8 +2,8 @@
 emacs_is_beta=
 emacs_major_version=21
 emacs_minor_version=4
-emacs_beta_version=3
-xemacs_codename="Academic Rigor"
+emacs_beta_version=4
+xemacs_codename="Artificial Intelligence"
 infodock_major_version=4
 infodock_minor_version=0
 infodock_build_version=8