Commits

cvs  committed 78478c6

Import from CVS: tag r20-4b4

  • Participants
  • Parent commits 49f55ca
  • Tags r20-4b4

Comments (0)

Files changed (69)

File CHANGES-beta

 							-*- indented-text -*-
+to 20.4 beta4 "American Cashmere"
+-- Major changes in portable dumping/Lisp_Object code courtesy of Kyle Jones
+-- Miscellaneous patches from Kyle Jones, Hrvoje Niksic
+-- various build tweaks
+-- help-macro ported from Emacs 20 courtesy of Hrvoje Niksic
+-- Fix compiler warnings
+-- MS Windows patches from Marc Paquette and Darryl Okahata
+-- Change pointer glyph over custom buttons courtesy of Hrvoje Niksic
+-- New Lisp variable:  last-command-event-time courtesy of Kyle Jones
+-- miscellaneous bug fixes
+
 to 20.4 beta3 "Altai Mountain"
 -- query-replace and query-replace-regexp will only replace the region if the
    zmacs region is active.
+1997-11-10  SL Baur  <steve@altair.xemacs.org>
+
+	* info/dir: remove packaged entries.
+	From Glynn Clements <glynn@sensei.co.uk>
+
+	* configure.in: Puke and die if NAS sound is selected without X.
+
 1997-11-08  SL Baur  <steve@altair.xemacs.org>
 
 	* XEmacs 20.4-beta3 is released.
   test "$all_widgets" != "no no no no" && extra_objs="$extra_objs gui-x.o" &&  if test "$extra_verbose" = "yes"; then
    echo "    xemacs will be linked with \"gui-x.o\""
  fi
+else
+  if test \( "$with_sound" = "nas" \) -o \( "$with_sound" = "both" \); then
+    echo "Attempt to Build NAS sound without X"
+    echo "Please remove NAS configuration or build with X"
+    exit 1
+  fi
 fi
 
 
 
 if test "$with_mule" = "yes" ; then
   echo "checking for Mule-related features" 1>&6
-echo "configure:6574: checking for Mule-related features" >&5
+echo "configure:6580: checking for Mule-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining MULE
 EOF
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:6591: checking for $ac_hdr" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6594 "configure"
+echo "configure:6597: checking for $ac_hdr" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6600 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6599: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6605: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 
   
 echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6
-echo "configure:6630: checking for strerror in -lintl" >&5
+echo "configure:6636: 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 6635 "configure"
+#line 6641 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 strerror()
 ; return 0; }
 EOF
-if { (eval echo configure:6646: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6652: \"$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 "checking for Mule input methods" 1>&6
-echo "configure:6679: checking for Mule input methods" >&5
+echo "configure:6685: checking for Mule input methods" >&5
       test -z "$with_xim" -a "$opsys" != "sol2" && with_xim=no
   case "$with_xim" in "" | "yes" )
     echo "checking for XIM" 1>&6
-echo "configure:6683: checking for XIM" >&5
+echo "configure:6689: checking for XIM" >&5
     
 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6
-echo "configure:6686: checking for XmImMbLookupString in -lXm" >&5
+echo "configure:6692: 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 6691 "configure"
+#line 6697 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 XmImMbLookupString()
 ; return 0; }
 EOF
-if { (eval echo configure:6702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6708: \"$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
     fi
   else     case "$with_xfs" in  "yes" )
       echo "checking for XFontSet" 1>&6
-echo "configure:6765: checking for XFontSet" >&5
+echo "configure:6771: checking for XFontSet" >&5
       
 echo $ac_n "checking for XmbDrawString in -lX11""... $ac_c" 1>&6
-echo "configure:6768: checking for XmbDrawString in -lX11" >&5
+echo "configure:6774: checking for XmbDrawString in -lX11" >&5
 ac_lib_var=`echo X11'_'XmbDrawString | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lX11 "
 cat > conftest.$ac_ext <<EOF
-#line 6773 "configure"
+#line 6779 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 XmbDrawString()
 ; return 0; }
 EOF
-if { (eval echo configure:6784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6790: \"$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
     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:6823: checking for wnn/jllib.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6826 "configure"
+echo "configure:6829: checking for wnn/jllib.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6832 "configure"
 #include "confdefs.h"
 #include <wnn/jllib.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6831: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:6837: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
     for ac_func in crypt
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:6856: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 6859 "configure"
+echo "configure:6862: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 6865 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 
 ; return 0; }
 EOF
-if { (eval echo configure:6882: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
 
     test "$ac_cv_func_crypt" != "yes" && { 
 echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6
-echo "configure:6911: checking for crypt in -lcrypt" >&5
+echo "configure:6917: checking for crypt in -lcrypt" >&5
 ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lcrypt "
 cat > conftest.$ac_ext <<EOF
-#line 6916 "configure"
+#line 6922 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 crypt()
 ; return 0; }
 EOF
-if { (eval echo configure:6927: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6933: \"$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
   fi
     test -z "$with_wnn" && { 
 echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6
-echo "configure:6961: checking for jl_dic_list_e in -lwnn" >&5
+echo "configure:6967: checking for jl_dic_list_e in -lwnn" >&5
 ac_lib_var=`echo wnn'_'jl_dic_list_e | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -lwnn "
 cat > conftest.$ac_ext <<EOF
-#line 6966 "configure"
+#line 6972 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 jl_dic_list_e()
 ; return 0; }
 EOF
-if { (eval echo configure:6977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:6983: \"$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
  fi
     
 echo $ac_n "checking for jl_fi_dic_list in -lwnn""... $ac_c" 1>&6
-echo "configure:7014: checking for jl_fi_dic_list in -lwnn" >&5
+echo "configure:7020: 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 7019 "configure"
+#line 7025 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 jl_fi_dic_list()
 ; return 0; }
 EOF
-if { (eval echo configure:7030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7036: \"$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
 
     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:7062: checking for canna/RK.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7065 "configure"
+echo "configure:7068: checking for canna/RK.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7071 "configure"
 #include "confdefs.h"
 #include <canna/RK.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7070: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7076: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6
-echo "configure:7093: checking for RkBgnBun in -lRKC" >&5
+echo "configure:7099: 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 7098 "configure"
+#line 7104 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 RkBgnBun()
 ; return 0; }
 EOF
-if { (eval echo configure:7109: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7115: \"$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
  }
   test -z "$with_canna" && { 
 echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6
-echo "configure:7132: checking for jrKanjiControl in -lcanna" >&5
+echo "configure:7138: 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 7137 "configure"
+#line 7143 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 jrKanjiControl()
 ; return 0; }
 EOF
-if { (eval echo configure:7148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7154: \"$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
   libs_x="-lXm $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-lXm\" to \$libs_x"; fi
     
 echo $ac_n "checking for layout_object_getvalue in -li18n""... $ac_c" 1>&6
-echo "configure:7197: checking for layout_object_getvalue in -li18n" >&5
+echo "configure:7203: checking for layout_object_getvalue in -li18n" >&5
 ac_lib_var=`echo i18n'_'layout_object_getvalue | sed 'y%./+-%__p_%'`
 
 xe_check_libs=" -li18n "
 cat > conftest.$ac_ext <<EOF
-#line 7202 "configure"
+#line 7208 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 layout_object_getvalue()
 ; return 0; }
 EOF
-if { (eval echo configure:7213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7219: \"$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
 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 ulimit usleep utimes waitpid
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7286: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7289 "configure"
+echo "configure:7292: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7295 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 
 ; return 0; }
 EOF
-if { (eval echo configure:7312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
     for ac_func in realpath
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:7349: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7352 "configure"
+echo "configure:7355: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7358 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 
 ; return 0; }
 EOF
-if { (eval echo configure:7375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
 esac
 
 echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6
-echo "configure:7408: checking whether netdb declares h_errno" >&5
-cat > conftest.$ac_ext <<EOF
-#line 7410 "configure"
+echo "configure:7414: checking whether netdb declares h_errno" >&5
+cat > conftest.$ac_ext <<EOF
+#line 7416 "configure"
 #include "confdefs.h"
 #include <netdb.h>
 int main() {
 return h_errno;
 ; return 0; }
 EOF
-if { (eval echo configure:7417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7423: \"$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
 rm -f conftest*
 
 echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6
-echo "configure:7437: checking for sigsetjmp" >&5
-cat > conftest.$ac_ext <<EOF
-#line 7439 "configure"
+echo "configure:7443: checking for sigsetjmp" >&5
+cat > conftest.$ac_ext <<EOF
+#line 7445 "configure"
 #include "confdefs.h"
 #include <setjmp.h>
 int main() {
 sigjmp_buf bar; sigsetjmp (bar, 0);
 ; return 0; }
 EOF
-if { (eval echo configure:7446: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7452: \"$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
 rm -f conftest*
 
 echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6
-echo "configure:7466: checking whether localtime caches TZ" >&5
+echo "configure:7472: checking whether localtime caches TZ" >&5
 
 if test "$ac_cv_func_tzset" = "yes"; then
 cat > conftest.$ac_ext <<EOF
-#line 7470 "configure"
+#line 7476 "configure"
 #include "confdefs.h"
 #include <time.h>
 #if STDC_HEADERS
   exit (0);
 }
 EOF
-if { (eval echo configure:7505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:7511: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   emacs_cv_localtime_cache=no
 else
 
 if test "$HAVE_TIMEVAL" = "yes"; then
 echo $ac_n "checking whether gettimeofday cannot accept two arguments""... $ac_c" 1>&6
-echo "configure:7534: checking whether gettimeofday cannot accept two arguments" >&5
-cat > conftest.$ac_ext <<EOF
-#line 7536 "configure"
+echo "configure:7540: checking whether gettimeofday cannot accept two arguments" >&5
+cat > conftest.$ac_ext <<EOF
+#line 7542 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
 
 ; return 0; }
 EOF
-if { (eval echo configure:7558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   echo "$ac_t""no" 1>&6
 else
 fi
 
 echo $ac_n "checking whether the timezone variable is already declared""... $ac_c" 1>&6
-echo "configure:7579: checking whether the timezone variable is already declared" >&5
-cat > conftest.$ac_ext <<EOF
-#line 7581 "configure"
+echo "configure:7585: checking whether the timezone variable is already declared" >&5
+cat > conftest.$ac_ext <<EOF
+#line 7587 "configure"
 #include "confdefs.h"
 
 #ifdef TIME_WITH_SYS_TIME
 
 ; return 0; }
 EOF
-if { (eval echo configure:7601: \"$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*
   echo "$ac_t""yes" 1>&6
    { test "$extra_verbose" = "yes" && cat << \EOF
 
 
 echo $ac_n "checking for inline""... $ac_c" 1>&6
-echo "configure:7623: checking for inline" >&5
+echo "configure:7629: checking for inline" >&5
 
 ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat > conftest.$ac_ext <<EOF
-#line 7628 "configure"
+#line 7634 "configure"
 #include "confdefs.h"
 
 int main() {
 } $ac_kw foo() {
 ; return 0; }
 EOF
-if { (eval echo configure:7635: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:7641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   ac_cv_c_inline=$ac_kw; break
 else
 # 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:7685: checking for working alloca.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7688 "configure"
+echo "configure:7691: checking for working alloca.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7694 "configure"
 #include "confdefs.h"
 #include <alloca.h>
 int main() {
 char *p = alloca(2 * sizeof(int));
 ; return 0; }
 EOF
-if { (eval echo configure:7695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7701: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_header_alloca_h=yes
 else
 fi
 
 echo $ac_n "checking for alloca""... $ac_c" 1>&6
-echo "configure:7719: checking for alloca" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7722 "configure"
+echo "configure:7725: checking for alloca" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7728 "configure"
 #include "confdefs.h"
 
 #ifdef __GNUC__
 char *p = (char *) alloca(1);
 ; return 0; }
 EOF
-if { (eval echo configure:7745: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   ac_cv_func_alloca_works=yes
 else
 
 
 echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6
-echo "configure:7784: checking whether alloca needs Cray hooks" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7787 "configure"
+echo "configure:7790: checking whether alloca needs Cray hooks" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7793 "configure"
 #include "confdefs.h"
 #if defined(CRAY) && ! defined(CRAY2)
 webecray
 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:7811: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7814 "configure"
+echo "configure:7817: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7820 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 
 ; return 0; }
 EOF
-if { (eval echo configure:7837: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:7843: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
 fi
 
 echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6
-echo "configure:7867: checking stack direction for C alloca" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7870 "configure"
+echo "configure:7873: checking stack direction for C alloca" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7876 "configure"
 #include "confdefs.h"
 find_stack_direction ()
 {
   exit (find_stack_direction() < 0);
 }
 EOF
-if { (eval echo configure:7889: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:7895: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_c_stack_direction=1
 else
 
 ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for vfork.h""... $ac_c" 1>&6
-echo "configure:7917: checking for vfork.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7920 "configure"
+echo "configure:7923: checking for vfork.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7926 "configure"
 #include "confdefs.h"
 #include <vfork.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:7925: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:7931: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 fi
 
 echo $ac_n "checking for working vfork""... $ac_c" 1>&6
-echo "configure:7953: checking for working vfork" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 7956 "configure"
+echo "configure:7959: checking for working vfork" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 7962 "configure"
 #include "confdefs.h"
 /* Thanks to Paul Eggert for this test.  */
 #include <stdio.h>
   }
 }
 EOF
-if { (eval echo configure:8051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:8057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_func_vfork_works=yes
 else
 
 
 echo $ac_n "checking for working strcoll""... $ac_c" 1>&6
-echo "configure:8076: checking for working strcoll" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8079 "configure"
+echo "configure:8082: checking for working strcoll" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8085 "configure"
 #include "confdefs.h"
 #include <string.h>
 main ()
 	strcoll ("123", "456") >= 0);
 }
 EOF
-if { (eval echo configure:8089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:8095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_func_strcoll_works=yes
 else
 for ac_func in getpgrp
 do
 echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
-echo "configure:8116: checking for $ac_func" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8119 "configure"
+echo "configure:8122: checking for $ac_func" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8125 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func(); below.  */
 
 ; return 0; }
 EOF
-if { (eval echo configure:8142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_$ac_func=yes"
 else
 done
 
 echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6
-echo "configure:8170: checking whether getpgrp takes no argument" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8173 "configure"
+echo "configure:8176: checking whether getpgrp takes no argument" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8179 "configure"
 #include "confdefs.h"
 
 /*
 }
 
 EOF
-if { (eval echo configure:8228: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:8234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   ac_cv_func_getpgrp_void=yes
 else
 
 
 echo $ac_n "checking for working mmap""... $ac_c" 1>&6
-echo "configure:8254: checking for working mmap" >&5
+echo "configure:8260: checking for working mmap" >&5
 case "$opsys" in ultrix* ) have_mmap=no ;; *)
 cat > conftest.$ac_ext <<EOF
-#line 8257 "configure"
+#line 8263 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 #include <unistd.h>
   return 1;
 }
 EOF
-if { (eval echo configure:8290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
+if { (eval echo configure:8296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5
 then
   have_mmap=yes
 else
 
 ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for termios.h""... $ac_c" 1>&6
-echo "configure:8324: checking for termios.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8327 "configure"
+echo "configure:8330: checking for termios.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8333 "configure"
 #include "confdefs.h"
 #include <termios.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8332: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8338: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   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:8375: checking for termio.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8378 "configure"
+echo "configure:8381: checking for termio.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8384 "configure"
 #include "confdefs.h"
 #include <termio.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8389: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 
 
 echo $ac_n "checking for socket""... $ac_c" 1>&6
-echo "configure:8415: checking for socket" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8418 "configure"
+echo "configure:8421: checking for socket" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8424 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char socket(); below.  */
 
 ; return 0; }
 EOF
-if { (eval echo configure:8441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_socket=yes"
 else
   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:8456: checking for netinet/in.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8459 "configure"
+echo "configure:8462: checking for netinet/in.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8465 "configure"
 #include "confdefs.h"
 #include <netinet/in.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8464: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8470: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   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:8481: checking for arpa/inet.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8484 "configure"
+echo "configure:8487: checking for arpa/inet.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8490 "configure"
 #include "confdefs.h"
 #include <arpa/inet.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8489: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8495: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 }
 
       echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6
-echo "configure:8514: checking "for sun_len member in struct sockaddr_un"" >&5
+echo "configure:8520: checking "for sun_len member in struct sockaddr_un"" >&5
       cat > conftest.$ac_ext <<EOF
-#line 8516 "configure"
+#line 8522 "configure"
 #include "confdefs.h"
 
 #include <sys/types.h>
 static struct sockaddr_un x; x.sun_len = 1;
 ; return 0; }
 EOF
-if { (eval echo configure:8527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8533: \"$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
 
 
 echo $ac_n "checking for msgget""... $ac_c" 1>&6
-echo "configure:8558: checking for msgget" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8561 "configure"
+echo "configure:8564: checking for msgget" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8567 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char msgget(); below.  */
 
 ; 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:8590: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_msgget=yes"
 else
   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:8599: checking for sys/ipc.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8602 "configure"
+echo "configure:8605: checking for sys/ipc.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8608 "configure"
 #include "confdefs.h"
 #include <sys/ipc.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8607: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8613: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   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:8624: checking for sys/msg.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8627 "configure"
+echo "configure:8630: checking for sys/msg.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8633 "configure"
 #include "confdefs.h"
 #include <sys/msg.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8632: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8638: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 
 ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for dirent.h""... $ac_c" 1>&6
-echo "configure:8670: checking for dirent.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8673 "configure"
+echo "configure:8676: checking for dirent.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8679 "configure"
 #include "confdefs.h"
 #include <dirent.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8678: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8684: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
   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:8705: checking for sys/dir.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8708 "configure"
+echo "configure:8711: checking for sys/dir.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8714 "configure"
 #include "confdefs.h"
 #include <sys/dir.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8719: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 
 ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for nlist.h""... $ac_c" 1>&6
-echo "configure:8746: checking for nlist.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8749 "configure"
+echo "configure:8752: checking for nlist.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8755 "configure"
 #include "confdefs.h"
 #include <nlist.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8754: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8760: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 
 
 echo "checking "for sound support"" 1>&6
-echo "configure:8784: checking "for sound support"" >&5
+echo "configure:8790: checking "for sound support"" >&5
 case "$with_sound" in
   native | both ) with_native_sound=yes;;
   nas    | no   ) with_native_sound=no;;
     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:8795: checking for multimedia/audio_device.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8798 "configure"
+echo "configure:8801: checking for multimedia/audio_device.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8804 "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:8803: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8809: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
       if test -z "$native_sound_lib"; then
         
 echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6
-echo "configure:8851: checking for ALopenport in -laudio" >&5
+echo "configure:8857: 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 8856 "configure"
+#line 8862 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 ALopenport()
 ; return 0; }
 EOF
-if { (eval echo configure:8867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8873: \"$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
       if test -z "$native_sound_lib"; then
 	
 echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6
-echo "configure:8898: checking for AOpenAudio in -lAlib" >&5
+echo "configure:8904: 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 8903 "configure"
+#line 8909 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 AOpenAudio()
 ; return 0; }
 EOF
-if { (eval echo configure:8914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:8920: \"$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
     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:8952: checking for ${dir}/soundcard.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 8955 "configure"
+echo "configure:8958: checking for ${dir}/soundcard.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 8961 "configure"
 #include "confdefs.h"
 #include <${dir}/soundcard.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:8960: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:8966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
  fi
   libs_x="-laudio $libs_x" &&  if test "$extra_verbose" = "yes"; then echo "    Prepending \"-laudio\" to \$libs_x"; fi
       cat > conftest.$ac_ext <<EOF
-#line 9030 "configure"
+#line 9036 "configure"
 #include "confdefs.h"
 #include <audio/Xtutil.h>
 EOF
 
 if test "$with_tty" = "yes"  ; then
   echo "checking for TTY-related features" 1>&6
-echo "configure:9057: checking for TTY-related features" >&5
+echo "configure:9063: checking for TTY-related features" >&5
   { test "$extra_verbose" = "yes" && cat << \EOF
     Defining HAVE_TTY
 EOF
     if test -z "$with_ncurses"; then
     
 echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6
-echo "configure:9073: checking for tgetent in -lncurses" >&5
+echo "configure:9079: 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 9078 "configure"
+#line 9084 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:9089: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9095: \"$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
 
     ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6
-echo "configure:9122: checking for ncurses/curses.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9125 "configure"
+echo "configure:9128: checking for ncurses/curses.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9131 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9130: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9136: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 
     ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6
-echo "configure:9152: checking for ncurses/term.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9155 "configure"
+echo "configure:9158: checking for ncurses/term.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9161 "configure"
 #include "confdefs.h"
 #include <ncurses/term.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9160: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9166: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
       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:9190: checking for ncurses/curses.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9193 "configure"
+echo "configure:9196: checking for ncurses/curses.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9199 "configure"
 #include "confdefs.h"
 #include <ncurses/curses.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9198: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9204: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
 	for lib in curses termlib termcap; do
 	  
 echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6
-echo "configure:9233: checking for tgetent in -l$lib" >&5
+echo "configure:9239: 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 9238 "configure"
+#line 9244 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:9249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9255: \"$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
       else
 	
 echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6
-echo "configure:9280: checking for tgetent in -lcurses" >&5
+echo "configure:9286: 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 9285 "configure"
+#line 9291 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:9296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9302: \"$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
 else
   echo "$ac_t""no" 1>&6
 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6
-echo "configure:9314: checking for tgetent in -ltermcap" >&5
+echo "configure:9320: 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 9319 "configure"
+#line 9325 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 tgetent()
 ; return 0; }
 EOF
-if { (eval echo configure:9330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9336: \"$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
 
     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:9378: checking for gpm.h" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9381 "configure"
+echo "configure:9384: checking for gpm.h" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9387 "configure"
 #include "confdefs.h"
 #include <gpm.h>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:9386: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:9392: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out`
 if test -z "$ac_err"; then
   rm -rf conftest*
  }
   test -z "$with_gpm" && { 
 echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6
-echo "configure:9409: checking for Gpm_Open in -lgpm" >&5
+echo "configure:9415: 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 9414 "configure"
+#line 9420 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 Gpm_Open()
 ; return 0; }
 EOF
-if { (eval echo configure:9425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9431: \"$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 "checking for database support" 1>&6
-echo "configure:9474: checking for database support" >&5
+echo "configure:9480: 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:9479: checking for dbm_open in -lgdbm" >&5
+echo "configure:9485: 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 9484 "configure"
+#line 9490 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:9495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9501: \"$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
 
   if test "$with_database_gnudbm" != "yes"; then
     echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:9517: checking for dbm_open" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9520 "configure"
+echo "configure:9523: checking for dbm_open" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9526 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */
 
 ; return 0; }
 EOF
-if { (eval echo configure:9543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9549: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_dbm_open=yes"
 else
 
 if test "$with_database_dbm" != "no"; then
   echo $ac_n "checking for dbm_open""... $ac_c" 1>&6
-echo "configure:9579: checking for dbm_open" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9582 "configure"
+echo "configure:9585: checking for dbm_open" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9588 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbm_open(); below.  */
 
 ; return 0; }
 EOF
-if { (eval echo configure:9605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_dbm_open=yes"
 else
   if test "$need_libdbm" != "no"; then
     
 echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6
-echo "configure:9626: checking for dbm_open in -ldbm" >&5
+echo "configure:9632: 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 9631 "configure"
+#line 9637 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 dbm_open()
 ; return 0; }
 EOF
-if { (eval echo configure:9642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9648: \"$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
 
 if test "$with_database_berkdb" != "no"; then
   echo $ac_n "checking for dbopen""... $ac_c" 1>&6
-echo "configure:9679: checking for dbopen" >&5
-
-cat > conftest.$ac_ext <<EOF
-#line 9682 "configure"
+echo "configure:9685: checking for dbopen" >&5
+
+cat > conftest.$ac_ext <<EOF
+#line 9688 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dbopen(); below.  */
 
 ; return 0; }
 EOF
-if { (eval echo configure:9705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
   rm -rf conftest*
   eval "ac_cv_func_dbopen=yes"
 else
   if test "$need_libdb" != "no"; then
     
 echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6
-echo "configure:9726: checking for dbopen in -ldb" >&5
+echo "configure:9732: 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 9731 "configure"
+#line 9737 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 dbopen()
 ; return 0; }
 EOF
-if { (eval echo configure:9742: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9748: \"$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
   if test "$with_database_berkdb" = "yes"; then
     for path in "db/db.h" "db.h"; do
 cat > conftest.$ac_ext <<EOF
-#line 9766 "configure"
+#line 9772 "configure"
 #include "confdefs.h"
 #ifdef HAVE_INTTYPES_H
 #define __BIT_TYPES_DEFINED__
 
 ; return 0; }
 EOF
-if { (eval echo configure:9784: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+if { (eval echo configure:9790: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
   rm -rf conftest*
   db_h_path="$path"; break
 else
 if test "$with_socks" = "yes"; then
   
 echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6
-echo "configure:9836: checking for SOCKSinit in -lsocks" >&5
+echo "configure:9842: 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 9841 "configure"
+#line 9847 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
 SOCKSinit()
 ; return 0; }
 EOF
-if { (eval echo configure:9852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
+if { (eval echo configure:9858: \"$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

File configure.in

   test "$with_dialogs"    != "no"      && XE_ADD_OBJS(dialog-x.o)
   test "$with_toolbars"   != "no"      && XE_ADD_OBJS(toolbar-x.o)
   test "$all_widgets" != "no no no no" && XE_ADD_OBJS(gui-x.o)
+else
+  if test \( "$with_sound" = "nas" \) -o \( "$with_sound" = "both" \); then
+    echo "Attempt to Build NAS sound without X"
+    echo "Please remove NAS configuration or build with X"
+    exit 1
+  fi
 fi
 
 dnl ----------------------
 
 Local Packages:
 
-* CC-MODE::	Mode for editing C, C++, and Objective-C code.
 * CL::		A Common Lisp compatibility package for Emacs-Lisp.
 * Custom::	Customization Library for Emacs
-* Ediff::	A Visual Interface to Unix Diff and Patch Utilities.
-* EFS::		Transparent remote file access via FTP
 * External-Widget::
 		Use XEmacs as a text widget inside of another program.
 * Forms::	A package for editing databases by filling in forms.
-* HM--HTML-Mode::  HTML Editing Mode.
-* Hyperbole::	A programmable information management and hypertext system.
-* ILISP::	Multi-dialect inferior LISP interface.
 * Ispell::	Interactive spelling corrector.
-* Mailcrypt::	Emacs interface to cryptographic functions for mail and news.
 * OO-Browser::	The Multi-Language Object-Oriented Browser.
-* PCL-CVS::	An XEmacs-based front end to CVS.
 * PH::		Client interface to the CCSO white pages directory system
-* PSGML::	A powerful mode for HTML and other SGML documents.
-* PSGML-API::	PSGML, the API documentation.
 * Standards::	The GNU coding standards.
 * Supercite::	Lets you cite parts of messages you're replying to.
 * Term::	ANSI-compatible terminal emulator.
 		to handle all types of character-display terminals.
 * Texinfo::	With one source file, make either a printed manual (through
 		TeX) or an Info file (through texinfo).
-* Viper::	A VI Plan for Emacs Rescue and a venomous VI PERil.
 * Vhdl-mode::	A major mode for editing VHDL files.
 * Widget::	An Emacs Lisp widget library
-* tm-en::	Tools for Mime (English version)
-* tm-mh-e-en::	Tools for Mime for MH-E (English version)
-* gnus-mime-en::
-		Tools for Mime for Gnus (English version)
-* tm-vm-en::    Tools for Mime for VM
-* tm-ja::	Tools for Mime (Japanese version)
-* tm-mh-e-ja::	Tools for Mime for MH-E (Japanese version)
-* gnus-mime-ja::
-		Tools for Mime for Gnus (Japanese version)
 * Locals:

File lisp/ChangeLog

+1997-11-12  Hrvoje Niksic  <hniksic@srce.hr>
+
+	* help.el (help-for-help): Use `make-help-screen'.
+	* help-macro.el:  New file.
+
+1997-11-10  SL Baur  <steve@altair.xemacs.org>
+
+	* x-menubar.el (options-menu-saved-forms):
+	`current-language-environment' is a variable now.
+
+	* packages/add-log.el (TopLevel): Require 'fortran only if it is
+	available.
+
+	* modes/lazy-shot.el (lazy-shot-unstall): Add guard on removing
+	the timer because the timer may not have been installed first.
+
+1997-11-10  Hrvoje Niksic  <hniksic@srce.hr>
+
+	* prim/frame.el (default-deselect-frame-hook): Dehighlight the
+	currently highlighted extent.
+
+1997-11-09  Hrvoje Niksic  <hniksic@srce.hr>
+
+	* prim/help.el (describe-variable): Add proper spacing.
+
+1997-11-10  SL Baur  <steve@altair.xemacs.org>
+
+	* utils/browse-url.el (TopLevel): Guard against term not being in
+	the load path.
+	(browse-url-lynx-emacs): Attach guards against term not being in
+	the load path.
+
+1997-11-09  SL Baur  <steve@altair.xemacs.org>
+
+	* packages/autoinsert.el: Fix bottom of lisp file template.
+
+1997-11-09  Kyle Jones  <kyle_jones@wonderworks.com>
+
+	* gui.el: For gui-button-face, set
+	  foreground/background colors only on X devices.
+	  Previously they were set for all devices.
+
+1997-11-09  Hrvoje Niksic  <hniksic@srce.hr>
+
+	* prim/extents.el (extent-keymap): New function.
+
+1997-11-09  Kyle Jones  <kyle_jones@wonderworks.com>
+
+	* specifier.el: Define specifier tags for the
+	  device types that do not have compiled in support.
+	  This allows device type specific properties to be set
+	  in specifiers even if the device type isn't supported
+	  in the current binary.
+
+1997-11-07  Hrvoje Niksic  <hniksic@srce.hr>
+
+	* custom/wid-edit.el (widget-glyph-pointer-glyph): New variable.
+	(widget-glyph-insert-glyph): Use it.
+
+1997-11-09  SL Baur  <steve@altair.xemacs.org>
+
+	* files.el (find-file-noselect): Guard against dired not being
+	available.
+
+1997-11-09  Kyle Jones  <kyle_jones@wonderworks.com>
+
+	* gui.el: Set the reverse-p property on
+	  gui-button-face so that it will likely look different
+	  than the default face on ttys.
+
+1997-11-09  SL Baur  <steve@altair.xemacs.org>
+
+	* x-menubar.el (default-menubar): Strokes has been packaged.
+
 1997-11-08  SL Baur  <steve@altair.xemacs.org>
 
 	* prim/about.el (about-hackers): New entries.

File lisp/emulators/crisp.el

 
 ;; Author: Gary D. Foster <Gary.Foster@corp.sun.com>
 ;; Created: 01 Mar 1996
-;; Version: 1.21
+;; Version: $Revision: 1.7 $
 ;; Keywords: emulations brief crisp
 ;; X-Modified-by:
-;;	crisp.el,v
+;;	$Log: crisp.el,v $
+;;	Revision 1.7  1997/11/12 07:09:59  steve
+;;	Patches to beta4
+;;	
+;;	Revision 1.23  1997/11/11 19:47:02  gfoster
+;;	Merged changes suggested by Hrvoje Niksic
+;;	   make crisp-mode-map a sparse keymap parented from current-global-map
+;;	   don't copy the keymap in (crisp-mode-original-keymap)
+;;	   declare last-last-command to shut up the byte-compiler
+;;	   make (crisp-mode) honor ARG
+;;
+;;	Revision 1.22  1997/11/11 19:37:44  gfoster
+;;	kp-add/minus now copy/kill the current line if there is no highlighted
+;;	region.  These also honor the universal prefix argument conventions.
+;;
+;;	Revision 1.21  1997/10/16 18:52:54  gfoster
+;;	Fixed bogus XEmacs/Lucid string-match checking
+;;	made modeline entry mouse2-able
+;;
 ;;	Revision 1.20  1997/08/22 18:49:11  gfoster
 ;;	Added next-buffer/previous-buffer keybindings (bound to M-n/M-p)
 ;;	Added crisp-unbury-buffer function
 
 ;; local variables
 
-(defgroup emulations-crisp nil
+(defgroup crisp nil
   "CRiSP emulator customizable settings."
   :group 'emulations)
 
-(defvar crisp-mode-map (copy-keymap (current-global-map))
+(defvar crisp-mode-map (let ((map (make-sparse-keymap)))
+			 (set-keymap-parent map (current-global-map))
+			 map)
   "Local keymap for CRiSP emulation mode.
 All the bindings are done here instead of globally to try and be
 nice to the world.")
 (defcustom crisp-mode-modeline-string " *CRiSP*"
   "*String to display in the modeline when CRiSP emulation mode is enabled."
   :type 'string
-  :group 'emulations-crisp)
+  :group 'crisp)
 
-(defvar crisp-mode-original-keymap (copy-keymap (current-global-map))
+(defvar crisp-mode-original-keymap (current-global-map)
   "The original keymap before CRiSP emulation mode remaps anything.
 This keymap is restored when CRiSP emulation mode is disabled.")
 
 provides the usual M-x functionality on the F10 key.  If this variable
 is non-nil, M-x will exit Emacs."
   :type 'boolean
-  :group 'emulations-crisp)
+  :group 'crisp)
 
 (defvar crisp-load-scroll-lock nil
   "Controls loading of the Scroll Lock in the CRiSP emulator.
 (defvar crisp-load-hook nil
   "Hooks to run after loading the CRiSP emulator package.")
 
-(defconst crisp-version "crisp.el release 1.1/1.21"
+(defconst crisp-version "crisp.el release 1.1/$Revision: 1.7 $"
   "The release number and RCS version for the CRiSP emulator.")
 
+;; Silence the byte-compiler.
+(defvar last-last-command)
+
 ;; and now the keymap defines
 
 (define-key crisp-mode-map [(f1)]           'other-window)
 (define-key crisp-mode-map [(meta f10)]      'compile)
 
 (define-key crisp-mode-map [(SunF37)]          'kill-buffer)
-(define-key crisp-mode-map [(kp-add)]       'x-copy-primary-selection)
-(define-key crisp-mode-map [(kp-subtract)]  'x-kill-primary-selection)
+(define-key crisp-mode-map [(kp-add)]       'crisp-copy-line)
+(define-key crisp-mode-map [(kp-subtract)]  'crisp-kill-line)
 (define-key crisp-mode-map [(insert)]       'x-yank-clipboard-selection)
 (define-key crisp-mode-map [(f16)]          'x-copy-primary-selection) ; copy on Sun5 kbd
 (define-key crisp-mode-map [(f20)]          'x-kill-primary-selection) ; cut on Sun5 kbd 
 (define-key crisp-mode-map [(home)] 'crisp-home)
 (define-key crisp-mode-map [(end)] 'crisp-end)
 
+(defun crisp-mark-line (arg)
+  "Put mark at the end of line.  Arg works as in `end-of-line'."
+  (interactive "p")
+  (mark-something 'crisp-mark-line 'end-of-line arg))
+
+(defun crisp-kill-line (arg)
+  "Mark and kill line(s).
+Marks the entire current line (honoring prefix arguments), copies the
+region to the kill ring and clipboard, and then deletes it."
+  (interactive "*p")
+  (if zmacs-region-active-p
+      (x-kill-primary-selection)
+    (beginning-of-line)
+    (crisp-mark-line arg)
+    (x-kill-primary-selection)))
+
+(defun crisp-copy-line (arg)
+  "Mark and copy entire current line (honoring prefix arguments), copies the
+region to the kill ring and clipboard, and then deactivates the region."
+  (interactive "*p")
+  (let ((curpos (point)))
+    (if zmacs-region-active-p
+	(x-copy-primary-selection)
+      (beginning-of-line)
+      (crisp-mark-line arg)
+      (x-copy-primary-selection)
+      (goto-char curpos))))
+
 (defun crisp-home ()
   "\"Home\" the point, the way CRiSP would do it.
 The first use moves point to beginning of the line.  Second
 
 ;; Now enable the mode
 
-(defun crisp-mode ()
-  "Toggle CRiSP emulation minor mode."
-  (interactive nil)
-  (setq crisp-mode-enabled (not crisp-mode-enabled))
+(defun crisp-mode (&optional arg)
+  "Toggle CRiSP emulation minor mode.
+With ARG, turn CRiSP mode on if ARG is positive, off otherwise."
+  (interactive "P")
+  (setq crisp-mode-enabled (if (null arg)
+			       (not crisp-mode-enabled)
+			     (> (prefix-numeric-value arg) 0)))
   (cond
    ((eq crisp-mode-enabled 't)
     (use-global-map crisp-mode-map)
    ((eq crisp-mode-enabled 'nil)
     (use-global-map crisp-mode-original-keymap))))
 
-(if (string-match "\\(XEmacs\\|Lucid\\)" emacs-version)
+(if (fboundp 'add-minor-mode)
     (add-minor-mode 'crisp-mode-enabled 'crisp-mode-modeline-string
 		    nil nil 'crisp-mode)
   (or (assq 'crisp-mode-enabled minor-mode-alist)

File lisp/emulators/custom-load.el

 
 ;;; Code:
 
+(custom-add-loads 'crisp '("crisp"))
 (custom-add-loads 'emulations '("crisp"))
-(custom-add-loads 'emulations-crisp '("crisp"))
 
 ;;; custom-load.el ends here

File lisp/extents.el

   "Set EXTENT's `keymap' property to KEYMAP."
   (set-extent-property extent 'keymap keymap))
 
+(defun extent-keymap (extent)
+  "Return EXTENT's `keymap' property."
+  (extent-property extent 'keymap))
+
 ;;; extents.el ends here

File lisp/files.el

 problems will be suppressed."
   (setq filename (abbreviate-file-name (expand-file-name filename)))
   (if (file-directory-p filename)
-      (if find-file-run-dired
+      (if (and (fboundp 'dired-noselect) find-file-run-dired)
 	  (dired-noselect (if find-file-use-truenames
 			      (abbreviate-file-name (file-truename filename))
 			    filename))

File lisp/frame.el

 (defun default-deselect-frame-hook ()
   "Implements the `auto-lower-frame' variable.
 For use as the value of `deselect-frame-hook'."
-  (if auto-lower-frame (lower-frame (selected-frame))))
+  (if auto-lower-frame (lower-frame (selected-frame)))
+  (highlight-extent nil nil))
 
 (or select-frame-hook
     (add-hook 'select-frame-hook 'default-select-frame-hook))
 (make-face 'gui-button-face "Face used for gui buttons")
 (if (not (face-differs-from-default-p 'gui-button-face))
     (progn
-      (set-face-background 'gui-button-face "grey75")
-      (set-face-foreground 'gui-button-face "black")))
+      (set-face-reverse-p 'gui-button-face t)
+      (set-face-background 'gui-button-face "grey75" nil '(x color))
+      (set-face-foreground 'gui-button-face "black" nil '(x color))))
 
 (defun make-gui-button (string &optional action user-data)
   "Make a GUI button whose label is STRING and whose action is ACTION.

File lisp/help-macro.el

+;;; help-macro.el --- Makes command line help such as help-for-help
+
+;; Copyright (C) 1993, 1994, 1997 Free Software Foundation, Inc.
+
+;; Author: Lynn Slater <lrs@indetech.com>
+;; Maintainer: FSF
+;; Created: : Mon Oct  1 11:42:39 1990
+;; Adapted-By: ESR
+
+;; This file is part of XEmacs.
+
+;; XEmacs is free software; you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation; either version 2, or (at your option)
+;; any later version.
+
+;; XEmacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;; GNU General Public License for more details.
+
+;; You should have received a copy of the GNU General Public License
+;; along with XEmacs; see the file COPYING.  If not, write to the
+;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Commentary:
+
+;;; Synched up with: FSF 20.2.
+
+;; This file supplies the macro make-help-screen which constructs
+;; single character dispatching with browsable help such as that provided
+;; by help-for-help. This can be used to make many modes easier to use; for
+;; example, the Gnu Emacs Empire Tool uses this for every "nested" mode map
+;; called from the main mode map.
+
+;;       The name of this package was changed from help-screen.el to
+;; help-macro.el in order to fit in a 14-character limit.
+
+;;-> ***********************  Example of use *********************************
+
+;;->(make-help-screen help-for-empire-redistribute-map
+;;->		  "c:civ m:mil p:population f:food ?"
+;;->		  "You have discovered the GEET redistribution commands
+;;->   From here, you can use the following options:
+;;->
+;;->c	Redistribute civs from overfull sectors into connected underfull ones
+;;->	  The functions typically named by empire-ideal-civ-fcn control
+;;->          based in part on empire-sector-civ-threshold  
+;;->m	Redistribute military using levels given by empire-ideal-mil-fcn
+;;->p	Redistribute excess population to highways for max pop growth
+;;->	  Excess is any sector so full babies will not be born.
+;;->f	Even out food on highways to highway min and leave levels
+;;->	  This is good to pump max food to all warehouses/dist pts
+;;->
+;;->
+;;->Use \\[help-for-empire-redistribute-map] for help on redistribution.
+;;->Use \\[help-for-empire-extract-map] for help on data extraction.
+;;->Please use \\[describe-key] to find out more about any of the other keys."
+;;->		  empire-shell-redistribute-map)
+
+;;->  (define-key c-mp "\C-h" 'help-for-empire-redistribute-map)
+;;->  (define-key c-mp help-character 'help-for-empire-redistribute-map)
+
+;;; Code:
+
+(provide 'help-macro)
+
+;;;###autoload
+(defcustom three-step-help t
+  "*Non-nil means give more info about Help command in three steps.
+The three steps are simple prompt, prompt with all options,
+and window listing and describing the options.
+A value of nil means skip the middle step, so that
+\\[help-command] \\[help-command] gives the window that lists the options."
+  :type 'boolean
+  :group 'help-appearance)
+
+(defun help-read-key (prompt)
+  (let (events)
+    (while (not (key-press-event-p
+		 (aref (setq events (read-key-sequence prompt)) 0)))
+      ;; Mouse clicks are not part of the help feature, so reexecute
+      ;; them in the standard environment.
+      (mapc 'dispatch-event events))
+    (let ((key (nconc (event-modifiers (aref events 0))
+		      (list (event-key (aref events 0))))))
+      ;; Make the HELP key translate to C-h.
+      (when (lookup-key function-key-map key)
+	(setq key (lookup-key function-key-map key)))
+      (if (eq (length key) 1)
+	  (car key)
+	key))))
+
+(defmacro make-help-screen (fname help-line help-text helped-map)
+  "Construct help-menu function name FNAME.
+When invoked, FNAME shows HELP-LINE and reads a command using HELPED-MAP.
+If the command is the help character, FNAME displays HELP-TEXT
+and continues trying to read a command using HELPED-MAP.
+When FNAME finally does get a command, it executes that command
+and then returns."
+  `(defun ,fname ()
+     ,help-text
+     (interactive)
+     (let ((line-prompt
+	    (substitute-command-keys ,help-line)))
+       (when three-step-help
+	 (message "%s" line-prompt))
+       (let* ((help-screen (documentation (quote ,fname)))
+	      ;; We bind overriding-local-map for very small
+	      ;; sections, *excluding* where we switch buffers
+	      ;; and where we execute the chosen help command.
+	      (local-map (make-sparse-keymap))
+	      (minor-mode-map-alist nil)
+	      (prev-frame (selected-frame))
+	      config new-frame key)
+	 (unwind-protect
+	     (progn
+	       (set-keymap-parents local-map (list ,helped-map))
+	       (cond (three-step-help
+		      (let* ((overriding-local-map local-map))
+			(setq key (help-read-key nil))))
+		     (t
+		      (setq key ??)))
+	       (when (or (equal key ??)
+			 (equal key (list help-char)))
+		 (setq config (current-window-configuration))
+		 (switch-to-buffer-other-window "*Help*")
+		 (and (not (eq (window-frame (selected-window))
+			       prev-frame))
+		      (setq new-frame (window-frame (selected-window))
+			    config nil))
+		 (setq buffer-read-only nil)
+		 (erase-buffer)
+		 (insert help-screen)
+		 (help-mode)
+		 (goto-char (point-min))
+		 (while (member key `((,help-char) ?? (control v) space ?\177
+				      delete backspace (meta v)))
+		   (ignore-errors
+		     (cond ((member key '((control v) space))
+			    (scroll-up))
+			   ((member key '(?\177 delete (meta v) backspace))
+			    (scroll-down))))
+		   (let ((cursor-in-echo-area t)
+			 (overriding-local-map local-map))
+		     (setq key (help-read-key
+				(format "Type one of the options listed%s: "
+					(if (pos-visible-in-window-p
+					     (point-max))
+					    "" " or Space to scroll")))))))
+	       ;; We don't need the prompt any more.
+	       (message nil)
+	       (let ((defn (lookup-key local-map key)))
+		 (cond (defn
+			 (when config