--- a/CHANGES-beta	Mon Aug 13 09:40:48 2007 +0200
+++ b/CHANGES-beta	Mon Aug 13 09:41:43 2007 +0200
@@ -1,4 +1,10 @@
 							-*- indented-text -*-
+to 20.3 beta6.
+-- Configure updates courtesy of Martin Buchholz
+-- Mule updates courtesy of MORIOKA Tomohiko
+-- Lots of Ebola cleanup, but much remains.
+-- Miscellaneous bug fixes.
+
 to 20.3 beta5.
 -- Configure patches continued from Martin Buchholz
 -- Miscellaneous Bug Fixes from various people (see ChangeLogs)

--- a/ChangeLog	Mon Aug 13 09:40:48 2007 +0200
+++ b/ChangeLog	Mon Aug 13 09:41:43 2007 +0200
@@ -1,3 +1,94 @@
+1997-06-11  Steven L Baur  <steve@altair.xemacs.org>
+
+	* XEmacs 20.3-b6 is released.
+
+	* configure.in (GNU_MALLOC): Check for (-l)PW instead of (-l)-lPW.
+	Suggested by Martin Buchholz  <mrb@eng.sun.com>
+
+1997-06-11  Martin Buchholz  <mrb@eng.sun.com>
+
+	* src/Makefile.in: 
+	* lwlib/Makefile.in: 
+	* lib-src/Makefile.in: 
+	* Makefile.in: More Makefile cleanup
+	- add .PHONY targets where necessary
+	- remove most builtin rules using .SUFFIXES
+	- -lXau only gets used for linking gnuserv binaries
+	- No VPATH for root Makefile
+	- remove gcc v1 support
+	* configure.in: 
+	- A new test to autodetect need to define NARROWPROTO,
+	  needed by XFree86
+	- Consistently use idiom foo=`echo '' $foo | sed -s 's:^ ::' -e ...`
+	- Immediately exit if SIZEOF_* tests fail.
+	- Check for libPW
+	- Use more sophisticated Xpm test that confirms xpm.h and libXpm
+	  are in sync.
+	* src/s/linux.h: 
+	* src/m/intel386.h: Yet another attempt to clean up linux defines.
+
+1997-06-10  Steven L Baur  <steve@altair.xemacs.org>
+
+	* lib-src/pop.c: Correct incantation for pop.h.
+	From Martin Buchholz <mrb@Eng.Sun.COM>
+
+Tue Jun 10 15:11:16 1997  Steven L Baur  <steve@altair.xemacs.org>
+
+	* configure.in (beta): Correct test looking for Beta number.
+
+1997-06-11  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* src/Makefile.in.in, mule/language/misc-lang.el,
+	mule/mule-load.el, mule/ipa-hooks.el: Use
+	lisp/mule/language/misc-lang.el instead of lisp/mule/ipa-hooks.el;
+	mule/ipa-hooks.el was deleted.
+
+1997-06-10  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* Use lisp/mule/language/thai-util.el instead of
+	lisp/mule/thai.el.
+
+	* lisp/custom/wid-edit.el: Add widget `coding-system' for mule.
+
+	* lisp/mule/thai-hooks.el, lisp/mule/mule-load.el: Use
+	lisp/mule/language/thai.el instead of lisp/mule/thai-hooks.el.
+
+	* lisp/mule/language/thai.el: modified for XEmacs.
+
+1997-06-09  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* lisp/mule/mule-load.el, src/Makefile.in.in: Use
+	lisp/mule/language/chinese.el, lisp/mule/language/cyrillic.el,
+	lisp/mule/language/european.el, lisp/mule/language/greek.el,
+	lisp/mule/language/japanese.el and lisp/mule/language/korean.el
+	instead of lisp/mule/chinese-hooks.el,
+	lisp/mule/cyrillic-hooks.el, lisp/mule/european-hooks.el,
+	lisp/mule/greek-hooks.el, lisp/mule/japanese-hooks.el and
+	lisp/mule/korean-hooks.el.
+
+	* lisp/mule/language/*.el was imported from
+	Emacs/mule-19.34.94-zeta.
+
+	* Use lisp/mule/language/china-util.el instead of
+	lisp/mule/chinese.el.
+
+1997-06-08  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* lisp/apel/emu-x20.el (mime-charset-coding-system-alist):
+	iso-8859-1, hz-gb-2312, cn-gb-2312, gb2312, cn-big5 and koi8-r
+	were defined as coding-system.
+
+1997-06-08  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* etc/smilies/Face_smile.xbm, etc/smilies/Face_weep.xbm,
+	etc/smilies/Face_ase2.xbm, etc/smilies/Face_ase3.xbm,
+	etc/smilies/Face_ase.xbm: Add Japanese smiley faces.
+
+1997-06-07  MORIOKA Tomohiko  <morioka@jaist.ac.jp>
+
+	* lisp/gnus/smiley.el (smiley-deformed-regexp-alist): Add Japanese
+	smiley faces.
+
 1997-06-09  Steven L Baur  <steve@altair.xemacs.org>
 
 	* XEmacs 20.3-b5 is released.

--- a/Makefile.in	Mon Aug 13 09:40:48 2007 +0200
+++ b/Makefile.in	Mon Aug 13 09:41:43 2007 +0200
@@ -123,9 +123,6 @@
 # set by the configure script's `--srcdir' option.
 srcdir=@srcdir@
 
-# Tell make where to find source files; this is needed for the makefiles.
-VPATH=@srcdir@
-
 # ==================== XEmacs-specific directories ====================
 
 # These variables hold the values XEmacs will actually use.  They are
@@ -216,21 +213,26 @@
 # instead, we have written out explicit code in the `install' targets.
 COPYDIR = ${srcdir}/etc ${srcdir}/lisp
 COPYDESTS = ${etcdir} ${lispdir}
+GENERATED_HEADERS = src/paths.h src/Emacs.ad.h src/config.h src/puresize_adjust.h
 
-.NO_PARALLEL:	src/paths.h src/Emacs.ad.h ${MAKE_SUBDIR} dump-elcs
+all:	${GENERATED_HEADERS} ${MAKE_SUBDIR}
 
-all:	src/paths.h src/Emacs.ad.h ${MAKE_SUBDIR}
+# For performance and consistency, no built-in rules
+.SUFFIXES:
+
+.NO_PARALLEL:	${GENERATED_HEADERS} ${MAKE_SUBDIR} dump-elcs
+.PHONY: ${SUBDIR} all beta all-elc all-elcs dump-elc dump-elcs autoloads
 
 # Convenience target for XEmacs beta testers
 beta:	clean all-elc
 
 # Build XEmacs and recompile out-of-date and missing .elc files along
 # the way.
-all-elc all-elcs:  src/paths.h src/Emacs.ad.h lib-src lwlib dump-elcs src
+all-elc all-elcs:   lib-src lwlib dump-elcs src
 	MAKE='$(MAKE)' sh ${srcdir}/lib-src/update-elc.sh
 
 # Sub-target for all-elc.
-dump-elc dump-elcs:  FRC.dump-elcs
+dump-elc dump-elcs: ${GENERATED_HEADERS} FRC.dump-elcs
 	cd src && $(MAKE) dump-elcs $(MFLAGS) \
 		CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}'
 
@@ -245,36 +247,31 @@
 # 386bsd.
 src/paths.h: Makefile ${srcdir}/src/paths.h.in FRC.src.paths.h
 	@echo "Producing \`src/paths.h' from \`src/paths.h.in'."
-	-rm -f src/paths.h.tmp
+	@-rm -f src/paths.h.tmp
 	@cp ${srcdir}/src/paths.h.in src/paths.h.tmp
-	-chmod 0644 src/paths.h.tmp
-	@echo '#define PATH_PREFIX "${prefix}"' >> src/paths.h.tmp
-	@if [ x"${lispdir_user_defined}" = x"yes" ]; then \
-	  echo '#define PATH_LOADSEARCH "${lispdir}"' >> src/paths.h.tmp;\
-	else \
-	  echo '/* #define PATH_LOADSEARCH "${lispdir}" */' >>src/paths.h.tmp;\
-	fi
-	@if [ x"${archlibdir_user_defined}" = x"yes" ]; then \
-	  echo '#define PATH_EXEC "${archlibdir}"' >> src/paths.h.tmp ;\
-	else \
-	  echo '/* #define PATH_EXEC "${archlibdir}" */' >> src/paths.h.tmp ;\
-	fi
-	@if [ x"${etcdir_user_defined}" = x"yes" ]; then \
-	  echo '#define PATH_DATA "${etcdir}"' >> src/paths.h.tmp ;\
-	else \
-	  echo '/* #define PATH_DATA "${etcdir}" */' >> src/paths.h.tmp ;\
-	fi
-	@if [ x"${lockdir_user_defined}" = x"yes" ]; then \
-	  echo '#define PATH_LOCK "${lockdir}"' >> src/paths.h.tmp ;\
-	else \
-	  echo '/* #define PATH_LOCK "${lockdir}" */' >> src/paths.h.tmp ;\
-	fi
-	@if [ x"${infodir_user_defined}" = x"yes" ]; then \
-	  echo '#define PATH_INFO "${infodir}"' >> src/paths.h.tmp ;\
-	else \
-	  echo '/* #define PATH_INFO "${infodir}" */' >> src/paths.h.tmp ;\
-	fi
-	@sh ${srcdir}/move-if-change src/paths.h.tmp src/paths.h
+	@-chmod 0644 src/paths.h.tmp
+	@(echo '#define PATH_PREFIX "${prefix}"'; \
+	 if test "${lispdir_user_defined}" = "yes"; \
+	   then echo    '#define PATH_LOADSEARCH "${lispdir}"'; \
+	   else echo '/* #define PATH_LOADSEARCH "${lispdir}" */'; \
+	 fi; \
+	 if test "${archlibdir_user_defined}" = "yes"; \
+	   then echo    '#define PATH_EXEC "${archlibdir}"'; \
+	   else echo '/* #define PATH_EXEC "${archlibdir}" */'; \
+	 fi; \
+	 if test "${etcdir_user_defined}" = "yes"; \
+	   then echo    '#define PATH_DATA "${etcdir}"'; \
+	   else echo '/* #define PATH_DATA "${etcdir}" */'; \
+	 fi; \
+	 if test "${lockdir_user_defined}" = "yes"; \
+	   then echo    '#define PATH_LOCK "${lockdir}"'; \
+	   else echo '/* #define PATH_LOCK "${lockdir}" */'; \
+	 fi; \
+	 if test "${infodir_user_defined}" = "yes"; \
+	   then echo    '#define PATH_INFO "${infodir}"'; \
+	   else echo '/* #define PATH_INFO "${infodir}" */'; \
+	fi; ) >> src/paths.h.tmp; \
+	sh ${srcdir}/move-if-change src/paths.h.tmp src/paths.h
 
 # We have to force the building of Emacs.ad.h as well in order to get it
 # updated correctly when VPATH is being used.  Since we use move-if-change,
@@ -288,13 +285,19 @@
 	  /bin/sh ${srcdir}/lib-src/ad2c ${srcdir}/etc/Emacs.ad ) > \
 	  src/Emacs.ad.h
 
+src/puresize_adjust.h:	${srcdir}/src/puresize.h
+	@echo "Resetting \`src/puresize_adjust.h'."; \
+	(echo "/*	Do not edit this file!" ; \
+	 echo "  	Automatically generated by XEmacs */" ; \
+	 echo "#define PURESIZE_ADJUSTMENT 0") > $@
+
 src:	@SRC_SUBDIR_DEPS@ FRC.src
 lib-src: FRC.lib-src
 lwlib:	FRC.lwlib
 
 .RECURSIVE: ${SUBDIR}
 
-${SUBDIR}: ${SUBDIR_MAKEFILES} src/config.h src/puresize_adjust.h FRC
+${SUBDIR}: ${SUBDIR_MAKEFILES} ${GENERATED_HEADERS} FRC
 	cd $@ && $(MAKE) all $(MFLAGS) \
 		CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}'
 
@@ -313,12 +316,6 @@
 src/config.h: ${srcdir}/src/config.h.in
 	./config.status
 
-src/puresize_adjust.h:	${srcdir}/src/puresize.h
-	@echo "Resetting \`src/puresize_adjust.h'."
-	@echo '/* This file is generated by XEmacs, DO NOT MODIFY!!! */' > src/puresize_adjust.h
-	@echo '#define PURESIZE_ADJUSTMENT 0' >> src/puresize_adjust.h
-
-
 # ==================== Installation ====================
 
 ## If we let lib-src do its own installation, that means we
@@ -328,7 +325,7 @@
 ## On AIX, use tar xBf.
 ## On Xenix, use tar xpf.
 
-.PHONY: install install-arch-dep install-arch-indep mkdir
+.PHONY: install-only install install-arch-dep install-arch-indep gzip.el mkdir
 
 ## We delete each directory in ${COPYDESTS} before we copy into it;
 ## that way, we can reinstall over directories that have been put in
@@ -542,7 +539,7 @@
 SOURCES = ChangeLog GETTING.GNU.SOFTWARE INSTALL Makefile.in PROBLEMS \
 	README build-install.in configure make-dist move-if-change
 
-.PHONY: unlock relock
+.PHONY: unlock relock TAGS tags check dist info dvi mcs
 
 unlock:
 	chmod u+w $(SOURCES) cpp/*
@@ -566,9 +563,7 @@
 	(cd lwlib && chmod u+w *.[ch] Makefile.in.in)
 	(cd src && $(MAKE) $(MFLAGS) relock)
 
-.PHONY: TAGS tags check dist
-
-TAGS tags:
+TAGS tags: FRC.tags
 	@echo "If you don't have a copy of etags around, then do 'make lib-src' first."
 	@PATH=`pwd`/lib-src:$$PATH HOME=/-=-; export PATH HOME; \
 	  echo "Using etags from `which etags`."
@@ -585,9 +580,7 @@
 dist:
 	cd ${srcdir} && make-dist
 
-.PHONY: info dvi
-force-info:
-info: force-info
+info: FRC.info
 	cd ${srcdir}/man && $(MAKE) $(MFLAGS) $@
 dvi:
 	cd ${srcdir}/man && $(MAKE) $(MFLAGS) $@

--- a/configure	Mon Aug 13 09:40:48 2007 +0200
+++ b/configure	Mon Aug 13 09:41:43 2007 +0200
@@ -469,7 +469,7 @@
    -no-recursion | --no-recursion | --no-recursio | --no-recursi \
    | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
    *)
-   quoted_i="`echo $i | sed $quoted_sed_magic`"
+   quoted_i="`echo '' $i | sed -e 's:^ ::' -e $quoted_sed_magic`"
    quoted_arguments="$quoted_arguments '$quoted_i'" ;;
    esac
 done
@@ -594,7 +594,7 @@
 	  with_database_berkdb=no
 	  with_database_dbm=no
 	  with_database_gnudbm=no
-	  for x in `echo "$val" | sed 's/,/ /'` ; do
+	  for x in `echo "$val" | sed -e 's/,/ /'` ; do
 	    case "$x" in
 		no ) ;;
 		b | be | ber | berk | berkd | berkdb )  with_database_berkdb=yes ;;
@@ -660,7 +660,7 @@
 
         	"error_checking" )
 	  	  	  
-	  for x in `echo "$val" | sed 's/,/ /'` ; do
+	  for x in `echo "$val" | sed -e 's/,/ /'` ; do
 	    case "$x" in
 	      	      n | no | non | none ) new_default=no ;;
 	      a | al | all )	    new_default=yes ;;
@@ -770,9 +770,9 @@
 
 test "$extra_verbose" = "yes" && verbose=yes
 
-case "site_includes" in *:* ) site_includes="`echo $site_includes | sed 's/:/ /g'`";; esac
-case "site_libraries" in *:* ) site_libraries="`echo $site_libraries | sed 's/:/ /g'`";; esac
-case "site_runtime_libraries" in *:* ) site_runtime_libraries="`echo $site_runtime_libraries | sed 's/:/ /g'`";; esac
+case "site_includes" in *:* ) site_includes="`echo '' $site_includes | sed -e 's:^ ::' -e 's/:/ /g'`";; esac
+case "site_libraries" in *:* ) site_libraries="`echo '' $site_libraries | sed -e 's:^ ::' -e 's/:/ /g'`";; esac
+case "site_runtime_libraries" in *:* ) site_runtime_libraries="`echo '' $site_runtime_libraries | sed -e 's:^ ::' -e 's/:/ /g'`";; esac
 
 test -n "$with_x" && with_x11="$with_x"
 
@@ -2154,8 +2154,8 @@
 
 
 if test "$add_runtime_path" = "yes" -a -n "$dash_r"; then
-    ld_switch_site="`echo $ld_switch_site     | sed \"s/${dash_r}[^ ]*//\"`"
-  ld_switch_x_site="`echo $ld_switch_x_site | sed \"s/${dash_r}[^ ]*//\"`"
+    ld_switch_site=`echo   '' $ld_switch_site   | sed -e 's:^ ::' -e "s/${dash_r}[^ ]*//"`
+  ld_switch_x_site=`echo '' $ld_switch_x_site | sed -e 's:^ ::' -e "s/${dash_r}[^ ]*//"`
   
         runpath=""
   if test -n "$LD_RUN_PATH"; then
@@ -2165,7 +2165,7 @@
     xe_runpath_link='${CC-cc} -o conftest -v $CFLAGS '"$xe_ldflags"' conftest.$ac_ext 2>&1 1>/dev/null'
     for arg in `eval "$xe_runpath_link" | grep ' -L'`; do
       case "$arg" in P,* | -L* | -R* )
-        for dir in `echo "$arg" | sed -e 's/^..//' -e 'y/:/ /'`; do
+        for dir in `echo '' "$arg" | sed -e 's:^ ::' -e 's/^..//' -e 'y/:/ /'`; do
           
 xe_runpath_dir="$dir"
 if test "$xe_runpath_dir" != "/lib"     -a \
@@ -2182,7 +2182,7 @@
   else
         for arg in $ld_switch_site $ld_switch_x_site; do
       case "$arg" in -L*) 
-xe_runpath_dir=`echo "$arg" | sed 's/^-L//'`
+xe_runpath_dir=`echo '' "$arg" | sed -e 's:^ ::' -e 's/^-L//'`
 if test "$xe_runpath_dir" != "/lib"     -a \
 	"$xe_runpath_dir" != "/usr/lib" -a \
 	-n "`ls ${xe_runpath_dir}/*.s[ol] 2>/dev/null`"; then
@@ -3217,9 +3217,15 @@
 }
 
 
+if test "$ac_cv_sizeof_long" = 0; then
+  echo ""
+  echo "*** PANIC *** Configure tests are not working - compiler is broken."
+  echo "*** PANIC *** Please examine config.log for compilation errors."
+  exit 1
+fi
 
 echo $ac_n "checking for long file names""... $ac_c" 1>&6
-echo "configure:3223: checking for long file names" >&5
+echo "configure:3229: 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:
@@ -3265,14 +3271,13 @@
 
 
 
-
 echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6
-echo "configure:3271: checking for sqrt in -lm" >&5
+echo "configure:3276: checking for sqrt in -lm" >&5
 ac_lib_var=`echo m'_'sqrt | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lm "
 cat > conftest.$ac_ext <<EOF
-#line 3276 "configure"
+#line 3281 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3283,7 +3288,7 @@
 sqrt()
 ; return 0; }
 EOF
-if { (eval echo configure:3287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3315,6 +3320,52 @@
 
 
 
+
+echo $ac_n "checking for main in -lPW""... $ac_c" 1>&6
+echo "configure:3326: checking for main in -lPW" >&5
+ac_lib_var=`echo PW'_'main | sed 'y%./+-%__p_%'`
+
+xe_check_libs=" -lPW "
+cat > conftest.$ac_ext <<EOF
+#line 3331 "configure"
+#include "confdefs.h"
+
+int main() {
+main()
+; return 0; }
+EOF
+if { (eval echo configure:3338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=yes"
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  eval "ac_cv_lib_$ac_lib_var=no"
+fi
+rm -f conftest*
+xe_check_libs=""
+
+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
+  echo "$ac_t""yes" 1>&6
+    ac_tr_lib=HAVE_LIB`echo PW | sed -e 's/[^a-zA-Z0-9_]/_/g' \
+    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
+  { test "$extra_verbose" = "yes" && cat << EOF
+    Defining $ac_tr_lib
+EOF
+cat >> confdefs.h <<EOF
+#define $ac_tr_lib 1
+EOF
+}
+
+  LIBS="-lPW $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lPW\" to \$LIBS"; fi
+
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+
+
 { test "$extra_verbose" = "yes" && cat << \EOF
     Defining LISP_FLOAT_TYPE
 EOF
@@ -3325,7 +3376,7 @@
 
 
 echo "checking type of mail spool file locking" 1>&6
-echo "configure:3329: checking type of mail spool file locking" >&5
+echo "configure:3380: checking type of mail spool file locking" >&5
 test -z "$mail_locking" -a "$mail_use_flock" = "yes" && mail_locking=flock
 test -z "$mail_locking" -a "$mail_use_lockf" = "yes" && mail_locking=lockf
 if   test "$mail_locking" = "lockf"; then { test "$extra_verbose" = "yes" && cat << \EOF
@@ -3349,12 +3400,12 @@
 
 
 echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6
-echo "configure:3353: checking for kstat_open in -lkstat" >&5
+echo "configure:3404: 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 3358 "configure"
+#line 3409 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3365,7 +3416,7 @@
 kstat_open()
 ; return 0; }
 EOF
-if { (eval echo configure:3369: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3399,12 +3450,12 @@
 
 
 echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6
-echo "configure:3403: checking for kvm_read in -lkvm" >&5
+echo "configure:3454: 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 3408 "configure"
+#line 3459 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3415,7 +3466,7 @@
 kvm_read()
 ; return 0; }
 EOF
-if { (eval echo configure:3419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3449,12 +3500,12 @@
 
 
 echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6
-echo "configure:3453: checking for cma_open in -lpthreads" >&5
+echo "configure:3504: 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 3458 "configure"
+#line 3509 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3465,7 +3516,7 @@
 cma_open()
 ; return 0; }
 EOF
-if { (eval echo configure:3469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3520: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3501,7 +3552,7 @@
 fi
 
 echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6
-echo "configure:3505: checking whether the -xildoff compiler flag is required" >&5
+echo "configure:3556: 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;
@@ -3511,7 +3562,7 @@
 fi
 
 echo $ac_n "checking for dynodump""... $ac_c" 1>&6
-echo "configure:3515: checking for dynodump" >&5
+echo "configure:3566: checking for dynodump" >&5
 case "$opsys" in sol2* )
   echo "$ac_t""yes" 1>&6
   { test "$extra_verbose" = "yes" && cat << \EOF
@@ -3534,7 +3585,7 @@
 
 case "$opsys" in sol2-[6-9]* )
   echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6
-echo "configure:3538: checking for \"-z ignore\" linker flag" >&5
+echo "configure:3589: 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 ;;
@@ -3544,7 +3595,7 @@
 
 
 echo "checking "for specified window system"" 1>&6
-echo "configure:3548: checking "for specified window system"" >&5
+echo "configure:3599: checking "for specified window system"" >&5
 
 if test "$x_includes $x_libraries" = "NONE NONE"; then
   if test -n "$OPENWINHOME" \
@@ -3565,7 +3616,7 @@
 # Uses ac_ vars as temps to allow command line to override cache and checks.
 # --without-x overrides everything else, but does not touch the cache.
 echo $ac_n "checking for X""... $ac_c" 1>&6
-echo "configure:3569: checking for X" >&5
+echo "configure:3620: checking for X" >&5
 
 # Check whether --with-x or --without-x was given.
 if test "${with_x+set}" = set; then
@@ -3625,12 +3676,12 @@
 
   # First, try using that file with no special directory specified.
 cat > conftest.$ac_ext <<EOF
-#line 3629 "configure"
+#line 3680 "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:3634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:3685: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -3699,14 +3750,14 @@
   ac_save_LIBS="$LIBS"
   LIBS="-l$x_direct_test_library $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 3703 "configure"
+#line 3754 "configure"
 #include "confdefs.h"
 
 int main() {
 ${x_direct_test_function}()
 ; return 0; }
 EOF
-if { (eval echo configure:3710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   LIBS="$ac_save_LIBS"
 # We can link X programs with no special library path.
@@ -3815,17 +3866,17 @@
     case "`(uname -sr) 2>/dev/null`" in
     "SunOS 5"*)
       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
-echo "configure:3819: checking whether -R must be followed by a space" >&5
+echo "configure:3870: 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 3822 "configure"
+#line 3873 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3829: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_R_nospace=yes
 else
@@ -3841,14 +3892,14 @@
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat > conftest.$ac_ext <<EOF
-#line 3845 "configure"
+#line 3896 "configure"
 #include "confdefs.h"
 
 int main() {
 
 ; return 0; }
 EOF
-if { (eval echo configure:3852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3903: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_R_space=yes
 else
@@ -3884,12 +3935,12 @@
 else
 
 echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
-echo "configure:3888: checking for dnet_ntoa in -ldnet" >&5
+echo "configure:3939: 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 3893 "configure"
+#line 3944 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3900,7 +3951,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:3904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3924,12 +3975,12 @@
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
       
 echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
-echo "configure:3928: checking for dnet_ntoa in -ldnet_stub" >&5
+echo "configure:3979: 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 3933 "configure"
+#line 3984 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -3940,7 +3991,7 @@
 dnet_ntoa()
 ; return 0; }
 EOF
-if { (eval echo configure:3944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:3995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -3969,10 +4020,10 @@
     # The nsl library prevents programs from opening the X display
     # on Irix 5.2, according to dickey@clark.net.
     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
-echo "configure:3973: checking for gethostbyname" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 3976 "configure"
+echo "configure:4024: checking for gethostbyname" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4027 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname(); below.  */
@@ -3995,7 +4046,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:3999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_gethostbyname=yes"
 else
@@ -4016,12 +4067,12 @@
     if test $ac_cv_func_gethostbyname = no; then
       
 echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
-echo "configure:4020: checking for gethostbyname in -lnsl" >&5
+echo "configure:4071: 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 4025 "configure"
+#line 4076 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4032,7 +4083,7 @@
 gethostbyname()
 ; return 0; }
 EOF
-if { (eval echo configure:4036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4062,10 +4113,10 @@
     # -lsocket must be given before -lnsl if both are needed.
     # We assume that if connect needs -lnsl, so does gethostbyname.
     echo $ac_n "checking for connect""... $ac_c" 1>&6
-echo "configure:4066: checking for connect" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4069 "configure"
+echo "configure:4117: checking for connect" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4120 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect(); below.  */
@@ -4088,7 +4139,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_connect=yes"
 else
@@ -4111,12 +4162,12 @@
 xe_msg_checking="for connect in -lsocket"
 test -n "$X_EXTRA_LIBS" && xe_msg_checking="$xe_msg_checking using extra libs $X_EXTRA_LIBS"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:4115: checking "$xe_msg_checking"" >&5
+echo "configure:4166: 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 4120 "configure"
+#line 4171 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4127,7 +4178,7 @@
 connect()
 ; return 0; }
 EOF
-if { (eval echo configure:4131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4151,10 +4202,10 @@
 
     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
     echo $ac_n "checking for remove""... $ac_c" 1>&6
-echo "configure:4155: checking for remove" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4158 "configure"
+echo "configure:4206: checking for remove" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4209 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove(); below.  */
@@ -4177,7 +4228,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_remove=yes"
 else
@@ -4198,12 +4249,12 @@
     if test $ac_cv_func_remove = no; then
       
 echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
-echo "configure:4202: checking for remove in -lposix" >&5
+echo "configure:4253: 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 4207 "configure"
+#line 4258 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4214,7 +4265,7 @@
 remove()
 ; return 0; }
 EOF
-if { (eval echo configure:4218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4238,10 +4289,10 @@
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
     echo $ac_n "checking for shmat""... $ac_c" 1>&6
-echo "configure:4242: checking for shmat" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4245 "configure"
+echo "configure:4293: checking for shmat" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4296 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat(); below.  */
@@ -4264,7 +4315,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:4268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_shmat=yes"
 else
@@ -4285,12 +4336,12 @@
     if test $ac_cv_func_shmat = no; then
       
 echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
-echo "configure:4289: checking for shmat in -lipc" >&5
+echo "configure:4340: 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 4294 "configure"
+#line 4345 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4301,7 +4352,7 @@
 shmat()
 ; return 0; }
 EOF
-if { (eval echo configure:4305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4335,12 +4386,12 @@
   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
   
 echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
-echo "configure:4339: checking for IceConnectionNumber in -lICE" >&5
+echo "configure:4390: checking for IceConnectionNumber in -lICE" >&5
 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lICE "
 cat > conftest.$ac_ext <<EOF
-#line 4344 "configure"
+#line 4395 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4351,7 +4402,7 @@
 IceConnectionNumber()
 ; return 0; }
 EOF
-if { (eval echo configure:4355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4398,7 +4449,7 @@
   MAKE_SUBDIR="$MAKE_SUBDIR lwlib" &&  if test "$extra_verbose" = "yes"; then echo "    Appending \"lwlib\" to \$MAKE_SUBDIR"; fi
 
       for lib_dir in "/usr/dt/lib" "/usr/lib/Motif1.2" "/usr/lib/Motif1.1"; do
-    inc_dir="`echo $lib_dir | sed 's/lib/include/'`"
+    inc_dir=`echo $lib_dir | sed -e 's/lib/include/'`
     if test -d "$lib_dir" -a -d "$inc_dir"; then
       case "$x_libraries" in *"$lib_dir"* ) ;; *)
         x_libraries="$lib_dir $x_libraries"
@@ -4429,8 +4480,8 @@
 
   
 if test "$add_runtime_path" = "yes" -a -n "$dash_r"; then
-    ld_switch_site="`echo $ld_switch_site     | sed \"s/${dash_r}[^ ]*//\"`"
-  ld_switch_x_site="`echo $ld_switch_x_site | sed \"s/${dash_r}[^ ]*//\"`"
+    ld_switch_site=`echo   '' $ld_switch_site   | sed -e 's:^ ::' -e "s/${dash_r}[^ ]*//"`
+  ld_switch_x_site=`echo '' $ld_switch_x_site | sed -e 's:^ ::' -e "s/${dash_r}[^ ]*//"`
   
         runpath=""
   if test -n "$LD_RUN_PATH"; then
@@ -4440,7 +4491,7 @@
     xe_runpath_link='${CC-cc} -o conftest -v $CFLAGS '"$xe_ldflags"' conftest.$ac_ext 2>&1 1>/dev/null'
     for arg in `eval "$xe_runpath_link" | grep ' -L'`; do
       case "$arg" in P,* | -L* | -R* )
-        for dir in `echo "$arg" | sed -e 's/^..//' -e 'y/:/ /'`; do
+        for dir in `echo '' "$arg" | sed -e 's:^ ::' -e 's/^..//' -e 'y/:/ /'`; do
           
 xe_runpath_dir="$dir"
 if test "$xe_runpath_dir" != "/lib"     -a \
@@ -4457,7 +4508,7 @@
   else
         for arg in $ld_switch_site $ld_switch_x_site; do
       case "$arg" in -L*) 
-xe_runpath_dir=`echo "$arg" | sed 's/^-L//'`
+xe_runpath_dir=`echo '' "$arg" | sed -e 's:^ ::' -e 's/^-L//'`
 if test "$xe_runpath_dir" != "/lib"     -a \
 	"$xe_runpath_dir" != "/usr/lib" -a \
 	-n "`ls ${xe_runpath_dir}/*.s[ol] 2>/dev/null`"; then
@@ -4490,15 +4541,15 @@
 
     ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6
-echo "configure:4494: checking for X11/Intrinsic.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4497 "configure"
+echo "configure:4545: checking for X11/Intrinsic.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4548 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4502: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4553: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4522,12 +4573,12 @@
 
       
 echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6
-echo "configure:4526: checking for XOpenDisplay in -lX11" >&5
+echo "configure:4577: 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 4531 "configure"
+#line 4582 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4538,7 +4589,7 @@
 XOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:4542: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4563,12 +4614,12 @@
 xe_msg_checking="for XGetFontProperty in -lX11"
 test -n "-b i486-linuxaout" && xe_msg_checking="$xe_msg_checking using extra libs -b i486-linuxaout"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:4567: checking "$xe_msg_checking"" >&5
+echo "configure:4618: 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 4572 "configure"
+#line 4623 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4579,7 +4630,7 @@
 XGetFontProperty()
 ; return 0; }
 EOF
-if { (eval echo configure:4583: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4634: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4606,12 +4657,12 @@
 
     
 echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6
-echo "configure:4610: checking for XShapeSelectInput in -lXext" >&5
+echo "configure:4661: 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 4615 "configure"
+#line 4666 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4622,7 +4673,7 @@
 XShapeSelectInput()
 ; return 0; }
 EOF
-if { (eval echo configure:4626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4646,12 +4697,12 @@
     case "$opsys" in    sunos4* ) libs_x="-u _XtToolkitInitialize -lXt $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-u _XtToolkitInitialize -lXt\" to \$libs_x"; fi ;;
    * ) 
 echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6
-echo "configure:4650: checking for XtOpenDisplay in -lXt" >&5
+echo "configure:4701: 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 4655 "configure"
+#line 4706 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4662,7 +4713,7 @@
 XtOpenDisplay()
 ; return 0; }
 EOF
-if { (eval echo configure:4666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4686,14 +4737,14 @@
   esac
 
   echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6
-echo "configure:4690: checking the version of X11 being used" >&5
+echo "configure:4741: checking the version of X11 being used" >&5
   cat > conftest.$ac_ext <<EOF
-#line 4692 "configure"
+#line 4743 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
     main(int c, char* v[]) { return c>1 ? XlibSpecificationRelease : 0; }
 EOF
-if { (eval echo configure:4697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:4748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ./conftest foobar; x11_release=$?
 else
@@ -4717,15 +4768,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4721: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4724 "configure"
+echo "configure:4772: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 4775 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4729: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4780: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4756,7 +4807,7 @@
 
 
     echo $ac_n "checking for XFree86""... $ac_c" 1>&6
-echo "configure:4760: checking for XFree86" >&5
+echo "configure:4811: checking for XFree86" >&5
   if test -d "/usr/X386/include" -o \
           -f "/etc/XF86Config" -o \
 	  -f "/etc/X11/XF86Config" -o \
@@ -4778,12 +4829,12 @@
     * ) if test -z "$with_xmu"; then
 	  
 echo $ac_n "checking for XmuConvertStandardSelection in -lXmu""... $ac_c" 1>&6
-echo "configure:4782: checking for XmuConvertStandardSelection in -lXmu" >&5
+echo "configure:4833: checking for XmuConvertStandardSelection in -lXmu" >&5
 ac_lib_var=`echo Xmu'_'XmuConvertStandardSelection | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXmu "
 cat > conftest.$ac_ext <<EOF
-#line 4787 "configure"
+#line 4838 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4794,7 +4845,7 @@
 XmuConvertStandardSelection()
 ; return 0; }
 EOF
-if { (eval echo configure:4798: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4849: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4827,19 +4878,19 @@
 
       
 echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6
-echo "configure:4831: checking for main in -lXbsd" >&5
+echo "configure:4882: 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 4836 "configure"
+#line 4887 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:4843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4862,12 +4913,12 @@
 
     
 echo $ac_n "checking for XawScrollbarSetThumb in -lXaw""... $ac_c" 1>&6
-echo "configure:4866: checking for XawScrollbarSetThumb in -lXaw" >&5
+echo "configure:4917: checking for XawScrollbarSetThumb in -lXaw" >&5
 ac_lib_var=`echo Xaw'_'XawScrollbarSetThumb | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lXaw "
 cat > conftest.$ac_ext <<EOF
-#line 4871 "configure"
+#line 4922 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4878,7 +4929,7 @@
 XawScrollbarSetThumb()
 ; return 0; }
 EOF
-if { (eval echo configure:4882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:4933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4900,6 +4951,34 @@
 
 
 
+    echo $ac_n "checking for NARROWPROTO""... $ac_c" 1>&6
+echo "configure:4956: checking for NARROWPROTO" >&5
+  rm -fr conftestdir
+  if mkdir conftestdir; then
+    cd conftestdir
+    cat > Imakefile <<'EOF'
+xetest:
+	@echo 'proto_defines="${PROTO_DEFINES}"'
+EOF
+    if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
+      # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+      eval `${MAKE-make} xetest 2>/dev/null | grep -v make`
+      case "$proto_defines" in *NARROWPROTO* ) narrowproto=yes ;; esac
+    fi
+    cd ..
+    rm -fr conftestdir
+  fi
+  test -z "$narrowproto" && narrowproto=no
+  echo "$ac_t""$narrowproto" 1>&6
+  test "$narrowproto" = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF
+    Defining NARROWPROTO
+EOF
+cat >> confdefs.h <<\EOF
+#define NARROWPROTO 1
+EOF
+}
+
+
 fi 
 test -z "$window_system" && window_system="none"
 
@@ -4935,15 +5014,15 @@
 test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no
 test -z "$with_xauth" && { ac_safe=`echo "X11/Xauth.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for X11/Xauth.h""... $ac_c" 1>&6
-echo "configure:4939: checking for X11/Xauth.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 4942 "configure"
+echo "configure:5018: checking for X11/Xauth.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5021 "configure"
 #include "confdefs.h"
 #include <X11/Xauth.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4947: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5026: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4966,12 +5045,12 @@
  }
 test -z "$with_xauth" && { 
 echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6
-echo "configure:4970: checking for XauGetAuthByAddr in -lXau" >&5
+echo "configure:5049: 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 4975 "configure"
+#line 5054 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4982,7 +5061,7 @@
 XauGetAuthByAddr()
 ; return 0; }
 EOF
-if { (eval echo configure:4986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5065: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5013,20 +5092,25 @@
 EOF
 }
 
-  libs_x="-lXau $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lXau\" to \$libs_x"; fi
-fi
+  
+T=""
+for W in $X_EXTRA_LIBS -lXau $libs_x $X_PRE_LIBS; do if test -z "$T"; then T="$W"; else T="$T $W"; fi; done
+libs_xauth="$T"
+
+fi
+
 
 test -z "$with_offix" && { ac_safe=`echo "OffiX/DragAndDrop.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for OffiX/DragAndDrop.h""... $ac_c" 1>&6
-echo "configure:5022: checking for OffiX/DragAndDrop.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5025 "configure"
+echo "configure:5106: checking for OffiX/DragAndDrop.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5109 "configure"
 #include "confdefs.h"
 #include <OffiX/DragAndDrop.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5114: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5049,12 +5133,12 @@
  }
 test -z "$with_offix" && { 
 echo $ac_n "checking for DndInitialize in -lDnd""... $ac_c" 1>&6
-echo "configure:5053: checking for DndInitialize in -lDnd" >&5
+echo "configure:5137: checking for DndInitialize in -lDnd" >&5
 ac_lib_var=`echo Dnd'_'DndInitialize | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lDnd "
 cat > conftest.$ac_ext <<EOF
-#line 5058 "configure"
+#line 5142 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5065,7 +5149,7 @@
 DndInitialize()
 ; return 0; }
 EOF
-if { (eval echo configure:5069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5104,15 +5188,15 @@
       for dir in "" "Tt/" "desktop/" ; do
     ac_safe=`echo "${dir}tt_c.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ${dir}tt_c.h""... $ac_c" 1>&6
-echo "configure:5108: checking for ${dir}tt_c.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5111 "configure"
+echo "configure:5192: checking for ${dir}tt_c.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5195 "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:5116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5200: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5141,12 +5225,12 @@
 xe_msg_checking="for tt_message_create in -ltt"
 test -n "$extra_libs" && xe_msg_checking="$xe_msg_checking using extra libs $extra_libs"
 echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:5145: checking "$xe_msg_checking"" >&5
+echo "configure:5229: 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 5150 "configure"
+#line 5234 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5157,7 +5241,7 @@
 tt_message_create()
 ; return 0; }
 EOF
-if { (eval echo configure:5161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5206,15 +5290,15 @@
 
 test -z "$with_cde" && { ac_safe=`echo "Dt/Dt.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Dt/Dt.h""... $ac_c" 1>&6
-echo "configure:5210: checking for Dt/Dt.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5213 "configure"
+echo "configure:5294: checking for Dt/Dt.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5297 "configure"
 #include "confdefs.h"
 #include <Dt/Dt.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5218: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5302: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5237,12 +5321,12 @@
  }
 test -z "$with_cde" && { 
 echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6
-echo "configure:5241: checking for DtDndDragStart in -lDtSvc" >&5
+echo "configure:5325: 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 5246 "configure"
+#line 5330 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5253,7 +5337,7 @@
 DtDndDragStart()
 ; return 0; }
 EOF
-if { (eval echo configure:5257: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5300,19 +5384,19 @@
 
   
 echo $ac_n "checking for main in -lenergize""... $ac_c" 1>&6
-echo "configure:5304: checking for main in -lenergize" >&5
+echo "configure:5388: checking for main in -lenergize" >&5
 ac_lib_var=`echo energize'_'main | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lenergize "
 cat > conftest.$ac_ext <<EOF
-#line 5309 "configure"
+#line 5393 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5400: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5344,19 +5428,19 @@
   if test -z "$energize_version"; then
     
 echo $ac_n "checking for main in -lconn""... $ac_c" 1>&6
-echo "configure:5348: checking for main in -lconn" >&5
+echo "configure:5432: checking for main in -lconn" >&5
 ac_lib_var=`echo conn'_'main | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lconn "
 cat > conftest.$ac_ext <<EOF
-#line 5353 "configure"
+#line 5437 "configure"
 #include "confdefs.h"
 
 int main() {
 main()
 ; return 0; }
 EOF
-if { (eval echo configure:5360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5389,15 +5473,15 @@
   fi
   ac_safe=`echo "editorconn.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for editorconn.h""... $ac_c" 1>&6
-echo "configure:5393: checking for editorconn.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5396 "configure"
+echo "configure:5477: checking for editorconn.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5480 "configure"
 #include "confdefs.h"
 #include <editorconn.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5401: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5485: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5439,7 +5523,7 @@
 
 
 echo "checking for graphics libraries" 1>&6
-echo "configure:5443: checking for graphics libraries" >&5
+echo "configure:5527: checking for graphics libraries" >&5
 test -z "$with_gif" && with_gif=yes;
 if test "$with_gif" = "yes"; then
   { test "$extra_verbose" = "yes" && cat << \EOF
@@ -5455,77 +5539,31 @@
  fi
 fi
 
-test -z "$with_xpm" && { ac_safe=`echo "X11/xpm.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for X11/xpm.h""... $ac_c" 1>&6
-echo "configure:5461: checking for X11/xpm.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5464 "configure"
+echo $ac_n "checking for Xpm""... $ac_c" 1>&6
+echo "configure:5544: checking for Xpm" >&5
+xe_check_libs=-lXpm
+test -z "$with_xpm" && { cat > conftest.$ac_ext <<EOF
+#line 5547 "configure"
 #include "confdefs.h"
 #include <X11/xpm.h>
-EOF
-ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5469: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out`
-if test -z "$ac_err"; then
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=yes"
-else
-  echo "$ac_err" >&5
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_header_$ac_safe=no"
-fi
-rm -f conftest*
-if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-with_xpm=no
-fi
- }
-test -z "$with_xpm" && { 
-echo $ac_n "checking for XpmFree in -lXpm""... $ac_c" 1>&6
-echo "configure:5492: checking for XpmFree in -lXpm" >&5
-ac_lib_var=`echo Xpm'_'XpmFree | sed 'y%./+-%__p_%'`
-
-xe_check_libs=" -lXpm "
-cat > conftest.$ac_ext <<EOF
-#line 5497 "configure"
-#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error.  */
-/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char XpmFree();
-
-int main() {
-XpmFree()
-; return 0; }
-EOF
-if { (eval echo configure:5508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=yes"
-else
-  echo "configure: failed program was:" >&5
-  cat conftest.$ac_ext >&5
-  rm -rf conftest*
-  eval "ac_cv_lib_$ac_lib_var=no"
-fi
-rm -f conftest*
-xe_check_libs=""
-
-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
-  echo "$ac_t""yes" 1>&6
-  :
-else
-  echo "$ac_t""no" 1>&6
-with_xpm=no
-fi
-
- }
-test -z "$with_xpm" && with_xpm=yes
+int main(int argc, char *argv[]) {
+return (XpmIncludeVersion != XpmLibraryVersion()) ||
+        XpmIncludeVersion < 30406;
+}
+EOF
+if { (eval echo configure:5555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+then
+  with_xpm=yes
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -fr conftest*
+  with_xpm=no
+fi
+rm -fr conftest*
+}
+xe_check_libs=
+echo "$ac_t""$with_xpm" 1>&6
 if test "$with_xpm" = "yes"; then
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_XPM
@@ -5540,15 +5578,15 @@
 
 test -z "$with_xface" && { ac_safe=`echo "compface.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for compface.h""... $ac_c" 1>&6
-echo "configure:5544: checking for compface.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5547 "configure"
+echo "configure:5582: checking for compface.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5585 "configure"
 #include "confdefs.h"
 #include <compface.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5552: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5590: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5571,12 +5609,12 @@
  }
 test -z "$with_xface" && { 
 echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6
-echo "configure:5575: checking for UnGenFace in -lcompface" >&5
+echo "configure:5613: 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 5580 "configure"
+#line 5618 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5587,7 +5625,7 @@
 UnGenFace()
 ; return 0; }
 EOF
-if { (eval echo configure:5591: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5623,15 +5661,15 @@
 
 test -z "$with_jpeg" && { ac_safe=`echo "jpeglib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for jpeglib.h""... $ac_c" 1>&6
-echo "configure:5627: checking for jpeglib.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5630 "configure"
+echo "configure:5665: checking for jpeglib.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5668 "configure"
 #include "confdefs.h"
 #include <jpeglib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5635: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5673: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5654,12 +5692,12 @@
  }
 test -z "$with_jpeg" && { 
 echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6
-echo "configure:5658: checking for jpeg_destroy_decompress in -ljpeg" >&5
+echo "configure:5696: 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 5663 "configure"
+#line 5701 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5670,7 +5708,7 @@
 jpeg_destroy_decompress()
 ; return 0; }
 EOF
-if { (eval echo configure:5674: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5706,15 +5744,15 @@
 
 test -z "$with_png" && { ac_safe=`echo "png.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for png.h""... $ac_c" 1>&6
-echo "configure:5710: checking for png.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5713 "configure"
+echo "configure:5748: checking for png.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5751 "configure"
 #include "confdefs.h"
 #include <png.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5718: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5756: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5736,10 +5774,10 @@
 fi
  }
 test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6
-echo "configure:5740: checking for pow" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5743 "configure"
+echo "configure:5778: checking for pow" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5781 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char pow(); below.  */
@@ -5762,7 +5800,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:5766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5804: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_pow=yes"
 else
@@ -5787,12 +5825,12 @@
 xe_msg_checking="for png_read_image in -lpng"
 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:5791: checking "$xe_msg_checking"" >&5
+echo "configure:5829: checking "$xe_msg_checking"" >&5
 ac_lib_var=`echo png'_'png_read_image | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lpng $extra_libs"
 cat > conftest.$ac_ext <<EOF
-#line 5796 "configure"
+#line 5834 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5803,7 +5841,7 @@
 png_read_image()
 ; return 0; }
 EOF
-if { (eval echo configure:5807: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -5853,15 +5891,15 @@
 
   ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6
-echo "configure:5857: checking for Xm/Xm.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 5860 "configure"
+echo "configure:5895: checking for Xm/Xm.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 5898 "configure"
 #include "confdefs.h"
 #include <Xm/Xm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:5865: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:5903: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -5878,12 +5916,12 @@
   echo "$ac_t""yes" 1>&6
   
 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6
-echo "configure:5882: checking for XmStringFree in -lXm" >&5
+echo "configure:5920: 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 5887 "configure"
+#line 5925 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -5894,7 +5932,7 @@
 XmStringFree()
 ; return 0; }
 EOF
-if { (eval echo configure:5898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:5936: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6142,7 +6180,7 @@
 
 if test "$with_mule" = "yes" ; then
   echo "checking for Mule-related features" 1>&6
-echo "configure:6146: checking for Mule-related features" >&5
+echo "configure:6184: checking for Mule-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining MULE
 EOF
@@ -6159,15 +6197,15 @@
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6163: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6166 "configure"
+echo "configure:6201: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6204 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6171: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6209: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6198,12 +6236,12 @@
 
   
 echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
-echo "configure:6202: checking for strerror in -lintl" >&5
+echo "configure:6240: 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 6207 "configure"
+#line 6245 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6214,7 +6252,7 @@
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:6218: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6247,19 +6285,19 @@
 
 
   echo "checking for Mule input methods" 1>&6
-echo "configure:6251: checking for Mule input methods" >&5
+echo "configure:6289: checking for Mule input methods" >&5
       test -z "$with_xim" && case "$opsys" in sol2* ) ;; *) with_xim=no ;; esac
   case "$with_xim" in "" | "yes" )
     echo "checking for XIM" 1>&6
-echo "configure:6255: checking for XIM" >&5
+echo "configure:6293: checking for XIM" >&5
     
 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:6258: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:6296: 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 6263 "configure"
+#line 6301 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6270,7 +6308,7 @@
 XmImMbLookupString()
 ; return 0; }
 EOF
-if { (eval echo configure:6274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6332,15 +6370,15 @@
     test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support
   test -z "$with_wnn" && { ac_safe=`echo "wnn/jllib.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for wnn/jllib.h""... $ac_c" 1>&6
-echo "configure:6336: checking for wnn/jllib.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6339 "configure"
+echo "configure:6374: checking for wnn/jllib.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6377 "configure"
 #include "confdefs.h"
 #include <wnn/jllib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6344: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6382: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6362,15 +6400,13 @@
 fi
  }
   test -z "$with_wnn" && { 
-xe_msg_checking="for jl_dic_list_e in -lwnn"
-test -n "with_wnn=no" && xe_msg_checking="$xe_msg_checking using extra libs with_wnn=no"
-echo $ac_n "checking "$xe_msg_checking"""... $ac_c" 1>&6
-echo "configure:6369: checking "$xe_msg_checking"" >&5
+echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6
+echo "configure:6405: 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 with_wnn=no"
-cat > conftest.$ac_ext <<EOF
-#line 6374 "configure"
+xe_check_libs=" -lwnn "
+cat > conftest.$ac_ext <<EOF
+#line 6410 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6381,7 +6417,7 @@
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:6385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6421: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6395,21 +6431,10 @@
 
 if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes" ; then
   echo "$ac_t""yes" 1>&6
-    ac_tr_lib=HAVE_LIB`echo wnn | sed -e 's/[^a-zA-Z0-9_]/_/g' \
-    -e 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
-  { test "$extra_verbose" = "yes" && cat << EOF
-    Defining $ac_tr_lib
-EOF
-cat >> confdefs.h <<EOF
-#define $ac_tr_lib 1
-EOF
-}
-
-  LIBS="-lwnn $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lwnn\" to \$LIBS"; fi
-
-else
-  echo "$ac_t""no" 1>&6
-:
+  :
+else
+  echo "$ac_t""no" 1>&6
+with_wnn=no
 fi
 
  }
@@ -6429,12 +6454,12 @@
  fi
     
 echo $ac_n "checking for jl_fi_dic_list in -lwnn""... $ac_c" 1>&6
-echo "configure:6433: checking for jl_fi_dic_list in -lwnn" >&5
+echo "configure:6458: checking for jl_fi_dic_list in -lwnn" >&5
 ac_lib_var=`echo wnn'_'jl_fi_dic_list | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lwnn "
 cat > conftest.$ac_ext <<EOF
-#line 6438 "configure"
+#line 6463 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6445,7 +6470,7 @@
 jl_fi_dic_list()
 ; return 0; }
 EOF
-if { (eval echo configure:6449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6477,15 +6502,15 @@
 
     test -z "$with_canna" && { ac_safe=`echo "canna/RK.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for canna/RK.h""... $ac_c" 1>&6
-echo "configure:6481: checking for canna/RK.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6484 "configure"
+echo "configure:6506: checking for canna/RK.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6509 "configure"
 #include "confdefs.h"
 #include <canna/RK.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6489: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6514: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -6508,12 +6533,12 @@
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
-echo "configure:6512: checking for RkBgnBun in -lRKC" >&5
+echo "configure:6537: 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 6517 "configure"
+#line 6542 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6524,7 +6549,7 @@
 RkBgnBun()
 ; return 0; }
 EOF
-if { (eval echo configure:6528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6547,12 +6572,12 @@
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
-echo "configure:6551: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:6576: 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 6556 "configure"
+#line 6581 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -6563,7 +6588,7 @@
 jrKanjiControl()
 ; return 0; }
 EOF
-if { (eval echo configure:6567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -6612,8 +6637,8 @@
   libs_x="-lXm $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lXm\" to \$libs_x"; fi
   
 if test "$add_runtime_path" = "yes" -a -n "$dash_r"; then
-    ld_switch_site="`echo $ld_switch_site     | sed \"s/${dash_r}[^ ]*//\"`"
-  ld_switch_x_site="`echo $ld_switch_x_site | sed \"s/${dash_r}[^ ]*//\"`"
+    ld_switch_site=`echo   '' $ld_switch_site   | sed -e 's:^ ::' -e "s/${dash_r}[^ ]*//"`
+  ld_switch_x_site=`echo '' $ld_switch_x_site | sed -e 's:^ ::' -e "s/${dash_r}[^ ]*//"`
   
         runpath=""
   if test -n "$LD_RUN_PATH"; then
@@ -6623,7 +6648,7 @@
     xe_runpath_link='${CC-cc} -o conftest -v $CFLAGS '"$xe_ldflags"' conftest.$ac_ext 2>&1 1>/dev/null'
     for arg in `eval "$xe_runpath_link" | grep ' -L'`; do
       case "$arg" in P,* | -L* | -R* )
-        for dir in `echo "$arg" | sed -e 's/^..//' -e 'y/:/ /'`; do
+        for dir in `echo '' "$arg" | sed -e 's:^ ::' -e 's/^..//' -e 'y/:/ /'`; do
           
 xe_runpath_dir="$dir"
 if test "$xe_runpath_dir" != "/lib"     -a \
@@ -6640,7 +6665,7 @@
   else
         for arg in $ld_switch_site $ld_switch_x_site; do
       case "$arg" in -L*) 
-xe_runpath_dir=`echo "$arg" | sed 's/^-L//'`
+xe_runpath_dir=`echo '' "$arg" | sed -e 's:^ ::' -e 's/^-L//'`
 if test "$xe_runpath_dir" != "/lib"     -a \
 	"$xe_runpath_dir" != "/usr/lib" -a \
 	-n "`ls ${xe_runpath_dir}/*.s[ol] 2>/dev/null`"; then
@@ -6664,10 +6689,10 @@
 for ac_func in acosh asinh atanh cbrt closedir dup2 eaccess fmod fpathconf frexp ftime gethostname 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 strcasecmp strerror tzset utimes waitpid
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6668: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6671 "configure"
+echo "configure:6693: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6696 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6690,7 +6715,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6727,10 +6752,10 @@
     for ac_func in realpath
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6731: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6734 "configure"
+echo "configure:6756: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6759 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -6753,7 +6778,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -6786,16 +6811,16 @@
 esac
 
 echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:6790: checking whether netdb declares h_errno" >&5
-cat > conftest.$ac_ext <<EOF
-#line 6792 "configure"
+echo "configure:6815: checking whether netdb declares h_errno" >&5
+cat > conftest.$ac_ext <<EOF
+#line 6817 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 return h_errno;
 ; return 0; }
 EOF
-if { (eval echo configure:6799: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6824: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6
    { test "$extra_verbose" = "yes" && cat << \EOF
@@ -6815,16 +6840,16 @@
 rm -f conftest*
 
 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:6819: checking for sigsetjmp" >&5
-cat > conftest.$ac_ext <<EOF
-#line 6821 "configure"
+echo "configure:6844: checking for sigsetjmp" >&5
+cat > conftest.$ac_ext <<EOF
+#line 6846 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigjmp_buf bar; sigsetjmp (bar, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:6828: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6853: \"$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
@@ -6844,11 +6869,11 @@
 rm -f conftest*
 
 echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
-echo "configure:6848: checking whether localtime caches TZ" >&5
+echo "configure:6873: checking whether localtime caches TZ" >&5
 
 if test "$ac_cv_func_tzset" = "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 6852 "configure"
+#line 6877 "configure"
 #include "confdefs.h"
 #include <time.h>
 #if STDC_HEADERS
@@ -6883,7 +6908,7 @@
   exit (0);
 }
 EOF
-if { (eval echo configure:6887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:6912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   emacs_cv_localtime_cache=no
 else
@@ -6912,9 +6937,9 @@
 
 if test "$HAVE_TIMEVAL" = "yes"; then
 echo $ac_n "checking whether gettimeofday cannot accept two arguments""... $ac_c" 1>&6
-echo "configure:6916: checking whether gettimeofday cannot accept two arguments" >&5
-cat > conftest.$ac_ext <<EOF
-#line 6918 "configure"
+echo "configure:6941: checking whether gettimeofday cannot accept two arguments" >&5
+cat > conftest.$ac_ext <<EOF
+#line 6943 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
@@ -6936,7 +6961,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:6940: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""no" 1>&6
 else
@@ -6958,19 +6983,19 @@
 
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:6962: checking for inline" >&5
+echo "configure:6987: checking for inline" >&5
 
 ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 6967 "configure"
+#line 6992 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:6974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:6999: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
@@ -7020,17 +7045,17 @@
 # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works
 # for constant arguments.  Useless!
 echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6
-echo "configure:7024: checking for working alloca.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7027 "configure"
+echo "configure:7049: checking for working alloca.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7052 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:7034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
@@ -7054,10 +7079,10 @@
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:7058: checking for alloca" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7061 "configure"
+echo "configure:7083: checking for alloca" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7086 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
@@ -7080,7 +7105,7 @@
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:7084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
@@ -7119,10 +7144,10 @@
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:7123: checking whether alloca needs Cray hooks" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7126 "configure"
+echo "configure:7148: checking whether alloca needs Cray hooks" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7151 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
@@ -7146,10 +7171,10 @@
 if test $ac_cv_os_cray = yes; then
 for ac_func in _getb67 GETB67 getb67; do
   echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7150: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7153 "configure"
+echo "configure:7175: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7178 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
@@ -7172,7 +7197,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -7202,10 +7227,10 @@
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:7206: checking stack direction for C alloca" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7209 "configure"
+echo "configure:7231: checking stack direction for C alloca" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7234 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
@@ -7224,7 +7249,7 @@
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:7228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:7253: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_c_stack_direction=1
 else
@@ -7251,10 +7276,10 @@
  fi
 
 echo $ac_n "checking for pid_t""... $ac_c" 1>&6
-echo "configure:7255: checking for pid_t" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7258 "configure"
+echo "configure:7280: checking for pid_t" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7283 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #if STDC_HEADERS
@@ -7286,15 +7311,15 @@
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:7290: checking for vfork.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7293 "configure"
+echo "configure:7315: checking for vfork.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7318 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7298: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7323: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7322,10 +7347,10 @@
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:7326: checking for working vfork" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7329 "configure"
+echo "configure:7351: checking for working vfork" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7354 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
@@ -7420,7 +7445,7 @@
   }
 }
 EOF
-if { (eval echo configure:7424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:7449: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_func_vfork_works=yes
 else
@@ -7445,10 +7470,10 @@
 
 
 echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:7449: checking for working strcoll" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7452 "configure"
+echo "configure:7474: checking for working strcoll" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7477 "configure"
 #include "confdefs.h"
 #include <string.h>
 main ()
@@ -7458,7 +7483,7 @@
 	strcoll ("123", "456") >= 0);
 }
 EOF
-if { (eval echo configure:7462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:7487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_func_strcoll_works=yes
 else
@@ -7483,10 +7508,10 @@
 
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:7487: checking for working mmap" >&5
+echo "configure:7512: checking for working mmap" >&5
 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 cat > conftest.$ac_ext <<EOF
-#line 7490 "configure"
+#line 7515 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <unistd.h>
@@ -7519,7 +7544,7 @@
   return 1;
 }
 EOF
-if { (eval echo configure:7523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:7548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   have_mmap=yes
 else
@@ -7552,10 +7577,10 @@
 
 
 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:7556: checking for socket" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7559 "configure"
+echo "configure:7581: checking for socket" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7584 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
@@ -7578,7 +7603,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7582: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else
@@ -7593,15 +7618,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "netinet/in.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for netinet/in.h""... $ac_c" 1>&6
-echo "configure:7597: checking for netinet/in.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7600 "configure"
+echo "configure:7622: checking for netinet/in.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7625 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7630: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7618,15 +7643,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "arpa/inet.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for arpa/inet.h""... $ac_c" 1>&6
-echo "configure:7622: checking for arpa/inet.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7625 "configure"
+echo "configure:7647: checking for arpa/inet.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7650 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7630: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7655: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7651,9 +7676,9 @@
 }
 
       echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:7655: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:7680: checking "for sun_len member in struct sockaddr_un"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 7657 "configure"
+#line 7682 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
@@ -7664,7 +7689,7 @@
 static struct sockaddr_un x; x.sun_len = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:7668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""yes" 1>&6; { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_SOCKADDR_SUN_LEN
@@ -7695,10 +7720,10 @@
 
 
 echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:7699: checking for msgget" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7702 "configure"
+echo "configure:7724: checking for msgget" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7727 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char msgget(); below.  */
@@ -7721,7 +7746,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:7725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_msgget=yes"
 else
@@ -7736,15 +7761,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "sys/ipc.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/ipc.h""... $ac_c" 1>&6
-echo "configure:7740: checking for sys/ipc.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7743 "configure"
+echo "configure:7765: checking for sys/ipc.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7768 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7748: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7773: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7761,15 +7786,15 @@
   echo "$ac_t""yes" 1>&6
   ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6
-echo "configure:7765: checking for sys/msg.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7768 "configure"
+echo "configure:7790: checking for sys/msg.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7793 "configure"
 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7773: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7798: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7807,15 +7832,15 @@
 
 ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:7811: checking for dirent.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7814 "configure"
+echo "configure:7836: checking for dirent.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7839 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7819: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7844: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7842,15 +7867,15 @@
   echo "$ac_t""no" 1>&6
 ac_safe=`echo "sys/dir.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for sys/dir.h""... $ac_c" 1>&6
-echo "configure:7846: checking for sys/dir.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7849 "configure"
+echo "configure:7871: checking for sys/dir.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7874 "configure"
 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7854: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7883,15 +7908,15 @@
 
 ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:7887: checking for nlist.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7890 "configure"
+echo "configure:7912: checking for nlist.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7915 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7895: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -7936,7 +7961,7 @@
   echo "$progname: can't find current emacs version in \"$file\"." >&2
   exit 1
 fi
-beta=`sed -ne 's/^.*XEmacs Lucid (beta\([0-9][0-9]*\)).*$/\1/p' "$file"`
+beta=`sed -ne 's/^.*beta.*(beta\([0-9][0-9]*\)).*$/\1/p' "$file"`
 test -n "$beta" && version="${version}-b${beta}"
 { test "$extra_verbose" = "yes" && cat << EOF
     Defining EMACS_VERSION = "$version"
@@ -7946,7 +7971,7 @@
 EOF
 }
 
-main_1_id="`echo main_1_xemacs_${version}_${canonical} | sed 'y/.-/__/'`"
+main_1_id=`echo main_1_xemacs_${version}_${canonical} | sed 'y/.-/__/'`
 { test "$extra_verbose" = "yes" && cat << EOF
     Defining main_1 = $main_1_id
 EOF
@@ -7959,7 +7984,7 @@
 
 
 echo "checking "for sound support"" 1>&6
-echo "configure:7963: checking "for sound support"" >&5
+echo "configure:7988: checking "for sound support"" >&5
 case "$with_sound" in
   native | both ) with_native_sound=yes;;
   nas    | no   ) with_native_sound=no;;
@@ -7970,15 +7995,15 @@
     if test -n "$native_sound_lib"; then
     ac_safe=`echo "multimedia/audio_device.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for multimedia/audio_device.h""... $ac_c" 1>&6
-echo "configure:7974: checking for multimedia/audio_device.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7977 "configure"
+echo "configure:7999: checking for multimedia/audio_device.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8002 "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:7982: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8007: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8026,12 +8051,12 @@
       if test -z "$native_sound_lib"; then
         
 echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:8030: checking for ALopenport in -laudio" >&5
+echo "configure:8055: 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 8035 "configure"
+#line 8060 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8042,7 +8067,7 @@
 ALopenport()
 ; return 0; }
 EOF
-if { (eval echo configure:8046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8073,12 +8098,12 @@
       if test -z "$native_sound_lib"; then
 	
 echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:8077: checking for AOpenAudio in -lAlib" >&5
+echo "configure:8102: 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 8082 "configure"
+#line 8107 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8089,7 +8114,7 @@
 AOpenAudio()
 ; return 0; }
 EOF
-if { (eval echo configure:8093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8127,15 +8152,15 @@
     for dir in "machine" "sys" "linux"; do
       ac_safe=`echo "${dir}/soundcard.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ${dir}/soundcard.h""... $ac_c" 1>&6
-echo "configure:8131: checking for ${dir}/soundcard.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8134 "configure"
+echo "configure:8156: checking for ${dir}/soundcard.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8159 "configure"
 #include "confdefs.h"
 #include <${dir}/soundcard.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8139: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8164: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8205,7 +8230,7 @@
  fi
   LIBS="-laudio $LIBS" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-laudio\" to \$LIBS"; fi
       cat > conftest.$ac_ext <<EOF
-#line 8209 "configure"
+#line 8234 "configure"
 #include "confdefs.h"
 #include <audio/Xtutil.h>
 EOF
@@ -8232,7 +8257,7 @@
 
 if test "$with_tty" = "yes"  ; then
   echo "checking for TTY-related features" 1>&6
-echo "configure:8236: checking for TTY-related features" >&5
+echo "configure:8261: checking for TTY-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_TTY
 EOF
@@ -8247,15 +8272,15 @@
 
       ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:8251: checking for termios.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8254 "configure"
+echo "configure:8276: checking for termios.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8279 "configure"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8259: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8282,15 +8307,15 @@
   echo "$ac_t""no" 1>&6
 ac_safe=`echo "termio.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termio.h""... $ac_c" 1>&6
-echo "configure:8286: checking for termio.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8289 "configure"
+echo "configure:8311: checking for termio.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8314 "configure"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8294: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8319: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8323,12 +8348,12 @@
     if test -z "$with_ncurses"; then
     
 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:8327: checking for tgetent in -lncurses" >&5
+echo "configure:8352: 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 8332 "configure"
+#line 8357 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8339,7 +8364,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:8343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8372,15 +8397,15 @@
 
     ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:8376: checking for ncurses/curses.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8379 "configure"
+echo "configure:8401: checking for ncurses/curses.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8404 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8384: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8409: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8402,15 +8427,15 @@
 
     ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
-echo "configure:8406: checking for ncurses/term.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8409 "configure"
+echo "configure:8431: checking for ncurses/term.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8434 "configure"
 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8414: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8439: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8440,15 +8465,15 @@
       c_switch_site="$c_switch_site -I/usr/include/ncurses"
       ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:8444: checking for ncurses/curses.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8447 "configure"
+echo "configure:8469: checking for ncurses/curses.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8472 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8452: \"$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`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8483,12 +8508,12 @@
 	for lib in curses termlib termcap; do
 	  
 echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:8487: checking for tgetent in -l$lib" >&5
+echo "configure:8512: 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 8492 "configure"
+#line 8517 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8499,7 +8524,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:8503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8528: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8530,12 +8555,12 @@
       else
 	
 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:8534: checking for tgetent in -lcurses" >&5
+echo "configure:8559: 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 8539 "configure"
+#line 8564 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8546,7 +8571,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:8550: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8564,12 +8589,12 @@
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:8568: checking for tgetent in -ltermcap" >&5
+echo "configure:8593: 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 8573 "configure"
+#line 8598 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8580,7 +8605,7 @@
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:8584: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8628,15 +8653,15 @@
 
     test -z "$with_gpm" && { ac_safe=`echo "gpm.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for gpm.h""... $ac_c" 1>&6
-echo "configure:8632: checking for gpm.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8635 "configure"
+echo "configure:8657: checking for gpm.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8660 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8640: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8665: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -8659,12 +8684,12 @@
  }
   test -z "$with_gpm" && { 
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:8663: checking for Gpm_Open in -lgpm" >&5
+echo "configure:8688: 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 8668 "configure"
+#line 8693 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8675,7 +8700,7 @@
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:8679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8720,17 +8745,17 @@
 fi 
 
 echo "checking for database support" 1>&6
-echo "configure:8724: checking for database support" >&5
+echo "configure:8749: checking for database support" >&5
 
 if test "$with_database_gnudbm" != "no"; then
   
 echo $ac_n "checking for dbm_open in -lgdbm""... $ac_c" 1>&6
-echo "configure:8729: checking for dbm_open in -lgdbm" >&5
+echo "configure:8754: 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 8734 "configure"
+#line 8759 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8741,7 +8766,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:8745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8770: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8763,10 +8788,10 @@
 
   if test "$with_database_gnudbm" != "yes"; then
     echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:8767: checking for dbm_open" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8770 "configure"
+echo "configure:8792: checking for dbm_open" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8795 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */
@@ -8789,7 +8814,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_dbm_open=yes"
 else
@@ -8825,10 +8850,10 @@
 
 if test "$with_database_dbm" != "no"; then
   echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:8829: checking for dbm_open" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8832 "configure"
+echo "configure:8854: checking for dbm_open" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8857 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */
@@ -8851,7 +8876,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_dbm_open=yes"
 else
@@ -8872,12 +8897,12 @@
   if test "$need_libdbm" != "no"; then
     
 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:8876: checking for dbm_open in -ldbm" >&5
+echo "configure:8901: 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 8881 "configure"
+#line 8906 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8888,7 +8913,7 @@
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:8892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8917: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -8925,10 +8950,10 @@
 
 if test "$with_database_berkdb" != "no"; then
   echo $ac_n "checking for dbopen""... $ac_c" 1>&6
-echo "configure:8929: checking for dbopen" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8932 "configure"
+echo "configure:8954: checking for dbopen" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8957 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbopen(); below.  */
@@ -8951,7 +8976,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:8955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_dbopen=yes"
 else
@@ -8972,12 +8997,12 @@
   if test "$need_libdb" != "no"; then
     
 echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6
-echo "configure:8976: checking for dbopen in -ldb" >&5
+echo "configure:9001: checking for dbopen in -ldb" >&5
 ac_lib_var=`echo db'_'dbopen | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -ldb "
 cat > conftest.$ac_ext <<EOF
-#line 8981 "configure"
+#line 9006 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -8988,7 +9013,7 @@
 dbopen()
 ; return 0; }
 EOF
-if { (eval echo configure:8992: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9012,7 +9037,7 @@
   if test "$with_database_berkdb" = "yes"; then
     for path in "db/db.h" "db.h"; do
 cat > conftest.$ac_ext <<EOF
-#line 9016 "configure"
+#line 9041 "configure"
 #include "confdefs.h"
 #ifdef HAVE_INTTYPES_H
 #define __BIT_TYPES_DEFINED__
@@ -9030,7 +9055,7 @@
 
 ; return 0; }
 EOF
-if { (eval echo configure:9034: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9059: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   db_h_path="$path"; break
 else
@@ -9082,12 +9107,12 @@
 if test "$with_socks" = "yes"; then
   
 echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:9086: checking for SOCKSinit in -lsocks" >&5
+echo "configure:9111: 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 9091 "configure"
+#line 9116 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -9098,7 +9123,7 @@
 SOCKSinit()
 ; return 0; }
 EOF
-if { (eval echo configure:9102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -9711,9 +9736,9 @@
 
 # Remove any trailing slashes in these variables.
 test -n "$prefix" &&
-  prefix=`echo "$prefix" | sed 's,\([^/]\)/*$,\1,'`
+  prefix=`echo '' "$prefix" | sed -e 's:^ ::' -e 's,\([^/]\)/*$,\1,'`
 test -n "$exec_prefix" &&
-  exec_prefix=`echo "$exec_prefix" | sed 's,\([^/]\)/*$,\1,'`
+  exec_prefix=`echo '' "$exec_prefix" | sed -e 's:^ ::' -e 's,\([^/]\)/*$,\1,'`
 
 
 trap '' 1 2 15
@@ -9813,6 +9838,7 @@
 s%@X_PRE_LIBS@%$X_PRE_LIBS%g
 s%@X_LIBS@%$X_LIBS%g
 s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
+s%@libs_xauth@%$libs_xauth%g
 s%@lwlib_objs@%$lwlib_objs%g
 s%@ALLOCA@%$ALLOCA%g
 s%@SRC_SUBDIR_DEPS@%$SRC_SUBDIR_DEPS%g

--- a/configure.in	Mon Aug 13 09:40:48 2007 +0200
+++ b/configure.in	Mon Aug 13 09:41:43 2007 +0200
@@ -603,7 +603,7 @@
    -no-recursion | --no-recursion | --no-recursio | --no-recursi \
    | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) ;;
    *)
-   quoted_i="`echo $i | sed $quoted_sed_magic`"
+   quoted_i="`echo '' $i | sed -e 's:^ ::' -e $quoted_sed_magic`"
    quoted_arguments="$quoted_arguments '$quoted_i'" ;;
    esac
 done
@@ -749,7 +749,7 @@
 	  with_database_berkdb=no
 	  with_database_dbm=no
 	  with_database_gnudbm=no
-	  for x in `echo "$val" | sed 's/,/ /'` ; do
+	  for x in `echo "$val" | sed -e 's/,/ /'` ; do
 	    case "$x" in
 		no ) ;;
 		b | be | ber | berk | berkd | berkdb )  with_database_berkdb=yes ;;
@@ -814,7 +814,7 @@
 	  dnl Example: --error-checking=all,noextents,nobufpos
 	  dnl Example: --error-checking=none,malloc,gc
 
-	  for x in `echo "$val" | sed 's/,/ /'` ; do
+	  for x in `echo "$val" | sed -e 's/,/ /'` ; do
 	    case "$x" in
 	      dnl all and none are only permitted as the first in the list.
 	      n | no | non | none ) new_default=no ;;
@@ -942,7 +942,7 @@
 
 dnl Allow use of either ":" or spaces for lists of directories
 define(COLON_TO_SPACE,
-  [case "[$1]" in *:* [)] [$1]="`echo $[$1] | sed 's/:/ /g'`";; esac])dnl
+  [case "[$1]" in *:* [)] [$1]="`echo '' $[$1] | sed -e 's:^ ::' -e 's/:/ /g'`";; esac])dnl
 COLON_TO_SPACE(site_includes)
 COLON_TO_SPACE(site_libraries)
 COLON_TO_SPACE(site_runtime_libraries)
@@ -1830,8 +1830,8 @@
 define([XE_COMPUTE_RUNPATH],[
 if test "$add_runtime_path" = "yes" -a -n "$dash_r"; then
   dnl Remove runtime paths from current ld switches
-  ld_switch_site="`echo $ld_switch_site     | sed \"s/${dash_r}[[^ ]]*//\"`"
-  ld_switch_x_site="`echo $ld_switch_x_site | sed \"s/${dash_r}[[^ ]]*//\"`"
+  ld_switch_site=`echo   '' $ld_switch_site   | sed -e 's:^ ::' -e "s/${dash_r}[[^ ]]*//"`
+  ld_switch_x_site=`echo '' $ld_switch_x_site | sed -e 's:^ ::' -e "s/${dash_r}[[^ ]]*//"`
   dnl PRINT_VAR(ld_switch_site, ld_switch_x_site)
 
   dnl Fix up Runtime path
@@ -1846,7 +1846,7 @@
     xe_runpath_link='${CC-cc} -o conftest -v $CFLAGS '"$xe_ldflags"' conftest.$ac_ext 2>&1 1>/dev/null'
     for arg in `eval "$xe_runpath_link" | grep ' -L'`; do
       case "$arg" in P,* | -L* | -R* )
-        for dir in `echo "$arg" | sed -e 's/^..//' -e 'y/:/ /'`; do
+        for dir in `echo '' "$arg" | sed -e 's:^ ::' -e 's/^..//' -e 'y/:/ /'`; do
           XE_ADD_RUNPATH_DIR("$dir")
         done ;;
       esac
@@ -1855,7 +1855,7 @@
   else
     dnl Add all directories with .so files to runpath
     for arg in $ld_switch_site $ld_switch_x_site; do
-      case "$arg" in -L*) XE_ADD_RUNPATH_DIR(`echo "$arg" | sed 's/^-L//'`);; esac
+      case "$arg" in -L*) XE_ADD_RUNPATH_DIR(`echo '' "$arg" | sed -e 's:^ ::' -e 's/^-L//'`);; esac
     done
     dnl Sometimes /opt/SUNWdt/lib is the only installed Motif available
     case "$canonical" in  *-solaris2.[[1-4]]* )
@@ -1961,15 +1961,22 @@
 AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
+if test "$ac_cv_sizeof_long" = 0; then
+  echo ""
+  echo "*** PANIC *** Configure tests are not working - compiler is broken."
+  echo "*** PANIC *** Please examine config.log for compilation errors."
+  exit 1
+fi
 
 dnl check for long file names
 AC_SYS_LONG_FILE_NAMES
 
-dnl other checks for UNIX variants
-
-dnl -lm might be required for some X libraries to link with later
+dnl -lm is required by LISP_FLOAT_TYPE, among other things
 AC_CHECK_LIB(m, sqrt)
 
+dnl -lPW might be needed on some systems
+AC_CHECK_LIB(PW, main)
+
 dnl Floating operation support is now unconditional
 AC_DEFINE(LISP_FLOAT_TYPE)
 
@@ -2070,7 +2077,7 @@
   dnl Try to find Motif/CDE/Tooltalk dirs
   dnl These take precedence over other X libs/includes, so PRE-pend
   for lib_dir in "/usr/dt/lib" "/usr/lib/Motif1.2" "/usr/lib/Motif1.1"; do
-    inc_dir="`echo $lib_dir | sed 's/lib/include/'`"
+    inc_dir=`echo $lib_dir | sed -e 's/lib/include/'`
     if test -d "$lib_dir" -a -d "$inc_dir"; then
       case "$x_libraries" in *"$lib_dir"* ) ;; *)
         x_libraries="$lib_dir $x_libraries"
@@ -2177,6 +2184,27 @@
   dnl Autodetect -lXaw
   AC_CHECK_LIB(Xaw, XawScrollbarSetThumb, have_xaw=yes, have_xaw=no)
 
+  dnl Autodetect -DNARROWPROTO
+  AC_MSG_CHECKING(for NARROWPROTO)
+  rm -fr conftestdir
+  if mkdir conftestdir; then
+    cd conftestdir
+    cat > Imakefile <<'EOF'
+xetest:
+	@echo 'proto_defines="${PROTO_DEFINES}"'
+EOF
+    if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then
+      # GNU make sometimes prints "make[1]: Entering...", which would confuse us.
+      eval `${MAKE-make} xetest 2>/dev/null | grep -v make`
+      case "$proto_defines" in *NARROWPROTO* ) narrowproto=yes ;; esac
+    fi
+    cd ..
+    rm -fr conftestdir
+  fi
+  test -z "$narrowproto" && narrowproto=no
+  AC_MSG_RESULT($narrowproto)
+  test "$narrowproto" = "yes" && AC_DEFINE(NARROWPROTO)
+
 fi dnl $with_x11 = yes
 
 test -z "$window_system" && window_system="none"
@@ -2212,14 +2240,16 @@
 esac
 
 dnl Autodetect Xauth
+dnl -lXau is only used by gnuclient, so use a special variable for Xauth X libs
 test -z "$with_xauth" && test "$window_system" = "none" && with_xauth=no
 test -z "$with_xauth" && { AC_CHECK_HEADER(X11/Xauth.h,          ,with_xauth=no) }
 test -z "$with_xauth" && { AC_CHECK_LIB(Xau, XauGetAuthByAddr,[:],with_xauth=no) }
 test -z "$with_xauth" && with_xauth=yes
 if test "$with_xauth" = "yes"; then
   AC_DEFINE(HAVE_XAUTH)
-  XE_PREPEND(-lXau, libs_x)
+  XE_SPACE(libs_xauth, $X_EXTRA_LIBS -lXau $libs_x $X_PRE_LIBS)
 fi
+AC_SUBST(libs_xauth)
 
 dnl Autodetect OffiX
 test -z "$with_offix" && { AC_CHECK_HEADER(OffiX/DragAndDrop.h, , with_offix=no) }
@@ -2299,9 +2329,16 @@
 fi
 
 dnl Autodetect Xpm
-test -z "$with_xpm" && { AC_CHECK_HEADER(X11/xpm.h,   ,with_xpm=no) }
-test -z "$with_xpm" && { AC_CHECK_LIB(Xpm, XpmFree,[:],with_xpm=no) }
-test -z "$with_xpm" && with_xpm=yes
+AC_MSG_CHECKING(for Xpm)
+xe_check_libs=-lXpm
+test -z "$with_xpm" && { AC_TRY_RUN([#include <X11/xpm.h>
+int main(int argc, char *argv[]) {
+return (XpmIncludeVersion != XpmLibraryVersion()) ||
+        XpmIncludeVersion < 30406;
+}], with_xpm=yes, with_xpm=no)
+}
+xe_check_libs=
+AC_MSG_RESULT($with_xpm)
 if test "$with_xpm" = "yes"; then
   AC_DEFINE(HAVE_XPM)
   XE_PREPEND(-lXpm, libs_x)
@@ -2462,8 +2499,8 @@
 
   dnl Autodetect WNN
   test "$with_wnn6" = "yes" && with_wnn=yes # wnn6 implies wnn support
-  test -z "$with_wnn" && { AC_CHECK_HEADER(wnn/jllib.h, ,with_wnn=no) }
-  test -z "$with_wnn" && { AC_CHECK_LIB(wnn,jl_dic_list_e, ,[:],with_wnn=no) }
+  test -z "$with_wnn" && { AC_CHECK_HEADER(wnn/jllib.h,      ,with_wnn=no) }
+  test -z "$with_wnn" && { AC_CHECK_LIB(wnn,jl_dic_list_e,[:],with_wnn=no) }
   test -z "$with_wnn" && with_wnn=yes
   if test "$with_wnn" = "yes"; then
     AC_DEFINE(HAVE_WNN)
@@ -2704,10 +2741,10 @@
   echo "$progname: can't find current emacs version in \"$file\"." >&2
   exit 1
 fi
-beta=`sed -ne 's/^.*XEmacs Lucid (beta\([[0-9]][[0-9]]*\)).*$/\1/p' "$file"`
+beta=`sed -ne 's/^.*beta.*(beta\([[0-9]][[0-9]]*\)).*$/\1/p' "$file"`
 test -n "$beta" && version="${version}-b${beta}"
 AC_DEFINE_UNQUOTED(EMACS_VERSION, "$version")
-main_1_id="`echo main_1_xemacs_${version}_${canonical} | sed 'y/.-/__/'`"
+main_1_id=`echo main_1_xemacs_${version}_${canonical} | sed 'y/.-/__/'`
 AC_DEFINE_UNQUOTED(main_1, $main_1_id)
 
 
@@ -3295,9 +3332,9 @@
 AC_SUBST(internal_makefile_list)
 # Remove any trailing slashes in these variables.
 test -n "$prefix" &&
-  prefix=`echo "$prefix" | sed 's,\([[^/]]\)/*$,\1,'`
+  prefix=`echo '' "$prefix" | sed -e 's:^ ::' -e 's,\([[^/]]\)/*$,\1,'`
 test -n "$exec_prefix" &&
-  exec_prefix=`echo "$exec_prefix" | sed 's,\([[^/]]\)/*$,\1,'`
+  exec_prefix=`echo '' "$exec_prefix" | sed -e 's:^ ::' -e 's,\([[^/]]\)/*$,\1,'`
 
 dnl Build Makefile.in's from Makefile.in.in's
 dnl except ./Makefile from $srcdir/Makefile.in

--- a/etc/NEWS	Mon Aug 13 09:40:48 2007 +0200
+++ b/etc/NEWS	Mon Aug 13 09:41:43 2007 +0200
@@ -124,11 +124,11 @@
 creating a new frame with `C-x 5 2' also raises and selects that
 frame.  The behavior of window system frames is unchanged.
 
-** C-x n d now runs the new command narrow-to-defun,
+** `C-x n d' now runs the new command `narrow-to-defun',
 which narrows the accessible parts of the buffer to just
 the current defun.
 
-** The new command C-x 4 0 (kill-buffer-and-window) kills the
+** The new command `C-x 4 0' (kill-buffer-and-window) kills the
 current buffer and deletes the selected window.  It asks for
 confirmation first.
 
@@ -192,8 +192,15 @@
 ** Autoconf 2 is supported, making XEmacs more conforming to
 conventions used by other free software.
 
-** tty-erase-char is a new variable that reports which character
-was set up as the terminal's erase character at the tim Emacs was started.
+** `tty-erase-char' is a new variable that reports which character
+was set up as the terminal's erase character at the tim Emacs was
+started.
+
+** The TIME argument to `format-time-string' is now optional and
+defaults to the current time.
+
+** The PATTERN argument to `split-string' is now optional and defaults
+to whitespace ("[ \f\t\n\r\v]+").
 
 
 

--- a/etc/TUTORIAL	Mon Aug 13 09:40:48 2007 +0200
+++ b/etc/TUTORIAL	Mon Aug 13 09:41:43 2007 +0200
@@ -1,40 +1,35 @@
-Copyright (c) 1985, 1996 Free Software Foundation, Inc. See end for conditions.
-
+Copyright (c) 1985 Free Software Foundation, Inc;  See end for conditions.
 You are looking at the Emacs tutorial.
 
-Emacs commands generally involve the CONTROL key (sometimes labelled
-CTRL or CTL) or the META key.  On some keyboards, the META key is
-labelled ALT or EDIT or something else (for example, on Sun keyboards,
-the diamond key to the left of the spacebar is META).  If you have no
-META key, you can use ESC instead.  Rather than write out META or
-CONTROL each time we want you to prefix a character, we'll use the
-following abbreviations:
+Emacs commands generally involve the CONTROL key (sometimes labeled
+CTRL or CTL) or the META key (sometimes labeled EDIT or ALT).  Rather than
+write that in full each time, we'll use the following abbreviations:
 
  C-<chr>  means hold the CONTROL key while typing the character <chr>
 	  Thus, C-f would be: hold the CONTROL key and type f.
- M-<chr>  means hold the META key down while typing <chr>.  If there
-	  is no META key, type <ESC>, release it, then type the
-	  character <chr>.
+ M-<chr>  means hold the META or EDIT or ALT key down while typing <chr>.
+	  If there is no META, EDIT or ALT key, instead press and release the
+	  ESC key and then type <chr>.  We write <ESC> for the ESC key.
 
 Important note: to end the Emacs session, type C-x C-c.  (Two characters.)
 The characters ">>" at the left margin indicate directions for you to
 try using a command.  For instance:
 <<Blank lines inserted here by startup of help-with-tutorial>>
 >>  Now type C-v (View next screen) to move to the next screen.
-	(go ahead, do it by depressing the control key and v together).
-	From now on, you'll be expected to do this whenever you finish
+	(go ahead, do it by holding down the control key while typing v).
+	From now on, you should do this again whenever you finish
 	reading the screen.
 
-Note that there is an overlap when going from screen to screen; this
-provides some continuity when moving through the file.
+Note that there is an overlap of two lines when you move from screen
+to screen; this provides some continuity so you can continue reading
+the text.
 
-The first thing that you need to know is how to move around from
-place to place in the file.  You already know how to move forward a
-screen, with C-v.  To move backwards a screen, type M-v (depress the
-META key and type v, or type <ESC>v if you don't have a META or EDIT
-key).
+The first thing that you need to know is how to move around from place
+to place in the text.  You already know how to move forward one screen,
+with C-v.  To move backwards one screen, type M-v (hold down the META key
+and type v, or type <ESC>v if you do not have a META, EDIT, or ALT key).
 
->>  Try typing M-v and then C-v to move back and forth a few times.
+>>  Try typing M-v and then C-v, a few times.
 
 
 * SUMMARY
@@ -44,28 +39,28 @@
 
 	C-v	Move forward one screenful
 	M-v	Move backward one screenful
-	C-l	Clear screen and redisplay everything
-		 putting the text near the cursor at the center.
-		 (That's control-L, not control-1.  control-1
-		  has a completely different meaning, as
-		  described below.)
+	C-l	Clear screen and redisplay all the text,
+		 moving the text around the cursor
+		 to the center of the screen.
+		 (That's control-L, not control-1.)
 
->> Find the cursor and remember what text is near it.
-   Then type a C-l.
-   Find the cursor again and see what text is near it now.
+>> Find the cursor, and note what text is near it.
+   Then type C-l.
+   Find the cursor again and notice that the same text
+   is near the cursor now.
 
 
 * BASIC CURSOR CONTROL
 ----------------------
 
-Getting from screenful to screenful is useful, but how do you
-reposition yourself within a given screen to a specific place?
-There are several ways you can do this.  One way (not the best, but
-the most basic) is to use the commands previous, backward, forward
-and next.  As you can imagine these commands (which are given to
-Emacs as C-p, C-b, C-f, and C-n  respectively) move the cursor from
-where it currently is to a new place in the given direction.  Here,
-in a more graphical form are the commands:
+Moving from screenful to screenful is useful, but how do you
+move to a specific place within the text on the screen?
+
+There are several ways you can do this.  The most basic way is to use
+the commands C-p, C-b, C-f, and C-n.  Each of these commands moves the
+cursor one row or column in a particular direction on the screen.
+Here is a table showing these four commands and shows the directions
+they move:
  
 			  Previous line, C-p
 				  :
@@ -73,69 +68,81 @@
    Backward, C-b .... Current cursor position .... Forward, C-f
 				  :
 				  :
-			  Next line, C-n
+			    Next line, C-n
 
 >> Move the cursor to the line in the middle of that diagram
-   and type C-l to see the whole diagram centered in the screen.
+   using C-n or C-p.  Then type C-l to see the whole diagram
+   centered in the screen.
 
-You'll probably find it easy to think of these by letter.  P for
-previous, N for next, B for backward and F for forward.  These are
-the basic cursor positioning commands and you'll be using them ALL
-the time so it would be of great benefit if you learn them now.
+You'll probably find it easy to think of these by letter: P for
+previous, N for next, B for backward and F for forward.  These are the
+basic cursor positioning commands, and you'll be using them ALL the
+time, so it would be of great benefit if you learn them now.
 
 >> Do a few C-n's to bring the cursor down to this line.
 
 >> Move into the line with C-f's and then up with C-p's.
    See what C-p does when the cursor is in the middle of the line.
 
-Lines are separated by Newline characters.  For most applications
-there should normally be a Newline character at the end of the text,
-as well, but it is up to you to make sure of this.  A file can
-validly exist without a Newline at the end.
+Each of text line ends with a Newline character, which serves to
+separate it from the following line.  The last line in your file ought
+to have a Newline at the end (but Emacs does not require it to have
+one).
+
+>> Try to C-b at the beginning of a line.  It should move to
+   the end of the previous line.  This is because it moves back
+   across the Newline character.
+
+C-f can move across a Newline just like C-b.
 
->> Try to C-b at the beginning of a line.  Do a few more C-b's.
-   Then do C-f's back to the end of the line and beyond.
+>> Do a few more C-b's, so you get a feel for where the cursor is.
+   Then do C-f's to return to the end of the line.
+   Then do one more C-f to move to the following line.
 
-When you go off the top or bottom of the screen, the text beyond
-the edge is shifted onto the screen so that your instructions can
-be carried out while keeping the cursor on the screen.
+When you move past the top or bottom of the screen, the text beyond
+the edge shifts onto the screen.  This is called "scrolling".  It
+enables Emacs to move the cursor to the specified place in the text
+without moving it off the screen.
 
->> Try to move the cursor off the bottom of the screen with C-n and
+>> Try to move the cursor off the bottom of the screen with C-n, and
    see what happens.
 
 If moving by characters is too slow, you can move by words.  M-f
 (Meta-f) moves forward a word and M-b moves back a word.
 
->> Type a few M-f's and M-b's.  Intersperse them with C-f's and C-b's.
+>> Type a few M-f's and M-b's.
+
+When you are in the middle of a word, M-f moves to the end of the word.
+When you are in whitespace between words, M-f moves to the end of the
+following word.  M-b works likewise in the opposite direction.
+
+>> Type M-f and M-b a few times, interspersed with C-f's and C-b's
+   so that you can observe the action of M-f and M-b from various
+   places inside and between words.
 
 Notice the parallel between C-f and C-b on the one hand, and M-f and
 M-b on the other hand.  Very often Meta characters are used for
-operations related to English text whereas Control characters operate
-on the basic textual units that are independent of what you are
-editing (characters, lines, etc).  There is a similar parallel between
-lines and sentences: C-a and C-e move to the beginning or end of a
-line, and M-a and M-e move to the beginning or end of a sentence.
+operations related to the units defined by language (words, sentences,
+paragraphs), while Control characters operate on basic units that are
+independent of what you are editing (characters, lines, etc).
+
+This parallel applies between lines and sentences: C-a and C-e move to
+the beginning or end of a line, and M-a and M-e move to the beginning
+or end of a sentence.
 
 >> Try a couple of C-a's, and then a couple of C-e's.
    Try a couple of M-a's, and then a couple of M-e's.
 
-See how repeated C-a's do nothing, but repeated M-a's keep moving
-farther.  Do you think that this is right?
-
-Two other simple cursor motion commands are M-< (Meta Less-than),
-which moves to the beginning of the file, and M-> (Meta Greater-than),
-which moves to the end of the file.  You probably don't need to try
-them, since finding this spot again will be boring.  On most terminals
-the "<" is above the comma and you must use the shift key to type it.
-On these terminals you must use the shift key to type M-< also;
-without the shift key, you would be typing M-comma.
+See how repeated C-a's do nothing, but repeated M-a's keep moving one
+more sentence.  Although these are not quite analogous, each one seems
+natural.
 
 The location of the cursor in the text is also called "point".  To
 paraphrase, the cursor shows on the screen where point is located in
 the text.
 
-Here is a summary of simple moving operations including the word and
-sentence moving commands:
+Here is a summary of simple cursor-moving operations, including the
+word and sentence moving commands:
 
 	C-f	Move forward a character
 	C-b	Move backward a character
@@ -152,126 +159,120 @@
 	M-a	Move back to beginning of sentence
 	M-e	Move forward to end of sentence
 
-	M-<	Go to beginning of file
-	M->	Go to end of file
+>> Try all of these commands now a few times for practice.
+   These are the most often used commands.
+
+Two other important cursor motion commands are M-< (Meta Less-than),
+which moves to the beginning of the whole text, and M-> (Meta
+Greater-than), which moves to the end of the whole text.
 
->> Try all of these commands now a few times for practice.
-   Since the last two will take you away from this screen,
-   you can come back here with M-v's and C-v's.  These are
-   the most often used commands.
+On most terminals, the "<" is above the comma, so you must use the
+shift key to type it.  On these terminals you must use the shift key
+to type M-< also; without the shift key, you would be typing M-comma.
+
+>> Try M-< now, to move to the beginning of the tutorial.
+   Then use C-v repeatedly to move back here.
+
+>> Try M-> now, to move to the end of the tutorial.
+   Then use M-v repeatedly to move back here.
 
-Like all other commands in Emacs, these commands can be given
-arguments which cause them to be executed repeatedly.  The way you
-give a command a repeat count is by typing C-u and then the digits
-before you type the command.  If you have a META or EDIT key, you can
-omit the C-u if you hold down the META or EDIT key while you type the
-digits.  This is easier, but we recommend the C-u method because it
-works on any terminal.
+You can also move the cursor with the arrow keys, if your terminal has
+arrow keys.  We recommend learning C-b, C-f, C-n and C-p for three
+reasons.  First, they work on all kinds of terminals.  Second, once
+you gain practice at using Emacs, you will find that typing these CTRL
+characters is faster than typing the arrow keys (because you do not
+have to move your hands away from touch-typing position).  Third, once
+you form the habit of using these CTRL character commands, you can
+easily learn to use other advanced cursor motion commands as well.
+
+Most Emacs commands accept a numeric argument; for most commands, this
+serves as a repeat-count.  The way you give a command a repeat count
+is by typing C-u and then the digits before you type the command.  If
+you have a META (or EDIT or ALT) key, there is another alternative way
+to enter a numeric argument: type the digits while holding down the
+META key.  We recommend learning the C-u method because it works on
+any terminal.
 
 For instance, C-u 8 C-f moves forward eight characters.
 	
->> Try giving a suitable argument to C-n or C-p to come as close
-   as you can to this line in one jump.
+>> Try using C-n or C-p with a numeric argument, to move the cursor
+   to a line near this one with just one command.
 
-The only apparent exception to this is the screen moving commands,
-C-v and M-v.  When given an argument, they scroll the screen up or
-down by that many lines, rather than screenfuls.  This proves to be
-much more useful.
+Most commands use the numeric argument as a repeat count.  Certain
+exceptional commands use it differently.  C-v and M-v are among the
+exceptions.  When given an argument, they scroll the screen up or down
+by that many lines, rather than by a screenfuls.  For example, C-u 4
+C-v scrolls the screen by 4 lines.
 
 >> Try typing C-u 8 C-v now.
 
-Did it scroll the screen up by 8 lines?  If you would like to
-scroll it down you can give an argument to M-v.
+This should have scrolled the screen up by 8 lines.  If you would like
+to scroll it down again, you can give an argument to M-v.
 
-If you are using X Windows, there is probably a rectangular area
-called a scroll bar at the right hand side of the Emacs window.  You
-can scroll the text by manipulating the scroll bar with the mouse.
+If you are using X Windows, there should be a tall rectangular area
+called a scroll bar at the left hand side of the Emacs window.  You
+can scroll the text by clicking the mouse in the scroll bar.
 
 >> Try pressing the middle button at the top of the highlighted area
-within the scroll bar, then moving the mouse while holding that button
-down.
-
->> Move the mouse to a point in the scroll bar about three lines from
-the top, and click the left button a couple of times.
-
-
-* CURSOR CONTROL WITH AN X TERMINAL
------------------------------------
+   within the scroll bar.  This should scroll the text to a position
+   determined by how high or low you click.
 
-If you have an X terminal, you will probably find it easier to use
-the keys on the keypad to control the cursor.  The left, right, up,
-and down arrow keys move in the expected direction; they function
-exactly like C-b, C-f, C-p, and C-n, but are easier to type and to
-remember.  You can also use C-left and C-right to move by words, and
-C-up and C-down to move by blocks (e.g.  paragraphs, if you're
-editing text).  If you have keys labelled HOME (or BEGIN) and END,
-they will take you to the beginning and end of a line, respectively,
-and C-home and C-end will move to the beginning and end of the file.
-If your keyboard has PgUp and PgDn keys, you can use them to move up
-and down a screenful at a time, like M-v and C-v.
-
-All of these commands can take numeric arguments, as described above.
-You can use a shortcut to enter these arguments: just hold down the
-CONTROL or META key and type the number. For example, to move 12
-words to the right, type C-1 C-2 C-right.  Note that it is very easy
-to type this because you do not have to release the CONTROL key
-between keystrokes.
+>> Try moving the mouse up and down, while holding the middle button
+   pressed down.  You'll see that the text scrolls up and down as
+   you move the mouse.
 
 
 * WHEN EMACS IS HUNG
 --------------------
 
-If Emacs gets into an infinite (or simply very long) computation which
-you don't want to finish, you can stop it safely by typing C-g.
+If Emacs stops responding to your commands, you can stop it safely by
+typing C-g.  You can use C-g to stop a command which is taking too
+long to execute.
+
 You can also use C-g to discard a numeric argument or the beginning of
-a command that you don't want to finish.
+a command that you do not want to finish.
 
 >> Type C-u 100 to make a numeric arg of 100, then type C-g.
-   Now type C-f.  How many characters does it move?
-   If you have typed an <ESC> by mistake, you can get rid of it
-   with a C-g.
+   Now type C-f.  It should move just one character,
+   because you canceled the argument with C-g.
+
+If you have typed an <ESC> by mistake, you can get rid of it
+with a C-g.
+
+
+* DISABLED COMMANDS
+-------------------
 
-If you type <ESC> : then you get a new window appearing on the screen,
-telling you that M-: is a "disabled command" and asking whether you
-really want to execute it.  The command M-: is marked as disabled
-because we expect it would confuse beginners and you probably don't
-want to use it until you know more about Emacs.  If you really want to
-try the M-: command, you could type a Space in answer to the question,
-and M-: would go ahead.  Normally, if you do not want to execute M-:,
-you would type "n" to answer the question.
+Some Emacs commands are "disabled" so that beginning users cannot use
+them by accident.
+
+If you type one of the disabled commands, Emacs displays a message
+saying what the command was, and asking you whether you want to go
+ahead and execute the command.
 
->> Type <ESC> :, then type n.
+If you really want to try the command, type Space in answer to the
+question.  Normally, if you do not want to execute the disabled
+command, answer the question with "n".
+
+>> Type <ESC> : (which is a disabled command),
+   then type n to answer the question.
 
 
 * WINDOWS
 ---------
 
-Emacs can have several windows, each displaying its own text.
-Note that "window" as used by Emacs does not refer to separate
-overlapping windows in the window system, but to separate panes
-within a single X window. (Emacs can also have multiple X
-windows, or "frames" in Emacs terminology.  This is described
-later.)
-
-At this stage it is better not to go into the techniques of
-using multiple windows.  But you do need to know how to get
-rid of extra windows that may appear to display help or
-output from certain commands.  It is simple:
+Emacs can have several windows, each displaying its own text.  We will
+explain later on how to use multiple windows.  Right now we want to
+explain how to get rid of extra windows and go back to basic
+one-window editing.  It is simple:
 
 	C-x 1	One window (i.e., kill all other windows).
 
-That is Control-x followed by the digit 1.
-C-x 1 makes the window which the cursor is in become
-the full screen, by getting rid of any other windows.
+That is Control-x followed by the digit 1.  C-x 1 expands the window
+which contains the cursor, to occupy the full screen.  It deletes all
+other windows.
 
 >> Move the cursor to this line and type C-u 0 C-l.
-
-(Remember that C-l redraws the screen.  If you give a
-numeric argument to this command, it means "redraw the
-screen and put the current line that many lines from the
-top of the screen."  So C-u 0 C-l means "redraw the
-screen, putting the current line at the top.")
-
 >> Type Control-h k Control-f.
    See how this window shrinks, while a new one appears
    to display documentation on the Control-f command.
@@ -282,8 +283,8 @@
 * INSERTING AND DELETING
 ------------------------
 
-If you want to insert text, just type it.  Characters which you can
-see, such as A, 7, *, etc. are taken by Emacs as text and inserted
+If you want to insert text, just type the text.  Characters which you
+can see, such as A, 7, *, etc. are taken by Emacs as text and inserted
 immediately.  Type <Return> (the carriage-return key) to insert a
 Newline character.
 
@@ -294,29 +295,36 @@
 More generally, <Delete> deletes the character immediately before the
 current cursor position.
 
->> Do this now, type a few characters and then delete them
+>> Do this now--type a few characters, then delete them
    by typing <Delete> a few times.  Don't worry about this file
-   being changed; you won't affect the master tutorial.  This is just
-   a copy of it.
+   being changed; you will not alter the master tutorial.  This is
+   your personal copy of it.
 
->> Now start typing text until you reach the right margin, and keep
-   typing.  When a line of text gets too big for one line on the
-   screen, the line of text is "continued" onto a second screen line.
-   The backslash at the right margin indicates a line which has
-   been continued.
+When a line of text gets too big for one line on the screen, the line
+of text is "continued" onto a second screen line.  A backslash ("\")
+at the right margin indicates a line which has been continued.
+
+>> Insert text until you reach the right margin, and keep on inserting.
+   You'll see a continuation line appear.
+
 >> Use <Delete>s to delete the text until the line fits on one screen
    line again.  The continuation line goes away.
 
+You can delete a Newline character just like any other character.
+Deleting the Newline character between two lines merges them into
+one line.  If the resulting combined line is too long to fit in the
+screen width, it will be displayed with a continuation line.
+
 >> Move the cursor to the beginning of a line and type <Delete>.  This
-   deletes the newline before the line and merges the line onto
-   the previous line.  The resulting line may be too long to fit, in
-   which case it has a continuation line.
+   merges that line with the previous line.
+
 >> Type <Return> to reinsert the Newline you deleted.
 
 Remember that most Emacs commands can be given a repeat count;
-this includes characters which insert themselves.
+this includes text characters.  Repeating a text character inserts
+it several times.
 
->>  Try that now -- type C-u 8 * and see what happens.
+>>  Try that now -- type C-u 8 * to insert ********.
 
 You've now learned the most basic way of typing something in
 Emacs and correcting errors.  You can delete by words or lines
@@ -332,41 +340,43 @@
 	M-k	     kill to the end of the current sentence
 
 Notice that <Delete> and C-d vs M-<Delete> and M-d extend the parallel
-started by C-f and M-f (well, <Delete> isn't really a control
+started by C-f and M-f (well, <Delete> is not really a control
 character, but let's not worry about that).  C-k and M-k are like C-e
 and M-e, sort of, in that lines are opposite sentences.
 
-Now suppose you kill something, and then you decide that you want to
-get it back?  Well, whenever you kill something bigger than a
-character, Emacs saves it for you.  To yank it back, use C-y.  You
-can kill text in one place, move elsewhere, and then do C-y; this is
-a good way to move text around.  Note that the difference
-between "Killing" and "Deleting" something is that "Killed" things
-can be yanked back, and "Deleted" things cannot.  Generally, the
-commands that can destroy a lot of text save it, while the ones that
-attack only one character, or nothing but blank lines and spaces, do
-not save.
+When you delete more than one character at a time, Emacs saves the
+deleted text so that you can bring it back.  Bringing back killed text
+is called "yanking".  You can yank the killed text either at the same
+place where it was killed, or at some other place in the text.  You
+can yank the text several times in order to make multiple copies of
+it.  The command to yank is C-y.
 
-For instance, type C-n a couple times to position the cursor
-at some line on this screen.
+Note that the difference between "Killing" and "Deleting" something is
+that "Killed" things can be yanked back, and "Deleted" things cannot.
+Generally, the commands that can remove a lot of text save the text,
+while the commands that delete just one character, or just blank lines
+and spaces, do not save the deleted text.
 
->> Do this now, move the cursor and kill that line with C-k.
+>> Move the cursor to the  beginning of a line which is not empty.
+   Then type C-k to kill the text on that line.
+>> Type C-k a second time.  You'll see that it kills the Newline
+   which follows that line.
 
 Note that a single C-k kills the contents of the line, and a second
-C-k kills the line itself, and make all the other lines move up.  If
-you give C-k a repeat count, it kills that many lines AND their
-contents.
+C-k kills the line itself, and make all the other lines move up.  C-k
+treats a numeric argument specially: it kills that many lines AND
+their contents.  This is not mere repetition.  C-u 2 C-k kills two
+lines and their newlines; typing C-k twice would not do that.
 
-The text that has just disappeared is saved so that you can
-retrieve it.  To retrieve the last killed text and put it where
-the cursor currently is, type C-y.
+To retrieve the last killed text and put it where the cursor currently
+is, type C-y.
 
 >> Try it; type C-y to yank the text back.
 
-Think of C-y as if you were yanking something back that someone
-took away from you.  Notice that if you do several C-k's in a row
-the text that is killed is all saved together so that one C-y will
-yank all of the lines.
+Think of C-y as if you were yanking something back that someone took
+away from you.  Notice that if you do several C-k's in a row, all of
+the killed text is saved together, so that one C-y will yank all of
+the lines.
 
 >> Do this now, type C-k several times.
 
@@ -379,11 +389,14 @@
 you kill something else?  C-y would yank the more recent kill.  But
 the previous text is not lost.  You can get back to it using the M-y
 command.  After you have done C-y to get the most recent kill, typing
-M-Y replaces that yanked text with the previous kill.  Typing M-y
-again and again brings in earlier and earlier kills.  When you
-have reached the text you are looking for, you can just go away and
-leave it there.  If you M-y enough times, you come back to the
-starting point (the most recent kill).
+M-y replaces that yanked text with the previous kill.  Typing M-y
+again and again brings in earlier and earlier kills.  When you have
+reached the text you are looking for, you do not have to do anything to
+keep it.  Just go on with your editing, leaving the yanked text where
+it is.
+
+If you M-y enough times, you come back to the starting point (the most
+recent kill).
 
 >> Kill a line, move around, kill another line.
    Then do C-y to get back the second killed line.
@@ -397,26 +410,28 @@
 * UNDO
 ------
 
-Any time you make a change to the text and wish you had not done so,
-you can undo the change (return the text to its previous state)
-with the undo command, C-x u.  Normally, C-x u undoes one command's
-worth of changes; if you repeat the C-x u several times in a row,
-each time undoes one more command.  There are two exceptions:
-commands that made no change (just moved the cursor) do not count,
-and self-inserting characters are often lumped together in groups
-of up to 20.  This is to reduce the number of C-x u's you have to type.
+If you make a change to the text, and then decide that it was a
+mistake, you can undo the change with the undo command, C-x u.
+
+Normally, C-x u undoes the changes made by one command; if you repeat
+the C-x u several times in a row, each repetition undoes one
+additional command.
+
+But there are two exceptions: commands that do not change the text do
+not count (this includes cursor motion commands and scrolling
+command), and self-inserting characters are usually handled in groups
+of up to 20.  (This is to reduce the number of C-x u's you have to
+type to undo insertion of text.)
 
 >> Kill this line with C-k, then type C-x u and it should reappear.
 
-C-_ is another command for undoing; it is just the same as C-x u
-but easier to type several times in a row.  The problem with C-_ is
-that on some keyboards it is not obvious how to type it.  That is
-why C-x u is provided as well.  On some DEC terminals, you can type
-C-_ by typing / while holding down CTRL.  Illogical, but what can
-you expect from DEC?
+C-_ is an alternative undo command; it works just the same as C-x u,
+but it is easier to type several times in a row.  The disadvantage of
+C-_ is that on some keyboards it is not obvious how to type it.  That
+is why we provide C-x u as well.  On some terminals, you can type C-_
+by typing / while holding down CTRL.
 
-Giving a numeric argument to C-_ or C-x u is equivalent to repeating
-it as many times as the argument says.
+A numeric argument to C-_ or C-x u acts as a repeat count.
 
 
 * FILES
@@ -424,27 +439,31 @@
 
 In order to make the text you edit permanent, you must put it in a
 file.  Otherwise, it will go away when your invocation of Emacs goes
-away.  You put your editing in a file by "finding" the file.  What
-finding means is that you see the contents of the file in your Emacs;
-and, loosely speaking, what you are editing is the file itself.
-However, the changes still don't become permanent until you "save" the
-file.  This is so you can have control to avoid leaving a half-changed
-file around when you don't want to.  Even then, Emacs leaves the
-original file under a changed name in case your changes turn out
-to be a mistake.
+away.  You put your editing in a file by "finding" the file.  (This is
+also called "visiting" the file.)
+
+Finding a file means that you see the contents of the file within
+Emacs.  In many ways, it is as if you were editing the file itself.
+However, the changes you make using Emacs do not become permanent
+until you "save" the file.  This is so you can avoid leaving a
+half-changed file on the system when you do not want to.  Even when
+you save, Emacs leaves the original file under a changed name in case
+you later decide that your changes were a mistake.
 
 If you look near the bottom of the screen you will see a line that
-begins and ends with dashes, and contains the string "Emacs: TUTORIAL".
-Your copy of the Emacs tutorial is called "TUTORIAL".  Whatever
-file you find, that file's name will appear in that precise
+begins and ends with dashes, and contains the string "Emacs:
+TUTORIAL".  This part of the screen always shows the name of the file
+that you are visiting.  Right now, you are visiting a file called
+"TUTORIAL" which is your personal scratch copy of the Emacs tutorial.
+Whatever file you find, that file's name will appear in that precise
 spot.
 
 The commands for finding and saving files are unlike the other
 commands you have learned in that they consist of two characters.
 They both start with the character Control-x.  There is a whole series
 of commands that start with Control-x; many of them have to do with
-files, buffers, and related things, and all of them consist of
-Control-x followed by some other character.
+files, buffers, and related things.  These commands are two, three or
+four characters long.
 
 Another thing about the command for finding a file is that you have
 to say what file name you want.  We say the command "reads an argument
@@ -453,33 +472,40 @@
 
 	C-x C-f   Find a file
 
-Emacs asks you to type the file name.  It echoes on the bottom
-line of the screen.  You are using the minibuffer now!  this is
-what the minibuffer is for.  When you type <Return> to end the
-file name, the minibuffer is no longer needed, so it disappears.
+Emacs asks you to type the file name.  The file name you type appears
+on the bottom line of the screen.  The bottom line is called the
+minibuffer when it is used for this sort of input.  You can use
+ordinary Emacs editing commands to edit the file name.
+
+While you are entering the file name (or any minibuffer input),
+you can cancel the command with C-g.
 
 >> Type C-x C-f, then type C-g.  This cancels the minibuffer,
    and also cancels the C-x C-f command that was using the
    minibuffer.  So you do not find any file.
 
-In a little while the file contents appear on the screen.  You can
-edit the contents.  When you wish to make the changes permanent,
-issue the command
+When you have finished entering the file name, type <Return> to
+terminate it.  Then C-x C-f command goes to work, and finds the file
+you chose.  The minibuffer disappears when the C-x C-f command is
+finished.
+
+In a little while the file contents appear on the screen, and you can
+edit the contents.  When you wish to make your changes permanent,
+type the command
 
 	C-x C-s   Save the file
 
-The contents of Emacs are written into the file.  The first time you
-do this, the original file is renamed to a new name so that it
-is not lost.  The new name is made by appending "~" to the end
-of the original file's name.
+This copies the text within Emacs into the file.  The first time you
+do this, Emacs renames the original file to a new name so that it is
+not lost.  The new name is made by adding "~" to the end of the
+original file's name.
 
 When saving is finished, Emacs prints the name of the file written.
 You should save fairly often, so that you will not lose very much
 work if the system should crash.
 
 >> Type C-x C-s, saving your copy of the tutorial.
-   This should print "Wrote .../TUTORIAL" at the bottom of the screen.
-   On VMS it will print "Wrote ...[...]TUTORIAL."
+   This should print "Wrote ...TUTORIAL" at the bottom of the screen.
 
 NOTE: On some systems, typing C-x C-s will freeze the screen and you
 will see no further output from Emacs.  This indicates that an
@@ -488,11 +514,13 @@
 type C-q.  Then see the section "Spontaneous Entry to Incremental
 Search" in the Emacs manual for advice on dealing with this "feature".
 
-To make a new file, just find it "as if" it already existed.  Then
-start typing in the text.  When you ask to "save" the file, Emacs
-will really create the file with the text that you have inserted.
-From then on, you can consider yourself to be editing an already
-existing file.
+You can find an existing file, to view it or edit it.  You can also
+find a file which does not already exist.  This is the way to create a
+file with Emacs: find the file, which will start out empty, and then
+begin inserting the text for the file.  When you ask to "save" the
+file, Emacs will really create the file with the text that you have
+inserted.  From then on, you can consider yourself to be editing an
+already existing file.
 
 
 * BUFFERS
@@ -502,9 +530,14 @@
 inside Emacs.  You can switch back to it by finding it again with
 C-x C-f.  This way you can get quite a number of files inside Emacs.
 
-The object inside Emacs which holds the text read from one file
-is called a "buffer."  Finding a file makes a new buffer inside Emacs.
-To see a list of the buffers that exist in Emacs, type
+>> Create a file named "foo" by typing  C-x C-f foo <Return>.
+   Then insert some text, edit it, and save "foo" by typing  C-x C-s.
+   Finally, type C-x C-f TUTORIAL <Return>
+   to come back to the tutorial.
+
+Emacs stores each file's text inside an object called a "buffer."
+Finding a file makes a new buffer inside Emacs.  To see a list of the
+buffers that current exist in your Emacs job, type
 
 	C-x C-b   List buffers
 
@@ -515,7 +548,7 @@
 to files.  For example, the buffer named "*Buffer List*" does
 not have any file.  It is the buffer which contains the buffer
 list that was made by C-x C-b.  ANY text you see in an Emacs window
-has to be in some buffer.
+is always part of some buffer.
 
 >> Type C-x 1 to get rid of the buffer list.
 
@@ -529,71 +562,13 @@
 
 	C-x s     Save some buffers
 
-C-x s goes through the list of all the buffers you have
-and finds the ones that contain files you have changed.
-For each such buffer, C-x s asks you whether to save it.
-
-
-* USING THE MENU
-----------------
-
-If you are on an X terminal, you will notice a menubar at the
-top of the Emacs screen.  You can use this menubar to access all
-the most common Emacs commands, such as "find file".  You will
-find this easier at first, because you don't need to remember
-the keystrokes necessary to access any particular command.  Once
-you are comfortable with Emacs, it will be easy to begin using
-the keyboard commands because each menu item with a
-corresponding keyboard command has the command listed next to
-it.
-
-Note that there are many items in the menubar that have no exact
-keyboard equivalents.  For example, the Buffers menu lists all
-of the available buffers in most-recently used order.  You can
-switch to any buffer by simply findings its name in the Buffers
-menu and selecting it.
-
-
-* USING THE MOUSE
------------------
+C-x s asks you about each buffer which contains changes that you have
+not saved.  It asks you, for each such buffer, whether to save the
+buffer.
 
-When running under X, Emacs is fully integrated with the mouse.
-You can position the text cursor by clicking the left button at
-the desired location, and you can select text by dragging the
-left mouse button across the text you want to select. (Or
-alternatively, click the left mouse button at one end of the
-text, then move to the other end and use Shift-click to select
-the text.)
-
-To kill some selected text, you can use C-w or choose the Cut
-item from the Edit menu.  Note that these are *not* equivalent:
-C-w only saves the text internally within Emacs (similar to C-k
-as described above), whereas Cut does this and also puts the
-text into the X clipboard, where it can be accessed by other
-applications.
-
-To retrieve text from the X clipboard, use the Paste item from
-the Edit menu.
-
-The middle mouse button is commonly used to choose items that
-are visible on the screen.  For example, if you enter Info (the
-on-line Emacs documentation) using C-h i or the Help menu, you
-can follow a highlighted link by clicking the middle mouse
-button on it.  Similarly, if you are typing a file name in
-(e.g. when prompted by "Find File") and you hit TAB to show the
-possible completions, you can click the middle mouse button on
-one of the completions to select it.
-
-The right mouse button brings up a popup menu.  The contents of
-this menu vary depending on what mode you're in, and usually
-contain a few commonly used commands, so they're easier to
-access.
-
->> Press the right mouse button now.
-
-You will have to hold the button down in order to keep the
-menu up.
-
+>> Insert a line of text, then type C-x s.
+   It should ask you whether to save the buffer named TUTORIAL.
+   Answer yes to the question by typing "y".
 
 * EXTENDING THE COMMAND SET
 ---------------------------
@@ -606,33 +581,33 @@
 	M-x	Named command eXtend.  Followed by a long name.
 
 These are commands that are generally useful but used less than the
-commands you have already learned about.  You have already seen two
-of them: the file commands C-x C-f to Find and C-x C-s to Save.
-Another example is the command to tell Emacs that you'd like to stop
-editing and get rid of Emacs.  The command to do this is C-x C-c.
-(Don't worry; it offers to save each changed file before it kills the
-Emacs.)
+commands you have already learned about.  You have already seen two of
+them: the file commands C-x C-f to Find and C-x C-s to Save.  Another
+example is the command to end the Emacs session--this is the command
+C-x C-c.  (Do not worry about losing changes you have made; C-x C-c
+offers to save each changed file before it kills the Emacs.)
 
 C-z is the command to exit Emacs *temporarily*--so that you can go
 back to the same Emacs session afterward.
 
-On systems which allow it, C-z exits from Emacs to the shell but does
-not destroy the Emacs; if you use the C shell, you can resume Emacs
-with the `fg' command (or, more generally, with `%emacs', which works
-even if your most recent job was some other).  On systems which don't
-implement suspending, C-z creates a subshell running under Emacs to
-give you the chance to run other programs and return to Emacs
-afterward; it does not truly "exit" from Emacs.  In this case, the
-shell command `exit' is the usual way to get back to Emacs from the
-subshell.
+On systems which allow it, C-z "suspends" Emacs; that is, it returns
+to the shell but does not destroy the Emacs.  In the most common
+shells, you can resume Emacs with the `fg' command or with `%emacs'.
+
+On systems which do not implement suspending, C-z creates a subshell
+running under Emacs to give you the chance to run other programs and
+return to Emacs afterward; it does not truly "exit" from Emacs.  In
+this case, the shell command `exit' is the usual way to get back to
+Emacs from the subshell.
 
 The time to use C-x C-c is when you are about to log out.  It's also
 the right thing to use to exit an Emacs invoked under mail handling
-programs and other random utilities, since they may not know how to
-cope with suspension of Emacs.  On other occasions, use C-z, and
-resume the Emacs when you have more editing to do.
+programs and other miscellaneous utilities, since they may not know
+how to cope with suspension of Emacs.  In ordinary circumstances,
+though, if you are not about to log out, it is better to suspend Emacs
+with C-z instead of exiting Emacs.
 
-There are many C-x commands.  The ones you know are:
+There are many C-x commands.  Here is a list of the ones you have learned:
 
 	C-x C-f		Find file.
 	C-x C-s		Save file.
@@ -641,22 +616,23 @@
 	C-x u		Undo.
 
 Named eXtended commands are commands which are used even less
-frequently, or commands which are used only in certain modes.  These
-commands are usually called "functions".  An example is the function
-replace-string, which globally replaces one string with another.  When
-you type M-x, Emacs prompts you at the bottom of the screen with
-M-x and you should type the name of the function you wish to call; in
-this case, "replace-string".  Just type "repl s<TAB>" and Emacs will
-complete the name.  End the command name with <Return>.
-Then type the two "arguments"--the string to be replaced, and the string
-to replace it with--each one ended with a Return.
+frequently, or commands which are used only in certain modes.  An
+example is the command replace-string, which globally replaces one
+string with another.  When you type M-x, Emacs prompts you at the
+bottom of the screen with M-x and you should type the name of the
+command; in this case, "replace-string".  Just type "repl s<TAB>" and
+Emacs will complete the name.  End the command name with <Return>.
+
+The replace-string command requires two arguments--the string to be
+replaced, and the string to replace it with.  You must end each
+argument with <Return>.
 
 >> Move the cursor to the blank line two lines below this one.
    Then type M-x repl s<Return>changed<Return>altered<Return>.
 
    Notice how this line has changed: you've replaced
-   the word c-h-a-n-g-e-d with "altered" wherever it occurred
-   after the cursor.
+   the word c-h-a-n-g-e-d with "altered" wherever it occurred,
+   after the initial position of the cursor.
 
 
 * AUTO SAVE
@@ -664,11 +640,11 @@
 
 When you have made changes in a file, but you have not saved them yet,
 they could be lost if your computer crashes.  To protect you from
-this, Emacs writes "auto save" files periodically.  The auto save file
-name has a # at the beginning and the end; for example, if your file
-is named "hello.c", its auto save file's name is "#hello.c#".  When
-you save the file in the normal way, its auto save file is no longer
-necessary so Emacs deletes it.
+this, Emacs periodically writes an "auto save" file for each file that
+you are editing.  The auto save file name has a # at the beginning and
+the end; for example, if your file is named "hello.c", its auto save
+file's name is "#hello.c#".  When you save the file in the normal way,
+Emacs deletes its auto save file.
 
 If the computer crashes, you can recover your auto-saved editing by
 finding the file normally (the file you were editing, not the auto
@@ -677,72 +653,91 @@
 data.
 
 
-* MODE LINE
+* ECHO AREA
 -----------
 
 If Emacs sees that you are typing commands slowly it shows them to you
 at the bottom of the screen in an area called the "echo area."  The echo
-area contains the bottom line of the screen.  The line immediately above
-it is called the MODE LINE.  The mode line says something like
+area contains the bottom line of the screen.
+
+
+* MODE LINE
+-----------
 
---**--Emacs: TUTORIAL		    (Fundamental)----58%-------------
+The line immediately above the echo area it is called the "mode line".
+The mode line says something like this:
 
-This is a very useful "information" line.
+--**-Emacs: TUTORIAL          (Fundamental)--L670--58%----------------
+
+This line gives useful information about the status of Emacs and
+the text you are editing.
 
 You already know what the filename means--it is the file you have
-found.  What the --NN%-- means is that NN percent of the file is
-above the top of the screen.  If the top of the file is on the screen,
-it will say --TOP-- instead of --00%--.  If the bottom of the file is
-on the screen, it will say --BOT--.  If you are looking at a file so
-small it all fits on the screen, it says --ALL--.
+found.  -NN%-- indicates your current position in the text; it means
+that NN percent of the text is above the top of the screen.  If the
+top of the file is on the screen, it will say --Top-- instead of
+--00%--.  If the bottom of the text is on the screen, it will say
+--Bot--.  If you are looking at text so small that all of it fits on
+the screen, the mode line says --All--.
 
 The stars near the front mean that you have made changes to the text.
-Right after you visit or save a file, there are no stars, just dashes.
+Right after you visit or save a file, that part of the mode line shows
+no stars, just dashes.
 
 The part of the mode line inside the parentheses is to tell you what
-modes you are in.  The default mode is Fundamental which is what you
-are in now.  It is an example of a "major mode".  There are several
-major modes in Emacs for editing different languages and text, such as
-Lisp mode, Text mode, etc.  At any time one and only one major mode is
-active, and its name can always be found in the mode line just where
-"Fundamental" is now.  Each major mode makes a few commands behave
-differently.  For example, there are commands for creating comments in
-a program, and since each programming language has a different idea of
-what a comment should look like, each major mode has to insert
-comments differently.  Each major mode is the name of an extended
-command, which is how you get into the mode.  For example,
-M-x fundamental-mode is how to get into Fundamental mode.
+editing modes you are in.  The default mode is Fundamental which is
+what you are using now.  It is an example of a "major mode".  
+
+Emacs has many different major modes.  Some of them are meant for
+editing different languages and/or kinds of text, such as Lisp mode,
+Text mode, etc.  At any time one and only one major mode is active,
+and its name can always be found in the mode line just where
+"Fundamental" is now.
+
+Each major mode makes a few commands behave differently.  For example,
+there are commands for creating comments in a program, and since each
+programming language has a different idea of what a comment should
+look like, each major mode has to insert comments differently.  Each
+major mode is the name of an extended command, which is how you can
+switch to that mode.  For example, M-x fundamental-mode is a command to
+switch to Fundamental mode.
 
 If you are going to be editing English text, such as this file, you
 should probably use Text Mode.
 >> Type M-x text-mode<Return>.
 
 Don't worry, none of the commands you have learned changes Emacs in
-any great way.  But you can observe that apostrophes are now part of
-words when you do M-f or M-b.  Major modes are usually like that:
-commands don't change into completely unrelated things, but they work
-a little bit differently.
+any great way.  But you can observe that M-f and M-b now treat
+apostrophes as part of words.  Previously, in Fundamental mode,
+M-f and M-b treated apostrophes as word-separators.
 
-To get documentation on your current major mode, type C-h m.
+Major modes usually make subtle changes like that one: most commands
+do "the same job" in each major mode, but they work a little bit
+differently.
+
+To view documentation on your current major mode, type C-h m.
 
 >> Use C-u C-v once or more to bring this line near the top of screen.
 >> Type C-h m, to see how Text mode differs from Fundamental mode.
 >> Type C-x 1 to remove the documentation from the screen.
 
 Major modes are called major because there are also minor modes.
-They are called minor because they aren't alternatives to the major
-modes, just minor modifications of them.  Each minor mode can be
-turned on or off by itself, regardless of what major mode you are in,
-and regardless of the other minor modes.  So you can use no minor
-modes, or one minor mode, or any combination of several minor modes.
+Minor modes are alternatives not to the major modes, just minor
+modifications of them.  Each minor mode can be turned on or off by
+itself, independent of all other minor modes, and independent of your
+major mode.  So you can use no minor modes, or one minor mode, or any
+combination of several minor modes.
 
 One minor mode which is very useful, especially for editing English
 text, is Auto Fill mode.  When this mode is on, Emacs breaks the line
-in between words automatically whenever the line gets too long.  You
-can turn this mode on by doing M-x auto-fill-mode<Return>.  When the
-mode is on, you can turn it off by doing M-x auto-fill-mode<Return>.
-If the mode is off, this function turns it on, and if the mode is on,
-this function turns it off.  This is called "toggling".
+in between words automatically whenever you insert text and make a
+line that is too wide.
+
+You can turn Auto Fill mode on by doing M-x auto-fill-mode<Return>.
+When the mode is on, you can turn it off by doing M-x
+auto-fill-mode<Return>.  If the mode is off, this command turns it on,
+and if the mode is on, this command turns it off.  We say that the
+command "toggles the mode".
 
 >> Type M-x auto-fill-mode<Return> now.  Then insert a line of "asdf "
    over again until you see it divide into two lines.  You must put in
@@ -764,36 +759,39 @@
 
 >> Move the cursor into the previous paragraph and type M-q.
 
-
 * SEARCHING
 -----------
 
 Emacs can do searches for strings (these are groups of contiguous
-characters or words) either forward through the file or backward
-through it.  To search for the string means that you are trying to
-locate it somewhere in the file and have Emacs show you where the
-occurrences of the string exist.  This type of search is somewhat
-different from what you may be familiar with.  It is a search that is
-performed as you type in the thing to search for.  The command to
-initiate a search is C-s for forward search, and C-r for reverse
-search.  BUT WAIT!  Don't do them now.  When you type C-s you'll
-notice that the string "I-search" appears as a prompt in the echo
-area.  This tells you that Emacs is in what is called an incremental
-search waiting for you to type the thing that you want to search for.
-<RET> terminates a search.
+characters or words) either forward through the text or backward
+through it.  Searching for a string is a cursor motion command;
+it moves the cursor to the next place where that string appears.
+
+The Emacs search command is different from the search commands
+of most editors, in that it is "incremental".  This means that the
+search happens while you type in the string to search for.
+
+The command to initiate a search is C-s for forward search, and C-r
+for reverse search.  BUT WAIT!  Don't try them now.
+
+When you type C-s you'll notice that the string "I-search" appears as
+a prompt in the echo area.  This tells you that Emacs is in what is
+called an incremental search waiting for you to type the thing that
+you want to search for.  <RET> terminates a search.
 
 >> Now type C-s to start a search.  SLOWLY, one letter at a time,
    type the word 'cursor', pausing after you type each
    character to notice what happens to the cursor.
->> Type C-s to find the next occurrence of "cursor".
+   Now you have searched for "cursor", once.
+>> Type C-s again, to search for the next occurrence of "cursor".
 >> Now type <Delete> four times and see how the cursor moves.
 >> Type <RET> to terminate the search.
 
 Did you see what happened?  Emacs, in an incremental search, tries to
-go to the occurrence of the string that you've typed out so far.  To go
-to the next occurrence of 'cursor' just type C-s again.  If no such
-occurrence exists Emacs beeps and tells you that it is a failing
-search.  C-g would also terminate the search.
+go to the occurrence of the string that you've typed out so far.  To
+go to the next occurrence of 'cursor' just type C-s again.  If no such
+occurrence exists Emacs beeps and tells you the search is currently
+"failing", C-g would also terminate the search.
 
 NOTE: On some systems, typing C-s will freeze the screen and you will
 see no further output from Emacs.  This indicates that an operating
@@ -805,22 +803,21 @@
 If you are in the middle of an incremental search and type <Delete>,
 you'll notice that the last character in the search string is erased
 and the search backs up to the last place of the search.  For
-instance, suppose you currently have typed 'cu' and you see that your
-cursor is at the first occurrence of 'cu'.  If you now type <Delete>,
-the 'u' on the search line is erased and you'll be repositioned in the
-text to the occurrence of 'c' where the search took you before you
-typed the 'u'.  This provides a useful means for backing up while you
-are searching.
+instance, suppose you have typed "c", to search for the first
+occurrence of "c".  Now if you type "u", the cursor will move
+to the first occurrence of "cu".  Now type <Delete>.  This erases
+the "u" from the search string, and the cursor moves back to
+the first occurrence of "c".
 
 If you are in the middle of a search and type a control or meta
 character (with a few exceptions--characters that are special in
 a search, such as C-s and C-r), the search is terminated.
 
 The C-s starts a search that looks for any occurrence of the search
-string AFTER the current cursor position.  But what if you want to
-search for something earlier in the text?  To do this, type C-r for
-Reverse search.  Everything that applies to C-s applies to C-r except
-that the direction of the search is reversed.
+string AFTER the current cursor position.  If you want to search for
+something earlier in the text, type C-r instead.  Everything that we
+have said about C-s also applies to C-r, except that the direction of
+the search is reversed.
 
 
 * MULTIPLE WINDOWS
@@ -835,34 +832,34 @@
    Both windows display this tutorial.  The cursor stays in the top window.
 
 >> Type C-M-v to scroll the bottom window.
-   (If you don't have a real Meta key, type ESC C-v.)
+   (If you do not have a real Meta key, type ESC C-v.)
 
 >> Type C-x o ("o" for "other") to move the cursor to the bottom window.
 >> Use C-v and M-v in the bottom window to scroll it.
    Keep reading these directions in the top window.
 
 >> Type C-x o again to move the cursor back to the top window.
-   The cursor is still just where it was in the top window before.
+   The cursor in the top window is just where it was before.
 
 You can keep using C-x o to switch between the windows.  Each
 window has its own cursor position, but only one window actually
 shows the cursor.  All the ordinary editing commands apply to the
-window that the cursor is in.
+window that the cursor is in.  We call this the "selected window".
 
 The command C-M-v is very useful when you are editing text in one
 window and using the other window just for reference.  You can keep
-the cursor always in the window where you are editing, and edit
-there as you advance through the other window.
+the cursor always in the window where you are editing, and advance
+through the other window sequentially with C-M-v.
 
 C-M-v is an example of a CONTROL-META character.  If you have a real
 META key, you can type C-M-v by holding down both CTRL and META while
-typing v.
+typing v.  It does not matter whether CTRL or META "comes first,"
+because both of these keys act by modifying the characters you type.
 
-It doesn't matter whether CTRL or META "comes first," because both of
-these keys act by modifying the characters you type.  But if you don't
-have a real META key, and you use ESC instead, the order does matter:
-you must type ESC followed by CTRL-v; CTRL-ESC v will not work.  This
-is because ESC is a character in its own right, not a modifier key.
+If you do not have a real META key, and you use ESC instead, the order
+does matter: you must type ESC followed by CTRL-v; CTRL-ESC v will not
+work.  This is because ESC is a character in its own right, not a
+modifier key.
 
 >> Type C-x 1 (in the top window) to get rid of the bottom window.
 
@@ -870,16 +867,15 @@
 of the top one.  Think of this command as "Keep just one
 window--the window I am already in.")
 
-You don't have to display the same buffer in both windows.  If
-you use C-x C-f to find a file in one window, the other window
-doesn't change.  You can pick a file in each window
-independently.
+You do not have to display the same buffer in both windows.  If you
+use C-x C-f to find a file in one window, the other window does not
+change.  You can find a file in each window independently.
 
 Here is another way to use two windows to display two different
 things:
 
 >> Type C-x 4 C-f followed by the name of one of your files.
-   End with <RETURN>.  See the specified file appear in the bottom
+   End with <Return>.  See the specified file appear in the bottom
    window.  The cursor goes there, too.
 
 >> Type C-x o to go back to the top window, and C-x 1 to delete
@@ -900,9 +896,9 @@
 
 >> Type M-x to get into a minibuffer; then type ESC ESC ESC to get out.
 
-You can't use C-g to get out of a recursive editing level because C-g
-is used for canceling commands and arguments WITHIN the recursive
-editing level.
+You cannot use C-g to get out of a recursive editing level.  This is
+because C-g is used for canceling commands and arguments WITHIN the
+recursive editing level.
 
 
 * GETTING MORE HELP
@@ -911,18 +907,22 @@
 In this tutorial we have tried to supply just enough information to
 get you started using Emacs.  There is so much available in Emacs that
 it would be impossible to explain it all here.  However, you may want
-to learn more about Emacs since it has numerous desirable features
-that you don't know about yet.  Emacs has a great deal of internal
-documentation.  All of these commands can be accessed through
-the character Control-h, which we call "the Help character"
-because of the function it serves.
+to learn more about Emacs since it has many other useful features.
+Emacs provides commands for reading documentation about Emacs
+commands.  These "help" commands all start with the character
+Control-h, which is called "the Help character".
 
-To use the HELP features, type the C-h character, and then a
+To use the Help features, type the C-h character, and then a
 character saying what kind of help you want.  If you are REALLY lost,
 type C-h ? and Emacs will tell you what kinds of help it can give.
-If you have typed C-h and decide you don't want any help, just
+If you have typed C-h and decide you do not want any help, just
 type C-g to cancel it.
 
+(Some sites rebind the character C-h.  They really should not do this
+as a blanket measure, so complain to the system administrator.
+Meanwhile, if C-h does not display a message about help at the bottom
+of the screen, try typing M-x help RET instead.)
+
 The most basic HELP feature is C-h c.  Type C-h, a c, and a
 command character or sequence, and Emacs displays a very brief
 description of the command.
@@ -932,15 +932,16 @@
 
 	C-p runs the command previous-line
 
-This tells you the "name of the function".  That is important in
-writing Lisp code to extend Emacs; it also is enough to remind
-you of what the command does if you have seen it before but did
-not remember.
+This tells you the "name of the function".  Function names are used
+mainly for customizing and extending Emacs.  But since function names
+are chosen to indicate what the command does, they can serve also as
+very brief documentation--sufficient to remind you of commands you
+have already learned.
 
 Multi-character commands such as C-x C-s and (if you have no META or
-EDIT key) <ESC>v are also allowed after C-h c.
+EDIT or ALT key) <ESC>v are also allowed after C-h c.
 
-To get more information on the command, use C-h k instead of C-h c.
+To get more information about a command, use C-h k instead of C-h c.
 
 >> Type C-h k Control-p.
 
@@ -948,7 +949,7 @@
 name, in an Emacs window.  When you are finished reading the
 output, type C-x 1 to get rid of the help text.  You do not have
 to do this right away.  You can do some editing while referring
-to the help text and then type C-x 1.
+to the help text, and then type C-x 1.
 
 Here are some other useful C-h options:
 
@@ -963,14 +964,13 @@
 		all the commands whose names contain that keyword.
 		These commands can all be invoked with Meta-x.
 		For some commands, Command Apropos will also list a one
-		or two character sequence which has the same effect.
+		or two character sequence which runs the same command.
 
 >> Type C-h a file<Return>.
 
-This displays in another window a list of all M-x commands with
-"file" in their names.  You will also see commands like C-x C-f
-and C-x C-w, listed beside the command names find-file and
-write-file.
+This displays in another window a list of all M-x commands with "file"
+in their names.  You will see character-commands like C-x C-f listed
+beside the corresponding command names such as find-file.
 
 >> Type C-M-v to scroll the help window.  Do this a few times.
 
@@ -981,9 +981,7 @@
 ------------
 
 Remember, to exit Emacs permanently use C-x C-c.  To exit to a shell
-temporarily, so that you can come back in, use C-z. (This does not
-work under X windows, because there is no real concept of exiting
-temporarily to the shell.  Instead, C-z iconifies the Emacs screen.)
+temporarily, so that you can come back to Emacs afterward, use C-z.
 
 This tutorial is meant to be understandable to all new users, so if
 you found something unclear, don't sit and blame yourself - complain!
@@ -994,7 +992,6 @@
 
 This tutorial descends from a long line of Emacs tutorials
 starting with the one written by Stuart Cracraft for the original Emacs.
-Ben Wing updated the tutorial for X Windows.
 
 This version of the tutorial, like GNU Emacs, is copyrighted, and
 comes with permission to distribute copies on certain conditions:
@@ -1012,8 +1009,7 @@
    under the above conditions, provided also that they
    carry prominent notices stating who last altered them.
 
-The conditions for copying Emacs itself are slightly different
-but in the same spirit.  Please read the file COPYING and then
-do give copies of GNU Emacs to your friends.
-Help stamp out software obstructionism ("ownership") by using,
-writing, and sharing free software!
+The conditions for copying Emacs itself are more complex, but in the
+same spirit.  Please read the file COPYING and then do give copies of
+GNU Emacs to your friends.  Help stamp out software obstructionism
+("ownership") by using, writing, and sharing free software!