Mercurial > hg > xemacs-beta
changeset 169:15872534500d r20-3b11
Import from CVS: tag r20-3b11
line wrap: on
line diff
--- a/CHANGES-beta Mon Aug 13 09:45:48 2007 +0200 +++ b/CHANGES-beta Mon Aug 13 09:46:53 2007 +0200 @@ -1,4 +1,16 @@ -*- indented-text -*- +to 20.3 beta11 "Stockholm" +-- Try #2 with LOSING_BYTECODE disabled. +-- Interface change: value of `system-type' is provided as a feature. +-- Gnus-5.4.62 +-- W3-3.0.93 +-- Custom-1.9946 +-- New user variable `errors-deactivate-region'. +-- Miscellaneous bug fixes. +-- iso-acc.el-1.15 (Mule fixes) +-- autoloads/custom loads generation in build updated +-- Fix for frozen messages in message area from Kyle Jones. + to 20.3 beta10 "Athens" -- Linuxdoc-sgml.el courtesy of Arun Sharma. -- rewritten abbreviations from Hrvoje Niksic
--- a/ChangeLog Mon Aug 13 09:45:48 2007 +0200 +++ b/ChangeLog Mon Aug 13 09:46:53 2007 +0200 @@ -1,5 +1,46 @@ +1997-07-05 Martin Buchholz <mrb@eng.sun.com> + + * lib-src/getopt*.c: Don't redefine const - let configure do that. + + * configure.in: Better behavior for `configure --with-gcc=no' + - Autodetect ulimit.h + - Remove broken SunOS4 kludge for libXmu + - Autodetect usleep + + * src/s/sol2.h: Support gcc on various Solaris releases. + + * lib-src/*.c: Ansify prototypes. + + * lisp/prim/files.el: Optimize auto-mode-alist. + + * pkg-src/tree-x/Makefile.in.in: `make distclean' now works + - `make install' now works. + - dependencies updated. + + * pkg-src/tree-x/*.[ch]: Fix compile warnings. + - Replace uses of XtVa* with non-varargs variants. + +1997-07-01 MORIOKA Tomohiko <morioka@jaist.ac.jp> + + * lisp/modes/image-mode.el: Add `image-maybe-restore' to + `change-major-mode-hook'. + + * lisp/modes/image-mode.el (image-maybe-restore): New function. + + * src/glyphs.c (make_string_from_file): must protect from + `format-alist'. + +1997-06-30 Steven L Baur <steve@altair.xemacs.org> + + * pkg-src/tree-x/Makefile.in.in (INSTALL): Add configure written + variable. + 1997-06-29 Steven L Baur <steve@altair.xemacs.org> + * configure.in (CPP): Correct typo `print-lib-gcc-file-name' + should be `print-libgcc-file-name' + From Katsumi Yamaoka <yamaoka@ga.sony.co.jp> + * XEmacs 20.3-beta10 is released. 1997-06-29 MORIOKA Tomohiko <morioka@jaist.ac.jp>
--- a/configure Mon Aug 13 09:45:48 2007 +0200 +++ b/configure Mon Aug 13 09:46:53 2007 +0200 @@ -1303,18 +1303,17 @@ with_tooltalk=yes fi -test -n "$CC" && cc_specified=yes - -if test -n "$compiler"; then CC="$compiler"; fi +test -n "$compiler" && CC="$compiler" +if test "$with_gcc" = "no"; then case "$CC" in "" | *gcc* ) CC="${NON_GNU_CC-cc}" ;; esac +fi test "$cflags" != "UNSPECIFIED" && CFLAGS="$cflags" xe_save_CFLAGS="$CFLAGS" -test -n "$NON_GNU_CC" -a "$with_gcc" = "no" -a -z "$CC" && CC="$NON_GNU_CC" # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1318: checking for $ac_word" >&5 +echo "configure:1317: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1340,7 +1339,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1344: checking for $ac_word" >&5 +echo "configure:1343: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1385,7 +1384,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1389: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1388: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS' @@ -1397,11 +1396,11 @@ cross_compiling=no cat > conftest.$ac_ext <<EOF -#line 1401 "configure" +#line 1400 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1421,19 +1420,19 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1425: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1424: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1430: checking whether we are using GNU C" >&5 +echo "configure:1429: checking whether we are using GNU C" >&5 cat > conftest.c <<EOF #ifdef __GNUC__ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1436: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1447,7 +1446,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1451: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1450: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -1470,14 +1469,13 @@ GCC= test "${CFLAGS+set}" = set || CFLAGS="-g" fi - - -if test "$with_gcc" = "no" -a "$ac_cv_prog_gcc" = "yes"; then + +if test "$with_gcc" = "no" -a "$GCC" = "yes"; then CC=${NON_GNU_CC-cc} # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1481: checking for $ac_word" >&5 +echo "configure:1479: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1503,7 +1501,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1507: checking for $ac_word" >&5 +echo "configure:1505: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1548,7 +1546,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1552: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1550: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS' @@ -1560,11 +1558,11 @@ cross_compiling=no cat > conftest.$ac_ext <<EOF -#line 1564 "configure" +#line 1562 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1584,19 +1582,19 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1588: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1586: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1593: checking whether we are using GNU C" >&5 +echo "configure:1591: checking whether we are using GNU C" >&5 cat > conftest.c <<EOF #ifdef __GNUC__ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1598: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1610,7 +1608,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1614: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1612: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -1634,12 +1632,12 @@ test "${CFLAGS+set}" = set || CFLAGS="-g" fi -elif test "$with_gcc" = "yes" -a "$ac_cv_prog_gcc" = "no" ; then +elif test "$with_gcc" = "yes" -a "$GCC" != "yes" ; then CC=gcc # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1643: checking for $ac_word" >&5 +echo "configure:1641: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1665,7 +1663,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1669: checking for $ac_word" >&5 +echo "configure:1667: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1710,7 +1708,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1714: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1712: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c xe_cppflags='$CPPFLAGS $c_switch_site $c_switch_machine $c_switch_system $c_switch_x_site $X_CFLAGS' @@ -1722,11 +1720,11 @@ cross_compiling=no cat > conftest.$ac_ext <<EOF -#line 1726 "configure" +#line 1724 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1746,19 +1744,19 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1750: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1748: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1755: checking whether we are using GNU C" >&5 +echo "configure:1753: checking whether we are using GNU C" >&5 cat > conftest.c <<EOF #ifdef __GNUC__ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1762: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1760: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1772,7 +1770,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1776: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1774: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -1799,11 +1797,10 @@ fi CFLAGS="$xe_save_CFLAGS" -if test "$GCC" = "yes"; then with_gcc=yes; else with_gcc=no; fi -test -n "$NON_GNU_CPP" -a "$with_gcc" = "no" -a -z "$CPP" && CPP="$NON_GNU_CPP" +test -n "$NON_GNU_CPP" -a "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP" echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1807: checking how to run the C preprocessor" >&5 +echo "configure:1804: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1816,13 +1813,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1820 "configure" +#line 1817 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1823: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1833,13 +1830,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1837 "configure" +#line 1834 "configure" #include "confdefs.h" #include <assert.h> Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:1843: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1840: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1862,9 +1859,9 @@ echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:1866: checking for AIX" >&5 -cat > conftest.$ac_ext <<EOF -#line 1868 "configure" +echo "configure:1863: checking for AIX" >&5 +cat > conftest.$ac_ext <<EOF +#line 1865 "configure" #include "confdefs.h" #ifdef _AIX yes @@ -1891,9 +1888,9 @@ echo $ac_n "checking whether we are using SunPro C""... $ac_c" 1>&6 -echo "configure:1895: checking whether we are using SunPro C" >&5 -cat > conftest.$ac_ext <<EOF -#line 1897 "configure" +echo "configure:1892: checking whether we are using SunPro C" >&5 +cat > conftest.$ac_ext <<EOF +#line 1894 "configure" #include "confdefs.h" int main() { @@ -1904,7 +1901,7 @@ ; return 0; } EOF -if { (eval echo configure:1908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* __sunpro_c=yes else @@ -2189,7 +2186,7 @@ fi echo $ac_n "checking for dynodump""... $ac_c" 1>&6 -echo "configure:2193: checking for dynodump" >&5 +echo "configure:2190: checking for dynodump" >&5 if test "$unexec" != "unexsol2.o"; then echo "$ac_t""no" 1>&6 else @@ -2218,7 +2215,7 @@ if test "$ordinary_link" = "no" -a "$GCC" = "yes"; then test -z "$linker" && linker='$(CC) -nostdlib' - test -z "$lib_gcc" && lib_gcc='`$(CC) -print-lib-gcc-file-name`' + test -z "$lib_gcc" && lib_gcc='`$(CC) -print-lib-gccfile-name`' fi test "$GCC" != "yes" && lib_gcc= @@ -2260,19 +2257,19 @@ if test "$add_runtime_path" = "yes"; then echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6 -echo "configure:2264: checking "for runtime libraries flag"" >&5 +echo "configure:2261: checking "for runtime libraries flag"" >&5 dash_r="" for try_dash_r in "-R" "-R " "-rpath "; do xe_check_libs="${try_dash_r}/no/such/file-or-directory" cat > conftest.$ac_ext <<EOF -#line 2269 "configure" +#line 2266 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2276: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* dash_r="$try_dash_r" else @@ -2366,7 +2363,7 @@ # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2370: checking for $ac_word" >&5 +echo "configure:2367: checking for $ac_word" >&5 if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. @@ -2419,7 +2416,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:2423: checking for a BSD compatible install" >&5 +echo "configure:2420: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" @@ -2470,7 +2467,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2474: checking for $ac_word" >&5 +echo "configure:2471: checking for $ac_word" >&5 if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. @@ -2501,15 +2498,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2505: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2508 "configure" +echo "configure:2502: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2505 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2513: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2538,19 +2535,19 @@ fi done -for ac_hdr in utime.h locale.h libgen.h fcntl.h +for ac_hdr in utime.h locale.h libgen.h fcntl.h ulimit.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2546: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2549 "configure" +echo "configure:2543: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2546 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2554: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2551: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2583,15 +2580,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2587: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2590 "configure" +echo "configure:2584: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2587 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2595: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2592: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2621,10 +2618,10 @@ done echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:2625: checking for sys/wait.h that is POSIX.1 compatible" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2628 "configure" +echo "configure:2622: checking for sys/wait.h that is POSIX.1 compatible" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2625 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/wait.h> @@ -2640,7 +2637,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:2644: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -2664,10 +2661,10 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2668: checking for ANSI C header files" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2671 "configure" +echo "configure:2665: checking for ANSI C header files" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2668 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -2675,7 +2672,7 @@ #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2676: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2692,7 +2689,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 2696 "configure" +#line 2693 "configure" #include "confdefs.h" #include <string.h> EOF @@ -2710,7 +2707,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext <<EOF -#line 2714 "configure" +#line 2711 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -2728,7 +2725,7 @@ if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. cat > conftest.$ac_ext <<EOF -#line 2732 "configure" +#line 2729 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2739,7 +2736,7 @@ exit (0); } EOF -if { (eval echo configure:2743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:2740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then : else @@ -2764,10 +2761,10 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:2768: checking whether time.h and sys/time.h may both be included" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2771 "configure" +echo "configure:2765: checking whether time.h and sys/time.h may both be included" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2768 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -2776,7 +2773,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2780: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -2800,10 +2797,10 @@ fi echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 -echo "configure:2804: checking for sys_siglist declaration in signal.h or unistd.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2807 "configure" +echo "configure:2801: checking for sys_siglist declaration in signal.h or unistd.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2804 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -2815,7 +2812,7 @@ char *msg = *(sys_siglist + 1); ; return 0; } EOF -if { (eval echo configure:2819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else @@ -2840,9 +2837,9 @@ echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6 -echo "configure:2844: checking for struct utimbuf" >&5 -cat > conftest.$ac_ext <<EOF -#line 2846 "configure" +echo "configure:2841: checking for struct utimbuf" >&5 +cat > conftest.$ac_ext <<EOF +#line 2843 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME #include <sys/time.h> @@ -2861,7 +2858,7 @@ static struct utimbuf x; x.actime = x.modtime; ; return 0; } EOF -if { (eval echo configure:2865: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2862: \"$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 @@ -2881,10 +2878,10 @@ rm -f conftest* echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2885: checking return type of signal handlers" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2888 "configure" +echo "configure:2882: checking return type of signal handlers" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2885 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -2901,7 +2898,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:2905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2923,10 +2920,10 @@ echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2927: checking for size_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2930 "configure" +echo "configure:2924: checking for size_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2927 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2957,10 +2954,10 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:2961: checking for pid_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2964 "configure" +echo "configure:2958: checking for pid_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2961 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2991,10 +2988,10 @@ fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:2995: checking for uid_t in sys/types.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2998 "configure" +echo "configure:2992: checking for uid_t in sys/types.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2995 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -3030,10 +3027,10 @@ fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:3034: checking for mode_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3037 "configure" +echo "configure:3031: checking for mode_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3034 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3064,10 +3061,10 @@ fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:3068: checking for off_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3071 "configure" +echo "configure:3065: checking for off_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3068 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3099,9 +3096,9 @@ echo $ac_n "checking for struct timeval""... $ac_c" 1>&6 -echo "configure:3103: checking for struct timeval" >&5 -cat > conftest.$ac_ext <<EOF -#line 3105 "configure" +echo "configure:3100: checking for struct timeval" >&5 +cat > conftest.$ac_ext <<EOF +#line 3102 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME #include <sys/time.h> @@ -3117,7 +3114,7 @@ static struct timeval x; x.tv_sec = x.tv_usec; ; return 0; } EOF -if { (eval echo configure:3121: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 HAVE_TIMEVAL=yes @@ -3139,10 +3136,10 @@ rm -f conftest* echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 -echo "configure:3143: checking whether struct tm is in sys/time.h or time.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3146 "configure" +echo "configure:3140: checking whether struct tm is in sys/time.h or time.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3143 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -3150,7 +3147,7 @@ struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:3154: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -3174,10 +3171,10 @@ fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:3178: checking for tm_zone in struct tm" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3181 "configure" +echo "configure:3175: checking for tm_zone in struct tm" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3178 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_cv_struct_tm> @@ -3185,7 +3182,7 @@ struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:3189: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3186: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else @@ -3208,10 +3205,10 @@ else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:3212: checking for tzname" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3215 "configure" +echo "configure:3209: checking for tzname" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3212 "configure" #include "confdefs.h" #include <time.h> #ifndef tzname /* For SGI. */ @@ -3221,7 +3218,7 @@ atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:3225: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -3247,10 +3244,10 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3251: checking for working const" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3254 "configure" +echo "configure:3248: checking for working const" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3251 "configure" #include "confdefs.h" int main() { @@ -3299,7 +3296,7 @@ ; return 0; } EOF -if { (eval echo configure:3303: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3300: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3324,7 +3321,7 @@ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:3328: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:3325: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` cat > conftestmake <<\EOF @@ -3349,12 +3346,12 @@ echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:3353: checking whether byte ordering is bigendian" >&5 +echo "configure:3350: checking whether byte ordering is bigendian" >&5 ac_cv_c_bigendian=unknown # See if sys/param.h defines the BYTE_ORDER macro. cat > conftest.$ac_ext <<EOF -#line 3358 "configure" +#line 3355 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -3365,11 +3362,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:3369: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3366: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* # It does; now see whether it defined to BIG_ENDIAN or not. cat > conftest.$ac_ext <<EOF -#line 3373 "configure" +#line 3370 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -3380,7 +3377,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:3384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -3397,7 +3394,7 @@ rm -f conftest* if test $ac_cv_c_bigendian = unknown; then cat > conftest.$ac_ext <<EOF -#line 3401 "configure" +#line 3398 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -3410,7 +3407,7 @@ exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:3414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:3411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_c_bigendian=no else @@ -3436,10 +3433,10 @@ echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:3440: checking size of short" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3443 "configure" +echo "configure:3437: checking size of short" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3440 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3450,7 +3447,7 @@ exit(0); } EOF -if { (eval echo configure:3454: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:3451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_sizeof_short=`cat conftestval` else @@ -3477,10 +3474,10 @@ exit 1 fi echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:3481: checking size of int" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3484 "configure" +echo "configure:3478: checking size of int" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3481 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3491,7 +3488,7 @@ exit(0); } EOF -if { (eval echo configure:3495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:3492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_sizeof_int=`cat conftestval` else @@ -3512,10 +3509,10 @@ echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:3516: checking size of long" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3519 "configure" +echo "configure:3513: checking size of long" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3516 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3526,7 +3523,7 @@ exit(0); } EOF -if { (eval echo configure:3530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:3527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_sizeof_long=`cat conftestval` else @@ -3547,10 +3544,10 @@ echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:3551: checking size of long long" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3554 "configure" +echo "configure:3548: checking size of long long" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3551 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3561,7 +3558,7 @@ exit(0); } EOF -if { (eval echo configure:3565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:3562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_sizeof_long_long=`cat conftestval` else @@ -3582,10 +3579,10 @@ echo $ac_n "checking size of void *""... $ac_c" 1>&6 -echo "configure:3586: checking size of void *" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3589 "configure" +echo "configure:3583: checking size of void *" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3586 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3596,7 +3593,7 @@ exit(0); } EOF -if { (eval echo configure:3600: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:3597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_sizeof_void_p=`cat conftestval` else @@ -3618,7 +3615,7 @@ echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:3622: checking for long file names" >&5 +echo "configure:3619: 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: @@ -3665,12 +3662,12 @@ echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6 -echo "configure:3669: checking for sqrt in -lm" >&5 +echo "configure:3666: 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 3674 "configure" +#line 3671 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3681,7 +3678,7 @@ sqrt() ; return 0; } EOF -if { (eval echo configure:3685: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3682: \"$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 @@ -3724,7 +3721,7 @@ echo "checking type of mail spool file locking" 1>&6 -echo "configure:3728: checking type of mail spool file locking" >&5 +echo "configure:3725: 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 @@ -3748,12 +3745,12 @@ echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6 -echo "configure:3752: checking for kstat_open in -lkstat" >&5 +echo "configure:3749: 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 3757 "configure" +#line 3754 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3764,7 +3761,7 @@ kstat_open() ; return 0; } EOF -if { (eval echo configure:3768: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3765: \"$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 @@ -3798,12 +3795,12 @@ echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6 -echo "configure:3802: checking for kvm_read in -lkvm" >&5 +echo "configure:3799: 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 3807 "configure" +#line 3804 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3814,7 +3811,7 @@ kvm_read() ; return 0; } EOF -if { (eval echo configure:3818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3815: \"$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 @@ -3848,12 +3845,12 @@ echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6 -echo "configure:3852: checking for cma_open in -lpthreads" >&5 +echo "configure:3849: 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 3857 "configure" +#line 3854 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -3864,7 +3861,7 @@ cma_open() ; return 0; } EOF -if { (eval echo configure:3868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3865: \"$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 @@ -3900,7 +3897,7 @@ fi echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6 -echo "configure:3904: checking whether the -xildoff compiler flag is required" >&5 +echo "configure:3901: 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; @@ -3911,7 +3908,7 @@ if test "$opsys" = "sol2" && test "$OS_RELEASE" -ge 56; then echo $ac_n "checking for \"-z ignore\" linker flag""... $ac_c" 1>&6 -echo "configure:3915: checking for \"-z ignore\" linker flag" >&5 +echo "configure:3912: 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 ;; @@ -3921,7 +3918,7 @@ echo "checking "for specified window system"" 1>&6 -echo "configure:3925: checking "for specified window system"" >&5 +echo "configure:3922: checking "for specified window system"" >&5 if test "$x_includes $x_libraries" = "NONE NONE"; then if test -n "$OPENWINHOME" \ @@ -3942,7 +3939,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:3946: checking for X" >&5 +echo "configure:3943: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -4002,12 +3999,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 4006 "configure" +#line 4003 "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:4011: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4008: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4076,14 +4073,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 4080 "configure" +#line 4077 "configure" #include "confdefs.h" int main() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:4087: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4084: \"$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. @@ -4192,17 +4189,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:4196: checking whether -R must be followed by a space" >&5 +echo "configure:4193: 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 4199 "configure" +#line 4196 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:4206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_nospace=yes else @@ -4218,14 +4215,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <<EOF -#line 4222 "configure" +#line 4219 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:4229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_space=yes else @@ -4261,12 +4258,12 @@ else echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:4265: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:4262: 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 4270 "configure" +#line 4267 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4277,7 +4274,7 @@ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:4281: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4278: \"$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 @@ -4301,12 +4298,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:4305: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:4302: 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 4310 "configure" +#line 4307 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4317,7 +4314,7 @@ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:4321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4318: \"$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 @@ -4346,10 +4343,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:4350: checking for gethostbyname" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4353 "configure" +echo "configure:4347: checking for gethostbyname" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4350 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ @@ -4372,7 +4369,7 @@ ; return 0; } EOF -if { (eval echo configure:4376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -4393,12 +4390,12 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:4397: checking for gethostbyname in -lnsl" >&5 +echo "configure:4394: 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 4402 "configure" +#line 4399 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4409,7 +4406,7 @@ gethostbyname() ; return 0; } EOF -if { (eval echo configure:4413: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4410: \"$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 @@ -4439,10 +4436,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:4443: checking for connect" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4446 "configure" +echo "configure:4440: checking for connect" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4443 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect(); below. */ @@ -4465,7 +4462,7 @@ ; return 0; } EOF -if { (eval echo configure:4469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -4488,12 +4485,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:4492: checking "$xe_msg_checking"" >&5 +echo "configure:4489: 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 4497 "configure" +#line 4494 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4504,7 +4501,7 @@ connect() ; return 0; } EOF -if { (eval echo configure:4508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4505: \"$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 @@ -4528,10 +4525,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:4532: checking for remove" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4535 "configure" +echo "configure:4529: checking for remove" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4532 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove(); below. */ @@ -4554,7 +4551,7 @@ ; return 0; } EOF -if { (eval echo configure:4558: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -4575,12 +4572,12 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:4579: checking for remove in -lposix" >&5 +echo "configure:4576: 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 4584 "configure" +#line 4581 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4591,7 +4588,7 @@ remove() ; return 0; } EOF -if { (eval echo configure:4595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4592: \"$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 @@ -4615,10 +4612,10 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:4619: checking for shmat" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4622 "configure" +echo "configure:4616: checking for shmat" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4619 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat(); below. */ @@ -4641,7 +4638,7 @@ ; return 0; } EOF -if { (eval echo configure:4645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -4662,12 +4659,12 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:4666: checking for shmat in -lipc" >&5 +echo "configure:4663: 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 4671 "configure" +#line 4668 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4678,7 +4675,7 @@ shmat() ; return 0; } EOF -if { (eval echo configure:4682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4679: \"$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 @@ -4712,12 +4709,12 @@ # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:4716: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:4713: 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 4721 "configure" +#line 4718 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4728,7 +4725,7 @@ IceConnectionNumber() ; return 0; } EOF -if { (eval echo configure:4732: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4729: \"$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 @@ -4860,7 +4857,7 @@ fi echo "checking for X defines extracted by xmkmf" 1>&6 -echo "configure:4864: checking for X defines extracted by xmkmf" >&5 +echo "configure:4861: checking for X defines extracted by xmkmf" >&5 rm -fr conftestdir if mkdir conftestdir; then cd conftestdir @@ -4892,15 +4889,15 @@ ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6 -echo "configure:4896: checking for X11/Intrinsic.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4899 "configure" +echo "configure:4893: checking for X11/Intrinsic.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4896 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4904: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4901: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4924,12 +4921,12 @@ echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:4928: checking for XOpenDisplay in -lX11" >&5 +echo "configure:4925: 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 4933 "configure" +#line 4930 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4940,7 +4937,7 @@ XOpenDisplay() ; return 0; } EOF -if { (eval echo configure:4944: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4941: \"$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 @@ -4965,12 +4962,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:4969: checking "$xe_msg_checking"" >&5 +echo "configure:4966: 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 4974 "configure" +#line 4971 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -4981,7 +4978,7 @@ XGetFontProperty() ; return 0; } EOF -if { (eval echo configure:4985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4982: \"$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 @@ -5008,12 +5005,12 @@ echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6 -echo "configure:5012: checking for XShapeSelectInput in -lXext" >&5 +echo "configure:5009: 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 5017 "configure" +#line 5014 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5024,7 +5021,7 @@ XShapeSelectInput() ; return 0; } EOF -if { (eval echo configure:5028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5025: \"$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 @@ -5045,15 +5042,14 @@ - 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:5052: checking for XtOpenDisplay in -lXt" >&5 +echo "configure:5048: 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 5057 "configure" +#line 5053 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5064,7 +5060,7 @@ XtOpenDisplay() ; return 0; } EOF -if { (eval echo configure:5068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5064: \"$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 @@ -5084,18 +5080,17 @@ { echo "configure: error: "Unable to find X11 libraries."" 1>&2; exit 1; } fi - ;; - esac + echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6 -echo "configure:5092: checking the version of X11 being used" >&5 +echo "configure:5087: checking the version of X11 being used" >&5 cat > conftest.$ac_ext <<EOF -#line 5094 "configure" +#line 5089 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> main(int c, char* v[]) { return c>1 ? XlibSpecificationRelease : 0; } EOF -if { (eval echo configure:5099: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:5094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ./conftest foobar; x11_release=$? else @@ -5119,15 +5114,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5123: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5126 "configure" +echo "configure:5118: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5121 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5131: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5126: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5158,9 +5153,9 @@ echo $ac_n "checking for XFree86""... $ac_c" 1>&6 -echo "configure:5162: checking for XFree86" >&5 +echo "configure:5157: checking for XFree86" >&5 if test -d "/usr/X386/include" -o \ - -f "/etc/XF86Config" -o \ + -f "/etc/XF86Config" -o \ -f "/etc/X11/XF86Config" -o \ -f "/usr/X11R6/lib/X11/XF86Config"; then echo "$ac_t""yes" 1>&6 @@ -5176,27 +5171,25 @@ echo "$ac_t""no" 1>&6 fi - case "$opsys" in sunos4* ) libs_x="-u _get_applicationShellWidgetClass -lXmu $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-u _get_applicationShellWidgetClass -lXmu\" to \$libs_x"; fi ;; - * ) if test -z "$with_xmu"; then - -echo $ac_n "checking for XmuConvertStandardSelection in -lXmu""... $ac_c" 1>&6 -echo "configure:5184: checking for XmuConvertStandardSelection in -lXmu" >&5 -ac_lib_var=`echo Xmu'_'XmuConvertStandardSelection | sed 'y%./+-%__p_%'` + test -z "$with_xmu" && { +echo $ac_n "checking for XmuReadBitmapDataFromFile in -lXmu""... $ac_c" 1>&6 +echo "configure:5177: checking for XmuReadBitmapDataFromFile in -lXmu" >&5 +ac_lib_var=`echo Xmu'_'XmuReadBitmapDataFromFile | sed 'y%./+-%__p_%'` xe_check_libs=" -lXmu " cat > conftest.$ac_ext <<EOF -#line 5189 "configure" +#line 5182 "configure" #include "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 XmuConvertStandardSelection(); +char XmuReadBitmapDataFromFile(); int main() { -XmuConvertStandardSelection() +XmuReadBitmapDataFromFile() ; return 0; } EOF -if { (eval echo configure:5200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5193: \"$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 @@ -5216,32 +5209,29 @@ with_xmu=no fi - - fi - if test "$with_xmu" = "no"; then - extra_objs="$extra_objs xmu.o" && if test "$extra_verbose" = "yes"; then + } + if test "$with_xmu" = "no" + then extra_objs="$extra_objs xmu.o" && if test "$extra_verbose" = "yes"; then echo " xemacs will be linked with \"xmu.o\"" fi - else - libs_x="-lXmu $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXmu\" to \$libs_x"; fi - fi ;; - esac + else libs_x="-lXmu $libs_x" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-lXmu\" to \$libs_x"; fi + fi echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6 -echo "configure:5233: checking for main in -lXbsd" >&5 +echo "configure:5223: 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 5238 "configure" +#line 5228 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5245: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5235: \"$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 @@ -5264,12 +5254,12 @@ echo $ac_n "checking for XawScrollbarSetThumb in -lXaw""... $ac_c" 1>&6 -echo "configure:5268: checking for XawScrollbarSetThumb in -lXaw" >&5 +echo "configure:5258: 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 5273 "configure" +#line 5263 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5280,7 +5270,7 @@ XawScrollbarSetThumb() ; return 0; } EOF -if { (eval echo configure:5284: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5274: \"$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 @@ -5304,15 +5294,15 @@ if test "$have_xaw" = "yes"; then ac_safe=`echo "X11/Xaw/Reports.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Xaw/Reports.h""... $ac_c" 1>&6 -echo "configure:5308: checking for X11/Xaw/Reports.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5311 "configure" +echo "configure:5298: checking for X11/Xaw/Reports.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5301 "configure" #include "confdefs.h" #include <X11/Xaw/Reports.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5316: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5306: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5371,15 +5361,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:5375: checking for X11/Xauth.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5378 "configure" +echo "configure:5365: checking for X11/Xauth.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5368 "configure" #include "confdefs.h" #include <X11/Xauth.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5383: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5373: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5402,12 +5392,12 @@ } test -z "$with_xauth" && { echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6 -echo "configure:5406: checking for XauGetAuthByAddr in -lXau" >&5 +echo "configure:5396: 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 5411 "configure" +#line 5401 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5418,7 +5408,7 @@ XauGetAuthByAddr() ; return 0; } EOF -if { (eval echo configure:5422: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5412: \"$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 @@ -5459,15 +5449,15 @@ 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:5463: checking for OffiX/DragAndDrop.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5466 "configure" +echo "configure:5453: checking for OffiX/DragAndDrop.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5456 "configure" #include "confdefs.h" #include <OffiX/DragAndDrop.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5471: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5461: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5490,12 +5480,12 @@ } test -z "$with_offix" && { echo $ac_n "checking for DndInitialize in -lDnd""... $ac_c" 1>&6 -echo "configure:5494: checking for DndInitialize in -lDnd" >&5 +echo "configure:5484: 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 5499 "configure" +#line 5489 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5506,7 +5496,7 @@ DndInitialize() ; return 0; } EOF -if { (eval echo configure:5510: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5500: \"$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 @@ -5545,15 +5535,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:5549: checking for ${dir}tt_c.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5552 "configure" +echo "configure:5539: checking for ${dir}tt_c.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5542 "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:5557: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5582,12 +5572,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:5586: checking "$xe_msg_checking"" >&5 +echo "configure:5576: 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 5591 "configure" +#line 5581 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5598,7 +5588,7 @@ tt_message_create() ; return 0; } EOF -if { (eval echo configure:5602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5592: \"$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 @@ -5647,15 +5637,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:5651: checking for Dt/Dt.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5654 "configure" +echo "configure:5641: checking for Dt/Dt.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5644 "configure" #include "confdefs.h" #include <Dt/Dt.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5659: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5649: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5678,12 +5668,12 @@ } test -z "$with_cde" && { echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6 -echo "configure:5682: checking for DtDndDragStart in -lDtSvc" >&5 +echo "configure:5672: 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 5687 "configure" +#line 5677 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5694,7 +5684,7 @@ DtDndDragStart() ; return 0; } EOF -if { (eval echo configure:5698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5688: \"$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 @@ -5741,19 +5731,19 @@ echo $ac_n "checking for main in -lenergize""... $ac_c" 1>&6 -echo "configure:5745: checking for main in -lenergize" >&5 +echo "configure:5735: 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 5750 "configure" +#line 5740 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5747: \"$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 @@ -5785,19 +5775,19 @@ if test -z "$energize_version"; then echo $ac_n "checking for main in -lconn""... $ac_c" 1>&6 -echo "configure:5789: checking for main in -lconn" >&5 +echo "configure:5779: 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 5794 "configure" +#line 5784 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5791: \"$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 @@ -5830,15 +5820,15 @@ fi ac_safe=`echo "editorconn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for editorconn.h""... $ac_c" 1>&6 -echo "configure:5834: checking for editorconn.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5837 "configure" +echo "configure:5824: checking for editorconn.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5827 "configure" #include "confdefs.h" #include <editorconn.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5842: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5880,7 +5870,7 @@ echo "checking for graphics libraries" 1>&6 -echo "configure:5884: checking for graphics libraries" >&5 +echo "configure:5874: checking for graphics libraries" >&5 test -z "$with_gif" && with_gif=yes; if test "$with_gif" = "yes"; then { test "$extra_verbose" = "yes" && cat << \EOF @@ -5897,10 +5887,10 @@ fi echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6 -echo "configure:5901: checking for Xpm - no older than 3.4f" >&5 +echo "configure:5891: checking for Xpm - no older than 3.4f" >&5 xe_check_libs=-lXpm test -z "$with_xpm" && { cat > conftest.$ac_ext <<EOF -#line 5904 "configure" +#line 5894 "configure" #include "confdefs.h" #include <X11/xpm.h> int main(int c, char **v) { @@ -5910,7 +5900,7 @@ 0 ; } EOF -if { (eval echo configure:5914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:5904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ./conftest foobar; xpm_status=$?; if test "$xpm_status" = "0"; then with_xpm=yes; else with_xpm=no; fi; @@ -5948,15 +5938,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:5952: checking for compface.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5955 "configure" +echo "configure:5942: checking for compface.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5945 "configure" #include "confdefs.h" #include <compface.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5960: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5950: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5979,12 +5969,12 @@ } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:5983: checking for UnGenFace in -lcompface" >&5 +echo "configure:5973: 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 5988 "configure" +#line 5978 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -5995,7 +5985,7 @@ UnGenFace() ; return 0; } EOF -if { (eval echo configure:5999: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5989: \"$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 @@ -6031,15 +6021,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:6035: checking for jpeglib.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6038 "configure" +echo "configure:6025: checking for jpeglib.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6028 "configure" #include "confdefs.h" #include <jpeglib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6043: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6062,12 +6052,12 @@ } test -z "$with_jpeg" && { echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6 -echo "configure:6066: checking for jpeg_destroy_decompress in -ljpeg" >&5 +echo "configure:6056: 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 6071 "configure" +#line 6061 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6078,7 +6068,7 @@ jpeg_destroy_decompress() ; return 0; } EOF -if { (eval echo configure:6082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6072: \"$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 @@ -6114,15 +6104,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:6118: checking for png.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6121 "configure" +echo "configure:6108: checking for png.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6111 "configure" #include "confdefs.h" #include <png.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6126: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6144,10 +6134,10 @@ fi } test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6 -echo "configure:6148: checking for pow" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6151 "configure" +echo "configure:6138: checking for pow" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6141 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char pow(); below. */ @@ -6170,7 +6160,7 @@ ; return 0; } EOF -if { (eval echo configure:6174: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_pow=yes" else @@ -6195,12 +6185,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:6199: checking "$xe_msg_checking"" >&5 +echo "configure:6189: 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 6204 "configure" +#line 6194 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6211,7 +6201,7 @@ png_read_image() ; return 0; } EOF -if { (eval echo configure:6215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6205: \"$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 @@ -6261,15 +6251,15 @@ ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6 -echo "configure:6265: checking for Xm/Xm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6268 "configure" +echo "configure:6255: checking for Xm/Xm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6258 "configure" #include "confdefs.h" #include <Xm/Xm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6273: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6286,12 +6276,12 @@ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6 -echo "configure:6290: checking for XmStringFree in -lXm" >&5 +echo "configure:6280: 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 6295 "configure" +#line 6285 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6302,7 +6292,7 @@ XmStringFree() ; return 0; } EOF -if { (eval echo configure:6306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6296: \"$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 @@ -6550,7 +6540,7 @@ if test "$with_mule" = "yes" ; then echo "checking for Mule-related features" 1>&6 -echo "configure:6554: checking for Mule-related features" >&5 +echo "configure:6544: checking for Mule-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining MULE EOF @@ -6567,15 +6557,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6571: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6574 "configure" +echo "configure:6561: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6564 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6579: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6569: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6606,12 +6596,12 @@ echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6 -echo "configure:6610: checking for strerror in -lintl" >&5 +echo "configure:6600: 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 6615 "configure" +#line 6605 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6622,7 +6612,7 @@ strerror() ; return 0; } EOF -if { (eval echo configure:6626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6616: \"$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 @@ -6655,19 +6645,19 @@ echo "checking for Mule input methods" 1>&6 -echo "configure:6659: checking for Mule input methods" >&5 +echo "configure:6649: 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:6663: checking for XIM" >&5 +echo "configure:6653: checking for XIM" >&5 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6 -echo "configure:6666: checking for XmImMbLookupString in -lXm" >&5 +echo "configure:6656: 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 6671 "configure" +#line 6661 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6678,7 +6668,7 @@ XmImMbLookupString() ; return 0; } EOF -if { (eval echo configure:6682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6672: \"$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 @@ -6740,15 +6730,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:6744: checking for wnn/jllib.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6747 "configure" +echo "configure:6734: checking for wnn/jllib.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6737 "configure" #include "confdefs.h" #include <wnn/jllib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6752: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6742: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6773,10 +6763,10 @@ for ac_func in crypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6777: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6780 "configure" +echo "configure:6767: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6770 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6799,7 +6789,7 @@ ; return 0; } EOF -if { (eval echo configure:6803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6828,12 +6818,12 @@ test "$ac_cv_func_crypt" != "yes" && { echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:6832: checking for crypt in -lcrypt" >&5 +echo "configure:6822: 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 6837 "configure" +#line 6827 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6844,7 +6834,7 @@ crypt() ; return 0; } EOF -if { (eval echo configure:6848: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6838: \"$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 @@ -6878,12 +6868,12 @@ fi test -z "$with_wnn" && { echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6 -echo "configure:6882: checking for jl_dic_list_e in -lwnn" >&5 +echo "configure:6872: 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 6887 "configure" +#line 6877 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6894,7 +6884,7 @@ jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:6898: \"$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_lib_$ac_lib_var=yes" else @@ -6931,12 +6921,12 @@ fi echo $ac_n "checking for jl_fi_dic_list in -lwnn""... $ac_c" 1>&6 -echo "configure:6935: checking for jl_fi_dic_list in -lwnn" >&5 +echo "configure:6925: 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 6940 "configure" +#line 6930 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6947,7 +6937,7 @@ jl_fi_dic_list() ; return 0; } EOF -if { (eval echo configure:6951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6941: \"$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 @@ -6979,15 +6969,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:6983: checking for canna/RK.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6986 "configure" +echo "configure:6973: checking for canna/RK.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6976 "configure" #include "confdefs.h" #include <canna/RK.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6991: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6981: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -7010,12 +7000,12 @@ } test -z "$with_canna" && { echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6 -echo "configure:7014: checking for RkBgnBun in -lRKC" >&5 +echo "configure:7004: 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 7019 "configure" +#line 7009 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7026,7 +7016,7 @@ RkBgnBun() ; 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:7020: \"$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 @@ -7049,12 +7039,12 @@ } test -z "$with_canna" && { echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6 -echo "configure:7053: checking for jrKanjiControl in -lcanna" >&5 +echo "configure:7043: 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 7058 "configure" +#line 7048 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -7065,7 +7055,7 @@ jrKanjiControl() ; return 0; } EOF -if { (eval echo configure:7069: \"$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* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7162,13 +7152,13 @@ fi -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 usleep utimes waitpid +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:7169: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7172 "configure" +echo "configure:7159: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7162 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7191,7 +7181,7 @@ ; return 0; } EOF -if { (eval echo configure:7195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7228,10 +7218,10 @@ for ac_func in realpath do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7232: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7235 "configure" +echo "configure:7222: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7225 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7254,7 +7244,7 @@ ; return 0; } EOF -if { (eval echo configure:7258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7287,16 +7277,16 @@ esac echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6 -echo "configure:7291: checking whether netdb declares h_errno" >&5 -cat > conftest.$ac_ext <<EOF -#line 7293 "configure" +echo "configure:7281: checking whether netdb declares h_errno" >&5 +cat > conftest.$ac_ext <<EOF +#line 7283 "configure" #include "confdefs.h" #include <netdb.h> int main() { return h_errno; ; return 0; } EOF -if { (eval echo configure:7300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7290: \"$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 @@ -7316,16 +7306,16 @@ rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:7320: checking for sigsetjmp" >&5 -cat > conftest.$ac_ext <<EOF -#line 7322 "configure" +echo "configure:7310: checking for sigsetjmp" >&5 +cat > conftest.$ac_ext <<EOF +#line 7312 "configure" #include "confdefs.h" #include <setjmp.h> int main() { sigjmp_buf bar; sigsetjmp (bar, 0); ; return 0; } EOF -if { (eval echo configure:7329: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7319: \"$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 @@ -7345,11 +7335,11 @@ rm -f conftest* echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6 -echo "configure:7349: checking whether localtime caches TZ" >&5 +echo "configure:7339: checking whether localtime caches TZ" >&5 if test "$ac_cv_func_tzset" = "yes"; then cat > conftest.$ac_ext <<EOF -#line 7353 "configure" +#line 7343 "configure" #include "confdefs.h" #include <time.h> #if STDC_HEADERS @@ -7384,7 +7374,7 @@ exit (0); } EOF -if { (eval echo configure:7388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:7378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then emacs_cv_localtime_cache=no else @@ -7413,9 +7403,9 @@ if test "$HAVE_TIMEVAL" = "yes"; then echo $ac_n "checking whether gettimeofday cannot accept two arguments""... $ac_c" 1>&6 -echo "configure:7417: checking whether gettimeofday cannot accept two arguments" >&5 -cat > conftest.$ac_ext <<EOF -#line 7419 "configure" +echo "configure:7407: checking whether gettimeofday cannot accept two arguments" >&5 +cat > conftest.$ac_ext <<EOF +#line 7409 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME @@ -7437,7 +7427,7 @@ ; return 0; } EOF -if { (eval echo configure:7441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -7459,19 +7449,19 @@ echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:7463: checking for inline" >&5 +echo "configure:7453: checking for inline" >&5 ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 7468 "configure" +#line 7458 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:7475: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -7521,17 +7511,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:7525: checking for working alloca.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7528 "configure" +echo "configure:7515: checking for working alloca.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7518 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:7535: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -7555,10 +7545,10 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:7559: checking for alloca" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7562 "configure" +echo "configure:7549: checking for alloca" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7552 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -7581,7 +7571,7 @@ char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:7585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -7620,10 +7610,10 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:7624: checking whether alloca needs Cray hooks" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7627 "configure" +echo "configure:7614: checking whether alloca needs Cray hooks" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7617 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -7647,10 +7637,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:7651: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7654 "configure" +echo "configure:7641: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7644 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7673,7 +7663,7 @@ ; return 0; } EOF -if { (eval echo configure:7677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7703,10 +7693,10 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:7707: checking stack direction for C alloca" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7710 "configure" +echo "configure:7697: checking stack direction for C alloca" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7700 "configure" #include "confdefs.h" find_stack_direction () { @@ -7725,7 +7715,7 @@ exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:7729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:7719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_c_stack_direction=1 else @@ -7753,15 +7743,15 @@ ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:7757: checking for vfork.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7760 "configure" +echo "configure:7747: checking for vfork.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7750 "configure" #include "confdefs.h" #include <vfork.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7765: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -7789,10 +7779,10 @@ fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:7793: checking for working vfork" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7796 "configure" +echo "configure:7783: checking for working vfork" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7786 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include <stdio.h> @@ -7887,7 +7877,7 @@ } } EOF -if { (eval echo configure:7891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:7881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_func_vfork_works=yes else @@ -7912,10 +7902,10 @@ echo $ac_n "checking for working strcoll""... $ac_c" 1>&6 -echo "configure:7916: checking for working strcoll" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7919 "configure" +echo "configure:7906: checking for working strcoll" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7909 "configure" #include "confdefs.h" #include <string.h> main () @@ -7925,7 +7915,7 @@ strcoll ("123", "456") >= 0); } EOF -if { (eval echo configure:7929: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:7919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_func_strcoll_works=yes else @@ -7952,10 +7942,10 @@ for ac_func in getpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7956: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7959 "configure" +echo "configure:7946: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7949 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7978,7 +7968,7 @@ ; return 0; } EOF -if { (eval echo configure:7982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -8006,10 +7996,10 @@ done echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:8010: checking whether getpgrp takes no argument" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8013 "configure" +echo "configure:8000: checking whether getpgrp takes no argument" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8003 "configure" #include "confdefs.h" /* @@ -8064,7 +8054,7 @@ } EOF -if { (eval echo configure:8068: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:8058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_func_getpgrp_void=yes else @@ -8090,10 +8080,10 @@ echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:8094: checking for working mmap" >&5 +echo "configure:8084: checking for working mmap" >&5 case "$opsys" in ultrix* ) have_mmap=no ;; *) cat > conftest.$ac_ext <<EOF -#line 8097 "configure" +#line 8087 "configure" #include "confdefs.h" #include <stdio.h> #include <unistd.h> @@ -8126,7 +8116,7 @@ return 1; } EOF -if { (eval echo configure:8130: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:8120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then have_mmap=yes else @@ -8159,10 +8149,10 @@ echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:8163: checking for socket" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8166 "configure" +echo "configure:8153: checking for socket" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8156 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char socket(); below. */ @@ -8185,7 +8175,7 @@ ; return 0; } EOF -if { (eval echo configure:8189: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -8200,15 +8190,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:8204: checking for netinet/in.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8207 "configure" +echo "configure:8194: checking for netinet/in.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8197 "configure" #include "confdefs.h" #include <netinet/in.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8212: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8202: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8225,15 +8215,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:8229: checking for arpa/inet.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8232 "configure" +echo "configure:8219: checking for arpa/inet.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8222 "configure" #include "confdefs.h" #include <arpa/inet.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8237: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8227: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8258,9 +8248,9 @@ } echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6 -echo "configure:8262: checking "for sun_len member in struct sockaddr_un"" >&5 +echo "configure:8252: checking "for sun_len member in struct sockaddr_un"" >&5 cat > conftest.$ac_ext <<EOF -#line 8264 "configure" +#line 8254 "configure" #include "confdefs.h" #include <sys/types.h> @@ -8271,7 +8261,7 @@ static struct sockaddr_un x; x.sun_len = 1; ; return 0; } EOF -if { (eval echo configure:8275: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8265: \"$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 @@ -8302,10 +8292,10 @@ echo $ac_n "checking for msgget""... $ac_c" 1>&6 -echo "configure:8306: checking for msgget" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8309 "configure" +echo "configure:8296: checking for msgget" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8299 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char msgget(); below. */ @@ -8328,7 +8318,7 @@ ; return 0; } EOF -if { (eval echo configure:8332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_msgget=yes" else @@ -8343,15 +8333,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:8347: checking for sys/ipc.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8350 "configure" +echo "configure:8337: checking for sys/ipc.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8340 "configure" #include "confdefs.h" #include <sys/ipc.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8355: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8368,15 +8358,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:8372: checking for sys/msg.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8375 "configure" +echo "configure:8362: checking for sys/msg.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8365 "configure" #include "confdefs.h" #include <sys/msg.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8380: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8414,15 +8404,15 @@ ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dirent.h""... $ac_c" 1>&6 -echo "configure:8418: checking for dirent.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8421 "configure" +echo "configure:8408: checking for dirent.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8411 "configure" #include "confdefs.h" #include <dirent.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8426: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8449,15 +8439,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:8453: checking for sys/dir.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8456 "configure" +echo "configure:8443: checking for sys/dir.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8446 "configure" #include "confdefs.h" #include <sys/dir.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8461: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8490,15 +8480,15 @@ ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for nlist.h""... $ac_c" 1>&6 -echo "configure:8494: checking for nlist.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8497 "configure" +echo "configure:8484: checking for nlist.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8487 "configure" #include "confdefs.h" #include <nlist.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8502: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8492: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8602,7 +8592,7 @@ echo "checking "for sound support"" 1>&6 -echo "configure:8606: checking "for sound support"" >&5 +echo "configure:8596: checking "for sound support"" >&5 case "$with_sound" in native | both ) with_native_sound=yes;; nas | no ) with_native_sound=no;; @@ -8613,15 +8603,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:8617: checking for multimedia/audio_device.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8620 "configure" +echo "configure:8607: checking for multimedia/audio_device.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8610 "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:8625: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8615: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8669,12 +8659,12 @@ if test -z "$native_sound_lib"; then echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6 -echo "configure:8673: checking for ALopenport in -laudio" >&5 +echo "configure:8663: 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 8678 "configure" +#line 8668 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8685,7 +8675,7 @@ ALopenport() ; return 0; } EOF -if { (eval echo configure:8689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8679: \"$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 @@ -8716,12 +8706,12 @@ if test -z "$native_sound_lib"; then echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6 -echo "configure:8720: checking for AOpenAudio in -lAlib" >&5 +echo "configure:8710: 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 8725 "configure" +#line 8715 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8732,7 +8722,7 @@ AOpenAudio() ; return 0; } EOF -if { (eval echo configure:8736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8726: \"$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 @@ -8758,7 +8748,7 @@ extra_objs="$extra_objs hpplay.o" && if test "$extra_verbose" = "yes"; then echo " xemacs will be linked with \"hpplay.o\"" fi - if test "$with_gcc" = "yes" # Kludge city + if test "$GCC" = "yes" # Kludge city then sound_cflags="-Dconst= -Dvolatile= -I/usr/audio/examples" else sound_cflags="+e -I/usr/audio/examples" fi @@ -8770,15 +8760,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:8774: checking for ${dir}/soundcard.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8777 "configure" +echo "configure:8764: checking for ${dir}/soundcard.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8767 "configure" #include "confdefs.h" #include <${dir}/soundcard.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8782: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8772: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8848,7 +8838,7 @@ fi LIBS="-laudio $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-laudio\" to \$LIBS"; fi cat > conftest.$ac_ext <<EOF -#line 8852 "configure" +#line 8842 "configure" #include "confdefs.h" #include <audio/Xtutil.h> EOF @@ -8875,7 +8865,7 @@ if test "$with_tty" = "yes" ; then echo "checking for TTY-related features" 1>&6 -echo "configure:8879: checking for TTY-related features" >&5 +echo "configure:8869: checking for TTY-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_TTY EOF @@ -8890,15 +8880,15 @@ ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termios.h""... $ac_c" 1>&6 -echo "configure:8894: checking for termios.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8897 "configure" +echo "configure:8884: checking for termios.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8887 "configure" #include "confdefs.h" #include <termios.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8902: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8925,15 +8915,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:8929: checking for termio.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8932 "configure" +echo "configure:8919: checking for termio.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8922 "configure" #include "confdefs.h" #include <termio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8937: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8966,12 +8956,12 @@ if test -z "$with_ncurses"; then echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:8970: checking for tgetent in -lncurses" >&5 +echo "configure:8960: 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 8975 "configure" +#line 8965 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8982,7 +8972,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:8986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8976: \"$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 @@ -9015,15 +9005,15 @@ ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:9019: checking for ncurses/curses.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9022 "configure" +echo "configure:9009: checking for ncurses/curses.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9012 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9027: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9017: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9045,15 +9035,15 @@ ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6 -echo "configure:9049: checking for ncurses/term.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9052 "configure" +echo "configure:9039: checking for ncurses/term.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9042 "configure" #include "confdefs.h" #include <ncurses/term.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9057: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9047: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9083,15 +9073,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:9087: checking for ncurses/curses.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9090 "configure" +echo "configure:9077: checking for ncurses/curses.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9080 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9095: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9085: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9126,12 +9116,12 @@ for lib in curses termlib termcap; do echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6 -echo "configure:9130: checking for tgetent in -l$lib" >&5 +echo "configure:9120: 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 9135 "configure" +#line 9125 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9142,7 +9132,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:9146: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9136: \"$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 @@ -9173,12 +9163,12 @@ else echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 -echo "configure:9177: checking for tgetent in -lcurses" >&5 +echo "configure:9167: 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 9182 "configure" +#line 9172 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9189,7 +9179,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:9193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9183: \"$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 @@ -9207,12 +9197,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:9211: checking for tgetent in -ltermcap" >&5 +echo "configure:9201: 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 9216 "configure" +#line 9206 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9223,7 +9213,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:9227: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9217: \"$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 @@ -9271,15 +9261,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:9275: checking for gpm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9278 "configure" +echo "configure:9265: checking for gpm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9268 "configure" #include "confdefs.h" #include <gpm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9283: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9273: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9302,12 +9292,12 @@ } test -z "$with_gpm" && { echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:9306: checking for Gpm_Open in -lgpm" >&5 +echo "configure:9296: 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 9311 "configure" +#line 9301 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9318,7 +9308,7 @@ Gpm_Open() ; return 0; } EOF -if { (eval echo configure:9322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9312: \"$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 @@ -9367,17 +9357,17 @@ echo "checking for database support" 1>&6 -echo "configure:9371: checking for database support" >&5 +echo "configure:9361: 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:9376: checking for dbm_open in -lgdbm" >&5 +echo "configure:9366: 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 9381 "configure" +#line 9371 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9388,7 +9378,7 @@ dbm_open() ; return 0; } EOF -if { (eval echo configure:9392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9382: \"$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 @@ -9410,10 +9400,10 @@ if test "$with_database_gnudbm" != "yes"; then echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:9414: checking for dbm_open" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9417 "configure" +echo "configure:9404: checking for dbm_open" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9407 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dbm_open(); below. */ @@ -9436,7 +9426,7 @@ ; return 0; } EOF -if { (eval echo configure:9440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dbm_open=yes" else @@ -9472,10 +9462,10 @@ if test "$with_database_dbm" != "no"; then echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:9476: checking for dbm_open" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9479 "configure" +echo "configure:9466: checking for dbm_open" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9469 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dbm_open(); below. */ @@ -9498,7 +9488,7 @@ ; return 0; } EOF -if { (eval echo configure:9502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dbm_open=yes" else @@ -9519,12 +9509,12 @@ if test "$need_libdbm" != "no"; then echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:9523: checking for dbm_open in -ldbm" >&5 +echo "configure:9513: 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 9528 "configure" +#line 9518 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9535,7 +9525,7 @@ dbm_open() ; return 0; } EOF -if { (eval echo configure:9539: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9529: \"$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 @@ -9572,10 +9562,10 @@ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for dbopen""... $ac_c" 1>&6 -echo "configure:9576: checking for dbopen" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9579 "configure" +echo "configure:9566: checking for dbopen" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9569 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dbopen(); below. */ @@ -9598,7 +9588,7 @@ ; return 0; } EOF -if { (eval echo configure:9602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dbopen=yes" else @@ -9619,12 +9609,12 @@ if test "$need_libdb" != "no"; then echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6 -echo "configure:9623: checking for dbopen in -ldb" >&5 +echo "configure:9613: 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 9628 "configure" +#line 9618 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9635,7 +9625,7 @@ dbopen() ; return 0; } EOF -if { (eval echo configure:9639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9629: \"$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 @@ -9659,7 +9649,7 @@ if test "$with_database_berkdb" = "yes"; then for path in "db/db.h" "db.h"; do cat > conftest.$ac_ext <<EOF -#line 9663 "configure" +#line 9653 "configure" #include "confdefs.h" #ifdef HAVE_INTTYPES_H #define __BIT_TYPES_DEFINED__ @@ -9677,7 +9667,7 @@ ; return 0; } EOF -if { (eval echo configure:9681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9671: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* db_h_path="$path"; break else @@ -9729,12 +9719,12 @@ if test "$with_socks" = "yes"; then echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6 -echo "configure:9733: checking for SOCKSinit in -lsocks" >&5 +echo "configure:9723: 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 9738 "configure" +#line 9728 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -9745,7 +9735,7 @@ SOCKSinit() ; return 0; } EOF -if { (eval echo configure:9749: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9739: \"$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 @@ -10058,7 +10048,7 @@ EOF } -test "$with_gcc" = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF +test "$GCC" = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF Defining USE_GCC EOF cat >> confdefs.h <<\EOF
--- a/configure.in Mon Aug 13 09:45:48 2007 +0200 +++ b/configure.in Mon Aug 13 09:46:53 2007 +0200 @@ -1580,10 +1580,12 @@ with_tooltalk=yes fi -dnl Choose a compiler. -test -n "$CC" && cc_specified=yes - -if test -n "$compiler"; then CC="$compiler"; fi +dnl Choose a compiler from (in order) +dnl --compiler, env var CC, with_gcc=no && ${NON_GNU_CC:-cc}, AC_PROG_CC +test -n "$compiler" && CC="$compiler" +if test "$with_gcc" = "no"; then dnl Try to find a non-gcc compiler + case "$CC" in "" | *gcc* ) CC="${NON_GNU_CC-cc}" ;; esac +fi dnl If we don't set CFLAGS here, AC_PROG_CC will set it. dnl But we know better what's good for us, so we do our own @@ -1591,21 +1593,19 @@ test "$cflags" != "UNSPECIFIED" && CFLAGS="$cflags" xe_save_CFLAGS="$CFLAGS" -dnl Some systems specify a CPP or CC to use unless we are using GCC. -test -n "$NON_GNU_CC" -a "$with_gcc" = "no" -a -z "$CC" && CC="$NON_GNU_CC" -AC_PROG_CC - -if test "$with_gcc" = "no" -a "$ac_cv_prog_gcc" = "yes"; then +AC_PROG_CC dnl Autoconf has its own magic for compiler autodetection + +dnl Retry using random guesswork if AC_PROG_CC got it wrong... +if test "$with_gcc" = "no" -a "$GCC" = "yes"; then CC=${NON_GNU_CC-cc} AC_PROG_CC -elif test "$with_gcc" = "yes" -a "$ac_cv_prog_gcc" = "no" ; then +elif test "$with_gcc" = "yes" -a "$GCC" != "yes" ; then CC=gcc AC_PROG_CC fi CFLAGS="$xe_save_CFLAGS" -if test "$GCC" = "yes"; then with_gcc=yes; else with_gcc=no; fi -test -n "$NON_GNU_CPP" -a "$with_gcc" = "no" -a -z "$CPP" && CPP="$NON_GNU_CPP" +test -n "$NON_GNU_CPP" -a "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP" AC_PROG_CPP @@ -1843,7 +1843,7 @@ AC_SUBST(start_flags) if test "$ordinary_link" = "no" -a "$GCC" = "yes"; then test -z "$linker" && linker='$(CC) -nostdlib' - test -z "$lib_gcc" && lib_gcc='`$(CC) -print-lib-gcc-file-name`' + test -z "$lib_gcc" && lib_gcc='`$(CC) -print-lib-gccfile-name`' fi test "$GCC" != "yes" && lib_gcc= AC_SUBST(ld) @@ -2012,7 +2012,7 @@ dnl checks for header files AC_CHECK_HEADERS(mach/mach.h sys/stropts.h sys/timeb.h sys/time.h unistd.h) -AC_CHECK_HEADERS(utime.h locale.h libgen.h fcntl.h) +AC_CHECK_HEADERS(utime.h locale.h libgen.h fcntl.h ulimit.h) AC_CHECK_HEADERS(linux/version.h kstat.h sys/pstat.h inttypes.h limits.h) AC_HEADER_SYS_WAIT AC_HEADER_STDC @@ -2267,11 +2267,8 @@ AC_CHECK_LIB(Xext, XShapeSelectInput, XE_PREPEND(-lXext, libs_x)) dnl Require -lXt - case "$opsys" in dnl SunOS4 bug workaround - sunos4* ) XE_PREPEND(-u _XtToolkitInitialize -lXt, libs_x) ;; - * ) AC_CHECK_LIB(Xt, XtOpenDisplay, XE_PREPEND(-lXt, libs_x), - [AC_MSG_ERROR("Unable to find X11 libraries.")]) ;; - esac + AC_CHECK_LIB(Xt, XtOpenDisplay, XE_PREPEND(-lXt, libs_x), + AC_MSG_ERROR("Unable to find X11 libraries.")) AC_MSG_CHECKING(the version of X11 being used) AC_TRY_RUN([#include <X11/Intrinsic.h> @@ -2285,7 +2282,7 @@ dnl remove this - we should avoid checking for specific OS AC_MSG_CHECKING(for XFree86) if test -d "/usr/X386/include" -o \ - -f "/etc/XF86Config" -o \ + -f "/etc/XF86Config" -o \ -f "/etc/X11/XF86Config" -o \ -f "/usr/X11R6/lib/X11/XF86Config"; then AC_MSG_RESULT(yes) @@ -2295,17 +2292,12 @@ fi dnl autodetect -lXmu - case "$opsys" in dnl SunOS4 bug workaround - sunos4* ) XE_PREPEND(-u _get_applicationShellWidgetClass -lXmu, libs_x) ;; - * ) if test -z "$with_xmu"; then - AC_CHECK_LIB(Xmu, XmuConvertStandardSelection, with_xmu=yes, with_xmu=no) - fi - if test "$with_xmu" = "no"; then - XE_ADD_OBJS(xmu.o) - else - XE_PREPEND(-lXmu, libs_x) - fi ;; - esac + test -z "$with_xmu" && { AC_CHECK_LIB(Xmu, XmuReadBitmapDataFromFile, + with_xmu=yes, with_xmu=no) } + if test "$with_xmu" = "no" + then XE_ADD_OBJS(xmu.o) + else XE_PREPEND(-lXmu, libs_x) + fi dnl Autodetect -lXbsd dnl #### Someone, please add a better function than main @@ -2671,7 +2663,7 @@ XE_COMPUTE_RUNPATH() fi -AC_CHECK_FUNCS(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 usleep utimes waitpid) +AC_CHECK_FUNCS(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) dnl realpath is buggy on linux, decosf and aix4 @@ -2948,7 +2940,7 @@ if test -n "$native_sound_lib"; then sound_found=yes XE_ADD_OBJS(hpplay.o) - if test "$with_gcc" = "yes" # Kludge city + if test "$GCC" = "yes" # Kludge city then sound_cflags="-Dconst= -Dvolatile= -I/usr/audio/examples" else sound_cflags="+e -I/usr/audio/examples" fi @@ -3323,7 +3315,7 @@ elif test "$use_system_malloc" = "yes"; then AC_DEFINE(USE_SYSTEM_MALLOC) fi test "$with_i18n3" = "yes" && AC_DEFINE(I18N3) -test "$with_gcc" = "yes" && AC_DEFINE(USE_GCC) +test "$GCC" = "yes" && AC_DEFINE(USE_GCC) test "$with_term" = "yes" && AC_DEFINE(HAVE_TERM) test "$external_widget" = "yes" && AC_DEFINE(EXTERNAL_WIDGET) test "$with_gnu_make" = "yes" && AC_DEFINE(USE_GNU_MAKE)
--- a/etc/NEWS Mon Aug 13 09:45:48 2007 +0200 +++ b/etc/NEWS Mon Aug 13 09:46:53 2007 +0200 @@ -138,6 +138,21 @@ creating a new frame with `C-x 5 2' also raises and selects that frame. The behavior of window system frames is unchanged. +** Zmacs region is selectively deactivated when an error is signaled. + +The behavior of the zmacs region can now be controlled in the event of a +signaled error. The new variable `errors-deactivate-region' may be set +to nil to avoid losing the zmacs region. When this is in effect, to +deactivate the region, you have to press C-g explicitly, in the buffer +where the region is active. This can be a win under many circumstances, +but can lead to potentially confusing situations when isearch is in effect. + +To control just keeping the region when moving against the endpoints of a +buffer, the existing variable `signal-error-on-buffer-boundary' can be set +to nil. + +NOTE: This feature is enabled by default in 20.3beta. + ** Abbreviations can now contain non-word characters. This means that it is finally possible to do such simple things as @@ -238,6 +253,9 @@ was set up as the terminal's erase character at the tim Emacs was started. +** `string-to-number' now accepts an optional BASE argument which +specifies which base to use. The default base is 10. + ** The TIME argument to `format-time-string' is now optional and defaults to the current time.
--- a/lib-src/ChangeLog Mon Aug 13 09:45:48 2007 +0200 +++ b/lib-src/ChangeLog Mon Aug 13 09:46:53 2007 +0200 @@ -1,3 +1,8 @@ +1997-07-03 Steven L Baur <steve@altair.xemacs.org> + + * update-elc.sh (make_special_commands): Fix building of ilisp so + custom-load.elc gets built. + 1997-06-27 Steven L Baur <steve@altair.xemacs.org> * update-autoloads.sh: Major rework. Avoid looking at MULE
--- a/lib-src/getopt.c Mon Aug 13 09:45:48 2007 +0200 +++ b/lib-src/getopt.c Mon Aug 13 09:46:53 2007 +0200 @@ -34,14 +34,6 @@ #include <config.h> #endif -#if !defined (__STDC__) || !__STDC__ -/* This is a separate conditional since some stdc systems - reject `defined (const)'. */ -#ifndef const -#define const -#endif -#endif - #include <stdio.h> #ifdef STDC_HEADERS #include <string.h>
--- a/lib-src/getopt1.c Mon Aug 13 09:45:48 2007 +0200 +++ b/lib-src/getopt1.c Mon Aug 13 09:46:53 2007 +0200 @@ -25,14 +25,6 @@ #include "getopt.h" -#if !defined (__STDC__) || !__STDC__ -/* This is a separate conditional since some stdc systems - reject `defined (const)'. */ -#ifndef const -#define const -#endif -#endif - #include <stdio.h> /* Comment out all this code if we are using the GNU C Library, and are not
--- a/lib-src/make-path.c Mon Aug 13 09:45:48 2007 +0200 +++ b/lib-src/make-path.c Mon Aug 13 09:46:53 2007 +0200 @@ -39,8 +39,7 @@ char *prog_name; -static int touchy_mkdir (path) - char *path; +static int touchy_mkdir (char *path) { struct stat buf; @@ -62,9 +61,7 @@ } int -main (argc, argv) - int argc; - char **argv; +main (int argc, char *argv[]) { prog_name = *argv;
--- a/lib-src/sorted-doc.c Mon Aug 13 09:45:48 2007 +0200 +++ b/lib-src/sorted-doc.c Mon Aug 13 09:46:53 2007 +0200 @@ -53,8 +53,7 @@ /* Print error message. `s1' is printf control string, `s2' is arg for it. */ static void -error (s1, s2) - char *s1, *s2; +error (char *s1, char *s2) { fprintf (stderr, "sorted-doc: "); fprintf (stderr, s1, s2); @@ -64,8 +63,7 @@ /* Print error message and exit. */ static void -fatal (s1, s2) - char *s1, *s2; +fatal (char *s1, char *s2) { error (s1, s2); exit (1); @@ -74,8 +72,7 @@ /* Like malloc but get fatal error if memory is exhausted. */ static void * -xmalloc (size) - int size; +xmalloc (int size) { char *result = malloc ((unsigned)size); if (result == NULL) @@ -113,7 +110,7 @@ }; int -main () +main (int argc, char *argv[]) { register DOCSTR *dp = NULL; /* allocated DOCSTR */ register LINE *lp = NULL; /* allocated line */
--- a/lib-src/update-autoloads.sh Mon Aug 13 09:45:48 2007 +0200 +++ b/lib-src/update-autoloads.sh Mon Aug 13 09:46:53 2007 +0200 @@ -46,7 +46,18 @@ fi # Compute patterns to ignore when searching for files -ignore_dirs="" +# These directories don't have autoloads and customizations, or are partially +# broken. +ignore_dirs="cl egg eos ilisp its language locale mel mu sunpro term tooltalk" + +# Prepare for autoloading directories with directory-specific instructions +make_special_commands='' +make_special () { + dir="$1"; shift; + ignore_dirs="$ignore_dirs $dir" + make_special_commands="$make_special_commands \ + (cd \"lisp/$dir\" && ${MAKE:-make} EMACS=$REAL ${1+$*});" +} # Only use Mule XEmacs to build Mule-specific autoloads & custom-loads. echon "Checking for Mule support..." @@ -54,17 +65,30 @@ mule_p="`$EMACS -batch -no-site-file -eval \"$lisp_prog\"`" if test "$mule_p" = nil ; then echo No - ignore_dirs="$ignore_dirs its egg mule leim" + ignore_dirs="$ignore_dirs mule leim" else echo Yes fi +if test "$mule_p" = nil ; then + make_special auctex autoloads +else + make_special auctex autoloads MULE_EL=tex-jp.elc +fi +make_special cc-mode autoloads +make_special efs autoloads +#make_special eos autoloads # EOS doesn't have custom or autoloads +#make_special gnus autoloads +make_special hyperbole autoloads +# make_special ilisp autoloads +make_special oobr HYPB_ELC='' autoloads +make_special w3 autoloads + dirs= for dir in lisp/*; do if test -d $dir \ -a $dir != lisp/CVS \ - -a $dir != lisp/SCCS \ - -a $dir != lisp/language; then + -a $dir != lisp/SCCS; then for ignore in $ignore_dirs; do if test $dir = lisp/$ignore; then continue 2 @@ -74,7 +98,9 @@ fi done -set -x +# set -x for dir in $dirs; do $EMACS -batch -q -l autoload -f batch-update-directory $dir done + +eval "$make_special_commands"
--- a/lib-src/update-elc.sh Mon Aug 13 09:45:48 2007 +0200 +++ b/lib-src/update-elc.sh Mon Aug 13 09:46:53 2007 +0200 @@ -118,6 +118,8 @@ make_special eos -k # not strictly necessary... make_special gnus some make_special hyperbole elc +# We're not ready for the following, yet. +#make_special ilisp XEmacsELC=custom-load.elc elc make_special ilisp elc make_special oobr HYPB_ELC='' elc make_special w3 xemacs-w3
--- a/lib-src/wakeup.c Mon Aug 13 09:45:48 2007 +0200 +++ b/lib-src/wakeup.c Mon Aug 13 09:46:53 2007 +0200 @@ -21,14 +21,10 @@ #endif #endif -void -main (argc, argv) - int argc; - char **argv; +int +main (int argc, char *argv[]) { int period = 60; - time_t when; - struct tm *tp; if (argc > 1) period = atoi (argv[1]); @@ -37,13 +33,15 @@ { /* Make sure wakeup stops when Emacs goes away. */ if (getppid () == 1) - exit (0); + return 0; printf ("Wake up!\n"); fflush (stdout); /* If using a period of 60, produce the output when the minute changes. */ if (period == 60) { + time_t when; + struct tm *tp; time (&when); tp = localtime (&when); sleep (60 - tp->tm_sec);
--- a/lib-src/yow.c Mon Aug 13 09:45:48 2007 +0200 +++ b/lib-src/yow.c Mon Aug 13 09:46:53 2007 +0200 @@ -44,10 +44,8 @@ &res;}) #endif -void -main (argc, argv) - int argc; - char *argv[]; +int +main (int argc, char *argv[]) { FILE *fp; char file[BUFSIZ]; @@ -82,7 +80,7 @@ setup_yow(fp); yow(fp); fclose(fp); - exit(0); + return 0; } static long len = -1;
--- a/lisp/ChangeLog Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/ChangeLog Mon Aug 13 09:46:53 2007 +0200 @@ -1,3 +1,131 @@ +1997-07-06 Steven L Baur <steve@altair.xemacs.org> + + * prim/cmdloop.el (errors-deactivate-region): Default to no error + behavior for beta testing. + + * prim/dumped-lisp.el (dumped-lisp-packages): Reenable dumping + winnt.elc with MS Windows NT version of XEmacs. + +1997-07-05 Steven L Baur <steve@altair.xemacs.org> + + * comint/shell.el ((not shell-mode-map)): M-RET conflicts with + Hyperbole binding. + + * comint/comint.el (comint-mode): Use easymenu for making menus. + (comint-popup-menu): Use mode-popup menu instead of private menu. + + * efs/dired.el (toplevel): Do not string test version against + "Lucid". + + * prim/obsolete.el (add-menu): Don't make obsolete. + + * utils/easymenu.el (easy-menu-remove): Do something neater when + only one buffer menu is in effect. + (easy-menu-add): Ditto. + + * prim/dumped-lisp.el (dumped-lisp-packages): easymenu will be + dumped with XEmacs. + + * utils/easymenu.el (easy-menu-define): Don't autoload. + + * modes/lisp-mode.el (toplevel): Rename menu descriptors. + (emacs-lisp-mode): Use easy-menu-define/easy-menu-add to add menus. + (lisp-interaction-mode): Ditto. + +1997-07-04 Steven L Baur <steve@altair.xemacs.org> + + * prim/cmdloop.el (errors-deactivate-region): Default to existing + behavior. + + * leim/quail.el (quail-mode): Correct addition of quail minor mode + info to minor-mode-map-alist. + (top-level): Ditto. + +1997-06-30 Hrvoje Niksic <hniksic@srce.hr> + + * modes/abbrev.el (define-mode-abbrev): Call `define-abbrev' with + correct arguments. + +1997-07-04 Hrvoje Niksic <hniksic@srce.hr> + + * prim/minibuf.el (read-from-minibuffer): Initialize + `current-minibuffer-contents', `current-minibuffer-point', and + `initial-minibuffer-history-position'. + (next-history-element): Use them. + (previous-matching-history-element): Ditto. + +1997-07-04 Steven L Baur <steve@altair.xemacs.org> + + * prim/cus-load.el (custom-put): New alias for overloadable + function. + +1997-07-03 Steven L Baur <steve@altair.xemacs.org> + + * utils/autoload.el (batch-update-directory): Fix typo. + (update-autoloads-from-directory): Avoid scanning custom-load.el + and auto-autoload.el files. + (batch-update-autoloads): Remove duplicate status message. + (autoload-snarf-defcustom): Keep track of what symbols we have + attached property lists to. + + * ilisp/Makefile (autoloads): Add autoloads dependencies. + + * hyperbole/Makefile: Add autoloads dependencies. + + * utils/autoload.el (batch-update-autoloads): Load custom-load + prior to updating autoloads. + + * cc-mode/Makefile (autoloads): New targets to automatically + rebuild autoloads and custom-loads. + +1997-07-02 Steven L Baur <steve@altair.xemacs.org> + + * auctex/Makefile (autoloads): New targets to automatically + rebuild autoloads and custom-loads. + + * utils/autoload.el (batch-update-autoloads): Add new parameter, + update DOC string. + + * comint/gdb.el (gdb-mode): Semantics of c-mode-syntax-table have + changed. + +1997-07-01 Steven L Baur <steve@altair.xemacs.org> + + * x11/x-menubar.el: bookmark submenu beautification -- This will + make it look better (and will prevent some consing, but that's + being anal). + From Hrvoje Niksic <hniksic@srce.hr> + + * prim/simple.el (delete-key-deletes-forward): Mark docstring as + an user option. + From Gary D. Foster <Gary.Foster@Corp.Sun.COM> + + * mel/mel-q.el (q-encoding-encode-string): Fix Ebola-ified + comparison. + + * efs/efs-ovwrt.el (efs-overwrite-fn): efs is manufacturing its + own byte code. Whee. + * utils/advice.el (ad-interactive-form): Don't treat bytecode as a + vector if it can be avoided. + From Kyle Jones <kyle_jones@wonderworks.com> + +1997-06-30 Steven L Baur <steve@altair.xemacs.org> + + * prim/files.el (auto-mode-alist): Don't set image-mode by default + on xpms. + +Sun Jun 29 20:57:15 1997 Kyle Jones <kyle_jones@wonderworks.com> + + * prim/simple.el: bind inhibit-read-only to t before + trying to erase or otherwise modify the echo area buffer. + +1997-07-01 MORIOKA Tomohiko <morioka@jaist.ac.jp> + + * modes/image-mode.el: Add `image-maybe-restore' to + `change-major-mode-hook'. + + * modes/image-mode.el (image-maybe-restore): New function. + 1997-06-29 Hrvoje Niksic <hniksic@srce.hr> * modes/abbrev.el (define-mode-abbrev): Would ignore EXPANSION.
--- a/lisp/apel/auto-autoloads.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/apel/auto-autoloads.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,9 +1,6 @@ ;;; DO NOT MODIFY THIS FILE (if (not (featurep 'apel-autoloads)) (progn - -(provide 'apel-autoloads) -)) ;;;### (autoloads (module-installed-p exec-installed-p file-installed-p get-latest-path add-latest-path add-path) "file-detect" "apel/file-detect.el") @@ -61,3 +58,6 @@ (autoload 'richtext-decode "richtext" nil nil nil) ;;;*** + +(provide 'apel-autoloads) +))
--- a/lisp/apel/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '())
--- a/lisp/auctex/ChangeLog Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/auctex/ChangeLog Mon Aug 13 09:46:53 2007 +0200 @@ -1,3 +1,8 @@ +1997-07-02 Steven L Baur <steve@altair.xemacs.org> + + * Makefile (autoloads): New targets to automatically rebuild + autoloads and custom-loads. + 1997-06-27 Steven L Baur <steve@altair.xemacs.org> * Makefile (CONTRIBELC): Remove hardcoded dependency on
--- a/lisp/auctex/Makefile Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/auctex/Makefile Mon Aug 13 09:46:53 2007 +0200 @@ -72,7 +72,7 @@ MINMAPSRC = auc-menu.el maniac.el outln-18.el all.el multi-prompt.el ## MULE_ELC is set by update-elc.sh if bytecompiling for XEmacs/Mule -CONTRIB = bib-cite.el font-latex.el custom-load.el +CONTRIB = bib-cite.el $(MULE_EL) font-latex.el custom-load.el CONTRIBELC = bib-cite.elc $(MULE_ELC) font-latex.elc custom-load.elc AUCSRC = auc-old.el tex.el tex-buf.el latex.el tex-info.el multi-prompt.el @@ -219,3 +219,11 @@ -cvs add $(MINMAPSRC) cvs commit -m "Update" cp $(MINMAPSRC) doc/math-ref.tex $(FTPDIR) + +autoloads: auto-autoloads.el + +auto-autoloads.el: $(AUCSRC) $(CONTRIB) + $(EMACS) -batch -q -no-site-file \ + -eval '(setq autoload-target-directory "'`pwd`'/")' \ + -l autoload \ + -f batch-update-autoloads $?
--- a/lisp/auctex/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/auctex/custom-load.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,82 +1,11 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'tex 'custom-loads '("tex")) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'LaTeX-label 'custom-loads '("latex")) -(put 'LaTeX-environment 'custom-loads '("latex")) -(put 'auto-save 'custom-loads '()) -(put 'LaTeX-macro 'custom-loads '("latex")) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'TeX-output 'custom-loads '("tex-buf" "tex")) -(put 'editing-basics 'custom-loads '()) -(put 'LaTeX-math 'custom-loads '("latex")) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'TeX-parse 'custom-loads '("tex")) -(put 'data 'custom-loads '()) -(put 'AUC-TeX 'custom-loads '("tex")) -(put 'TeX-command 'custom-loads '("tex")) -(put 'TeX-command-name 'custom-loads '("tex")) -(put 'ps-print 'custom-loads '()) -(put 'TeX-commands 'custom-loads '("tex-buf")) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'TeX-indentation 'custom-loads '("latex")) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'TeX-macro 'custom-loads '("latex")) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'LaTeX-indentation 'custom-loads '("latex")) -(put 'message-insertion 'custom-loads '()) -(put 'LaTeX 'custom-loads '("latex" "tex")) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'TeX-file 'custom-loads '("tex")) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '()) +(custom-put 'AUC-TeX 'custom-loads '("tex" )) +(custom-put 'TeX-file 'custom-loads '("tex" )) +(custom-put 'TeX-command 'custom-loads '("tex" )) +(custom-put 'LaTeX 'custom-loads '("tex""latex" )) +(custom-put 'TeX-output 'custom-loads '("tex""tex-buf" )) +(custom-put 'TeX-command-name 'custom-loads '("tex" )) +(custom-put 'LaTeX-environment 'custom-loads '("latex" )) +(custom-put 'LaTeX-label 'custom-loads '("latex" )) +(custom-put 'LaTeX-indentation 'custom-loads '("latex" )) +(custom-put 'LaTeX-math 'custom-loads '("latex" )) +(custom-put 'LaTeX-macro 'custom-loads '("latex" ))
--- a/lisp/bytecomp/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '())
--- a/lisp/calendar/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/calendar/custom-load.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,67 +1,3 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '("calendar")) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '("calendar")) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '("calendar")) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '("calendar")) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'appt 'custom-loads '("appt")) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '()) +(custom-put 'appt 'custom-loads '("appt")) +(custom-put 'holidays 'custom-loads '("calendar")) +(custom-put 'diary 'custom-loads '("calendar"))
--- a/lisp/cc-mode/Makefile Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/cc-mode/Makefile Mon Aug 13 09:46:53 2007 +0200 @@ -8,8 +8,6 @@ PRELOADS = -l ./cc-vars.el -l ./cc-mode.el -l ./cc-menus.el -l ./cc-langs.el -SPECIAL_ELCS = custom-load.elc - .el.elc: $(EMACS) $(OPTS) $(PRELOADS) $(CMD) $< @@ -18,10 +16,15 @@ cc-engine.elc cc-langs.elc cc-menus.elc cc-mode.elc \ cc-styles.elc cc-vars.elc -all: $(ALL_ELCS) $(SPECIAL_ELCS) - -custom-load.elc: custom-load.el - $(EMACS) $(OPTS) $(CMD) $< +all: $(ALL_ELCS) clean: -rm $(ALL_ELCS) + +autoloads: auto-autoloads.el + +auto-autoloads.el: $(ALL_ELC:.elc=.el) + $(EMACS) -batch -q -no-site-file \ + -eval '(setq autoload-target-directory "'`pwd`'/")' \ + -l autoload \ + -f batch-update-autoloads $?
--- a/lisp/cc-mode/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,67 +0,0 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '()) -(put 'c 'custom-loads '("cc-vars"))
--- a/lisp/cl/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '())
--- a/lisp/comint/comint.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/comint/comint.el Mon Aug 13 09:46:53 2007 +0200 @@ -148,6 +148,8 @@ ;;; comint-completion-autolist - boolean behavior ;;; comint-completion-recexact - boolean ... +(require 'easymenu) + (defgroup comint nil "General command interpreter in a window stuff." :group 'processes) @@ -405,6 +407,61 @@ (put 'comint-scroll-show-maximum-output 'permanent-local t) (put 'comint-ptyp 'permanent-local t) +(defvar comint-1-menubar-menu nil) +(defconst comint-1-menubar-menu-1 + (purecopy + '("Comint1" + ["Previous Matching Current Input" + comint-previous-matching-input-from-input t] + ["Next Matching Current Input" comint-next-matching-input-from-input t] + ["Previous Input" comint-previous-input t] + ["Next Input" comint-next-input t] + ["Previous Input Matching Regexp..." comint-previous-matching-input t] + ["Next Input Matching Regexp..." comint-next-matching-input t] + ["Backward Matching Input..." comint-backward-matching-input t] + ["Forward Matching Input..." comint-forward-matching-input t] + "---" + ["Copy Old Input" comint-copy-old-input t] + ["Kill Current Input" comint-kill-input t] + ["Show Current Output Group" comint-show-output t] + ["Show Maximum Output" comint-show-maximum-output t] + ["Goto Previous Prompt" comint-previous-prompt t] + ["Goto Next Prompt" comint-next-prompt t] + ["Kill Command Output" comint-kill-output t] + ))) + +(defvar comint-2-menubar-menu nil) +(defconst comint-2-menubar-menu-1 + (purecopy + '("Comint2" + ["Complete Before Point" comint-dynamic-complete t] + ["Complete File Name" comint-dynamic-complete-filename t] + ["File Completion Listing" comint-dynamic-list-filename-completions t] + ["Expand File Name" comint-replace-by-expanded-filename t] + ;; this is cheesy but the easiest way to get this. + ["Complete Env. Variable Name" shell-dynamic-complete-environment-variable + :active t :included (eq 'shell-mode major-mode)] + ["Expand Directory Reference" shell-replace-by-expanded-directory + :active t :included (eq 'shell-mode major-mode)] + "---" + ["Send INT" comint-interrupt-subjob t] + ["Send STOP" comint-stop-subjob t] + ["Send CONT" comint-continue-subjob t] + ["Send QUIT" comint-quit-subjob t] + ["Send KILL" comint-kill-subjob t] + ["Send EOF" comint-send-eof t] + ))) + +(defvar comint-history-menubar-menu nil) +(defconst comint-history-menubar-menu-1 + (purecopy + '("History" + :filter comint-history-menu-filter + ["Expand History Before Point" comint-replace-by-expanded-history + comint-input-autoexpand] + ["List Input History" comint-dynamic-list-input-ring t] + "---" + ))) (defun comint-mode () @@ -491,10 +548,22 @@ (progn ;; make a local copy of the menubar, so our modes don't ;; change the global menubar - (set-buffer-menubar current-menubar) - (add-submenu nil comint-1-menubar-menu) - (add-submenu nil comint-2-menubar-menu) - (add-submenu nil comint-history-menubar-menu))) + ;; (set-buffer-menubar current-menubar) + ;; (add-submenu nil comint-1-menubar-menu) + (unless comint-1-menubar-menu + (easy-menu-define comint-1-menubar-menu nil "" + comint-1-menubar-menu-1)) + (easy-menu-add comint-1-menubar-menu) + ;; (add-submenu nil comint-2-menubar-menu) + (unless comint-2-menubar-menu + (easy-menu-define comint-2-menubar-menu nil "" + comint-2-menubar-menu-1)) + (easy-menu-add comint-2-menubar-menu) + ;; (add-submenu nil comint-history-menubar-menu))) + (unless comint-history-menubar-menu + (easy-menu-define comint-history-menubar-menu nil "" + comint-history-menubar-menu-1)) + (easy-menu-add comint-history-menubar-menu))) (run-hooks 'comint-mode-hook)) (if comint-mode-map @@ -553,88 +622,35 @@ #-infodock (define-key comint-mode-map 'button3 'comint-popup-menu) ) -(defconst comint-1-menubar-menu - (purecopy - '("Comint1" - ["Previous Matching Current Input" - comint-previous-matching-input-from-input t] - ["Next Matching Current Input" comint-next-matching-input-from-input t] - ["Previous Input" comint-previous-input t] - ["Next Input" comint-next-input t] - ["Previous Input Matching Regexp..." comint-previous-matching-input t] - ["Next Input Matching Regexp..." comint-next-matching-input t] - ["Backward Matching Input..." comint-backward-matching-input t] - ["Forward Matching Input..." comint-forward-matching-input t] - "---" - ["Copy Old Input" comint-copy-old-input t] - ["Kill Current Input" comint-kill-input t] - ["Show Current Output Group" comint-show-output t] - ["Show Maximum Output" comint-show-maximum-output t] - ["Goto Previous Prompt" comint-previous-prompt t] - ["Goto Next Prompt" comint-next-prompt t] - ["Kill Command Output" comint-kill-output t] - ))) - -(defconst comint-2-menubar-menu - (purecopy - '("Comint2" - ["Complete Before Point" comint-dynamic-complete t] - ["Complete File Name" comint-dynamic-complete-filename t] - ["File Completion Listing" comint-dynamic-list-filename-completions t] - ["Expand File Name" comint-replace-by-expanded-filename t] - ;; this is cheesy but the easiest way to get this. - ["Complete Env. Variable Name" shell-dynamic-complete-environment-variable - :active t :included (eq 'shell-mode major-mode)] - ["Expand Directory Reference" shell-replace-by-expanded-directory - :active t :included (eq 'shell-mode major-mode)] - "---" - ["Send INT" comint-interrupt-subjob t] - ["Send STOP" comint-stop-subjob t] - ["Send CONT" comint-continue-subjob t] - ["Send QUIT" comint-quit-subjob t] - ["Send KILL" comint-kill-subjob t] - ["Send EOF" comint-send-eof t] - ))) - -(defconst comint-history-menubar-menu - (purecopy - '("History" - :filter comint-history-menu-filter - ["Expand History Before Point" comint-replace-by-expanded-history - comint-input-autoexpand] - ["List Input History" comint-dynamic-list-input-ring t] - "---" - ))) - -(defconst comint-popup-menu - '("Command Interpreter Commands" - ["Kill Command Output" comint-kill-output t] - ["Goto Next Prompt" comint-next-prompt t] - ["Goto Previous Prompt" comint-previous-prompt t] - ["Kill Input" comint-kill-input t] - "----" - ["Previous Input" comint-previous-matching-input-from-input t] - ["Next Input" comint-next-matching-input-from-input t] - ["Previous Input matching Regexp..." 'comint-previous-matching-input t] - ["Next Input matching Regexp..." 'comint-next-matching-input t] - ["List Command History" comint-dynamic-list-input-ring t] - "----" - ["Send INT" comint-interrupt-subjob t] - ["Send STOP" comint-stop-subjob t] - ["Send CONT" comint-continue-subjob t] - ["Send QUIT" comint-quit-subjob t] - ["Send KILL" comint-kill-subjob t] - ["Send EOF" comint-send-eof t] - )) +;;(defconst comint-popup-menu +;; '("Command Interpreter Commands" +;; ["Kill Command Output" comint-kill-output t] +;; ["Goto Next Prompt" comint-next-prompt t] +;; ["Goto Previous Prompt" comint-previous-prompt t] +;; ["Kill Input" comint-kill-input t] +;; "----" +;; ["Previous Input" comint-previous-matching-input-from-input t] +;; ["Next Input" comint-next-matching-input-from-input t] +;; ["Previous Input matching Regexp..." 'comint-previous-matching-input t] +;; ["Next Input matching Regexp..." 'comint-next-matching-input t] +;; ["List Command History" comint-dynamic-list-input-ring t] +;; "----" +;; ["Send INT" comint-interrupt-subjob t] +;; ["Send STOP" comint-stop-subjob t] +;; ["Send CONT" comint-continue-subjob t] +;; ["Send QUIT" comint-quit-subjob t] +;; ["Send KILL" comint-kill-subjob t] +;; ["Send EOF" comint-send-eof t] +;; )) (defun comint-popup-menu (event) "Display the comint-mode menu." (interactive "@e") (let ((history (comint-make-history-menu))) (popup-menu (if history - (append comint-popup-menu + (append mode-popup-menu (list "---" (cons "Command History" history))) - comint-popup-menu)))) + mode-popup-menu)))) (defcustom comint-history-menu-max 40 "*Maximum number of entries to display on the Comint command-history menu."
--- a/lisp/comint/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/comint/custom-load.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,78 +1,10 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'ssh 'custom-loads '("ssh")) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'telnet 'custom-loads '("telnet")) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'shell 'custom-loads '("shell")) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'comint-completion 'custom-loads '("comint")) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'comint 'custom-loads '("comint-xemacs" "comint" "telnet")) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'rlogin 'custom-loads '("rlogin")) -(put 'diff 'custom-loads '()) -(put 'shell-faces 'custom-loads '("shell")) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'shell-directories 'custom-loads '("shell")) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'comint-source 'custom-loads '("comint")) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'processes 'custom-loads '("background" "comint" "rlogin" "shell" "ssh")) -(put 'message-insertion 'custom-loads '()) -(put 'background 'custom-loads '("background")) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'unix 'custom-loads '("rlogin" "shell" "ssh")) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '()) +(custom-put 'background 'custom-loads '("background")) +(custom-put 'comint 'custom-loads '("comint-xemacs" "comint" "telnet")) +(custom-put 'comint-completion 'custom-loads '("comint")) +(custom-put 'comint-source 'custom-loads '("comint")) +(custom-put 'rlogin 'custom-loads '("rlogin")) +(custom-put 'shell 'custom-loads '("shell")) +(custom-put 'shell-directories 'custom-loads '("shell")) +(custom-put 'shell-faces 'custom-loads '("shell")) +(custom-put 'ssh 'custom-loads '("ssh")) +(custom-put 'telnet 'custom-loads '("telnet"))
--- a/lisp/comint/gdb.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/comint/gdb.el Mon Aug 13 09:46:53 2007 +0200 @@ -243,8 +243,8 @@ (interactive) (comint-mode) (use-local-map gdb-mode-map) - (when (not (boundp 'c-mode-syntax-table)) - (require 'cc-mode)) + (when (not c-mode-syntax-table) + (require 'cc-lang)) (set-syntax-table c-mode-syntax-table) (make-local-variable 'gdb-last-frame-displayed-p) (make-local-variable 'gdb-last-frame)
--- a/lisp/comint/shell.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/comint/shell.el Mon Aug 13 09:46:53 2007 +0200 @@ -283,7 +283,8 @@ ;; who use directory aliases ... someone shoot me if they ;; don't like this binding. Another possibility is C-c C-s ;; but that's way awkward. - (define-key map "\M-\C-m" 'shell-resync-dirs) + ;; July-5-1997, Bang! -slb + #-infodock (define-key map "\M-\C-m" 'shell-resync-dirs) (setq shell-mode-map map))) (defcustom shell-mode-hook nil
--- a/lisp/custom/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/custom/custom-load.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,88 +1,53 @@ -(put 'extensions 'custom-loads '("wid-edit")) -(put 'copyright 'custom-loads '()) -(put 'custom-buffer 'custom-loads '("cus-edit")) -(put 'eldoc 'custom-loads '()) -(put 'custom-faces 'custom-loads '("cus-edit")) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'widgets 'custom-loads '("wid-browse" "wid-edit")) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '("cus-edit")) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'custom-menu 'custom-loads '("cus-edit")) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '("cus-edit")) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'hypermedia 'custom-loads '("wid-edit")) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'applications 'custom-loads '("cus-edit")) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '("cus-edit")) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'widget-browse 'custom-loads '("wid-browse")) -(put 'data 'custom-loads '()) -(put 'widget-documentation 'custom-loads '("wid-edit")) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '("cus-edit" "wid-edit" "cus-face")) -(put 'custom-browse 'custom-loads '("cus-edit")) -(put 'abbrev 'custom-loads '("cus-edit")) -(put 'programming 'custom-loads '("cus-edit")) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'widget-button 'custom-loads '("wid-edit")) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'files 'custom-loads '("cus-edit")) -(put 'external 'custom-loads '("cus-edit")) -(put 'development 'custom-loads '("cus-edit")) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'widget-faces 'custom-loads '("wid-edit")) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'languages 'custom-loads '("cus-edit")) -(put 'fill 'custom-loads '()) -(put 'custom-magic-faces 'custom-loads '("cus-edit")) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'faces 'custom-loads '("cus-edit" "wid-edit")) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'emacs 'custom-loads '("cus-edit")) -(put 'processes 'custom-loads '("cus-edit")) -(put 'message-insertion 'custom-loads '()) -(put 'wp 'custom-loads '("cus-edit")) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '("cus-edit")) -(put 'matching 'custom-loads '()) -(put 'i18n 'custom-loads '("cus-edit")) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '()) +(custom-put 'widget-button 'custom-loads '("wid-edit")) +(custom-put 'widget-faces 'custom-loads '("wid-edit")) +(custom-put 'widget-documentation 'custom-loads '("wid-edit")) +(custom-put 'widgets 'custom-loads '("wid-browse" "wid-edit")) +(custom-put 'widget-browse 'custom-loads '("wid-browse")) +(custom-put 'custom-magic-faces 'custom-loads '("cus-edit")) +(custom-put 'windows 'custom-loads '()) +(custom-put 'processes-basics 'custom-loads '()) +(custom-put 'auto-save 'custom-loads '()) +(custom-put 'keyboard 'custom-loads '()) +(custom-put 'minibuffer 'custom-loads '()) +(custom-put 'debug 'custom-loads '()) +(custom-put 'limits 'custom-loads '()) +(custom-put 'dired 'custom-loads '()) +(custom-put 'execute 'custom-loads '()) +(custom-put 'display 'custom-loads '()) +(custom-put 'editing-basics 'custom-loads '()) +(custom-put 'fill 'custom-loads '()) +(custom-put 'modeline 'custom-loads '()) +(custom-put 'undo 'custom-loads '()) +(custom-put 'alloc 'custom-loads '()) +(custom-put 'custom-menu 'custom-loads '("cus-edit")) +(custom-put 'custom-buffer 'custom-loads '("cus-edit")) +(custom-put 'custom-browse 'custom-loads '("cus-edit")) +(custom-put 'custom-faces 'custom-loads '("cus-edit")) +(custom-put 'customize 'custom-loads '("cus-edit" "wid-edit" "cus-face")) +(custom-put 'local 'custom-loads '()) +(custom-put 'help 'custom-loads '("cus-edit")) +(custom-put 'hypermedia 'custom-loads '("wid-edit")) +(custom-put 'faces 'custom-loads '("cus-edit" "wid-edit")) +(custom-put 'wp 'custom-loads '("cus-edit")) +(custom-put 'files 'custom-loads '("cus-edit")) +(custom-put 'data 'custom-loads '()) +(custom-put 'frames 'custom-loads '()) +(custom-put 'x 'custom-loads '()) +(custom-put 'i18n 'custom-loads '("cus-edit")) +(custom-put 'environment 'custom-loads '("cus-edit")) +(custom-put 'maint 'custom-loads '()) +(custom-put 'internal 'custom-loads '("cus-edit")) +(custom-put 'extensions 'custom-loads '("wid-edit")) +(custom-put 'development 'custom-loads '("cus-edit")) +(custom-put 'calendar 'custom-loads '()) +(custom-put 'applications 'custom-loads '("cus-edit")) +(custom-put 'lisp 'custom-loads '()) +(custom-put 'languages 'custom-loads '("cus-edit")) +(custom-put 'programming 'custom-loads '("cus-edit")) +(custom-put 'processes 'custom-loads '("cus-edit")) +(custom-put 'external 'custom-loads '("cus-edit")) +(custom-put 'mouse 'custom-loads '()) +(custom-put 'matching 'custom-loads '()) +(custom-put 'abbrev 'custom-loads '("cus-edit")) +(custom-put 'editing 'custom-loads '("cus-edit")) +(custom-put 'emacs 'custom-loads '("cus-edit"))
--- a/lisp/edebug/auto-autoloads.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/edebug/auto-autoloads.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,9 +1,6 @@ ;;; DO NOT MODIFY THIS FILE (if (not (featurep 'edebug-autoloads)) (progn - -(provide 'edebug-autoloads) -)) ;;;### (autoloads (edebug-eval-top-level-form def-edebug-spec) "edebug" "edebug/edebug.el") @@ -21,3 +18,6 @@ or if an error occurs, leave point after it with mark at the original point." t nil) ;;;*** + +(provide 'edebug-autoloads) +))
--- a/lisp/edebug/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/edebug/custom-load.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,67 +1,1 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '("edebug")) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'edebug 'custom-loads '("edebug")) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '()) +(custom-put 'edebug 'custom-loads '("edebug"))
--- a/lisp/ediff/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/ediff/custom-load.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,73 +1,6 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'tools 'custom-loads '("ediff")) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'ediff-diff 'custom-loads '("ediff-diff")) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'ediff-window 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '("ediff-wind")) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'ediff-ptch 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'ediff-merge 'custom-loads '("ediff-merg")) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'ediff-mult 'custom-loads '("ediff-mult")) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ediff 'custom-loads '("ediff-diff" "ediff-merg" "ediff-mult" "ediff-ptch" "ediff-wind" "ediff")) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '()) +(custom-put 'ediff 'custom-loads '("ediff-diff" "ediff-merg" "ediff-mult" "ediff-ptch" "ediff-wind" "ediff")) +(custom-put 'ediff-window 'custom-loads '()) +(custom-put 'ediff-ptch 'custom-loads '()) +(custom-put 'ediff-mult 'custom-loads '("ediff-mult")) +(custom-put 'ediff-merge 'custom-loads '("ediff-merg")) +(custom-put 'ediff-diff 'custom-loads '("ediff-diff"))
--- a/lisp/efs/Makefile Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/efs/Makefile Mon Aug 13 09:46:53 2007 +0200 @@ -2,7 +2,7 @@ # # File: Makefile # Release: $efs release: 1.15 $ -# Version: $Revision: 1.7 $ +# Version: $Revision: 1.8 $ # RCS: # Description: Makefile for byte-compiling efs and dired. # Author: Andy Norman, HPLabs, Bristol, UK. @@ -302,4 +302,12 @@ clean: rm -f $(OBJS) +autoloads: auto-autoloads.el + +auto-autoloads.el: $(EFSSRC) $(DSRC) efs-x19.15.el $(XESRC) $(MULESRC) + $(EMACS) -batch -q -no-site-file \ + -eval '(setq autoload-target-directory "'`pwd`'/")' \ + -l autoload \ + -f batch-update-autoloads $? + ## end of Makefile ##
--- a/lisp/efs/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/efs/custom-load.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,66 +1,1 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '("dired-faces")) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '("dired-faces")) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '()) +(custom-put 'dired 'custom-loads '("dired-faces"))
--- a/lisp/efs/dired.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/efs/dired.el Mon Aug 13 09:46:53 2007 +0200 @@ -75,7 +75,9 @@ (require 'backquote) ; For macros. ;; Compatibility requirements for the file-name-handler-alist. -(let ((lucid-p (string-match "Lucid" emacs-version)) +;; Testing against the string `Lucid' breaks InfoDock. How many years has +;; it been since Lucid went away? +(let ((lucid-p (string-match "XEmacs" emacs-version)) ver subver) (or (string-match "^\\([0-9]+\\)\\.\\([0-9]+\\)" emacs-version) (error "dired does not work with emacs version %s" emacs-version)) @@ -108,7 +110,7 @@ Will use the variable default-directory-function if it non-nil." (if default-directory-function (funcall default-directory-function) - (if (string-match "Lucid" emacs-version) + (if (string-match "XEmacs" emacs-version) (abbreviate-file-name default-directory t) (abbreviate-file-name default-directory)))) @@ -6373,7 +6375,7 @@ ;;;; Multi-flavour Emacs support ;;;; -------------------------------------------------------------- -(let ((lucid-p (string-match "Lucid" emacs-version)) +(let ((lucid-p (string-match "XEmacs" emacs-version)) ver) (or (string-match "^\\([0-9]+\\)\\." emacs-version) (error "Weird emacs version %s" emacs-version))
--- a/lisp/efs/efs-ovwrt.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/efs/efs-ovwrt.el Mon Aug 13 09:46:53 2007 +0200 @@ -102,10 +102,19 @@ (setcar ndoc-cdr (format efs-overwrite-fmt package))))) (t ;; it's an emacs19 compiled-code object - (let ((new-code (append nfun nil))) ; turn it into a list - (if (nthcdr 4 new-code) - (setcar (nthcdr 4 new-code) ndoc-str) - (setcdr (nthcdr 3 new-code) (cons ndoc-str nil))) + ;; + ;; XEmacs: can't use append on a compiled function + ;; as the latter is no longer a vector. Use the + ;; accessor functions instead. + (let ((new-code (nconc + (list (compiled-function-arglist nfun) + (compiled-function-instructions nfun) + (compiled-function-constants nfun) + (compiled-function-stack-depth nfun) + ndoc-str) + (if (compiled-function-interactive nfun) + (list (compiled-function-interactive nfun)) + nil)))) (fset new (apply 'make-byte-code new-code))))))))
--- a/lisp/egg/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '())
--- a/lisp/electric/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '())
--- a/lisp/emulators/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '())
--- a/lisp/eos/Makefile Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/eos/Makefile Mon Aug 13 09:46:53 2007 +0200 @@ -32,11 +32,16 @@ sun-eos-debugger.el sun-eos-editor.el sun-eos-init.el \ sun-eos-menubar.el sun-eos-toolbar.el sun-eos-load.el +EXTRA = custom-load.elc + all: $(OBJECTS) clean: rm -f $(OBJECTS) +custom-load.elc: auto-autoloads.el + ${EMACS} ${BATCHFLAGS} -f batch-byte-compile custom-load.el + sun-eos-browser.elc: sun-eos-browser.el $(CORE) ${EMACS} ${BATCHFLAGS} -f batch-byte-compile sun-eos-browser.el @@ -64,4 +69,12 @@ sun-eos-load.elc: sun-eos-load.el ${EMACS} ${BATCHFLAGS} -f batch-byte-compile sun-eos-load.el +autoloads: custom-load.el + +custom-load.el: $(SOURCES) + $(EMACS) -batch -q -no-site-file \ + -eval '(setq autoload-target-directory "'`pwd`'/")' \ + -l autoload \ + -f batch-update-autoloads $? + ### Makefile ends here
--- a/lisp/eos/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '())
--- a/lisp/eterm/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/eterm/custom-load.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,69 +1,1 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'term 'custom-loads '("term")) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'processes 'custom-loads '("term")) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'unix 'custom-loads '("term")) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '()) +(custom-put 'term 'custom-loads '("term"))
--- a/lisp/games/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/games/custom-load.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,68 +1,1 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'games 'custom-loads '("xmine")) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'xmine 'custom-loads '("xmine")) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '()) +(custom-put 'xmine 'custom-loads '("xmine"))
--- a/lisp/gnats/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '())
--- a/lisp/gnus/ChangeLog Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/gnus/ChangeLog Mon Aug 13 09:46:53 2007 +0200 @@ -1,3 +1,53 @@ +Sun Jul 6 17:22:47 1997 Lars Magne Ingebrigtsen <larsi@menja.ifi.uio.no> + + * gnus.el: Gnus v5.4.62 is released. + +Sun Jul 6 12:38:56 1997 Lars Magne Ingebrigtsen <larsi@ifi.uio.no> + + * nngateway.el (nngateway-request-post): Call sendmail function. + + * message.el (message-send-news): Supply the method to the post + function. + + * gnus.el (gnus-group-auto-expirable-p): Dox fox. + + * message.el (message-clone-locals): Only clone Gnus variables. + + * gnus-nocem.el (gnus-nocem-enter-article): Use real group name. + +Fri Jul 4 13:00:39 1997 enami tsugutomo <enami@but-b.or.jp> + + * gnus-group.el (gnus-group-set-mode-line): Use new, shorter + format. + +Fri Jul 4 12:31:18 1997 Lars Magne Ingebrigtsen <larsi@ifi.uio.no> + + * gnus-score.el (gnus-score-headers): Let the score buffer inherit + variables from the summary buffer. + + * message.el (message-clone-locals): Made into own function. + + * gnus.el (gnus-select-method): Changed default. + + * gnus-start.el (gnus-read-active-file): Changed default to + `some'. + +Tue Jul 1 01:51:24 1997 Lars Magne Ingebrigtsen <larsi@menja.ifi.uio.no> + + * gnus.el: Gnus v5.4.61 is released. + +Tue Jul 1 01:33:39 1997 Lars Magne Ingebrigtsen <larsi@ifi.uio.no> + + * gnus-sum.el (gnus-adjust-marked-articles): Typo. + +Tue Jul 1 00:56:21 1997 Gary D. Foster <Gary.Foster@corp.sun.com> + + * gnus-topic.el (gnus-topic-mode-map): [delete]. + +Tue Jul 1 00:53:04 1997 Lars Magne Ingebrigtsen <larsi@ifi.uio.no> + + * gnus-demon.el (gnus-demon): Make sure Emacs really is idle. + Sun Jun 29 21:32:13 1997 Lars Magne Ingebrigtsen <larsi@menja.ifi.uio.no> * gnus.el: Gnus v5.4.60 is released.
--- a/lisp/gnus/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/gnus/custom-load.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,146 +1,80 @@ -(put 'gnus-start 'custom-loads '("gnus-group" "gnus-int" "gnus-start" "gnus-util" "gnus")) -(put 'extensions 'custom-loads '()) -(put 'message 'custom-loads '("message")) -(put 'copyright 'custom-loads '()) -(put 'gnus-score-expire 'custom-loads '("gnus-kill" "gnus-score")) -(put 'gnus-score-kill 'custom-loads '("gnus-kill")) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'gnus-message 'custom-loads '("message")) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'gnus-summary-sort 'custom-loads '("gnus-sum")) -(put 'nnmail-procmail 'custom-loads '("nnmail")) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'gnus-article-buttons 'custom-loads '("gnus-art")) -(put 'gnus-extract-archive 'custom-loads '("gnus-uu")) -(put 'gnus-article-headers 'custom-loads '("gnus-art" "gnus-sum")) -(put 'holidays 'custom-loads '()) -(put 'gnus-score 'custom-loads '("gnus-nocem" "gnus")) -(put 'gnus-summary-various 'custom-loads '("gnus-sum")) -(put 'gnus-topic 'custom-loads '("gnus-topic")) -(put 'gnus-article-emphasis 'custom-loads '("gnus-art")) -(put 'earcon 'custom-loads '("earcon")) -(put 'auto-save 'custom-loads '()) -(put 'gnus-group-foreign 'custom-loads '("gnus-group")) -(put 'gnus-article-washing 'custom-loads '("gnus-xmas" "gnus-art")) -(put 'ispell 'custom-loads '()) -(put 'mail 'custom-loads '("gnus" "message")) -(put 'gnus-summary-exit 'custom-loads '("gnus-sum")) -(put 'fortran-indent 'custom-loads '()) -(put 'gnus-article-saving 'custom-loads '("gnus-art")) -(put 'gnus-extract-view 'custom-loads '("gnus-sum" "gnus-uu")) -(put 'gnus-group-listing 'custom-loads '("gnus-group")) -(put 'lpr 'custom-loads '()) -(put 'gnus-summary 'custom-loads '("gnus-sum" "gnus")) -(put 'message-headers 'custom-loads '("message")) -(put 'editing-basics 'custom-loads '()) -(put 'gnus-group-select 'custom-loads '("gnus-sum")) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'gnus-summary-mail 'custom-loads '("gnus-sum")) -(put 'gnus-score-default 'custom-loads '("gnus-score" "gnus-sum")) -(put 'nnmail-expire 'custom-loads '("nnmail")) -(put 'gnus-thread 'custom-loads '("gnus-sum")) -(put 'gnus-nocem 'custom-loads '("gnus-nocem")) -(put 'gnus-threading 'custom-loads '("gnus-sum")) -(put 'paren-matching 'custom-loads '()) -(put 'gnus-summary-maneuvering 'custom-loads '("gnus-sum")) -(put 'gnus-extract 'custom-loads '("gnus" "gnus-uu")) -(put 'help 'custom-loads '()) -(put 'gnus-summary-tree 'custom-loads '("gnus-salt")) -(put 'local 'custom-loads '()) -(put 'nnmail-split 'custom-loads '("nnmail")) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'gnus-article-various 'custom-loads '("gnus-art" "gnus-sum")) -(put 'message-sending 'custom-loads '("message")) -(put 'data 'custom-loads '()) -(put 'gnus-article 'custom-loads '("gnus-art" "gnus-cite")) -(put 'ps-print 'custom-loads '()) -(put 'gnus 'custom-loads '("gnus-art" "gnus-async" "gnus-cache" "gnus-demon" "gnus-dup" "gnus-eform" "gnus-uu" "gnus-win" "gnus-xmas" "gnus" "nnmail")) -(put 'backup 'custom-loads '()) -(put 'gnus-xmas 'custom-loads '("gnus-xmas")) -(put 'gnus-treading 'custom-loads '("gnus-sum")) -(put 'frames 'custom-loads '()) -(put 'nnmail 'custom-loads '("nnmail")) -(put 'gnus-article-hiding 'custom-loads '("gnus-art" "gnus-sum")) -(put 'customize 'custom-loads '()) -(put 'nnmail-duplicate 'custom-loads '("nnmail")) -(put 'gnus-summary-visual 'custom-loads '("gnus-sum" "gnus")) -(put 'gnus-group-various 'custom-loads '("gnus-group")) -(put 'abbrev 'custom-loads '()) -(put 'nnmail-retrieve 'custom-loads '("nnmail")) -(put 'message-interface 'custom-loads '("message")) -(put 'gnus-group 'custom-loads '("gnus-topic" "gnus")) -(put 'gnus-article-signature 'custom-loads '("gnus-art")) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'gnus-duplicate 'custom-loads '("gnus-dup")) -(put 'gnus-score-adapt 'custom-loads '("gnus-score")) -(put 'nnmail-various 'custom-loads '("nnmail")) -(put 'nnmail-files 'custom-loads '("nnmail")) -(put 'gnus-asynchronous 'custom-loads '("gnus-async")) -(put 'gnus-visual 'custom-loads '("earcon" "gnus-art" "gnus-picon" "gnus" "smiley")) -(put 'message-forwarding 'custom-loads '("message")) -(put 'killing 'custom-loads '()) -(put 'message-news 'custom-loads '("message")) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnus-edit-form 'custom-loads '("gnus-eform")) -(put 'gnus-files 'custom-loads '("gnus" "nnmail")) -(put 'gnus-summary-pick 'custom-loads '("gnus-salt")) -(put 'gnus-cite 'custom-loads '("gnus-cite")) -(put 'gnus-demon 'custom-loads '("gnus-demon")) -(put 'gnus-summary-choose 'custom-loads '("gnus-sum")) -(put 'gnuserv 'custom-loads '()) -(put 'gnus-windows 'custom-loads '("gnus-win")) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '("message")) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '("message")) -(put 'resize-minibuffer 'custom-loads '()) -(put 'gnus-group-levels 'custom-loads '("gnus-group")) -(put 'gnus-summary-format 'custom-loads '("gnus-sum")) -(put 'gnus-score-decay 'custom-loads '("gnus-score")) -(put 'fill 'custom-loads '()) -(put 'gnus-extract-post 'custom-loads '("gnus-uu")) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'faces 'custom-loads '("gnus" "message")) -(put 'diary 'custom-loads '()) -(put 'gnus-various 'custom-loads '("gnus-sum")) -(put 'smiley 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'gnus-article-highlight 'custom-loads '("gnus-art")) -(put 'news 'custom-loads '("gnus" "message")) -(put 'gnus-cache 'custom-loads '()) -(put 'message-insertion 'custom-loads '("message")) -(put 'message-faces 'custom-loads '("message")) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'gnus-score-files 'custom-loads '("gnus-score")) -(put 'modeline 'custom-loads '()) -(put 'gnus-summary-marks 'custom-loads '("gnus-sum")) -(put 'picons 'custom-loads '("gnus-picon")) -(put 'processes-basics 'custom-loads '()) -(put 'nnmail-prepare 'custom-loads '("nnmail")) -(put 'message-buffers 'custom-loads '("message")) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'gnus-article-mime 'custom-loads '("gnus-art" "gnus-sum")) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '()) +(custom-put 'earcon 'custom-loads '("earcon")) +(custom-put 'gnus-article 'custom-loads '("gnus-art" "gnus-cite")) +(custom-put 'gnus-article-hiding 'custom-loads '("gnus-art" "gnus-sum")) +(custom-put 'gnus-article-highlight 'custom-loads '("gnus-art")) +(custom-put 'gnus-article-signature 'custom-loads '("gnus-art")) +(custom-put 'gnus-article-headers 'custom-loads '("gnus-art" "gnus-sum")) +(custom-put 'gnus-article-washing 'custom-loads '("gnus-xmas" "gnus-art")) +(custom-put 'gnus-article-emphasis 'custom-loads '("gnus-art")) +(custom-put 'gnus-article-saving 'custom-loads '("gnus-art")) +(custom-put 'gnus-article-mime 'custom-loads '("gnus-art" "gnus-sum")) +(custom-put 'gnus-article-buttons 'custom-loads '("gnus-art")) +(custom-put 'gnus-article-various 'custom-loads '("gnus-art" "gnus-sum")) +(custom-put 'gnus-asynchronous 'custom-loads '("gnus-async")) +(custom-put 'gnus-cache 'custom-loads '()) +(custom-put 'gnus-cite 'custom-loads '("gnus-cite")) +(custom-put 'gnus-demon 'custom-loads '("gnus-demon")) +(custom-put 'gnus-duplicate 'custom-loads '("gnus-dup")) +(custom-put 'gnus-edit-form 'custom-loads '("gnus-eform")) +(custom-put 'gnus-nocem 'custom-loads '("gnus-nocem")) +(custom-put 'picons 'custom-loads '("gnus-picon")) +(custom-put 'gnus-topic 'custom-loads '("gnus-topic")) +(custom-put 'gnus-extract 'custom-loads '("gnus" "gnus-uu")) +(custom-put 'gnus-extract-view 'custom-loads '("gnus-sum" "gnus-uu")) +(custom-put 'gnus-extract-archive 'custom-loads '("gnus-uu")) +(custom-put 'gnus-extract-post 'custom-loads '("gnus-uu")) +(custom-put 'gnus-windows 'custom-loads '("gnus-win")) +(custom-put 'gnus-xmas 'custom-loads '("gnus-xmas")) +(custom-put 'gnus 'custom-loads '("gnus-art" "gnus-async" "gnus-cache" "gnus-demon" "gnus-dup" "gnus-eform" "gnus-uu" "gnus-win" "gnus-xmas" "gnus" "nnmail")) +(custom-put 'gnus-start 'custom-loads '("gnus-group" "gnus-int" "gnus-start" "gnus-util" "gnus")) +(custom-put 'gnus-group 'custom-loads '("gnus-topic" "gnus")) +(custom-put 'gnus-group-foreign 'custom-loads '("gnus-group")) +(custom-put 'gnus-group-levels 'custom-loads '("gnus-group")) +(custom-put 'gnus-group-select 'custom-loads '("gnus-sum")) +(custom-put 'gnus-group-listing 'custom-loads '("gnus-group")) +(custom-put 'gnus-group-various 'custom-loads '("gnus-group")) +(custom-put 'gnus-summary 'custom-loads '("gnus-sum" "gnus")) +(custom-put 'gnus-summary-exit 'custom-loads '("gnus-sum")) +(custom-put 'gnus-summary-marks 'custom-loads '("gnus-sum")) +(custom-put 'gnus-thread 'custom-loads '("gnus-sum")) +(custom-put 'gnus-summary-format 'custom-loads '("gnus-sum")) +(custom-put 'gnus-summary-choose 'custom-loads '("gnus-sum")) +(custom-put 'gnus-summary-maneuvering 'custom-loads '("gnus-sum")) +(custom-put 'gnus-summary-mail 'custom-loads '("gnus-sum")) +(custom-put 'gnus-summary-sort 'custom-loads '("gnus-sum")) +(custom-put 'gnus-summary-visual 'custom-loads '("gnus-sum" "gnus")) +(custom-put 'gnus-summary-various 'custom-loads '("gnus-sum")) +(custom-put 'gnus-summary-pick 'custom-loads '("gnus-salt")) +(custom-put 'gnus-summary-tree 'custom-loads '("gnus-salt")) +(custom-put 'gnus-score 'custom-loads '("gnus-nocem" "gnus")) +(custom-put 'gnus-score-kill 'custom-loads '("gnus-kill")) +(custom-put 'gnus-score-adapt 'custom-loads '("gnus-score")) +(custom-put 'gnus-score-default 'custom-loads '("gnus-score" "gnus-sum")) +(custom-put 'gnus-score-expire 'custom-loads '("gnus-kill" "gnus-score")) +(custom-put 'gnus-score-decay 'custom-loads '("gnus-score")) +(custom-put 'gnus-score-files 'custom-loads '("gnus-score")) +(custom-put 'gnus-visual 'custom-loads '("earcon" "gnus-art" "gnus-picon" "gnus" "smiley")) +(custom-put 'gnus-files 'custom-loads '("gnus" "nnmail")) +(custom-put 'gnus-message 'custom-loads '("message")) +(custom-put 'gnus-various 'custom-loads '("gnus-sum")) +(custom-put 'message 'custom-loads '("message")) +(custom-put 'message-various 'custom-loads '("message")) +(custom-put 'message-buffers 'custom-loads '("message")) +(custom-put 'message-sending 'custom-loads '("message")) +(custom-put 'message-interface 'custom-loads '("message")) +(custom-put 'message-forwarding 'custom-loads '("message")) +(custom-put 'message-insertion 'custom-loads '("message")) +(custom-put 'message-headers 'custom-loads '("message")) +(custom-put 'message-news 'custom-loads '("message")) +(custom-put 'message-mail 'custom-loads '("message")) +(custom-put 'message-faces 'custom-loads '("message")) +(custom-put 'nnmail 'custom-loads '("nnmail")) +(custom-put 'nnmail-retrieve 'custom-loads '("nnmail")) +(custom-put 'nnmail-prepare 'custom-loads '("nnmail")) +(custom-put 'nnmail-duplicate 'custom-loads '("nnmail")) +(custom-put 'nnmail-split 'custom-loads '("nnmail")) +(custom-put 'nnmail-files 'custom-loads '("nnmail")) +(custom-put 'nnmail-expire 'custom-loads '("nnmail")) +(custom-put 'nnmail-procmail 'custom-loads '("nnmail")) +(custom-put 'nnmail-various 'custom-loads '("nnmail")) +(custom-put 'smiley 'custom-loads '())
--- a/lisp/gnus/gnus-art.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/gnus/gnus-art.el Mon Aug 13 09:46:53 2007 +0200 @@ -1419,7 +1419,7 @@ (gnus-article-hide-headers 1 t))) (save-window-excursion (if (not gnus-default-article-saver) - (error "No default saver is defined.") + (error "No default saver is defined") ;; !!! Magic! The saving functions all save ;; `gnus-original-article-buffer' (or so they think), but we ;; bind that variable to our save-buffer. @@ -2471,7 +2471,7 @@ (interactive "P") (when (and (not force) (gnus-group-read-only-p)) - (error "The current newsgroup does not support article editing.")) + (error "The current newsgroup does not support article editing")) (gnus-article-edit-article `(lambda () (gnus-summary-edit-article-done
--- a/lisp/gnus/gnus-demon.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/gnus/gnus-demon.el Mon Aug 13 09:46:53 2007 +0200 @@ -223,7 +223,8 @@ ((null (setq idle (nth 2 handler))) ;; We do nothing. ) - ((not (numberp idle)) + ((and (not (numberp idle)) + (gnus-demon-is-idle-p)) ;; We want to call this handler each and every time that ;; Emacs is idle. (ignore-errors (funcall (car handler)))) @@ -232,6 +233,7 @@ ;; for a specified number of timesteps. (and (not (memq (car handler) gnus-demon-idle-has-been-called)) (< idle gnus-demon-idle-time) + (gnus-demon-is-idle-p) (progn (ignore-errors (funcall (car handler))) ;; Make sure the handler won't be called once more in
--- a/lisp/gnus/gnus-group.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/gnus/gnus-group.el Mon Aug 13 09:46:53 2007 +0200 @@ -1213,8 +1213,7 @@ (not (zerop (buffer-size)))))) (mode-string (eval gformat))) ;; Say whether the dribble buffer has been modified. - (setq mode-line-modified - (if modified "--**- " "----- ")) + (setq mode-line-modified (if modified "**" "--")) ;; If the line is too long, we chop it off. (when (> (length mode-string) max-len) (setq mode-string (substring mode-string 0 (- max-len 4)))) @@ -2146,7 +2145,7 @@ (pgroup (gnus-group-prefixed-name group method))) ;; Check whether it exists already. (when (gnus-gethash pgroup gnus-newsrc-hashtb) - (error "Group %s already exists." pgroup)) + (error "Group %s already exists" pgroup)) ;; Subscribe the new group after the group on the current line. (gnus-subscribe-group pgroup (gnus-group-group-name) method) (gnus-group-update-group pgroup)
--- a/lisp/gnus/gnus-nocem.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/gnus/gnus-nocem.el Mon Aug 13 09:46:53 2007 +0200 @@ -222,7 +222,8 @@ ;; Make sure all entries in the hashtb are bound. (set group nil)) (t - (when (gnus-gethash (symbol-name group) gnus-newsrc-hashtb) + (when (gnus-gethash (gnus-group-real-name (symbol-name group)) + gnus-newsrc-hashtb) ;; Valid group. (beginning-of-line) (while (= (following-char) ?\t)
--- a/lisp/gnus/gnus-score.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/gnus/gnus-score.el Mon Aug 13 09:46:53 2007 +0200 @@ -1359,6 +1359,7 @@ (save-excursion (set-buffer (get-buffer-create "*Headers*")) (buffer-disable-undo (current-buffer)) + (message-clone-locals gnus-summary-buffer) ;; Set the global variant of this variable. (setq gnus-current-score-file current-score-file)
--- a/lisp/gnus/gnus-soup.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/gnus/gnus-soup.el Mon Aug 13 09:46:53 2007 +0200 @@ -356,7 +356,7 @@ (call-process shell-file-name nil nil nil shell-command-switch (concat "cd " dir " ; rm " files)) (gnus-message 4 "Packing...done" packer)) - (error "Couldn't pack packet.")))) + (error "Couldn't pack packet")))) (defun gnus-soup-parse-areas (file) "Parse soup area file FILE. @@ -521,7 +521,7 @@ (goto-char (point-min)) (while (not (eobp)) (unless (looking-at "#! *rnews +\\([0-9]+\\)") - (error "Bad header.")) + (error "Bad header")) (forward-line 1) (setq beg (point) end (+ (point) (string-to-int
--- a/lisp/gnus/gnus-srvr.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/gnus/gnus-srvr.el Mon Aug 13 09:46:53 2007 +0200 @@ -503,6 +503,7 @@ "n" gnus-browse-next-group "p" gnus-browse-prev-group "\177" gnus-browse-prev-group + [delete] gnus-browse-prev-group "N" gnus-browse-next-group "P" gnus-browse-prev-group "\M-n" gnus-browse-next-group @@ -661,7 +662,7 @@ "(Un)subscribe to the next ARG groups." (interactive "p") (when (eobp) - (error "No group at current line.")) + (error "No group at current line")) (let ((ward (if (< arg 0) -1 1)) (arg (abs arg))) (while (and (> arg 0)
--- a/lisp/gnus/gnus-start.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/gnus/gnus-start.el Mon Aug 13 09:46:53 2007 +0200 @@ -123,7 +123,7 @@ :group 'gnus-start-server :type 'boolean) -(defcustom gnus-read-active-file t +(defcustom gnus-read-active-file 'some "*Non-nil means that Gnus will read the entire active file at startup. If this variable is nil, Gnus will only know about the groups in your `.newsrc' file. @@ -691,7 +691,7 @@ "Unload all Gnus features." (interactive) (unless (boundp 'load-history) - (error "Sorry, `gnus-unload' is not implemented in this Emacs version.")) + (error "Sorry, `gnus-unload' is not implemented in this Emacs version")) (let ((history load-history) feature) (while history @@ -1625,7 +1625,7 @@ (t (if (not (gnus-request-list method)) (unless (equal method gnus-message-archive-method) - (gnus-error 1 "Cannot read active file from %s server." + (gnus-error 1 "Cannot read active file from %s server" (car method))) (gnus-message 5 mesg) (gnus-active-to-gnus-format method gnus-active-hashtb)
--- a/lisp/gnus/gnus-sum.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/gnus/gnus-sum.el Mon Aug 13 09:46:53 2007 +0200 @@ -3826,8 +3826,8 @@ (set var (delq article (symbol-value var)))))) ;; Adjust assocs. ((memq mark uncompressed) - (when (not (listp (car (symbol-value var))))) - (set var (list (symbol-value var))) + (when (not (listp (cdr (symbol-value var)))) + (set var (list (symbol-value var)))) (when (not (listp (cdr articles))) (setq articles (list articles))) (while articles @@ -5001,7 +5001,7 @@ (suppress-keymap gnus-dead-summary-mode-map) (substitute-key-definition 'undefined 'gnus-summary-wake-up-the-dead gnus-dead-summary-mode-map) - (let ((keys '("\C-d" "\r" "\177"))) + (let ((keys '("\C-d" "\r" "\177" [delete]))) (while keys (define-key gnus-dead-summary-mode-map (pop keys) 'gnus-summary-wake-up-the-dead)))) @@ -5299,7 +5299,7 @@ did) (and (not pseudo) (gnus-summary-article-pseudo-p article) - (error "This is a pseudo-article.")) + (error "This is a pseudo-article")) (prog1 (save-excursion (set-buffer gnus-summary-buffer) @@ -7005,7 +7005,7 @@ (gnus-set-global-variables) (unless (gnus-check-backend-function 'request-expire-articles gnus-newsgroup-name) - (error "The current newsgroup does not support article deletion.")) + (error "The current newsgroup does not support article deletion")) ;; Compute the list of articles to delete. (let ((articles (gnus-summary-work-articles n)) not-deleted) @@ -7043,7 +7043,7 @@ (gnus-set-global-variables) (when (and (not force) (gnus-group-read-only-p)) - (error "The current newsgroup does not support article editing.")) + (error "The current newsgroup does not support article editing")) ;; Select article if needed. (unless (eq (gnus-summary-article-number) gnus-current-article) @@ -7064,7 +7064,7 @@ (not (gnus-request-replace-article (cdr gnus-article-current) (car gnus-article-current) (current-buffer)))) - (error "Couldn't replace article.") + (error "Couldn't replace article") ;; Update the summary buffer. (if (and references (equal (message-tokenize-header references " ") @@ -7712,7 +7712,7 @@ (setq scored (cdr scored))) (if (not headers) (when (not no-error) - (error "No expunged articles hidden.")) + (error "No expunged articles hidden")) (goto-char (point-min)) (gnus-summary-prepare-unthreaded (nreverse headers)) (goto-char (point-min)) @@ -7867,9 +7867,9 @@ is non-nil or the Subject: of both articles are the same." (interactive) (unless (not (gnus-group-read-only-p)) - (error "The current newsgroup does not support article editing.")) + (error "The current newsgroup does not support article editing")) (unless (<= (length gnus-newsgroup-processable) 1) - (error "No more than one article may be marked.")) + (error "No more than one article may be marked")) (save-window-excursion (let ((gnus-article-buffer " *reparent*") (current-article (gnus-summary-article-number)) @@ -7879,13 +7879,13 @@ (save-excursion (if (eq (forward-line -1) 0) (gnus-summary-article-number) - (error "Beginning of summary buffer.")))))) + (error "Beginning of summary buffer")))))) (unless (not (eq current-article parent-article)) - (error "An article may not be self-referential.")) + (error "An article may not be self-referential")) (let ((message-id (mail-header-id (gnus-summary-article-header parent-article)))) (unless (and message-id (not (equal message-id ""))) - (error "No message-id in desired parent.")) + (error "No message-id in desired parent")) (gnus-summary-select-article t t nil current-article) (set-buffer gnus-original-article-buffer) (let ((buf (format "%s" (buffer-string)))) @@ -7898,11 +7898,11 @@ (unless (gnus-request-replace-article current-article (car gnus-article-current) (current-buffer)) - (error "Couldn't replace article.")))) + (error "Couldn't replace article")))) (set-buffer gnus-summary-buffer) (gnus-summary-unmark-all-processable) (gnus-summary-rethread-current) - (gnus-message 3 "Article %d is now the child of article %d." + (gnus-message 3 "Article %d is now the child of article %d" current-article parent-article))))) (defun gnus-summary-toggle-threads (&optional arg)
--- a/lisp/gnus/gnus-topic.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/gnus/gnus-topic.el Mon Aug 13 09:46:53 2007 +0200 @@ -894,6 +894,7 @@ [tab] gnus-topic-indent "r" gnus-topic-rename "\177" gnus-topic-delete + [delete] gnus-topic-delete "h" gnus-topic-toggle-display-empty-topics) (gnus-define-keys (gnus-topic-sort-map "S" gnus-group-topic-map) @@ -1319,7 +1320,7 @@ (if group (gnus-group-edit-group-parameters group) (if (not (gnus-group-topic-p)) - (error "Nothing to edit on the current line.") + (error "Nothing to edit on the current line") (let ((topic (gnus-group-topic-name))) (gnus-edit-form (gnus-topic-parameters topic)
--- a/lisp/gnus/gnus.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/gnus/gnus.el Mon Aug 13 09:46:53 2007 +0200 @@ -238,7 +238,7 @@ :link '(custom-manual "(gnus)Exiting Gnus") :group 'gnus) -(defconst gnus-version-number "5.4.60" +(defconst gnus-version-number "5.4.62" "Version number for this version of Gnus.") (defconst gnus-version (format "Gnus v%s" gnus-version-number) @@ -791,7 +791,7 @@ (when (and gnus-default-nntp-server (not (string= gnus-default-nntp-server ""))) gnus-default-nntp-server) - (system-name))) + "news")) (if (or (null gnus-nntp-service) (equal gnus-nntp-service "nntp")) nil @@ -2014,7 +2014,7 @@ (string-match gnus-total-expirable-newsgroups group))))) (defun gnus-group-auto-expirable-p (group) - "Check whether GROUP is total-expirable or not." + "Check whether GROUP is auto-expirable or not." (let ((params (gnus-group-find-parameter group)) val) (cond
--- a/lisp/gnus/message.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/gnus/message.el Mon Aug 13 09:46:53 2007 +0200 @@ -1942,10 +1942,10 @@ ;; qmail-inject doesn't say anything on it's stdout/stderr, ;; we have to look at the retval instead (0 nil) - (1 (error "qmail-inject reported permanent failure.")) - (111 (error "qmail-inject reported transient failure.")) + (1 (error "qmail-inject reported permanent failure")) + (111 (error "qmail-inject reported transient failure")) ;; should never happen - (t (error "qmail-inject reported unknown failure.")))) + (t (error "qmail-inject reported unknown failure")))) (defun message-send-mail-with-mh () "Send the prepared message buffer with mh." @@ -2023,7 +2023,8 @@ (funcall (intern (format "%s-open-server" (car method))) (cadr method) (cddr method)) (setq result - (funcall (intern (format "%s-request-post" (car method)))))) + (funcall (intern (format "%s-request-post" (car method))) + (cadr method)))) (kill-buffer tembuf)) (set-buffer messbuf) (if result @@ -3641,19 +3642,27 @@ Then clone the local variables and values from the old buffer to the new one, cloning only the locals having a substring matching the regexp varstr." - (let ((oldlocals (buffer-local-variables))) + (let ((oldbuf (current-buffer))) (save-excursion (set-buffer (generate-new-buffer name)) - (mapcar (lambda (dude) - (when (and (car dude) - (or (not varstr) - (string-match varstr (symbol-name (car dude))))) - (ignore-errors - (set (make-local-variable (car dude)) - (cdr dude))))) - oldlocals) + (message-clone-locals oldbuf) (current-buffer)))) +(defun message-clone-locals (buffer) + "Clone the local variables from BUFFER to the current buffer." + (let ((locals (save-excursion + (set-buffer buffer) + (buffer-local-variables))) + (regexp "^gnus\\|^nn\\|^message")) + (mapcar + (lambda (local) + (when (and (car local) + (string-match regexp (symbol-name (car local)))) + (ignore-errors + (set (make-local-variable (car local)) + (cdr local))))) + locals))) + (run-hooks 'message-load-hook) (provide 'message)
--- a/lisp/gnus/nngateway.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/gnus/nngateway.el Mon Aug 13 09:46:53 2007 +0200 @@ -58,9 +58,11 @@ (insert-buffer-substring buf) (message-narrow-to-head) (funcall nngateway-header-transformation nngateway-address) + (goto-char (point-max)) + (insert mail-header-separator "\n") (widen) (let (message-required-mail-headers) - (message-send-mail)))))) + (funcall message-send-mail-function)))))) ;;; Internal functions
--- a/lisp/gnus/nnmail.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/gnus/nnmail.el Mon Aug 13 09:46:53 2007 +0200 @@ -541,7 +541,7 @@ (defun nnmail-move-inbox (inbox) "Move INBOX to `nnmail-crash-box'." (if (not (file-writable-p nnmail-crash-box)) - (gnus-error 1 "Can't write to crash box %s. Not moving mail." + (gnus-error 1 "Can't write to crash box %s. Not moving mail" nnmail-crash-box) ;; If the crash box exists and is empty, we delete it. (when (and (file-exists-p nnmail-crash-box)
--- a/lisp/gnus/nnoo.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/gnus/nnoo.el Mon Aug 13 09:46:53 2007 +0200 @@ -143,7 +143,7 @@ (def (assq backend nnoo-definition-alist)) (parents (nth 1 def))) (unless def - (error "%s belongs to a backend that hasn't been declared." var)) + (error "%s belongs to a backend that hasn't been declared" var)) (setcar (nthcdr 2 def) (delq (assq var (nth 2 def)) (nth 2 def))) (setcar (nthcdr 2 def)
--- a/lisp/gnus/nnsoup.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/gnus/nnsoup.el Mon Aug 13 09:46:53 2007 +0200 @@ -623,7 +623,7 @@ (nnsoup-write-replies) ;; Check whether there is anything here. (when (null (directory-files nnsoup-replies-directory nil "\\.MSG$")) - (error "No files to pack.")) + (error "No files to pack")) ;; Pack all these files into a SOUP packet. (gnus-soup-pack nnsoup-replies-directory nnsoup-packer))
--- a/lisp/gnus/pop3.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/gnus/pop3.el Mon Aug 13 09:46:53 2007 +0200 @@ -77,7 +77,7 @@ ((equal 'pass pop3-authentication-scheme) (pop3-user process pop3-maildrop) (pop3-pass process)) - (t (error "Invalid POP3 authentication scheme."))) + (t (error "Invalid POP3 authentication scheme"))) (setq message-count (car (pop3-stat process))) (while (<= n message-count) (message (format "Retrieving message %d of %d from %s..."
--- a/lisp/hm--html-menus/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '())
--- a/lisp/hyperbole/ChangeLog Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/hyperbole/ChangeLog Mon Aug 13 09:46:53 2007 +0200 @@ -1,3 +1,7 @@ +1997-07-03 Steven L Baur <steve@altair.xemacs.org> + + * Makefile: Add autoloads dependencies. + 1997-06-27 Steven L Baur <steve@altair.xemacs.org> * wrolo-menu.el (TopLevel): Fix tests so that W3's id-menubar
--- a/lisp/hyperbole/Makefile Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/hyperbole/Makefile Mon Aug 13 09:46:53 2007 +0200 @@ -167,7 +167,7 @@ @ echo $< >> $(ELISP_TO_COMPILE) # Compile all recorded .el files. -elc: elc-init hsite.el $(ELC_KOTL) $(ELC_COMPILE) +elc: elc-init hsite.el $(ELC_KOTL) $(ELC_COMPILE) $(XEMACS_COMPILE) @- \test ! -f $(ELISP_TO_COMPILE) \ || (echo "These files will be compiled: " \ && echo "`cat $(ELISP_TO_COMPILE)`" \ @@ -258,3 +258,11 @@ distclean: clean -$(RM) TAGS hsite.el* kotl/TO-DO* $(mandir)/hyperbole.dvi \ $(mandir)/hyperbole.?? + +autoloads: auto-autoloads.el + +auto-autoloads.el: $(EL_SRC) $(EL_COMPILE) $(EL_KOTL) + $(EMACS) -batch -q -no-site-file \ + -eval '(setq autoload-target-directory "'`pwd`'/")' \ + -l autoload \ + -f batch-update-autoloads $?
--- a/lisp/hyperbole/auto-autoloads.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/hyperbole/auto-autoloads.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,5 +1,5 @@ ;;; DO NOT MODIFY THIS FILE -(if (not (featurep 'hyperbole-autoloads)) +(if (not (featurep '-autoloads)) (progn ;;;### (autoloads (hmail:compose) "hmail" "hyperbole/hmail.el") @@ -343,6 +343,83 @@ of a string." t nil) ;;;*** + +;;;### (autoloads (kfile:is-p kfile:view kfile:find) "kfile" "kotl/kfile.el") -(provide 'hyperbole-autoloads) +(autoload 'kfile:find "kfile" "\ +Find a file FILE-NAME containing a kotl or create one if none exists. +Return the new kview." t nil) + +(autoload 'kfile:view "kfile" "\ +View an existing kotl version-2 file FILE-NAME in a read-only mode." t nil) + +(autoload 'kfile:is-p "kfile" "\ +Iff current buffer contains an unformatted or formatted koutline, return file format version string, else nil." nil nil) + +;;;*** + +;;;### (autoloads (kimport:text kimport:star-outline kimport:aug-post-outline kimport:file) "kimport" "kotl/kimport.el") + +(autoload 'kimport:file "kimport" "\ +Import a buffer or file IMPORT-FROM into the koutline in buffer or file OUTPUT-TO. + +Any suffix in IMPORT-FROM's buffer name is used to determine the type of +importation. All others are imported as text, one paragraph per cell. + +See the documentation for the variable, `kimport:suffix-alist' for +information on specific importation formats." t nil) + +(autoload 'kimport:aug-post-outline "kimport" "\ +Insert Augment outline statements from IMPORT-FROM into koutline OUTPUT-TO. +Displays and leaves point in OUTPUT-TO. See documentation for +`kimport:initialize' for valid values of IMPORT-FROM and OUTPUT-TO and for +an explanation of where imported cells are placed. + +If OUTPUT-TO is a new koutline, the first statement inserted will be the +first cell. Otherwise, it will be the successor of the current cell. + +Each statement to be imported is delimited by an Augment relative id at the +end of the statement. \"1\" = level 1, \"1a\" = level 2 in outline and so +on." t nil) + +(autoload 'kimport:star-outline "kimport" "\ +Insert star outline nodes from IMPORT-FROM into koutline OUTPUT-TO. +Displays and leaves point in OUTPUT-TO. See documentation for +`kimport:initialize' for valid values of IMPORT-FROM and OUTPUT-TO and for +an explanation of where imported cells are placed. + +\"* \" = level 1, \"** \" = level 2 in outline and so on." t nil) + +(autoload 'kimport:text "kimport" "\ +Insert text paragraphs from IMPORT-FROM into koutline OUTPUT-TO. +Displays and leaves point in OUTPUT-TO. See documentation for +`kimport:initialize' for valid values of IMPORT-FROM and OUTPUT-TO and for +an explanation of where imported cells are placed. + +Text paragraphs are imported as a sequence of same level cells. Koutlines +are imported with their structure intact. + +The variable, `paragraph-start,' is used to determine paragraphs." t nil) + +;;;*** + +;;;### (autoloads (klink:create) "klink" "kotl/klink.el") + +(autoload 'klink:create "klink" "\ +Insert at point an implicit link to REFERENCE. +REFERENCE should be a cell-ref or a string containing \"filename, cell-ref\". +See documentation for `kcell:ref-to-id' for valid cell-ref formats." t nil) + +;;;*** + +;;;### (autoloads (kotl-mode) "kotl-mode" "kotl/kotl-mode.el") + +(autoload 'kotl-mode "kotl-mode" "\ +The major mode used to edit and view koutlines. +It provides the following keys: +\\{kotl-mode-map}" t nil) + +;;;*** + +(provide '-autoloads) ))
--- a/lisp/hyperbole/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '())
--- a/lisp/ilisp/Makefile Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/ilisp/Makefile Mon Aug 13 09:46:53 2007 +0200 @@ -14,6 +14,9 @@ # Note: this makefile assumes GNU make +# Updated for XEmacs autoloads builds, but unused at present since no +# autoloads are generated, and this package hasn't been customized. + #============================================================================== # Various Variables @@ -58,7 +61,7 @@ compile: $(EMACS) -batch -l ilisp-mak.el -elc: $(LoadFiles) +elc: $(LoadFiles) $(XEmacsELC) $(LoadFiles) : $(EMACS) -batch -l ilisp-mak.el @@ -101,5 +104,15 @@ (cd $(Ilisp_src_dir)/.. ; \ uuencode $(Ilisp_tar_dir).tar.gz $(Ilisp_tar_dir).tar.gz > il.uue) +#autoloads: auto-autoloads.el + +#custom-load.elc: custom-load.el +# $(EMACS) -batch -q -no-site-file -f batch-byte-compile $? + +#auto-autoloads.el: $(LoadFiles:.elc=.el) +# $(EMACS) -batch -q -no-site-file \ +# -eval '(setq autoload-target-directory "'`pwd`'/")' \ +# -l autoload \ +# -f batch-update-autoloads $? # end of file -- Makefile --
--- a/lisp/ilisp/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '())
--- a/lisp/iso/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '())
--- a/lisp/iso/iso-acc.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/iso/iso-acc.el Mon Aug 13 09:46:53 2007 +0200 @@ -5,8 +5,8 @@ ;; Author: Johan Vromans ;; Maintainer: Alexandre Oliva <oliva@dcc.unicamp.br> ;; Keywords: i18n -;; $Revision: 1.5 $ -;; $Date: 1997/05/29 23:49:45 $ +;; $Revision: 1.6 $ +;; $Date: 1997/07/07 00:52:57 $ ;; This file is part of GNU Emacs. @@ -71,8 +71,12 @@ ;; multiple Emacs versions compatibility section (if (fboundp 'make-char) - (defalias 'iso-make-char 'make-char) - (defun iso-make-char (charset) 128)) + (defun iso-make-char (charset char) + (cond + ((integerp char) (make-char charset char)) + ((and (char-or-string-p char) (not (stringp char))) char) + (t (error "invalid character")))) + (defun iso-make-char (charset char) "Returns its second argument" char)) (if (fboundp 'read-event) (defalias 'iso-read-event 'read-event) @@ -97,12 +101,6 @@ (this-command-keys)) (defun this-single-command-keys () (this-command-keys)))) -(defvar iso-accents-insert-offset - (if (boundp 'nonascii-insert-offset) - nonascii-insert-offset - 0) - "*Offset added by ISO Accents mode to character codes 0200 and above.") - ;; end of compatibility section (defvar iso-languages @@ -284,6 +282,9 @@ (defvar iso-accents-list nil "Association list for ISO accent combinations, for the chosen language.") +(defvar iso-accents-charset 'latin-iso8859-1 + "Charset that will be used for generated characters.") + (defvar iso-accents-mode nil "*Non-nil enables ISO Accents mode. Setting this variable makes it local to the current buffer. @@ -311,6 +312,7 @@ (defun iso-accents-compose (prompt) (let* ((first-char last-input-char) (list (assq first-char iso-accents-list)) + (charset iso-accents-charset) ;; Wait for the second key and look up the combination. (second-char (if (or prompt (not (eq (key-binding "a") @@ -329,14 +331,13 @@ (delete-region (1- (point)) (point))))) (entry (cdr (assq second-char list)))) (if entry + (progn + (if (and (consp entry) (symbolp (car entry))) + (setq charset (car entry) + entry (cdr entry))) ;; Found it: return the mapped char - (vector - (iso-char-to-event - (if (and (boundp 'enable-multibyte-characters) - enable-multibyte-characters - (>= entry ?\200)) - (+ iso-accents-insert-offset entry) - entry))) + (vector + (iso-char-to-event (iso-make-char charset entry)))) ;; Otherwise, advance and schedule the second key for execution. (setq unread-command-events (cons (iso-char-list-to-event (list second-char)) @@ -396,11 +397,9 @@ tail) (if (not table) (error "Unknown language `%s'" language) - (setq iso-accents-insert-offset (- (iso-make-char - (if (symbolp (car table)) - (car table) - 'latin-iso8859-1)) - 128)) + (setq iso-accents-charset (if (symbolp (car table)) + (car table) + 'latin-iso8859-1)) (if (symbolp (car table)) (setq table (cdr table))) (setq iso-language language
--- a/lisp/its/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '())
--- a/lisp/language/auto-autoloads.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,80 +0,0 @@ - -;;;### (autoloads (encode-hz-buffer encode-hz-region decode-hz-buffer decode-hz-region) "china-util" "language/china-util.el") - -(autoload 'decode-hz-region "china-util" "\ -Decode HZ/ZW encoded text in the current region. -Return the length of resulting text." t nil) - -(autoload 'decode-hz-buffer "china-util" "\ -Decode HZ/ZW encoded text in the current buffer." t nil) - -(autoload 'encode-hz-region "china-util" "\ -Encode the text in the current region to HZ. -Return the length of resulting text." t nil) - -(autoload 'encode-hz-buffer "china-util" "\ -Encode the text in the current buffer to HZ." t nil) - -;;;*** - -;;;### (autoloads (read-hiragana-string japanese-zenkaku-region japanese-hankaku-region japanese-hiragana-region japanese-katakana-region japanese-zenkaku japanese-hankaku japanese-hiragana japanese-katakana) "japan-util" "language/japan-util.el") - -(autoload 'japanese-katakana "japan-util" "\ -Convert argument to Katakana and return that. -The argument may be a character or string. The result has the same type. -The argument object is not altered--the value is a copy. -Optional argument HANKAKU t means to convert to `hankaku' Katakana - (`japanese-jisx0201-kana'), in which case return value - may be a string even if OBJ is a character if two Katakanas are - necessary to represent OBJ." nil nil) - -(autoload 'japanese-hiragana "japan-util" "\ -Convert argument to Hiragana and return that. -The argument may be a character or string. The result has the same type. -The argument object is not altered--the value is a copy." nil nil) - -(autoload 'japanese-hankaku "japan-util" "\ -Convert argument to `hankaku' and return that. -The argument may be a character or string. The result has the same type. -The argument object is not altered--the value is a copy. -Optional argument ASCII-ONLY non-nil means to return only ASCII character." nil nil) - -(autoload 'japanese-zenkaku "japan-util" "\ -Convert argument to `zenkaku' and return that. -The argument may be a character or string. The result has the same type. -The argument object is not altered--the value is a copy." nil nil) - -(autoload 'japanese-katakana-region "japan-util" "\ -Convert Japanese `hiragana' chars in the region to `katakana' chars. -Optional argument HANKAKU t means to convert to `hankaku katakana' character -of which charset is `japanese-jisx0201-kana'." t nil) - -(autoload 'japanese-hiragana-region "japan-util" "\ -Convert Japanese `katakana' chars in the region to `hiragana' chars." t nil) - -(autoload 'japanese-hankaku-region "japan-util" "\ -Convert Japanese `zenkaku' chars in the region to `hankaku' chars. -`Zenkaku' chars belong to `japanese-jisx0208' -`Hankaku' chars belong to `ascii' or `japanese-jisx0201-kana'. -Optional argument ASCII-ONLY non-nil means to convert only to ASCII char." t nil) - -(autoload 'japanese-zenkaku-region "japan-util" "\ -Convert hankaku' chars in the region to Japanese `zenkaku' chars. -`Zenkaku' chars belong to `japanese-jisx0208' -`Hankaku' chars belong to `ascii' or `japanese-jisx0201-kana'." t nil) - -(autoload 'read-hiragana-string "japan-util" "\ -Read a Hiragana string from the minibuffer, prompting with string PROMPT. -If non-nil, second arg INITIAL-INPUT is a string to insert before reading." nil nil) - -;;;*** - -;;;### (autoloads (thai-compose-buffer thai-compose-region) "thai-util" "language/thai-util.el") - -(autoload 'thai-compose-region "thai-util" "\ -Compose Thai characters in the region." t nil) - -(autoload 'thai-compose-buffer "thai-util" "\ -Compose Thai characters in the current buffer." t nil) - -;;;***
--- a/lisp/language/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,57 +0,0 @@ -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'hyper-apropos 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'x 'custom-loads '())
--- a/lisp/leim/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '())
--- a/lisp/leim/quail.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/leim/quail.el Mon Aug 13 09:46:53 2007 +0200 @@ -257,7 +257,9 @@ (if (local-variable-p 'minor-mode-map-alist nil) (let ((map (default-value 'minor-mode-map-alist))) (or (assq 'quail-mode map) - (set-default 'minor-mode-map-alist (cons 'quail-mode map))))) + ;; (set-default 'minor-mode-map-alist (cons 'quail-mode map))))) + (set-default 'minor-mode-map-alist + (cons (cons 'quail-mode quail-mode-map) map))))) (defvar quail-translation-keymap (let ((map (make-keymap)) @@ -504,15 +506,23 @@ ;; Let's turn on Quail mode. ;; At first, be sure that quail-mode is at the first element of ;; minor-mode-map-alist. - (or (eq (car minor-mode-map-alist) 'quail-mode) - (let ((l minor-mode-map-alist)) - (while (cdr l) - (if (eq (car (cdr l)) 'quail-mode) - (progn - (setcdr l (cdr (cdr l))) - (setq l nil)) - (setq l (cdr l)))) - (setq minor-mode-map-alist (cons 'quail-mode minor-mode-map-alist)))) + ;; The following code removed by slb because it corrupts the XEmacs + ;; minor-mode-map-alist +; (or (eq (car minor-mode-map-alist) 'quail-mode) +; (let ((l minor-mode-map-alist)) +; (while (cdr l) +; (if (eq (car (cdr l)) 'quail-mode) +; (progn +; (setcdr l (cdr (cdr l))) +; (setq l nil)) +; (setq l (cdr l)))) +; (setq minor-mode-map-alist (cons 'quail-mode minor-mode-map-alist)))) + ;; End bogus code removal. + (delete-if (lambda (item) (eq (car item) 'quail-mode)) + minor-mode-map-alist) + (setq minor-mode-map-alist + (cons (cons 'quail-mode quail-mode-map) minor-mode-map-alist)) + (if (null quail-current-package) ;; Quail package is not yet selected. Select one now. (let (name)
--- a/lisp/locale/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '())
--- a/lisp/mailcrypt/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '())
--- a/lisp/mel/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '())
--- a/lisp/mel/mel-q.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/mel/mel-q.el Mon Aug 13 09:46:53 2007 +0200 @@ -4,7 +4,7 @@ ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp> ;; Created: 1995/6/25 -;; Version: $Id: mel-q.el,v 1.3 1997/06/06 00:57:14 steve Exp $ +;; Version: $Id: mel-q.el,v 1.4 1997/07/07 00:52:59 steve Exp $ ;; Keywords: MIME, Quoted-Printable, Q-encoding ;; This file is part of MEL (MIME Encoding Library). @@ -259,7 +259,7 @@ )))) (mapconcat (function (lambda (chr) - (cond ((eq chr 32) "_") + (cond ((eq chr ? ) "_") ((or (< chr 32) (< 126 chr) (memq chr specials) )
--- a/lisp/mh-e/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/mh-e/custom-load.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,71 +1,4 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'mail 'custom-loads '("mh-e")) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'mh-hook 'custom-loads '("mh-e")) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'mh-buffer 'custom-loads '("mh-utils")) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'mh-compose 'custom-loads '("mh-comp")) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'mh 'custom-loads '("mh-comp" "mh-e" "mh-utils")) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '()) +(custom-put 'mh-buffer 'custom-loads '("mh-utils")) +(custom-put 'mh-hook 'custom-loads '("mh-e")) +(custom-put 'mh 'custom-loads '("mh-comp" "mh-e" "mh-utils")) +(custom-put 'mh-compose 'custom-loads '("mh-comp"))
--- a/lisp/modes/abbrev.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/modes/abbrev.el Mon Aug 13 09:46:53 2007 +0200 @@ -140,7 +140,7 @@ (interactive "sDefine mode abbrev: \nsExpansion for %s: ") (define-abbrev (or local-abbrev-table (error "Major mode has no abbrev table")) - (downcase name) expansion 0)) + (downcase name) expansion nil 0)) (defun abbrev-symbol (abbrev &optional table) "Return the symbol representing abbrev named ABBREV.
--- a/lisp/modes/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/modes/custom-load.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,105 +1,31 @@ -(put 'extensions 'custom-loads '("auto-show")) -(put 'message 'custom-loads '("sendmail")) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'prolog 'custom-loads '("prolog")) -(put 'auto-show 'custom-loads '("auto-show")) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '("outl-mouse" "strokes")) -(put 'reftex-defining-label-environments 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '("mail-abbrevs")) -(put 'pascal 'custom-loads '("pascal")) -(put 'tex 'custom-loads '("reftex")) -(put 'tcl 'custom-loads '("tcl")) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'icon 'custom-loads '("icon")) -(put 'holidays 'custom-loads '()) -(put 'texinfo 'custom-loads '("texinfo")) -(put 'auto-save 'custom-loads '()) -(put 'xrdb 'custom-loads '("xrdb-mode")) -(put 'ispell 'custom-loads '()) -(put 'mail 'custom-loads '("mail-abbrevs")) -(put 'fortran-indent 'custom-loads '("fortran")) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'docs 'custom-loads '("texinfo")) -(put 'lisp-indent 'custom-loads '("cl-indent")) -(put 'tools 'custom-loads '("make-mode")) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '("cl-indent")) -(put 'reftex 'custom-loads '("reftex")) -(put 'diff 'custom-loads '()) -(put 'sh-script 'custom-loads '("sh-script")) -(put 'outlines 'custom-loads '("outl-mouse" "whitespace-mode")) -(put 'paren-matching 'custom-loads '()) -(put 'f90 'custom-loads '("f90")) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'asm 'custom-loads '("asm-mode")) -(put 'reftex-label-support 'custom-loads '("reftex")) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'fortran-comment 'custom-loads '("fortran")) -(put 'outl-mouse 'custom-loads '("outl-mouse")) -(put 'frames 'custom-loads '("rsz-minibuf")) -(put 'customize 'custom-loads '()) -(put 'verilog 'custom-loads '("verilog-mode")) -(put 'abbrev 'custom-loads '("abbrev")) -(put 'f90-indent 'custom-loads '("f90")) -(put 'strokes 'custom-loads '("strokes")) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'c-macro 'custom-loads '("cmacexp")) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'vrml 'custom-loads '("vrml-mode")) -(put 'find-file 'custom-loads '()) -(put 'fortran 'custom-loads '("f90" "fortran")) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '("rsz-minibuf")) -(put 'languages 'custom-loads '("asm-mode" "fortran" "icon" "pascal" "prolog" "rexx-mode" "sh-script" "tcl" "verilog-mode" "vrml-mode" "winmgr-mode" "xrdb-mode")) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '("auto-show")) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'enriched 'custom-loads '("enriched")) -(put 'processes 'custom-loads '("executable")) -(put 'rexx 'custom-loads '("rexx-mode")) -(put 'executable 'custom-loads '("executable")) -(put 'message-insertion 'custom-loads '()) -(put 'wp 'custom-loads '("enriched")) -(put 'vc 'custom-loads '()) -(put 'sh 'custom-loads '("sh-script")) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'makefile-mode 'custom-loads '("make-mode")) -(put 'processes-basics 'custom-loads '()) -(put 'whitespace 'custom-loads '("whitespace-mode")) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '("whitespace-mode")) -(put 'winmgr 'custom-loads '("winmgr-mode")) -(put 'ps-print-color 'custom-loads '()) -(put 'unix 'custom-loads '("sh-script")) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '()) -(put 'c 'custom-loads '("cmacexp")) +(custom-put 'asm 'custom-loads '("asm-mode")) +(custom-put 'auto-show 'custom-loads '("auto-show")) +(custom-put 'lisp-indent 'custom-loads '("cl-indent")) +(custom-put 'c-macro 'custom-loads '("cmacexp")) +(custom-put 'enriched 'custom-loads '("enriched")) +(custom-put 'executable 'custom-loads '("executable")) +(custom-put 'f90 'custom-loads '("f90")) +(custom-put 'f90-indent 'custom-loads '("f90")) +(custom-put 'fortran 'custom-loads '("f90" "fortran")) +(custom-put 'fortran-indent 'custom-loads '("fortran")) +(custom-put 'fortran-comment 'custom-loads '("fortran")) +(custom-put 'icon 'custom-loads '("icon")) +(custom-put 'mail-abbrevs 'custom-loads '("mail-abbrevs")) +(custom-put 'makefile-mode 'custom-loads '("make-mode")) +(custom-put 'outl-mouse 'custom-loads '("outl-mouse")) +(custom-put 'pascal 'custom-loads '("pascal")) +(custom-put 'prolog 'custom-loads '("prolog")) +(custom-put 'reftex 'custom-loads '("reftex")) +(custom-put 'reftex-label-support 'custom-loads '("reftex")) +(custom-put 'rexx 'custom-loads '("rexx-mode")) +(custom-put 'resize-minibuffer 'custom-loads '("rsz-minibuf")) +(custom-put 'sh 'custom-loads '("sh-script")) +(custom-put 'sh-script 'custom-loads '("sh-script")) +(custom-put 'strokes 'custom-loads '("strokes")) +(custom-put 'tcl 'custom-loads '("tcl")) +(custom-put 'texinfo 'custom-loads '("texinfo")) +(custom-put 'verilog 'custom-loads '("verilog-mode")) +(custom-put 'vrml 'custom-loads '("vrml-mode")) +(custom-put 'whitespace 'custom-loads '("whitespace-mode")) +(custom-put 'winmgr 'custom-loads '("winmgr-mode")) +(custom-put 'xrdb 'custom-loads '("xrdb-mode"))
--- a/lisp/modes/image-mode.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/modes/image-mode.el Mon Aug 13 09:46:53 2007 +0200 @@ -4,7 +4,7 @@ ;; Author: MORIOKA Tomohiko <morioka@jaist.ac.jp> ;; Created: 1997/6/27 -;; Version: $Id: image-mode.el,v 1.1 1997/06/29 23:12:55 steve Exp $ +;; Version: image-mode.el,v 20.3.1.2 1997/07/01 17:29:44 morioka Exp ;; Keywords: image, graphics ;; This file is part of XEmacs. @@ -123,6 +123,24 @@ (kill-buffer (current-buffer)) ) +(defun image-maybe-restore () + "Restore buffer from file if it is decoded as `buffer-file-format'." + (when (and buffer-file-format + buffer-file-name) + (setq buffer-read-only nil) + (erase-buffer) + (map-extents (function + (lambda (extent maparg) + (delete-extent extent) + )) nil (point-min)(point-min)) + (setq buffer-file-format nil) + (insert-file-contents-literally buffer-file-name) + (set-buffer-modified-p nil) + )) + +(add-hook 'change-major-mode-hook 'image-maybe-restore) + + ;;;###autoload (defun image-mode (&optional arg) "\\{image-mode-map}"
--- a/lisp/modes/lisp-mode.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/modes/lisp-mode.el Mon Aug 13 09:46:53 2007 +0200 @@ -30,6 +30,8 @@ ;; The base major mode for editing Lisp code (used also for Emacs Lisp). ;; This mode is documented in the Emacs manual +;; July/05/97 slb Converted to use easymenu. + ;;; Code: (defvar lisp-mode-syntax-table nil "") @@ -37,8 +39,9 @@ (defvar lisp-mode-abbrev-table nil "") ;; XEmacs change -(defvar lisp-interaction-mode-popup-menu - (purecopy '("Lisp Interaction Menu" +(defvar lisp-interaction-mode-popup-menu nil) +(defvar lisp-interaction-mode-popup-menu-1 + (purecopy '("Lisp-Interaction" ["Evaluate Last S-expression" eval-last-sexp t] ["Evaluate Entire Buffer" eval-current-buffer t] ["Evaluate Region" eval-region (region-exists-p)] @@ -60,22 +63,24 @@ :style toggle :selected debug-on-quit] ))) -(defvar emacs-lisp-mode-popup-menu +(defvar emacs-lisp-mode-popup-menu nil) +(defvar emacs-lisp-mode-popup-menu-1 (purecopy (nconc - '("Emacs-Lisp Menu" + '("Emacs-Lisp" ["Byte-compile This File" emacs-lisp-byte-compile t] ["Byte-recompile Directory..." byte-recompile-directory t] "---") - (cdr lisp-interaction-mode-popup-menu)))) + (cdr lisp-interaction-mode-popup-menu-1)))) ;Don't have a menubar entry in Lisp Interaction mode. Otherwise, the ;*scratch* buffer has a Lisp menubar item! Very confusing. ;(defvar lisp-interaction-mode-menubar-menu ; (purecopy (cons "Lisp" (cdr lisp-interaction-mode-popup-menu)))) -(defvar emacs-lisp-mode-menubar-menu - (purecopy (cons "Lisp" (cdr emacs-lisp-mode-popup-menu)))) +(defvar emacs-lisp-mode-menubar-menu nil) +(defvar emacs-lisp-mode-menubar-menu-1 + (purecopy (cons "Lisp" (cdr emacs-lisp-mode-popup-menu-1)))) (if (not emacs-lisp-mode-syntax-table) (let ((i 0)) @@ -259,15 +264,19 @@ (set-syntax-table emacs-lisp-mode-syntax-table) ;; XEmacs changes (setq major-mode 'emacs-lisp-mode - mode-popup-menu emacs-lisp-mode-popup-menu + ;; mode-popup-menu emacs-lisp-mode-popup-menu mode-name "Emacs-Lisp") - (if (and (featurep 'menubar) - current-menubar) - (progn + ;; (if (and (featurep 'menubar) + ;; current-menubar) + ;; (progn ;; make a local copy of the menubar, so our modes don't ;; change the global menubar - (set-buffer-menubar current-menubar) - (add-submenu nil emacs-lisp-mode-menubar-menu))) + ;; (set-buffer-menubar current-menubar) + ;; (add-submenu nil emacs-lisp-mode-menubar-menu))) + (unless emacs-lisp-mode-popup-menu + (easy-menu-define emacs-lisp-mode-popup-menu emacs-lisp-mode-map "" + emacs-lisp-mode-popup-menu-1)) + (easy-menu-add emacs-lisp-mode-popup-menu) (lisp-mode-variables nil) (run-hooks 'emacs-lisp-mode-hook)) @@ -346,7 +355,14 @@ (setq major-mode 'lisp-interaction-mode) (setq mode-name "Lisp Interaction") ;; XEmacs change - (setq mode-popup-menu lisp-interaction-mode-popup-menu) + ;; (setq mode-popup-menu lisp-interaction-mode-popup-menu) + (unless lisp-interaction-mode-popup-menu + (easy-menu-define lisp-interaction-mode-popup-menu + lisp-interaction-mode-map + "" + lisp-interaction-mode-popup-menu-1)) + (easy-menu-add lisp-interaction-mode-popup-menu) + (set-syntax-table emacs-lisp-mode-syntax-table) (lisp-mode-variables nil) (run-hooks 'lisp-interaction-mode-hook))
--- a/lisp/mu/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '())
--- a/lisp/mule/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '())
--- a/lisp/mule/mule-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,80 +0,0 @@ -;;; mule-load.el --- Load up all pre-loaded Mule Lisp files. -;; Copyright (C) 1995 Sun Microsystems. - -;; This file is part of XEmacs. - -;; XEmacs is free software; you can redistribute it and/or modify it -;; under the terms of the GNU General Public License as published by -;; the Free Software Foundation; either version 2, or (at your option) -;; any later version. - -;; XEmacs is distributed in the hope that it will be useful, but -;; WITHOUT ANY WARRANTY; without even the implied warranty of -;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -;; General Public License for more details. - -;; You should have received a copy of the GNU General Public License -;; along with XEmacs; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. - -;;; Commentary: - -;; This file is obsoleted by dumped-lisp.el and will be removed shortly. - -;; (load-gc) is defined in loadup.el - -;; Load these two first, to set up the most basic stuff. -(load-gc "mule-charset") -(load-gc "mule-coding") -;; Handle I/O of files with extended characters. -(load-gc "mule-files") -;; Load the remaining basic files. -(load-gc "mule-category") -(load-gc "mule-ccl") -(load-gc "mule-misc") -(load-gc "kinsoku") -(when (featurep 'x) - (load-gc "mule-x-init")) -(load-gc "mule-cmds") ; to sync with Emacs 20.1 - -;; after this goes the specific lisp routines for a particular input system -;; 97.2.5 JHod Shouldn't these go into a site-load file to allow site -;; or user switching of input systems??? -;(if (featurep 'wnn) -; (progn -; (load-gc "egg") -; (load-gc "egg-wnn") -; (setq egg-default-startup-file "eggrc-wnn"))) - -;; (if (and (boundp 'CANNA) CANNA) -;; (load-gc "canna") -;; ) - -;; Now load files to set up all the different languages/environments -;; that Mule knows about. - -(load-gc "language/arabic") -(load-gc "language/chinese") -(load-gc "language/cyrillic") -(load-gc "language/english") -(load-gc "language/ethiopic") -(load-gc "language/european") -(load-gc "language/greek") -(load-gc "hebrew-hooks") -(load-gc "language/japanese") -(load-gc "language/korean") -(load-gc "language/misc-lang") -(load-gc "language/thai") -(load-gc "vietnamese-hooks-1") -(load-gc "vietnamese-hooks-2") - -;; Set up the XEmacs environment for Mule. -;; Assumes the existence of various stuff above. -(load-gc "mule-init") - -;; Enable Mule capability for Gnus, mail, etc... -;; Moved to sunpro-load.el - the default only for Sun. -;;(load-gc "mime-setup") - -;;; mule-load.el ends here
--- a/lisp/oobr/Makefile Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/oobr/Makefile Mon Aug 13 09:46:53 2007 +0200 @@ -292,3 +292,11 @@ -cd tree-x; $(RM) .*~ *~ *\# *.orig *.rej *.o xoobr .nfs* -cd tree-nx; $(RM) -r .*~ *~ *\# *.orig *.rej obj* TreeView.app .nfs* -cd $(tar_mandir); $(RM) oo-browser.?? oo-browser.dvi .*~ *~ *\# *.orig *.rej .nfs* + +autoloads: auto-autoloads.el + +auto-autoloads.el: $(EL_COMPILE) + $(EMACS) -batch -q -no-site-file \ + -eval '(setq autoload-target-directory "'`pwd`'/")' \ + -l autoload \ + -f batch-update-autoloads $?
--- a/lisp/oobr/auto-autoloads.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/oobr/auto-autoloads.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,5 +1,5 @@ ;;; DO NOT MODIFY THIS FILE -(if (not (featurep 'oobr-autoloads)) +(if (not (featurep '-autoloads)) (progn ;;;### (autoloads (br-env-load br-env-browse) "br-env" "oobr/br-env.el") @@ -131,5 +131,5 @@ ;;;*** -(provide 'oobr-autoloads) +(provide '-autoloads) ))
--- a/lisp/oobr/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '())
--- a/lisp/packages/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/packages/custom-load.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,118 +1,45 @@ -(put 'extensions 'custom-loads '("page-ext" "time-stamp")) -(put 'change-log 'custom-loads '("add-log")) -(put 'filladapt 'custom-loads '("filladapt")) -(put 'copyright 'custom-loads '("upd-copyr")) -(put 'eldoc 'custom-loads '()) -(put 'recent-files-menu 'custom-loads '("recent-files")) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '("avoid")) -(put 'mail-abbrevs 'custom-loads '()) -(put 'tex 'custom-loads '("texnfo-tex")) -(put 'etags 'custom-loads '("etags")) -(put 'limits 'custom-loads '()) -(put 'igrep 'custom-loads '("igrep")) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '("gnuserv")) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'texinfo 'custom-loads '("texnfo-tex")) -(put 'terminals 'custom-loads '("gnuserv")) -(put 'auto-save 'custom-loads '("auto-save")) -(put 'ispell 'custom-loads '("ispell")) -(put 'mail 'custom-loads '("feedmail" "metamail" "supercite")) -(put 'fortran-indent 'custom-loads '()) -(put 'ps-print-face 'custom-loads '("ps-print")) -(put 'crypt 'custom-loads '("crypt")) -(put 'object 'custom-loads '("gopher")) -(put 'man 'custom-loads '("man")) -(put 'lpr 'custom-loads '("lpr")) -(put 'message-headers 'custom-loads '()) -(put 'ps-print-header 'custom-loads '("ps-print")) -(put 'docs 'custom-loads '("hyper-apropos" "makeinfo")) -(put 'completion 'custom-loads '("completion")) -(put 'tools 'custom-loads '("add-log" "diff" "etags" "func-menu" "generic-sc" "hyper-apropos" "rcompile")) -(put 'recent-files 'custom-loads '("recent-files")) -(put 'editing-basics 'custom-loads '()) -(put 'display-time-balloon 'custom-loads '("time")) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'dabbrev 'custom-loads '("dabbrev")) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '("time")) -(put 'hypermedia 'custom-loads '("gopher" "metamail")) -(put 'save-place 'custom-loads '("saveplace")) -(put 'lisp 'custom-loads '("hyper-apropos")) -(put 'jka-compr 'custom-loads '("jka-compr")) -(put 'diff 'custom-loads '("diff")) -(put 'supercite-cite 'custom-loads '("supercite")) -(put 'paren-matching 'custom-loads '("paren")) -(put 'time-stamp 'custom-loads '("time-stamp")) -(put 'avoid 'custom-loads '("avoid")) -(put 'help 'custom-loads '("hyper-apropos" "info" "man")) -(put 'supercite 'custom-loads '("supercite")) -(put 'generic-sc 'custom-loads '("generic-sc")) -(put 'local 'custom-loads '("gopher")) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'hyper-apropos-faces 'custom-loads '("hyper-apropos")) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '("auto-save" "jka-compr" "recent-files" "saveplace" "time-stamp")) -(put 'ps-print 'custom-loads '("ps-print")) -(put 'ps-print-font 'custom-loads '("ps-print")) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '("balloon-help" "desktop")) -(put 'customize 'custom-loads '()) -(put 'supercite-attr 'custom-loads '("supercite")) -(put 'desktop 'custom-loads '("desktop")) -(put 'abbrev 'custom-loads '("dabbrev")) -(put 'remote-compile 'custom-loads '("rcompile")) -(put 'programming 'custom-loads '("compile")) -(put 'metamail 'custom-loads '("metamail")) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '("compile")) -(put 'dired 'custom-loads '()) -(put 'makeinfo 'custom-loads '("makeinfo")) -(put 'fume 'custom-loads '("func-menu")) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'fast-lock 'custom-loads '("fast-lock")) -(put 'gnuserv 'custom-loads '("gnuserv")) -(put 'ps-print-horizontal 'custom-loads '("ps-print")) -(put 'maint 'custom-loads '("add-log" "upd-copyr")) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '("filladapt")) -(put 'balloon-help 'custom-loads '("balloon-help")) -(put 'debug 'custom-loads '()) -(put 'supercite-hooks 'custom-loads '("supercite")) -(put 'display 'custom-loads '()) -(put 'texinfo-tex 'custom-loads '("texnfo-tex")) -(put 'faces 'custom-loads '("fast-lock" "hyper-apropos" "ps-print")) -(put 'pages 'custom-loads '("page-ext")) -(put 'diary 'custom-loads '()) -(put 'supercite-frames 'custom-loads '("supercite")) -(put 'browse-url 'custom-loads '()) -(put 'feedmail 'custom-loads '("feedmail")) -(put 'processes 'custom-loads '("gnuserv" "ispell" "metamail" "rcompile")) -(put 'news 'custom-loads '("supercite")) -(put 'message-insertion 'custom-loads '()) -(put 'hyper-apropos 'custom-loads '("hyper-apropos")) -(put 'wp 'custom-loads '("lpr" "ps-print")) -(put 'vc 'custom-loads '()) -(put 'ps-print-vertical 'custom-loads '("ps-print")) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'gopher 'custom-loads '("gopher")) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '("completion" "hyper-apropos")) -(put 'ps-print-color 'custom-loads '("ps-print")) -(put 'info 'custom-loads '("info")) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '()) +(custom-put 'copyright 'custom-loads '("upd-copyr")) +(custom-put 'time-stamp 'custom-loads '("time-stamp")) +(custom-put 'texinfo-tex 'custom-loads '("texnfo-tex")) +(custom-put 'supercite-hooks 'custom-loads '("supercite")) +(custom-put 'supercite-cite 'custom-loads '("supercite")) +(custom-put 'supercite-attr 'custom-loads '("supercite")) +(custom-put 'supercite-frames 'custom-loads '("supercite")) +(custom-put 'supercite 'custom-loads '("supercite")) +(custom-put 'save-place 'custom-loads '("saveplace")) +(custom-put 'recent-files-menu 'custom-loads '("recent-files")) +(custom-put 'recent-files 'custom-loads '("recent-files")) +(custom-put 'remote-compile 'custom-loads '("rcompile")) +(custom-put 'ps-print-face 'custom-loads '("ps-print")) +(custom-put 'ps-print-color 'custom-loads '("ps-print")) +(custom-put 'ps-print-font 'custom-loads '("ps-print")) +(custom-put 'ps-print-header 'custom-loads '("ps-print")) +(custom-put 'ps-print-vertical 'custom-loads '("ps-print")) +(custom-put 'ps-print-horizontal 'custom-loads '("ps-print")) +(custom-put 'ps-print 'custom-loads '("ps-print")) +(custom-put 'pages 'custom-loads '("page-ext")) +(custom-put 'metamail 'custom-loads '("metamail")) +(custom-put 'man 'custom-loads '("man")) +(custom-put 'makeinfo 'custom-loads '("makeinfo")) +(custom-put 'lpr 'custom-loads '("lpr")) +(custom-put 'ispell 'custom-loads '("ispell")) +(custom-put 'info 'custom-loads '("info")) +(custom-put 'hyper-apropos-faces 'custom-loads '("hyper-apropos")) +(custom-put 'hyper-apropos 'custom-loads '("hyper-apropos")) +(custom-put 'gopher 'custom-loads '("gopher")) +(custom-put 'gnuserv 'custom-loads '("gnuserv")) +(custom-put 'generic-sc 'custom-loads '("generic-sc")) +(custom-put 'fume 'custom-loads '("func-menu")) +(custom-put 'filladapt 'custom-loads '("filladapt")) +(custom-put 'feedmail 'custom-loads '("feedmail")) +(custom-put 'fast-lock 'custom-loads '("fast-lock")) +(custom-put 'etags 'custom-loads '("etags")) +(custom-put 'diff 'custom-loads '("diff")) +(custom-put 'desktop 'custom-loads '("desktop")) +(custom-put 'dabbrev 'custom-loads '("dabbrev")) +(custom-put 'completion 'custom-loads '("completion")) +(custom-put 'compilation 'custom-loads '("compile")) +(custom-put 'balloon-help 'custom-loads '("balloon-help")) +(custom-put 'avoid 'custom-loads '("avoid")) +(custom-put 'auto-save 'custom-loads '("auto-save")) +(custom-put 'change-log 'custom-loads '("add-log"))
--- a/lisp/pcl-cvs/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '())
--- a/lisp/prim/cmdloop.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/prim/cmdloop.el Mon Aug 13 09:46:53 2007 +0200 @@ -97,6 +97,12 @@ (defvar last-error nil "#### Document me.") +;; #### Provisionally turned on for XEmacs 20.3beta. +(defcustom errors-deactivate-region nil + "*Non-nil means that errors will cause the region to be deactivated." + :type 'boolean + :group 'editing-basics) + (defun command-error (error-object) (let ((inhibit-quit t) (debug-on-error nil) @@ -105,7 +111,8 @@ (setq standard-output t) (setq standard-input t) (setq executing-kbd-macro nil) -; (zmacs-deactivate-region) + (and errors-deactivate-region + (zmacs-deactivate-region)) (discard-input) (setq last-error error-object)
--- a/lisp/prim/cus-load.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/prim/cus-load.el Mon Aug 13 09:46:53 2007 +0200 @@ -30,6 +30,8 @@ ;;; Code: +(fset 'custom-put 'put) + (let ((dir load-path)) (while dir (condition-case nil
--- a/lisp/prim/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/prim/custom-load.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,66 +1,12 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '("mouse")) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '("minibuf")) -(put 'environment 'custom-loads '("frame" "minibuf" "modeline" "sound")) -(put 'sound 'custom-loads '("sound")) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '("files")) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '("simple" "files" "lisp")) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '("help")) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '("lisp")) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '("help")) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '("cmdloop")) -(put 'minubuffer 'custom-loads '("minibuf")) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '("files")) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '("files")) -(put 'frames 'custom-loads '("frame" "window-xemacs")) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '("files")) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '("files")) -(put 'killing 'custom-loads '("simple")) -(put 'paren-blinking 'custom-loads '("simple")) -(put 'find-file 'custom-loads '("files")) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '("simple")) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '("window" "window-xemacs")) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '("simple")) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '("files")) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '("isearch-mode")) -(put 'modeline 'custom-loads '("modeline")) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '("simple")) -(put 'matching 'custom-loads '("simple" "isearch-mode")) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '()) +(custom-put 'backup 'custom-loads '("files")) +(custom-put 'find-file 'custom-loads '("files")) +(custom-put 'frames 'custom-loads '("frame" "window-xemacs")) +(custom-put 'help-appearance 'custom-loads '("help")) +(custom-put 'isearch 'custom-loads '("isearch-mode")) +(custom-put 'minibuffer 'custom-loads '("minibuf")) +(custom-put 'modeline 'custom-loads '("modeline")) +(custom-put 'editing-basics 'custom-loads '("simple" "files" "lisp" "cmdloop")) +(custom-put 'killing 'custom-loads '("simple")) +(custom-put 'fill-comments 'custom-loads '("simple")) +(custom-put 'paren-matching 'custom-loads '()) +(custom-put 'sound 'custom-loads '("sound"))
--- a/lisp/prim/dumped-lisp.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/prim/dumped-lisp.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,39 +1,40 @@ -(setq dumped-lisp-packages '( -"backquote" ; needed for defsubst etc. -"bytecomp-runtime" ; define defsubst -"subr" ; load the most basic Lisp functions -"replace" ; match-string used in version.el. -"version.el" ; Ignore compiled-by-mistake version.elc -"cl" -;;"featurep" -"widget" -"custom" ; Before the world so everything can be customized -"cus-start" ; for customization of builtin variables -"cmdloop" - ; (or (fboundp 'recursive-edit) (load-gc "cmdloop1")) -"keymap" -"syntax" -"device" -"console" -"obsolete" -"specifier" -"faces" ; must be loaded before any make-face call +(setq dumped-lisp-packages + '("backquote" ; needed for defsubst etc. + "bytecomp-runtime" ; define defsubst + "subr" ; load the most basic Lisp functions + "replace" ; match-string used in version.el. + "version.el" ; Ignore compiled-by-mistake version.elc + "cl" + ;;"featurep" + "widget" + "custom" ; Before the world so everything can be + ; customized + "cus-start" ; for customization of builtin variables + "cmdloop" +;; (or (fboundp 'recursive-edit) (load-gc "cmdloop1")) + "keymap" + "syntax" + "device" + "console" + "obsolete" + "specifier" + "faces" ; must be loaded before any make-face call ;;(load-gc "facemenu") #### not yet ported -"glyphs" -"objects" -"extents" -"events" -"text-props" -"process" -"frame" ; move up here cause some stuff needs it here -"map-ynp" -"simple" -"keydefs" ; Before loaddefs so that keymap vars exist. -"abbrev" -"derived" -"minibuf" -"list-mode" -"modeline" ; needs simple.el to be loaded first + "glyphs" + "objects" + "extents" + "events" + "text-props" + "process" + "frame" ; move up here cause some stuff needs it here + "map-ynp" + "simple" + "keydefs" ; Before loaddefs so that keymap vars exist. + "abbrev" + "derived" + "minibuf" + "list-mode" + "modeline" ; needs simple.el to be loaded first ;; If SparcWorks support is included some additional packages are ;; dumped which would normally have autoloads. To avoid ;; duplicate doc string warnings, SparcWorks uses a separate @@ -41,40 +42,41 @@ ;; After fixing, eos/loaddefs-eos and loaddefs appear identical?!! ;; So just make loaddefs-eos go away... ;;(load-gc (if (featurep 'sparcworks) "eos/loaddefs-eos" "loaddefs")) -"loaddefs" ; <=== autoloads get loaded here -"misc" -;; (load-gc "profile") -"help" -;; (load-gc "hyper-apropos") Soon... -#-mule "files-nomule" -"files" -"lib-complete" -"format" -"indent" -"isearch-mode" -"buffer" -"buff-menu" -"undo-stack" -"window" -"window-xemacs" -"paths.el" ; don't get confused if paths compiled. -"startup" -"lisp" -"page" -"register" -"iso8859-1" ; This must be before any modes - ; (sets standard syntax table.) -"paragraphs" -"lisp-mode" -"text-mode" -"fill" -;; (load-gc "cc-mode") ; as FSF goes so go we .. -;; (load-gc "scroll-in-place") ; We're not ready for this :-( -;; we no longer load buff-menu automatically. -;; it will get autoloaded if needed. + "loaddefs" ; <=== autoloads get loaded here + "misc" + ;; (load-gc "profile") + "help" + ;; (load-gc "hyper-apropos") Soon... + #-mule "files-nomule" + "files" + "lib-complete" + "format" + "indent" + "isearch-mode" + "buffer" + "buff-menu" + "undo-stack" + "window" + "window-xemacs" + "paths.el" ; don't get confused if paths compiled. + "startup" + "lisp" + "page" + "register" + "iso8859-1" ; This must be before any modes + ; (sets standard syntax table.) + "paragraphs" + "easymenu" ; Added for 20.3. + "lisp-mode" + "text-mode" + "fill" + ;; "cc-mode" ; as FSF goes so go we .. + ;; "scroll-in-place" ; We're not ready for this :-( + ;; we no longer load buff-menu automatically. + ;; it will get autoloaded if needed. -;; Before this will work again, the different system types will need -;; to have features named for them. + ;; Before this will work again, the different system types will need + ;; to have features named for them. ; (cond ; Differences based on system-type ; ((eq system-type 'vax-vms) @@ -82,33 +84,34 @@ ; (load-gc "vms-patch")) ; ((eq system-type 'windows-nt) ; ;; (load-gc "ls-lisp") -; (load-gc "winnt")) + #+windows-nt "winnt" ; ((eq system-type 'ms-dos) ; ;; (load-gc "ls-lisp") ; (load-gc "dos-fns") ; (load-gc "disp-table"))) ; needed to setup ibm-pc char set, ; see internal.el -#+lisp-float-type "float-sup" -"itimer" ; for vars auto-save-timeout and auto-gc-threshold -"itimer-autosave" -#+toolbar "toolbar" + #+lisp-float-type "float-sup" + "itimer" ; for vars auto-save-timeout and + ; auto-gc-threshold + "itimer-autosave" + #+toolbar "toolbar" ; ;; else still define a few functions. ; (defun toolbar-button-p (obj) "No toolbar support." nil) ; (defun toolbar-specifier-p (obj) "No toolbar support." nil)) -#+scrollbar "scrollbar" -#+menubar "menubar" -#+dialog "dialog" -#+mule "mule-charset" -#+mule "mule-coding" + #+scrollbar "scrollbar" + #+menubar "menubar" + #+dialog "dialog" + #+mule "mule-charset" + #+mule "mule-coding" ;; Handle I/O of files with extended characters. -#+mule "mule-files" + #+mule "mule-files" ;; Load the remaining basic files. -#+mule "mule-category" -#+mule "mule-ccl" -#+mule "mule-misc" -#+mule "kinsoku" -#+(and mule x) "mule-x-init" -#+mule "mule-cmds" ; to sync with Emacs 20.1 + #+mule "mule-category" + #+mule "mule-ccl" + #+mule "mule-misc" + #+mule "kinsoku" + #+(and mule x) "mule-x-init" + #+mule "mule-cmds" ; to sync with Emacs 20.1 ;; after this goes the specific lisp routines for a particular input system ;; 97.2.5 JHod Shouldn't these go into a site-load file to allow site @@ -126,65 +129,65 @@ ;; Now load files to set up all the different languages/environments ;; that Mule knows about. -#+mule "language/arabic" -#+mule "language/chinese" -#+mule "language/cyrillic" -#+mule "language/english" -#+mule "language/ethiopic" -#+mule "language/european" -#+mule "language/greek" -#+mule "hebrew-hooks" -#+mule "language/japanese" -#+mule "language/korean" -#+mule "language/misc-lang" -#+mule "language/thai" -#+mule "vietnamese-hooks-1" -#+mule "vietnamese-hooks-2" + #+mule "language/arabic" + #+mule "language/chinese" + #+mule "language/cyrillic" + #+mule "language/english" + #+mule "language/ethiopic" + #+mule "language/european" + #+mule "language/greek" + #+mule "hebrew-hooks" + #+mule "language/japanese" + #+mule "language/korean" + #+mule "language/misc-lang" + #+mule "language/thai" + #+mule "vietnamese-hooks-1" + #+mule "vietnamese-hooks-2" ;; Set up the XEmacs environment for Mule. ;; Assumes the existence of various stuff above. -#+mule "mule-init" + #+mule "mule-init" ;; Enable Mule capability for Gnus, mail, etc... ;; Moved to sunpro-load.el - the default only for Sun. ;;(load-gc "mime-setup") ;;; mule-load.el ends here -#+window-system "gui" -#+window-system "mode-motion" -#+window-system "mouse" + #+window-system "gui" + #+window-system "mode-motion" + #+window-system "mouse" ;; preload the X code, for faster startup. -#+(and x menubar) "x-menubar" -#+x "x-faces" -#+x "x-iso8859-1" -#+x "x-mouse" -#+x "x-select" -#+(and x scrollbar) "x-scrollbar" -#+x "x-misc" -#+x "x-init" -#+(and x toolbar) "x-toolbar" + #+(and x menubar) "x-menubar" + #+x "x-faces" + #+x "x-iso8859-1" + #+x "x-mouse" + #+x "x-select" + #+(and x scrollbar) "x-scrollbar" + #+x "x-misc" + #+x "x-init" + #+(and x toolbar) "x-toolbar" ;; preload the TTY init code. -#+tty "tty-init" + #+tty "tty-init" ;;; Formerly in tooltalk/tooltalk-load.el -#+tooltalk "tooltalk/tooltalk-macros" -#+tooltalk "tooltalk/tooltalk-util" -#+tooltalk "tooltalk/tooltalk-init" -"vc-hooks" -"ediff-hook" -"fontl-hooks" -"auto-show" + #+tooltalk "tooltalk/tooltalk-macros" + #+tooltalk "tooltalk/tooltalk-util" + #+tooltalk "tooltalk/tooltalk-init" + "vc-hooks" + "ediff-hook" + "fontl-hooks" + "auto-show" ;; #+energize "energize/energize-load.el" ;;; formerly in sunpro/sunpro-load.el -#+sparcworks "cc-mode" -#+sparcworks "sunpro-init" -#+sparcworks "ring" -#+sparcworks "comint" -#+sparcworks "annotations" + #+sparcworks "cc-mode" + #+sparcworks "sunpro-init" + #+sparcworks "ring" + #+sparcworks "comint" + #+sparcworks "annotations" ;;; formerly in eos/sun-eos-load.el -#+sparcworks "sun-eos-init" -#+sparcworks "sun-eos-common" -#+sparcworks "sun-eos-editor" -#+sparcworks "sun-eos-browser" -#+sparcworks "sun-eos-debugger" -#+sparcworks "sun-eos-debugger-extra" -#+sparcworks "sun-eos-menubar" + #+sparcworks "sun-eos-init" + #+sparcworks "sun-eos-common" + #+sparcworks "sun-eos-editor" + #+sparcworks "sun-eos-browser" + #+sparcworks "sun-eos-debugger" + #+sparcworks "sun-eos-debugger-extra" + #+sparcworks "sun-eos-menubar" ))
--- a/lisp/prim/files.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/prim/files.el Mon Aug 13 09:46:53 2007 +0200 @@ -1175,10 +1175,10 @@ ("\\.mss\\'" . scribe-mode) ("\\.m\\([mes]\\|an\\)\\'" . nroff-mode) ("\\.icn\\'" . icon-mode) - ("\\.[ck]?sh\\'\\|\\.shar\\'\\|/\\.z?profile\\'" . sh-mode) - ("/\\.\\(bash_profile\\|z?login\\|bash_login\\|z?logout\\)\\'" . sh-mode) - ("/\\.\\(bash_logout\\|[kz]shrc\\|bashrc\\|t?cshrc\\|esrc\\)\\'" . sh-mode) - ("/\\.\\([kz]shenv\\|xinitrc\\|startxrc\\|xsession\\)\\'" . sh-mode) + ("\\.\\([ckz]?sh\\|shar\\)\\'" . sh-mode) + ("/\\.\\(bash_\\|z\\)?\\(profile\\|login\||logout\\)\\'" . sh-mode) + ("/\\.\\([ckz]sh\\|bash\\|tcsh\\|es\\|xinit\\|startx\\)rc\\'" . sh-mode) + ("/\\.\\([kz]shenv\\|xsession\\)\\'" . sh-mode) ;;; The following should come after the ChangeLog pattern ;;; for the sake of ChangeLog.1, etc. ;;; and after the .scm.[0-9] pattern too. @@ -1226,7 +1226,6 @@ ("\\.[Jj][Pp][Ee]?[Gg]\\'" . image-mode) ("\\.[Pp][Nn][Gg]\\'" . image-mode) ("\\.[Gg][Ii][Ff]\\'" . image-mode) - ("\\.xpm\\'" . image-mode) ) "Alist of filename patterns vs. corresponding major mode functions. Each element looks like (REGEXP . FUNCTION) or (REGEXP FUNCTION NON-NIL).
--- a/lisp/prim/minibuf.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/prim/minibuf.el Mon Aug 13 09:46:53 2007 +0200 @@ -287,6 +287,11 @@ (cons STRING (symbol-value minibuffer-history-variable)))") (defvar minibuffer-history-position) +;; Added by hniksic: +(defvar initial-minibuffer-history-position) +(defvar current-minibuffer-contents) +(defvar current-minibuffer-point) + (defcustom minibuffer-history-minimum-string-length 3 "*If this variable is non-nil, a string will not be added to the minibuffer history if its length is less than that value." @@ -376,6 +381,11 @@ (setq default-directory dir) (make-local-variable 'print-escape-newlines) (setq print-escape-newlines t) + (make-local-variable 'current-minibuffer-contents) + (make-local-variable 'current-minibuffer-point) + (make-local-variable 'initial-minibuffer-history-position) + (setq current-minibuffer-contents "" + current-minibuffer-point 1) (if (not minibuffer-smart-completion-tracking-behavior) nil (make-local-variable 'mode-motion-hook) @@ -394,8 +404,12 @@ (if (consp initial-contents) (progn (insert (car initial-contents)) - (goto-char (1+ (cdr initial-contents)))) - (insert initial-contents))) + (goto-char (1+ (cdr initial-contents))) + (setq current-minibuffer-contents (car initial-contents) + current-minibuffer-point (cdr initial-contents))) + (insert initial-contents) + (setq current-minibuffer-contents initial-contents + current-minibuffer-point (point)))) (use-local-map (or keymap minibuffer-local-map)) (let ((mouse-grabbed-buffer (and minibuffer-smart-completion-tracking-behavior @@ -413,6 +427,8 @@ (t 0))) (minibuffer-scroll-window owindow)) + (setq initial-minibuffer-history-position + minibuffer-history-position) (if abbrev-table (setq local-abbrev-table abbrev-table abbrev-mode t)) @@ -1174,7 +1190,7 @@ (let ((enable-recursive-minibuffers t) (minibuffer-history-sexp-flag nil)) (if (eq 't (symbol-value minibuffer-history-variable)) - (error "history is not being recorded in this context")) + (error "History is not being recorded in this context")) (list (read-from-minibuffer "Previous element matching (regexp): " (car minibuffer-history-search-history) minibuffer-local-map @@ -1185,7 +1201,7 @@ prevpos (pos minibuffer-history-position)) (if (eq history t) - (error "history is not being recorded in this context")) + (error "History is not being recorded in this context")) (while (/= n 0) (setq prevpos pos) (setq pos (min (max 1 (+ pos (if (< n 0) -1 1))) (length history))) @@ -1200,6 +1216,8 @@ (nth (1- pos) history))) (setq n (+ n (if (< n 0) 1 -1))))) (setq minibuffer-history-position pos) + (setq current-minibuffer-contents (buffer-string) + current-minibuffer-point (point)) (erase-buffer) (let ((elt (nth (1- pos) history))) (insert (if minibuffer-history-sexp-flag @@ -1220,7 +1238,7 @@ (let ((enable-recursive-minibuffers t) (minibuffer-history-sexp-flag nil)) (if (eq t (symbol-value minibuffer-history-variable)) - (error "history is not being recorded in this context")) + (error "History is not being recorded in this context")) (list (read-from-minibuffer "Next element matching (regexp): " (car minibuffer-history-search-history) minibuffer-local-map @@ -1233,32 +1251,36 @@ "Insert the next element of the minibuffer history into the minibuffer." (interactive "p") (if (eq 't (symbol-value minibuffer-history-variable)) - (error "history is not being recorded in this context")) - (or (zerop n) - (let ((narg (min (max 1 (- minibuffer-history-position n)) - (length (symbol-value minibuffer-history-variable))))) - (if (or (zerop narg) - (= minibuffer-history-position narg)) - (error (if (>= n 0) ;; rewritten for I18N3 snarfing - (format "No following item in %s" - minibuffer-history-variable) - (format "No preceding item in %s" - minibuffer-history-variable))) - (erase-buffer) - (setq minibuffer-history-position narg) - (let ((elt (nth (1- minibuffer-history-position) - (symbol-value minibuffer-history-variable)))) - (insert - (if (not (stringp elt)) - (let ((print-level nil)) - (condition-case nil - (let ((print-readably t) - (print-escape-newlines t)) - (prin1-to-string elt)) - (error (prin1-to-string elt)))) - elt))) - ;; FSF has point-min here. - (goto-char (point-max)))))) + (error "History is not being recorded in this context")) + (unless (zerop n) + (when (eq minibuffer-history-position + initial-minibuffer-history-position) + (setq current-minibuffer-contents (buffer-string) + current-minibuffer-point (point))) + (let ((narg (- minibuffer-history-position n))) + (cond ((< narg 0) + (error "No following item in %s" minibuffer-history-variable)) + ((> narg (length (symbol-value minibuffer-history-variable))) + (error "No preceding item in %s" minibuffer-history-variable))) + (erase-buffer) + (setq minibuffer-history-position narg) + (if (eq narg initial-minibuffer-history-position) + (progn + (insert current-minibuffer-contents) + (goto-char current-minibuffer-point)) + (let ((elt (nth (1- minibuffer-history-position) + (symbol-value minibuffer-history-variable)))) + (insert + (if (not (stringp elt)) + (let ((print-level nil)) + (condition-case nil + (let ((print-readably t) + (print-escape-newlines t)) + (prin1-to-string elt)) + (error (prin1-to-string elt)))) + elt))) + ;; FSF has point-min here. + (goto-char (point-max)))))) (defun previous-history-element (n) "Inserts the previous element of the minibuffer history into the minibuffer."
--- a/lisp/prim/obsolete.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/prim/obsolete.el Mon Aug 13 09:46:53 2007 +0200 @@ -347,11 +347,12 @@ (make-obsolete 'add-menu-item 'add-menu-button) (defun add-menu (menu-path menu-name menu-items &optional before) - "Obsolete. See the function `add-submenu'." + "See the function `add-submenu'." (or menu-name (error (gettext "must specify a menu name"))) (or menu-items (error (gettext "must specify some menu items"))) (add-submenu menu-path (cons menu-name menu-items) before)) -(make-obsolete 'add-menu 'add-submenu) +;; Can't make this obsolete. easymenu depends on it. +(make-compatible 'add-menu 'add-submenu) (define-obsolete-function-alias 'popup-menu-up-p 'popup-up-p)
--- a/lisp/prim/simple.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/prim/simple.el Mon Aug 13 09:46:53 2007 +0200 @@ -362,7 +362,7 @@ (save-excursion (insert-char ?\ arg)))) (defcustom delete-key-deletes-forward nil - "If non-nil, the DEL key will erase one character forwards. + "*If non-nil, the DEL key will erase one character forwards. If nil, the DEL key will erase one character backwards." :type 'boolean :group 'editing-basics) @@ -3278,11 +3278,12 @@ "List of symbols indicating labels of messages which shouldn't be logged. See `display-message' for some common labels. See also `log-message'.") -;Subsumed by view-lossage -;(defun show-message-log () -; "Show the \" *Message-Log*\" buffer, which contains old messages and errors." -; (interactive) -; (pop-to-buffer " *Message-Log*")) +;;Subsumed by view-lossage +;; Not really, I'm adding it back by popular demand. -slb +(defun show-message-log () + "Show the \" *Message-Log*\" buffer, which contains old messages and errors." + (interactive) + (pop-to-buffer " *Message-Log*")) (defvar log-message-filter-function 'log-message-filter "Value must be a function of two arguments: a symbol (label) and @@ -3290,11 +3291,6 @@ should be logged. Possible values include 'log-message-filter and 'log-message-filter-errors-only.") -(defun show-message-log () - "Show the \" *Message-Log*\" buffer, which contains old messages and errors." - (interactive) - (pop-to-buffer " *Message-Log*")) - (defun log-message-filter (label message) "Default value of log-message-filter-function. Mesages whose text matches one of the log-message-ignore-regexps @@ -3362,6 +3358,7 @@ (let ((clear-stream (and message-stack (eq 'stream (frame-type frame))))) (remove-message label frame) (let ((buffer (get-buffer " *Echo Area*")) + (inhibit-read-only t) (zmacs-region-stays zmacs-region-stays)) ; preserve from change (erase-buffer buffer)) (if clear-stream @@ -3400,7 +3397,8 @@ (error (setq remove-message-hook nil) (message "remove-message-hook error: %s" e) (sit-for 2) - (erase-buffer (get-buffer " *Echo Area*")) + (let ((inhibit-read-only t)) + (erase-buffer (get-buffer " *Echo Area*"))) (signal (car e) (cdr e)))) (setq log (cdr log))))) @@ -3420,7 +3418,8 @@ (zmacs-region-stays zmacs-region-stays)) ; preserve from change (save-excursion (set-buffer buffer) - (insert message)) + (let ((inhibit-read-only t)) + (insert message))) ;; Conditionalizing on the device type in this way is not that clean, ;; but neither is having a device method, as I originally implemented ;; it: all non-stream devices behave in the same way. Perhaps
--- a/lisp/psgml/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/psgml/custom-load.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,75 +1,7 @@ -(put 'extensions 'custom-loads '("tempo")) -(put 'message 'custom-loads '()) -(put 'psgml-dtd 'custom-loads '("psgml")) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'html 'custom-loads '("psgml-html")) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'psgml 'custom-loads '("psgml-html" "psgml")) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'psgml-html 'custom-loads '("psgml-html")) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'sgml 'custom-loads '("psgml-html" "psgml")) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'tempo 'custom-loads '("tempo")) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'languages 'custom-loads '("psgml")) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'psgml-insert 'custom-loads '("psgml")) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '()) +(custom-put 'tempo 'custom-loads '("tempo")) +(custom-put 'psgml-dtd 'custom-loads '("psgml")) +(custom-put 'psgml-insert 'custom-loads '("psgml")) +(custom-put 'psgml 'custom-loads '("psgml-html" "psgml")) +(custom-put 'sgml 'custom-loads '("psgml-html" "psgml")) +(custom-put 'psgml-html 'custom-loads '("psgml-html")) +(custom-put 'html 'custom-loads '("psgml-html"))
--- a/lisp/rmail/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '())
--- a/lisp/sunpro/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '())
--- a/lisp/sunpro/sunpro-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -(let ((gc-cons-threshold 30000)) - (require 'cc-mode) - ;(require 'fortran) - (load "sunpro-init") - ;;(load "sunpro-menubar") - ;;(load "sunpro-keys") - ;;(load "sccs") - ;;(load "sunpro-sparcworks") - (load "eos/sun-eos-load") - (require 'annotations) - (garbage-collect))
--- a/lisp/term/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '())
--- a/lisp/tl/auto-autoloads.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/tl/auto-autoloads.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,9 +1,6 @@ ;;; DO NOT MODIFY THIS FILE (if (not (featurep 'tl-autoloads)) (progn - -(provide 'tl-autoloads) -)) ;;;### (autoloads (view-charset) "char-table" "tl/char-table.el") @@ -18,3 +15,6 @@ Display character table of CHARSET by pop-up menu." t nil) ;;;*** + +(provide 'tl-autoloads) +))
--- a/lisp/tl/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '())
--- a/lisp/tm/auto-autoloads.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/tm/auto-autoloads.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,9 +1,6 @@ ;;; DO NOT MODIFY THIS FILE (if (not (featurep 'tm-autoloads)) (progn - -(provide 'tm-autoloads) -)) ;;;### (autoloads (mime/editor-mode) "tm-edit" "tm/tm-edit.el") @@ -147,3 +144,6 @@ (defalias 'edit-mime 'mime/editor-mode) ;;;*** + +(provide 'tm-autoloads) +))
--- a/lisp/tm/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '())
--- a/lisp/tooltalk/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '())
--- a/lisp/tooltalk/tooltalk-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,9 +0,0 @@ -;;; Load the elisp side of the Tooltalk interface. -;;; -;;; @(#)tooltalk-load.el 1.3 92/12/16 - -;; This file is obsoleted by dumped=-lisp.el and will be removed shortly. - -(load "tooltalk/tooltalk-macros") -(load "tooltalk/tooltalk-util") -(load "tooltalk/tooltalk-init")
--- a/lisp/utils/advice.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/utils/advice.el Mon Aug 13 09:46:53 2007 +0200 @@ -2608,7 +2608,10 @@ ;;"Returns the interactive form of DEFINITION." (cond ((ad-compiled-p definition) (and (commandp definition) - (list 'interactive (aref (ad-compiled-code definition) 5)))) + ;; XEmacs: we have an accessor function so don't use aref. + (if (fboundp 'compiled-function-interactive) + (compiled-function-interactive (ad-compiled-code definition)) + (list 'interactive (aref (ad-compiled-code definition) 5))))) ((or (ad-advice-p definition) (ad-lambda-p definition)) (commandp (ad-lambda-expression definition)))))
--- a/lisp/utils/auto-autoloads.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/utils/auto-autoloads.el Mon Aug 13 09:46:53 2007 +0200 @@ -150,7 +150,8 @@ (autoload 'update-file-autoloads "autoload" "\ Update the autoloads for FILE in `generated-autoload-file' -\(which FILE might bind in its local variables)." t nil) +\(which FILE might bind in its local variables). +This functions refuses to update autolaods files and custom loads." t nil) (autoload 'update-autoloads-here "autoload" "\ Update sections of the current buffer generated by `update-file-autoloads'." t nil) @@ -165,7 +166,9 @@ Runs `update-file-autoloads' on files and `update-directory-autoloads' on directories. Must be used only with -batch, and kills Emacs on completion. Each file will be processed even if an error occurred previously. -For example, invoke `xemacs -batch -f batch-update-autoloads *.el'." nil nil) +For example, invoke `xemacs -batch -f batch-update-autoloads *.el'. +The directory to which the auto-autoloads.el and custom-load.el files must +be the first parameter on the command line." nil nil) (autoload 'batch-update-directory "autoload" "\ Update the autoloads for the directory on the command line. @@ -229,71 +232,7 @@ ;;;*** -;;;### (autoloads (easy-menu-define) "easymenu" "utils/easymenu.el") - -(autoload 'easy-menu-define "easymenu" "\ -Define a menu bar submenu in maps MAPS, according to MENU. -The arguments SYMBOL and DOC are ignored; they are present for -compatibility only. SYMBOL is not evaluated. In other Emacs versions -these arguments may be used as a variable to hold the menu data, and a -doc string for that variable. - -The first element of MENU must be a string. It is the menu bar item name. -The rest of the elements are menu items. - -A menu item is usually a vector of three elements: [NAME CALLBACK ENABLE] - -NAME is a string--the menu item name. - -CALLBACK is a command to run when the item is chosen, -or a list to evaluate when the item is chosen. - -ENABLE is an expression; the item is enabled for selection -whenever this expression's value is non-nil. - -Alternatively, a menu item may have the form: - - [ NAME CALLBACK [ KEYWORD ARG ] ... ] - -Where KEYWORD is one of the symbol defined below. - - :keys KEYS - -KEYS is a string; a complex keyboard equivalent to this menu item. - - :active ENABLE - -ENABLE is an expression; the item is enabled for selection -whenever this expression's value is non-nil. - - :suffix NAME - -NAME is a string; the name of an argument to CALLBACK. - - :style STYLE - -STYLE is a symbol describing the type of menu item. The following are -defined: - -toggle: A checkbox. - Currently just prepend the name with the string \"Toggle \". -radio: A radio button. -nil: An ordinary menu item. - - :selected SELECTED - -SELECTED is an expression; the checkbox or radio button is selected -whenever this expression's value is non-nil. -Currently just disable radio buttons, no effect on checkboxes. - -A menu item can be a string. Then that string appears in the menu as -unselectable text. A string consisting solely of hyphens is displayed -as a solid horizontal line. - -A menu item can be a list. It is treated as a submenu. -The first element should be the submenu name. That's used as the -menu item in the top-level menu. The cdr of the submenu list -is a list of menu items, as above." nil 'macro) +;;;### (autoloads nil "easymenu" "utils/easymenu.el") ;;;***
--- a/lisp/utils/autoload.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/utils/autoload.el Mon Aug 13 09:46:53 2007 +0200 @@ -317,7 +317,7 @@ (when (< output-end (point)) (setq output-end (point-marker))) (while (< (point) output-end) - (let ((beg (point))) + ;; (let ((beg (point))) (end-of-line) ;; Emacs -- I still haven't figured this one out. ;; (if (> (- (point) beg) 900) @@ -325,7 +325,7 @@ ;; (message "A line is too long--over 900 characters") ;; (sleep-for 2) ;; (goto-char output-end))) - ) + ;; ) (forward-line 1)) (goto-char output-end) (insert generate-autoload-section-trailer))) @@ -359,6 +359,8 @@ data-directory) "*File `update-file-autoloads' puts customization into.") +(defvar customized-symbols nil) + ;; Written by Per Abrahamsen (defun autoload-snarf-defcustom (file) "Snarf all customizations in the current buffer." @@ -376,53 +378,62 @@ (when (and (listp expr) (memq (car expr) '(defcustom defface defgroup))) (eval expr) - (put (nth 1 expr) 'custom-where name))))) + (put (nth 1 expr) 'custom-where name) + (pushnew (nth 1 expr) customized-symbols))))) (error nil))) (unless (buffer-modified-p) (kill-buffer (current-buffer)))))) +(defvar autoload-do-custom-save nil) + ;;;###autoload (defun update-file-autoloads (file) "Update the autoloads for FILE in `generated-autoload-file' -\(which FILE might bind in its local variables)." +\(which FILE might bind in its local variables). +This functions refuses to update autolaods files and custom loads." (interactive "fUpdate autoloads for file: ") (setq file (expand-file-name file)) - (let ((load-name (replace-in-string (file-name-nondirectory file) - "\\.elc?$" - "")) - (trim-name (autoload-trim-file-name file)) - section-begin form) - (save-excursion - (let ((find-file-hooks nil)) - (set-buffer (or (get-file-buffer generated-autoload-file) - (find-file-noselect generated-autoload-file)))) - ;; First delete all sections for this file. - (goto-char (point-min)) - (while (search-forward generate-autoload-section-header nil t) - (setq section-begin (match-beginning 0)) - (setq form (read (current-buffer))) - (when (string= (nth 2 form) load-name) - (search-forward generate-autoload-section-trailer) - (delete-region section-begin (point)))) + (when (and (file-newer-than-file-p file generated-autoload-file) + (not (member (file-name-nondirectory file) + (list autoload-file-name cusload-file-name)))) - ;; Now find insertion point for new section - (block find-insertion-point + (setq autoload-do-custom-save t) + (let ((load-name (replace-in-string (file-name-nondirectory file) + "\\.elc?$" + "")) + (trim-name (autoload-trim-file-name file)) + section-begin form) + (save-excursion + (let ((find-file-hooks nil)) + (set-buffer (or (get-file-buffer generated-autoload-file) + (find-file-noselect generated-autoload-file)))) + ;; First delete all sections for this file. (goto-char (point-min)) (while (search-forward generate-autoload-section-header nil t) + (setq section-begin (match-beginning 0)) (setq form (read (current-buffer))) - (when (string< trim-name (nth 3 form)) - ;; Found alphabetically correct insertion point - (goto-char (match-beginning 0)) - (return-from find-insertion-point)) - (search-forward generate-autoload-section-trailer)) - (when (eq (point) (point-min)) ; No existing entries? - (goto-char (point-max)))) ; Append. + (when (string= (nth 2 form) load-name) + (search-forward generate-autoload-section-trailer) + (delete-region section-begin (point)))) - ;; Add in new sections for file - (generate-file-autoloads file) - (autoload-snarf-defcustom file)) + ;; Now find insertion point for new section + (block find-insertion-point + (goto-char (point-min)) + (while (search-forward generate-autoload-section-header nil t) + (setq form (read (current-buffer))) + (when (string< trim-name (nth 3 form)) + ;; Found alphabetically correct insertion point + (goto-char (match-beginning 0)) + (return-from find-insertion-point)) + (search-forward generate-autoload-section-trailer)) + (when (eq (point) (point-min)) ; No existing entries? + (goto-char (point-max)))) ; Append. - (when (interactive-p) (save-buffer)))) + ;; Add in new sections for file + (generate-file-autoloads file) + (autoload-snarf-defcustom file)) + + (when (interactive-p) (save-buffer))))) ;;;###autoload (defun update-autoloads-here () @@ -480,6 +491,7 @@ This runs `update-file-autoloads' on each .el file in DIR. Obsolete autoload entries for files that no longer exist are deleted." (interactive "DUpdate autoloads for directory: ") + (setq autoload-do-custom-save nil) (setq dir (expand-file-name dir)) (let ((simple-dir (file-name-as-directory (file-name-nondirectory @@ -515,29 +527,40 @@ (erase-buffer) (insert (with-output-to-string - (mapatoms (lambda (symbol) - (let ((members (condition-case nil - (get symbol 'custom-group) - (t (progn - (message "Bad plist in %s" - (symbol-name symbol))) - nil))) - item where found) - (when members - (princ "(put '") - (princ symbol) - (princ " 'custom-loads '(") - (while members - (setq item (car (car members)) - members (cdr members) - where (get item 'custom-where)) - (unless (or (null where) - (member where found)) - (when found - (princ " ")) - (prin1 where) - (push where found))) - (princ "))\n"))))))))) + (mapcar (lambda (symbol) + (let ((members (condition-case nil + (get symbol 'custom-group) + (t (progn + (message "Bad plist in %s" + (symbol-name symbol))) + nil))) + item where + (found (condition-case nil + (get symbol 'custom-loads) + (t nil))) + ) + (when (or members found) + (princ "(custom-put '") + (princ symbol) + (princ " 'custom-loads '(") + (when found + ;; (message "found = `%s'" found) + (insert (mapconcat 'prin1-to-string found " "))) + (while members + (setq item (car (car members)) + members (cdr members) + where (get item 'custom-where)) + (unless (or (null where) + (member where found)) + ;; (message "where = `%s', found = `%s'" where found) + (when found + (princ " ")) + (prin1 where) + (push where found))) + (princ "))\n")))) + customized-symbols))) + (when (= (point-min) (point-max)) + (set-buffer-modified-p nil)))) ;;;###autoload (defun batch-update-autoloads () @@ -545,12 +568,20 @@ Runs `update-file-autoloads' on files and `update-directory-autoloads' on directories. Must be used only with -batch, and kills Emacs on completion. Each file will be processed even if an error occurred previously. -For example, invoke `xemacs -batch -f batch-update-autoloads *.el'." +For example, invoke `xemacs -batch -f batch-update-autoloads *.el'. +The directory to which the auto-autoloads.el and custom-load.el files must +be the first parameter on the command line." (unless noninteractive (error "batch-update-autoloads is to be used only with -batch")) (let ((defdir default-directory) (enable-local-eval nil)) ; Don't query in batch mode. - (message "Updating autoloads in %s..." generated-autoload-file) + (when (file-exists-p generated-custom-file) + (flet ((custom-put (symbol property value) + (progn + (put symbol property value) + (pushnew symbol customized-symbols)))) + (load generated-custom-file nil t))) + ;; (message "Updating autoloads in %s..." generated-autoload-file) (dolist (arg command-line-args-left) (setq arg (expand-file-name arg defdir)) (cond @@ -560,9 +591,12 @@ ((file-exists-p arg) (update-file-autoloads arg)) (t (error "No such file or directory: %s" arg)))) - (autoload-save-customization) + (when autoload-do-custom-save + (autoload-save-customization)) + (fixup-autoload-buffer (concat (file-name-nondirectory defdir) + "-autoloads")) (save-some-buffers t) - (message "Done") + ;; (message "Done") (kill-emacs 0))) (defun fixup-autoload-buffer (sym) @@ -584,23 +618,34 @@ Runs `update-file-autoloads' on each file in the given directory, and must be used only with -batch, and kills XEmacs on completion." (unless noninteractive - (error "batch-update-autoloads is to be used only with -batch")) + (error "batch-update-directory is to be used only with -batch")) (let ((defdir default-directory) (enable-local-eval nil)) ; Don't query in batch mode. (dolist (arg command-line-args-left) (setq arg (expand-file-name arg defdir)) (let ((generated-autoload-file (concat arg "/" autoload-file-name)) (generated-custom-file (concat arg "/" cusload-file-name))) + (when (file-exists-p generated-custom-file) + (flet ((custom-put (symbol property value) + (progn + (put symbol property value) + ;; (message "Loading %s = %s" + ;; (symbol-name symbol) + ;; (prin1-to-string value)) + (pushnew symbol customized-symbols)))) + (load generated-custom-file nil t))) (cond ((file-directory-p arg) (message "Updating autoloads in directory %s..." arg) (update-autoloads-from-directory arg)) (t (error "No such file or directory: %s" arg))) - (autoload-save-customization) + (when autoload-do-custom-save + (autoload-save-customization) + (setq customized-symbols nil)) (fixup-autoload-buffer (concat (file-name-nondirectory arg) - "-autoloads")) + "-autoloads")) (save-some-buffers t)) - (message "Done") + ;; (message "Done") ;; (kill-emacs 0) ) (setq command-line-args-left nil)))
--- a/lisp/utils/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/utils/custom-load.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,83 +1,12 @@ -(put 'extensions 'custom-loads '("eldoc")) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '("eldoc")) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '("detached-minibuf" "savehist")) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'mail 'custom-loads '("highlight-headers" "ph" "smtpmail")) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'uniquify 'custom-loads '("uniquify")) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'hypermedia 'custom-loads '("browse-url")) -(put 'lisp 'custom-loads '("elp")) -(put 'diff 'custom-loads '()) -(put 'elp 'custom-loads '("elp")) -(put 'applications 'custom-loads '("uniquify")) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '("edmacro")) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'comm 'custom-loads '("ph")) -(put 'backup 'custom-loads '()) -(put 'id-select 'custom-loads '("id-select")) -(put 'frames 'custom-loads '("detached-minibuf")) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'smtpmail 'custom-loads '("smtpmail")) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'detached-minibuf 'custom-loads '("detached-minibuf")) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'edmacro 'custom-loads '("edmacro")) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'faces 'custom-loads '("highlight-headers")) -(put 'passwd 'custom-loads '("passwd")) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '("browse-url")) -(put 'processes 'custom-loads '("passwd")) -(put 'news 'custom-loads '("highlight-headers")) -(put 'highlight-headers 'custom-loads '("highlight-headers")) -(put 'message-insertion 'custom-loads '()) -(put 'savehist 'custom-loads '("savehist")) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'ph 'custom-loads '("ph")) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '()) +(custom-put 'uniquify 'custom-loads '("uniquify")) +(custom-put 'smtpmail 'custom-loads '("smtpmail")) +(custom-put 'savehist 'custom-loads '("savehist")) +(custom-put 'ph 'custom-loads '("ph")) +(custom-put 'passwd 'custom-loads '("passwd")) +(custom-put 'message-headers 'custom-loads '()) +(custom-put 'highlight-headers 'custom-loads '("highlight-headers")) +(custom-put 'elp 'custom-loads '("elp")) +(custom-put 'eldoc 'custom-loads '("eldoc")) +(custom-put 'edmacro 'custom-loads '("edmacro")) +(custom-put 'detached-minibuf 'custom-loads '("detached-minibuf")) +(custom-put 'browse-url 'custom-loads '("browse-url"))
--- a/lisp/utils/delbackspace.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,119 +0,0 @@ -;;; delbackspace.el --- rebind backspace and delete to be correct - -;; Copyright (C) 1994, 1995 Free Software Foundation, Inc. -;; Copyright (C) 1996 Ben Wing. -;; -;; Author: Tibor Polgar?? -;; Maintainer: Ben Wing <wing@666.com> -;; Keywords: terminals -;; - -;;; Synched up with: Not in FSF. -;;; #### should port FSF pc-bindings.el and nuke this. - -;; this is a hack that will have to do until function-key-map is implemented -(defconst delbackspace-backspace - (if (not (eq 'tty (device-type (selected-device)))) - 'backspace - "\C-h")) - -(global-unset-key delbackspace-backspace) -(local-unset-key delbackspace-backspace) -(global-unset-key [(control delete)]) -(global-unset-key [(meta delete)]) -(global-unset-key [(meta shift delete)]) -(global-unset-key [(control backspace)]) -(global-unset-key [(meta backspace)]) -(global-unset-key [(meta shift backspace)]) - -(if (eq 'tty (device-type (selected-device))) - (progn - (setq help-char '(meta h)) - (define-key global-map "\M-h" 'help-command))) - -(define-key key-translation-map 'delete 'delbackspace-compute-delete-value) -(define-key global-map 'intercepted_delete 'delete-char) - -(defun delbackspace-compute-delete-value (prompt) - (let ((orig-binding (key-binding 'delete))) - (if (memq orig-binding '(delete-backward-char - backward-delete-char - backward-delete-char-untabify - c-electric-delete - c++-electric-delete - cperl-electric-backspace)) - [intercepted_delete] - [delete]))) - -(define-key key-translation-map delbackspace-backspace [delete]) - -;; (ctrl) backspace to beginning of line -(global-set-key [(control backspace)] 'backward-kill-line) - -;; (meta) backspace word before cursor -(define-key key-translation-map [(meta backspace)] - [intercepted_meta_backspace]) -(define-key global-map 'intercepted_meta_backspace 'backward-kill-word) - -;; (alt) backspace sentence before cursor; backspace sexp before cursor -;; in language modes -(define-key key-translation-map [(alt backspace)] - [intercepted_alt_backspace]) -(define-key global-map 'intercepted_alt_backspace 'backward-kill-sentence) - -(mapcar (lambda (map) - (define-key map [(alt backspace)] 'backward-kill-sexp)) - (list - emacs-lisp-mode-map lisp-mode-map minibuffer-local-map)) - -(if (boundp 'c-mode-map) - (mapcar (lambda (map) - (define-key map [(alt backspace)] 'backward-kill-sexp)) - (list - c-mode-map c++-mode-map objc-mode-map java-mode-map)) - (setq after-load-alist - (append '(("cc-mode" - (mapcar (lambda (map) - (define-key map - [(alt backspace)] - 'backward-kill-sexp) - (define-key map [(alt delete)] 'kill-sexp)) - (list - c-mode-map - c++-mode-map - objc-mode-map - java-mode-map)))) - after-load-alist))) - -;; (meta shift) backspace paragraph before cursor -(global-set-key [(meta shift backspace)] 'backward-kill-paragraph) - -;; (alt) delete rest of line (erase EOF) -(global-set-key [(control delete)] 'kill-line) - -;; (meta) delete word before cursor -(define-key key-translation-map [(meta delete)] - [intercepted_meta_delete]) -(define-key global-map 'intercepted_meta_delete 'kill-word) - -;; (alt) delete sentence forward; delete sexp forward -;; in language modes -(define-key key-translation-map [(alt delete)] - [intercepted_alt_delete]) -(define-key global-map 'intercepted_alt_delete 'kill-sentence) -(mapcar (lambda (map) - (define-key map [(alt delete)] 'kill-sexp)) - (list - emacs-lisp-mode-map lisp-mode-map minibuffer-local-map)) -(when (boundp 'c-mode-map) - (mapcar (lambda (map) - (define-key map [(alt delete)] 'kill-sexp)) - (list - c-mode-map c++-mode-map objc-mode-map java-mode-map))) - -;; (meta shift) delete next paragraph -(global-set-key [(meta shift delete)] 'kill-paragraph) - -(provide 'delbackspace) - -;;; delbackspace.el ends here
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lisp/utils/delbs.el Mon Aug 13 09:46:53 2007 +0200 @@ -0,0 +1,58 @@ +;;; delbs.el --- a small lisp package to allow you to swap around DEL/BS keys + +;; Copyright (C) 1997 Gary Foster + +;; Author: Gary Foster <Gary.Foster@corp.sun.com> +;; Keywords: lisp, terminals + +;; This file is part of XEmacs. + +;; XEmacs is free software; you can redistribute it and/or modify it +;; under the terms of the GNU General Public License as published by +;; the Free Software Foundation; either version 2, or (at your option) +;; any later version. + +;; XEmacs is distributed in the hope that it will be useful, but +;; WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +;; General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with XEmacs; see the file COPYING. If not, write to the Free +;; Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +;; 02111-1307, USA. + +;;; Synched up with: not in FSF. + +;;; Commentary: + +;; This package should, *theoretically*, serve to quieten the DEL/BS rwars +;; a little. By using this package, you can have DEL and BS both do the +;; same function (normally delete one char to the left) or you can have +;; then bound separately (DEL --> delete-char, BS --> delete-backward-char) +;; with all appropriate Meta bindings in each mode. +;; +;; Author: Gary Foster <Gary.Foster@corp.sun.com> +;; Credits due to: Per Abrahamsen <abraham@dina.kvl.dk> + +;;; Code: + +(defun delbs-enable-delete-forward () + "Set up the delete key to delete forward, and backspace to delete backward." + (interactive) + (define-key key-translation-map [backspace] "\C-?") + (define-key key-translation-map [delete] "\C-d") + (define-key key-translation-map [(meta backspace)] "\M-\C-?") + (define-key key-translation-map [(meta delete)] "\M-d")) + +(defun delbs-disable-delete-forward () + "Return the DEL/BS key mappings to the XEmacs default" + (interactive) + (define-key key-translation-map [backspace] [backspace]) + (define-key key-translation-map [delete] [delete]) + (define-key key-translation-map [(meta backspace)] [(meta backspace)]) + (define-key key-translation-map [(meta delete)] [(meta delete)])) + +(provide 'delbs) + +;;; delbs.el ends here
--- a/lisp/utils/easymenu.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/utils/easymenu.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,11 +1,11 @@ ;;; easymenu.el - Easy menu support for Emacs 19 and XEmacs. ;; -;; $Id: easymenu.el,v 1.4 1997/05/23 01:36:43 steve Exp $ +;; $Id: easymenu.el,v 1.5 1997/07/07 00:53:20 steve Exp $ ;; ;; LCD Archive Entry: ;; easymenu|Per Abrahamsen|abraham@iesd.auc.dk| ;; Easy menu support for XEmacs| -;; $Date: 1997/05/23 01:36:43 $|$Revision: 1.4 $|~/misc/easymenu.el.gz| +;; $Date: 1997/07/07 00:53:20 $|$Revision: 1.5 $|~/misc/easymenu.el.gz| ;; Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc. @@ -78,7 +78,7 @@ ;;; Code: -;;;###autoload +;; ;;;###autoload (defmacro easy-menu-define (symbol maps doc menu) "Define a menu bar submenu in maps MAPS, according to MENU. The arguments SYMBOL and DOC are ignored; they are present for @@ -169,8 +169,10 @@ (if (featurep 'menubar) (progn (pushnew menu easy-menu-all-popups) - (setq mode-popup-menu (cons (easy-menu-title) - (reverse easy-menu-all-popups))) + (setq mode-popup-menu (if (< (length easy-menu-all-popups) 1) + (cons (easy-menu-title) + (reverse easy-menu-all-popups)) + (car easy-menu-all-popups))) (cond ((null current-menubar) ;; Don't add it to a non-existing menubar. @@ -191,8 +193,11 @@ (if (featurep 'menubar) (progn (setq easy-menu-all-popups (delq menu easy-menu-all-popups) - mode-popup-menu (cons (easy-menu-title) - (reverse easy-menu-all-popups))) + mode-popup-menu (if (< (length easy-menu-all-popups) 1) + (cons (easy-menu-title) + (reverse easy-menu-all-popups)) + (car easy-menu-all-popups))) + (and current-menubar (assoc (car menu) current-menubar) (delete-menu-item (list (car menu)))))))
--- a/lisp/viper/auto-autoloads.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/viper/auto-autoloads.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,9 +1,6 @@ ;;; DO NOT MODIFY THIS FILE (if (not (featurep 'viper-autoloads)) (progn - -(provide 'viper-autoloads) -)) ;;;### (autoloads (viper-mode) "viper" "viper/viper.el") @@ -13,3 +10,6 @@ Turn on Viper emulation of Vi." t nil) ;;;*** + +(provide 'viper-autoloads) +))
--- a/lisp/viper/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '())
--- a/lisp/vm/auto-autoloads.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/vm/auto-autoloads.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,9 +1,6 @@ ;;; DO NOT MODIFY THIS FILE (if (not (featurep 'vm-autoloads)) (progn - -(provide 'vm-autoloads) -)) ;;;### (autoloads (vm-easy-menu-create-keymaps vm-easy-menu-define) "vm-easymenu" "vm/vm-easymenu.el") @@ -74,3 +71,6 @@ (autoload 'vm-easy-menu-create-keymaps "vm-easymenu" nil nil nil) ;;;*** + +(provide 'vm-autoloads) +))
--- a/lisp/vm/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,66 +0,0 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '())
--- a/lisp/w3/ChangeLog Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/w3/ChangeLog Mon Aug 13 09:46:53 2007 +0200 @@ -2,8 +2,60 @@ * Makefile (xemacs-w3): Special target for XEmacs Build. +Wed Jul 2 10:39:30 1997 William M. Perry <wmperry@aventail.com> + +* Emacs/W3 3.0.93 released + +Tue Jul 1 08:54:40 1997 William M. Perry <wmperry@aventail.com> + +* lisp/w3-display.el (w3-handle-string-content): EBOLA vaccination + +Sun Jun 29 22:26:43 1997 William M. Perry <wmperry@aventail.com> + +* lisp/w3-emulate.el: Make sure we call widget-button-press not w3-follow-link + +* configure.in: New --enable-site-install option to control whether init + code goes in user's .emacs file or default.el + +* Makefile.in (dotemacs): New target for modifying the user's .emacs file + or the sitewide default init. + (html): New target for building html versions of the manuals. + +Fri Jun 27 21:08:24 1997 William M. Perry <wmperry@aventail.com> + +* texi/Makefile.in (%.html): Added targets for making HTML versions of the + info files. + +1997-06-27 William M. Perry <wmperry@aventail.com> + +* lisp/w3.el: In non-XEmacs, the version-specific stuff is loaded from + (format "w3-e%d" emacs-major-version), in case we need to do anything + special for Emacs 20.x with Mule support. + +* Only use one conditionalization variable - w3-running-xemacs + +1997-06-26 William M. Perry <wmperry@aventail.com> + +* Makefile.in: Make sure we recursively make usin $(MAKE), not + vanilla 'make'. + +* lisp/w3.el (w3-insert-formatted-url): Works again, forgot to update it + to use the new widget properties. + (w3-maybe-follow-link): Ditto. + (w3-view-this-url): Ditto. + (w3-follow-link): Ditto. + (w3-complete-link): Ditto. + Wed Jun 25 07:29:46 1997 William M. Perry <wmperry@aventail.com> +* lisp/w3.el (w3-find-default-stylesheets): Added more directories to the + stylesheet search path. + +* Emacs/W3 3.0.92 released + +* Moved lisp stuff into its own subdirectory, integrated into configure, + make, and install procedures. + * Makefile.in (Makefile): Ditto * texi/Makefile.in: Automatically rebuilds out-of-date Makefiles @@ -15,6 +67,8 @@ Tue Jun 24 14:35:05 1997 William M. Perry <wmperry@aventail.com> +* Emacs/W3 3.0.91 Released + * Moved texinfo stuff into its own subdirectory, integrated into configure, make, and install procedures.
--- a/lisp/w3/Makefile Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/w3/Makefile Mon Aug 13 09:46:53 2007 +0200 @@ -106,3 +106,11 @@ css.elc: css.el font.elc w3.elc: css.elc w3-vars.elc w3.el dsssl.elc: dsssl.el dsssl-flow.elc + +autoloads: auto-autoloads.el + +auto-autoloads.el: $(SOURCES) + $(EMACS) -batch -q -no-site-file \ + -eval '(setq autoload-target-directory "'`pwd`'/")' \ + -l autoload \ + -f batch-update-autoloads $?
--- a/lisp/w3/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/w3/custom-load.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,89 +1,18 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'url 'custom-loads '("url-gw" "url-irc" "url-vars" "url")) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'ssl 'custom-loads '("ssl")) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '()) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'url-cookie 'custom-loads '("url-cookie" "url-vars")) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'hypermedia 'custom-loads '("url-vars" "w3-cus")) -(put 'w3-advanced 'custom-loads '("w3-cus")) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'w3-menus 'custom-loads '("w3-cus" "w3-menu")) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'url-gateway 'custom-loads '("url-gw")) -(put 'message-sending 'custom-loads '()) -(put 'w3-files 'custom-loads '("w3-cus")) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'comm 'custom-loads '("ssl")) -(put 'backup 'custom-loads '()) -(put 'url-cache 'custom-loads '("url-cache" "url-vars")) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'w3-printing 'custom-loads '("w3-cus")) -(put 'w3-images 'custom-loads '("w3-cus")) -(put 'abbrev 'custom-loads '()) -(put 'url-history 'custom-loads '("url-vars")) -(put 'toolbar 'custom-loads '()) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'url-hairy 'custom-loads '("url-vars")) -(put 'url-mime 'custom-loads '("url-vars")) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'faces 'custom-loads '("font")) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'w3-hooks 'custom-loads '("w3-cus")) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'w3 'custom-loads '("w3-cus" "w3-script")) -(put 'url-file 'custom-loads '("url-cache" "url-vars")) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'w3-display 'custom-loads '("w3-cus")) -(put 'w3-parsing 'custom-loads '("w3-cus")) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'i18n 'custom-loads '("url-vars")) -(put 'ps-print-color 'custom-loads '()) -(put 'w3-scripting 'custom-loads '("w3-script")) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '()) +(custom-put 'ssl 'custom-loads '("ssl")) +(custom-put 'url-gateway 'custom-loads '("url-gw")) +(custom-put 'url 'custom-loads '("url-gw" "url-irc" "url-vars" "url")) +(custom-put 'url-file 'custom-loads '("url-cache" "url-vars")) +(custom-put 'url-cache 'custom-loads '("url-cache" "url-vars")) +(custom-put 'url-history 'custom-loads '("url-vars")) +(custom-put 'url-cookie 'custom-loads '("url-cookie" "url-vars")) +(custom-put 'url-mime 'custom-loads '("url-vars")) +(custom-put 'url-hairy 'custom-loads '("url-vars")) +(custom-put 'w3 'custom-loads '("w3-cus" "w3-script")) +(custom-put 'w3-files 'custom-loads '("w3-cus")) +(custom-put 'w3-images 'custom-loads '("w3-cus")) +(custom-put 'w3-printing 'custom-loads '("w3-cus")) +(custom-put 'w3-menus 'custom-loads '("w3-cus" "w3-menu")) +(custom-put 'w3-parsing 'custom-loads '("w3-cus")) +(custom-put 'w3-display 'custom-loads '("w3-cus")) +(custom-put 'w3-hooks 'custom-loads '("w3-cus")) +(custom-put 'w3-scripting 'custom-loads '("w3-script"))
--- a/lisp/w3/docomp.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/w3/docomp.el Mon Aug 13 09:46:53 2007 +0200 @@ -70,9 +70,4 @@ (require 'w3-vars) (require 'url) (require 'mm) -(and w3-running-FSF19 - (< emacs-minor-version 29) - (require 'font)) - (require 'w3-sysdp) -(provide 'ange-ftp)
--- a/lisp/w3/socks.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/w3/socks.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,7 +1,7 @@ ;;; socks.el --- A Socks v5 Client for Emacs ;; Author: wmperry -;; Created: 1997/01/10 00:13:05 -;; Version: 1.3 +;; Created: 1997/06/25 16:25:12 +;; Version: 1.4 ;; Keywords: comm, firewalls ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -201,7 +201,7 @@ (set-process-filter proc nil) (if (and auth-func (fboundp auth-func) (funcall auth-func proc)) - (message "Successfully authenticated using: %s" auth-desc) + nil ; We succeeded! (delete-process proc) (error "Failed to use auth method: %s (%d)" (or auth-desc "Unknown") auth-type)) @@ -325,11 +325,8 @@ ;; Authentication modules go here ;; Basic username/password authentication, ala RFC 1929 -;; To enable username/password authentication, uncomment the following -;; lines: -;; -;; (socks-register-authentication-method 2 "Username/Password" -;; 'socks-username/password-auth) +(socks-register-authentication-method 2 "Username/Password" + 'socks-username/password-auth) (defconst socks-username/password-auth-version 1)
--- a/lisp/w3/url-ns.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/w3/url-ns.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,7 +1,7 @@ ;;; url-ns.el --- Various netscape-ish functions for proxy definitions ;; Author: wmperry -;; Created: 1997/04/08 21:18:23 -;; Version: 1.2 +;; Created: 1997/06/29 22:51:33 +;; Version: 1.3 ;; Keywords: comm, data, processes, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -25,6 +25,8 @@ ;;; Boston, MA 02111-1307, USA. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(require 'url-gw) + (defun isPlainHostName (host) (not (string-match "\\." host)))
--- a/lisp/w3/url-vars.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/w3/url-vars.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,7 +1,7 @@ ;;; url-vars.el --- Variables for Uniform Resource Locator tool ;; Author: wmperry -;; Created: 1997/06/25 15:58:54 -;; Version: 1.69 +;; Created: 1997/07/02 17:41:55 +;; Version: 1.70 ;; Keywords: comm, data, processes, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -38,7 +38,7 @@ (defmacro defcustom (var value doc &rest args) (` (defvar (, var) (, value) (, doc)))))) -(defconst url-version (let ((x "p3.0.92")) +(defconst url-version (let ((x "p3.0.93")) (if (string-match "State: \\([^ \t\n]+\\)" x) (substring x (match-beginning 1) (match-end 1)) x))
--- a/lisp/w3/w3-auto.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/w3/w3-auto.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,4 +1,12 @@ ;;; All the autoloads for emacs-w3 +;; Bare essentials +(autoload 'w3-open-local "w3" nil t) +(autoload 'w3-find-file "w3" nil t) +(autoload 'w3-fetch "w3" nil t) +(autoload 'w3-fetch-other-frame "w3" nil t) +(autoload 'w3-follow-url-at-point "w3" nil t) +(autoload 'w3-preview-this-buffer "w3" nil t) +(autoload 'w3 "w3" nil t) ;; About pages (autoload 'w3-about "w3-about")
--- a/lisp/w3/w3-display.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/w3/w3-display.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,7 +1,7 @@ ;;; w3-display.el --- display engine v99999 ;; Author: wmperry -;; Created: 1997/06/25 14:30:16 -;; Version: 1.189 +;; Created: 1997/07/01 15:54:50 +;; Version: 1.192 ;; Keywords: faces, help, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -158,7 +158,12 @@ (save-excursion (goto-char (or (symbol-value 'cur-viewing-pos) (point-min))) (cond - (w3-running-FSF19 + (w3-running-xemacs + (if (and (not (sit-for 0)) (input-pending-p)) + (condition-case () + (dispatch-event (next-command-event)) + (error nil)))) + (t (if (and (not (sit-for 0)) (input-pending-p)) (condition-case () (progn @@ -167,13 +172,7 @@ (case (symbol-value 'cur-viewing-pos) ((w3-quit w3-leave-buffer) nil) (otherwise (call-interactively (symbol-value 'cur-viewing-pos))))) - (error nil)))) - (w3-running-xemacs - (if (and (not (sit-for 0)) (input-pending-p)) - (condition-case () - (dispatch-event (next-command-event)) - (error nil)))) - (t (sit-for 0))) + (error nil))))) (set 'cur-viewing-pos (point)))) (defmacro w3-get-pad-string (len) @@ -384,7 +383,7 @@ nil 'move) (replace-match " ")) (goto-char w3-scratch-start-point) - (if (and (memq (preceding-char) '(? ?\t ?\r ?\n)) + (if (and (memq (char-before) '(? ?\t ?\r ?\n)) (looking-at "[ \t\r\n]")) (delete-region (point) (progn
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lisp/w3/w3-e20.el Mon Aug 13 09:46:53 2007 +0200 @@ -0,0 +1,28 @@ +;;; w3-e19.el --- Emacs 20.xx specific functions for emacs-w3 +;; Author: wmperry +;; Created: 1997/06/27 15:28:39 +;; Version: 1.1 +;; Keywords: faces, help, mouse, hypermedia + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; Copyright (c) 1997 Free Software Foundation, Inc. +;;; +;;; This file is part of GNU Emacs. +;;; +;;; GNU Emacs 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. +;;; +;;; GNU Emacs 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 GNU Emacs; see the file COPYING. If not, write to the +;;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, +;;; Boston, MA 02111-1307, USA. +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; + +(require 'w3-e19)
--- a/lisp/w3/w3-emulate.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/w3/w3-emulate.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,7 +1,7 @@ ;;; w3-emulate.el --- All variable definitions for emacs-w3 ;; Author: wmperry -;; Created: 1997/04/04 14:24:19 -;; Version: 1.13 +;; Created: 1997/06/30 05:29:44 +;; Version: 1.14 ;; Keywords: comm, help, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -140,9 +140,9 @@ ;; http://www.crl.com/~subir/lynx/lynx_help/keystroke_commands/keystroke_help.htm ;; Movement -(define-key w3-lynx-emulation-minor-mode-map [up] 'w3-widget-backward) -(define-key w3-lynx-emulation-minor-mode-map [down] 'w3-widget-forward) -(define-key w3-lynx-emulation-minor-mode-map [right] 'w3-follow-link) +(define-key w3-lynx-emulation-minor-mode-map [up] 'widget-backward) +(define-key w3-lynx-emulation-minor-mode-map [down] 'widget-forward) +(define-key w3-lynx-emulation-minor-mode-map [right] 'widget-button-press) (define-key w3-lynx-emulation-minor-mode-map [left] 'w3-history-backward) ;; Scrolling @@ -184,7 +184,7 @@ (define-key w3-lynx-emulation-minor-mode-map "/" 'w3-search-forward) (define-key w3-lynx-emulation-minor-mode-map "v" 'w3-show-hotlist) (define-key w3-lynx-emulation-minor-mode-map "V" 'w3-show-hotlist) -(define-key w3-lynx-emulation-minor-mode-map "x" 'w3-follow-link) +(define-key w3-lynx-emulation-minor-mode-map "x" 'widget-button-press) (define-key w3-lynx-emulation-minor-mode-map "z" 'keyboard-quit) (define-key w3-lynx-emulation-minor-mode-map "=" 'w3-document-information) (define-key w3-lynx-emulation-minor-mode-map "\\" 'w3-source-document)
--- a/lisp/w3/w3-hot.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/w3/w3-hot.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,7 +1,7 @@ ;;; w3-hot.el --- Main functions for emacs-w3 on all platforms/versions ;; Author: wmperry -;; Created: 1997/06/10 05:42:43 -;; Version: 1.15 +;; Created: 1997/06/27 15:41:38 +;; Version: 1.16 ;; Keywords: faces, help, comm, news, mail, processes, mouse, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -239,12 +239,12 @@ (beginning-of-line) (delete-region (point) (progn (forward-line 2) (point))) (insert (format "%s %s\n%s\n" (nth 1 obj) (current-time-string) - new)) + new)) (setq w3-hotlist (cons (list new (nth 1 obj)) (w3-delete-from-alist title w3-hotlist))) (write-file w3-hotlist-file) (kill-buffer (current-buffer)) - (if (and w3-running-FSF19 (not (eq 'tty (device-type)))) + (if (not w3-running-xemacs) (progn (delete-menu-item '("Go")) (w3-build-FSF19-menu))))
--- a/lisp/w3/w3-mouse.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/w3/w3-mouse.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,7 +1,7 @@ ;;; w3-menu.el --- Mouse specific functions for emacs-w3 ;; Author: wmperry -;; Created: 1997/06/20 18:56:21 -;; Version: 1.12 +;; Created: 1997/06/27 15:41:35 +;; Version: 1.13 ;; Keywords: mouse, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -83,7 +83,7 @@ (define-key w3-netscape-emulation-minor-mode-map (vector w3-mouse-button2) 'w3-follow-mouse-other-frame))) -(if w3-running-FSF19 +(if (not w3-running-xemacs) (progn (define-key w3-mode-map [mouse-movement] 'w3-mouse-handler) (if w3-popup-menu-on-mouse-3
--- a/lisp/w3/w3-speak.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/w3/w3-speak.el Mon Aug 13 09:46:53 2007 +0200 @@ -91,26 +91,6 @@ (forward-line (window-height)) (emacspeak-speak-region start (point )))))) -(defadvice w3-follow-link (around emacspeak pre act) - "Provide feedback on what you did. " - (let ((data (emacspeak-w3-extract-form-field-information)) - (form-field-p nil) - (this-zone nil) - (opoint nil)) - (if data - (setq form-field-p t - opoint (point))) - ad-do-it - (when form-field-p - (w3-speak-summarize-form-field) - (case (w3-form-element-type data) - ((radio checkbox) - (emacspeak-auditory-icon 'button)) - ;; fill in any others here - (otherwise - nil))) - ad-return-value)) - (defadvice w3-revert-form (after emacspeak pre act) "Announce that you cleared the form. " (dtk-speak "Cleared the form. "))
--- a/lisp/w3/w3-vars.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/w3/w3-vars.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,7 +1,7 @@ ;;; w3-vars.el,v --- All variable definitions for emacs-w3 ;; Author: wmperry -;; Created: 1997/06/25 15:58:53 -;; Version: 1.143 +;; Created: 1997/07/02 17:41:53 +;; Version: 1.145 ;; Keywords: comm, help, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -34,7 +34,7 @@ (require 'wid-edit) ; For `widget-keymap' (defconst w3-version-number - (let ((x "p3.0.92")) + (let ((x "p3.0.93")) (if (string-match "State:[ \t\n]+.\\([^ \t\n]+\\)" x) (setq x (substring x (match-beginning 1) (match-end 1))) (setq x (substring x 1))) @@ -42,7 +42,7 @@ (function (lambda (x) (if (= x ?-) "." (char-to-string x)))) x "")) "Version # of w3-mode.") -(defconst w3-version-date (let ((x "1997/06/25 15:58:53")) +(defconst w3-version-date (let ((x "1997/07/02 17:41:53")) (if (string-match "Date: \\([^ \t\n]+\\)" x) (substring x (match-beginning 1) (match-end 1)) x)) @@ -79,10 +79,6 @@ (defvar w3-running-xemacs (string-match "XEmacs\\|Lucid" emacs-version) "*Got XEmacs?.") -(defvar w3-running-FSF19 (and (string-match "^19" emacs-version) - (not w3-running-xemacs)) - "*Got Emacs 19?") - ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Store the database of HTML general entities. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/w3/w3.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/w3/w3.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,7 +1,7 @@ ;;; w3.el --- Main functions for emacs-w3 on all platforms/versions ;; Author: wmperry -;; Created: 1997/06/24 22:38:28 -;; Version: 1.130 +;; Created: 1997/06/30 05:29:38 +;; Version: 1.134 ;; Keywords: faces, help, comm, news, mail, processes, mouse, hypermedia ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -697,7 +697,7 @@ (p (setq p (widget-at (point))) (or p (error "No url under point")) - (setq str (format "<a href=\"%s\">%s</a>" (widget-get p 'href) + (setq str (format "<a href=\"%s\">%s</a>" (widget-get p :href) (read-string "Link text: " (buffer-substring (widget-get p :from) @@ -764,10 +764,10 @@ (require 'w3) (if (not w3-setup-done) (w3-do-setup)) (let* ((widget (widget-at (point))) - (url1 (and widget (widget-get widget 'href))) + (url1 (and widget (widget-get widget :href))) (url2 (url-get-url-at-point))) (cond - (url1 (w3-follow-link)) + (url1 (widget-button-press)) ((and url2 (string-match url-nonrelative-link url2)) (w3-fetch url2)) (t (message "No URL could be found!"))))) @@ -1338,9 +1338,8 @@ ((and w3-running-xemacs (eq system-type 'ms-windows)) (error "WinEmacs no longer supported.")) (w3-running-xemacs (require 'w3-xemac)) - (w3-running-FSF19 (require 'w3-e19)) - (t - (error "Unable to determine the capabilities of this emacs."))) + (t ; Assume we are the FSF variant + (require (intern (format "w3-e%d" emacs-major-version))))) (if (featurep 'emacspeak) (condition-case () (progn @@ -1691,8 +1690,8 @@ (interactive) (let* ((widget (widget-at (point))) (parent (and widget (widget-get widget :parent))) - (href (or (and widget (widget-get widget 'href)) - (and parent (widget-get parent 'href))))) + (href (or (and widget (widget-get widget :href)) + (and parent (widget-get parent :href))))) (cond ((and no-show href) href) @@ -1921,8 +1920,12 @@ (concat data-directory "w3/") (expand-file-name "../../w3" data-directory) (file-name-directory (locate-library "w3")) + (expand-file-name "../" (file-name-directory + (locate-library "w3"))) (expand-file-name "../w3" (file-name-directory (locate-library "w3"))) + (expand-file-name "../etc" (file-name-directory + (locate-library "w3"))) w3-configuration-directory)) (total-found 0) (possible (append @@ -2154,7 +2157,7 @@ to disk." (interactive "P") (let* ((widget (widget-at (point))) - (href (and widget (widget-get widget 'href)))) + (href (and widget (widget-get widget :href)))) (cond ((null href) nil) ((or p w3-dump-to-disk) @@ -2184,7 +2187,7 @@ (setq link-at-point (widget-at (point)) link-at-point (and link-at-point - (widget-get link-at-point 'href) + (widget-get link-at-point :href) (widget-get link-at-point :from) (widget-get link-at-point :to) (w3-fix-spaces @@ -2201,7 +2204,7 @@ (buffer-substring-no-properties (widget-get widget :from) (widget-get widget :to))) - (widget-get widget 'href)) + (widget-get widget :href)) links-alist)))))) (if (not links-alist) (error "No links in current document.")) (setq links-alist (sort links-alist (function
--- a/lisp/x11/auto-autoloads.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/x11/auto-autoloads.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,9 +1,6 @@ ;;; DO NOT MODIFY THIS FILE (if (not (featurep 'x11-autoloads)) (progn - -(provide 'x11-autoloads) -)) ;;;### (autoloads (font-menu-weight-constructor font-menu-size-constructor font-menu-family-constructor reset-device-font-menus) "x-font-menu" "x11/x-font-menu.el") @@ -31,3 +28,6 @@ (autoload 'font-menu-weight-constructor "x-font-menu" nil nil nil) ;;;*** + +(provide 'x11-autoloads) +))
--- a/lisp/x11/custom-load.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/x11/custom-load.el Mon Aug 13 09:46:53 2007 +0200 @@ -1,66 +1,1 @@ -(put 'extensions 'custom-loads '()) -(put 'copyright 'custom-loads '()) -(put 'eldoc 'custom-loads '()) -(put 'auto-show 'custom-loads '()) -(put 'execute 'custom-loads '()) -(put 'mouse 'custom-loads '()) -(put 'mail-abbrevs 'custom-loads '()) -(put 'etags 'custom-loads '()) -(put 'limits 'custom-loads '()) -(put 'minibuffer 'custom-loads '()) -(put 'environment 'custom-loads '("x-toolbar")) -(put 'sound 'custom-loads '()) -(put 'holidays 'custom-loads '()) -(put 'auto-save 'custom-loads '()) -(put 'ispell 'custom-loads '()) -(put 'fortran-indent 'custom-loads '()) -(put 'lpr 'custom-loads '()) -(put 'message-headers 'custom-loads '()) -(put 'editing-basics 'custom-loads '()) -(put 'internal 'custom-loads '()) -(put 'calendar 'custom-loads '()) -(put 'help-appearance 'custom-loads '()) -(put 'display-time 'custom-loads '()) -(put 'lisp 'custom-loads '()) -(put 'diff 'custom-loads '()) -(put 'paren-matching 'custom-loads '()) -(put 'help 'custom-loads '()) -(put 'local 'custom-loads '()) -(put 'keyboard 'custom-loads '()) -(put 'minubuffer 'custom-loads '()) -(put 'message-sending 'custom-loads '()) -(put 'data 'custom-loads '()) -(put 'ps-print 'custom-loads '()) -(put 'backup 'custom-loads '()) -(put 'frames 'custom-loads '()) -(put 'customize 'custom-loads '()) -(put 'abbrev 'custom-loads '()) -(put 'toolbar 'custom-loads '("x-toolbar")) -(put 'compilation 'custom-loads '()) -(put 'dired 'custom-loads '()) -(put 'killing 'custom-loads '()) -(put 'paren-blinking 'custom-loads '()) -(put 'find-file 'custom-loads '()) -(put 'gnuserv 'custom-loads '()) -(put 'maint 'custom-loads '()) -(put 'fill-comments 'custom-loads '()) -(put 'message-mail 'custom-loads '()) -(put 'windows 'custom-loads '()) -(put 'message-various 'custom-loads '()) -(put 'resize-minibuffer 'custom-loads '()) -(put 'fill 'custom-loads '()) -(put 'debug 'custom-loads '()) -(put 'display 'custom-loads '()) -(put 'diary 'custom-loads '()) -(put 'browse-url 'custom-loads '()) -(put 'message-insertion 'custom-loads '()) -(put 'vc 'custom-loads '()) -(put 'alloc 'custom-loads '()) -(put 'isearch 'custom-loads '()) -(put 'modeline 'custom-loads '()) -(put 'processes-basics 'custom-loads '()) -(put 'editing 'custom-loads '()) -(put 'matching 'custom-loads '()) -(put 'ps-print-color 'custom-loads '()) -(put 'undo 'custom-loads '()) -(put 'x 'custom-loads '()) +(custom-put 'toolbar 'custom-loads '("x-toolbar"))
--- a/lisp/x11/x-menubar.el Mon Aug 13 09:45:48 2007 +0200 +++ b/lisp/x11/x-menubar.el Mon Aug 13 09:46:53 2007 +0200 @@ -847,7 +847,7 @@ (mapcar #'(lambda (bmk) (vector bmk `(bookmark-jump ',bmk) t)) (bookmark-all-names)) - (list "No Bookmarks Set"))) + '(["No Bookmarks Set" nil nil]))) (defun bookmark-delete-filter (menu-items) "*Build the bookmark delete submenu dynamically from all defined bookmarks." @@ -855,7 +855,7 @@ (mapcar #'(lambda (bmk) (vector bmk `(bookmark-delete ',bmk) t)) (bookmark-all-names)) - (list "No Bookmarks Set"))) + '(["No Bookmarks Set" nil nil]))) ;;; The Buffers menu
--- a/lwlib/lwlib-Xm.c Mon Aug 13 09:45:48 2007 +0200 +++ b/lwlib/lwlib-Xm.c Mon Aug 13 09:46:53 2007 +0200 @@ -797,1264 +797,3 @@ { xm_update_pushbutton (instance, widget, val); } -#ifdef MENUBARS_MOTIF - else if (class == xmCascadeButtonWidgetClass) - { - xm_update_cascadebutton (instance, widget, val); - } -#endif - else if (class == xmToggleButtonWidgetClass - || class == xmToggleButtonGadgetClass) - { - xm_update_toggle (instance, widget, val); - } - else if (class == xmRowColumnWidgetClass) - { - Boolean radiobox = 0; - - XtSetArg (al [0], XmNradioBehavior, &radiobox); - XtGetValues (widget, al, 1); - - if (radiobox) - xm_update_radiobox (instance, widget, val); -#ifdef MENUBARS_MOTIF - else - xm_update_menu (instance, widget, val, deep_p); -#endif - } -#ifdef DIALOGS_MOTIF - else if (class == xmTextWidgetClass) - { - xm_update_text (instance, widget, val); - } - else if (class == xmTextFieldWidgetClass) - { - xm_update_text_field (instance, widget, val); - } -#endif - else if (class == xmListWidgetClass) - { - xm_update_list (instance, widget, val); - } -#ifdef SCROLLBARS_MOTIF - else if (class == xmScrollBarWidgetClass) - { - xm_update_scrollbar (instance, widget, val); - } -#endif -} - -/* getting the value back */ -void -xm_update_one_value (widget_instance* instance, Widget widget, - widget_value* val) -{ - WidgetClass class = XtClass (widget); - widget_value *old_wv; - - /* copy the call_data slot into the "return" widget_value */ - for (old_wv = instance->info->val->contents; old_wv; old_wv = old_wv->next) - if (!strcmp (val->name, old_wv->name)) - { - val->call_data = old_wv->call_data; - break; - } - - if (class == xmToggleButtonWidgetClass || class == xmToggleButtonGadgetClass) - { - Arg al [1]; - XtSetArg (al [0], XmNset, &val->selected); - XtGetValues (widget, al, 1); - val->edited = True; - } -#ifdef DIALOGS_MOTIF - else if (class == xmTextWidgetClass) - { - if (val->value) - free (val->value); - val->value = XmTextGetString (widget); - val->edited = True; - } - else if (class == xmTextFieldWidgetClass) - { - if (val->value) - free (val->value); - val->value = XmTextFieldGetString (widget); - val->edited = True; - } -#endif - else if (class == xmRowColumnWidgetClass) - { - Boolean radiobox = 0; - Arg al [1]; - - XtSetArg (al [0], XmNradioBehavior, &radiobox); - XtGetValues (widget, al, 1); - - if (radiobox) - { - CompositeWidget radio = (CompositeWidget)widget; - int i; - for (i = 0; i < radio->composite.num_children; i++) - { - int set = False; - Widget toggle = radio->composite.children [i]; - Arg al [1]; - - XtSetArg (al [0], XmNset, &set); - XtGetValues (toggle, al, 1); - if (set) - { - if (val->value) - free (val->value); - val->value = safe_strdup (XtName (toggle)); - } - } - val->edited = True; - } - } - else if (class == xmListWidgetClass) - { - int pos_cnt; - int* pos_list; - if (XmListGetSelectedPos (widget, &pos_list, &pos_cnt)) - { - int i; - widget_value* cur; - for (cur = val->contents, i = 0; cur; cur = cur->next) - if (cur->value) - { - int j; - cur->selected = False; - i += 1; - for (j = 0; j < pos_cnt; j++) - if (pos_list [j] == i) - { - cur->selected = True; - val->value = safe_strdup (cur->name); - } - } - val->edited = 1; - XtFree ((char *) pos_list); - } - } -#ifdef SCROLLBARS_MOTIF - else if (class == xmScrollBarWidgetClass) - { - /* This function is not used by the scrollbar. */ - return; - } -#endif -} - - -/* This function is for activating a button from a program. It's wrong because - we pass a NULL argument in the call_data which is not Motif compatible. - This is used from the XmNdefaultAction callback of the List widgets to - have a dble-click put down a dialog box like the button woudl do. - I could not find a way to do that with accelerators. - */ -static void -activate_button (Widget widget, XtPointer closure, XtPointer call_data) -{ - Widget button = (Widget)closure; - XtCallCallbacks (button, XmNactivateCallback, NULL); -} - -/* creation functions */ - -#ifdef DIALOGS_MOTIF - -/* dialogs */ - -#if (XmVersion >= 1002) -# define ARMANDACTIVATE_KLUDGE -# define DND_KLUDGE -#endif - -#ifdef ARMANDACTIVATE_KLUDGE - /* We want typing Return at a dialog box to select the default button; but - we're satisfied with having it select the leftmost button instead. - - In Motif 1.1.5 we could do this by putting this resource in the - app-defaults file: - - *dialog*button1.accelerators:#override\ - <KeyPress>Return: ArmAndActivate()\n\ - <KeyPress>KP_Enter: ArmAndActivate()\n\ - Ctrl<KeyPress>m: ArmAndActivate()\n - - but that doesn't work with 1.2.1 and I don't understand why. However, - doing the equivalent C code does work, with the notable disadvantage that - the user can't override it. So that's what we do until we figure out - something better.... - */ -static char button_trans[] = "\ -<KeyPress>Return: ArmAndActivate()\n\ -<KeyPress>KP_Enter: ArmAndActivate()\n\ -Ctrl<KeyPress>m: ArmAndActivate()\n"; - -#endif /* ARMANDACTIVATE_KLUDGE */ - - -#ifdef DND_KLUDGE - /* This is a kludge to disable drag-and-drop in dialog boxes. The symptom - was a segv down in libXm somewhere if you used the middle button on a - dialog box to begin a drag; when you released the button to make a drop - things would lose if you were not over the button where you started the - drag (canceling the operation). This was probably due to the fact that - the dialog boxes were not set up to handle a drag but were trying to do - so anyway for some reason. - - So we disable drag-and-drop in dialog boxes by turning off the binding for - Btn2Down which, by default, initiates a drag. Clearly this is a shitty - solution as it only works in default configurations, but... - */ -static char disable_dnd_trans[] = "<Btn2Down>: "; -#endif /* DND_KLUDGE */ - - -static Widget -make_dialog (char* name, Widget parent, Boolean pop_up_p, - CONST char* shell_title, CONST char* icon_name, - Boolean text_input_slot, Boolean radio_box, Boolean list, - int left_buttons, int right_buttons) -{ - Widget result; - Widget form; - Widget row; - Widget icon; - Widget icon_separator; - Widget message; - Widget value = 0; - Widget separator; - Widget button = 0; - Widget children [16]; /* for the final XtManageChildren */ - int n_children; - Arg al[64]; /* Arg List */ - int ac; /* Arg Count */ - int i; - -#ifdef DND_KLUDGE - XtTranslations dnd_override = XtParseTranslationTable (disable_dnd_trans); -# define DO_DND_KLUDGE(widget) XtOverrideTranslations ((widget), dnd_override) -#else /* ! DND_KLUDGE */ -# define DO_DND_KLUDGE(widget) -#endif /* ! DND_KLUDGE */ - - if (pop_up_p) - { - ac = 0; - XtSetArg(al[ac], XmNtitle, shell_title); ac++; - XtSetArg(al[ac], XtNallowShellResize, True); ac++; - XtSetArg(al[ac], XmNdeleteResponse, XmUNMAP); ac++; - result = XmCreateDialogShell (parent, "dialog", al, ac); - - XtSetArg(al[ac], XmNautoUnmanage, FALSE); ac++; -/* XtSetArg(al[ac], XmNautoUnmanage, TRUE); ac++; */ /* ####is this ok? */ - XtSetArg(al[ac], XmNnavigationType, XmTAB_GROUP); ac++; - form = XmCreateForm (result, (char *) shell_title, al, ac); - } - else - { - ac = 0; - XtSetArg(al[ac], XmNautoUnmanage, FALSE); ac++; - XtSetArg(al[ac], XmNnavigationType, XmTAB_GROUP); ac++; - form = XmCreateForm (parent, (char *) shell_title, al, ac); - result = form; - } - - ac = 0; - XtSetArg(al[ac], XmNpacking, XmPACK_COLUMN); ac++; - XtSetArg(al[ac], XmNorientation, XmVERTICAL); ac++; - XtSetArg(al[ac], XmNnumColumns, left_buttons + right_buttons + 1); ac++; - XtSetArg(al[ac], XmNmarginWidth, 0); ac++; - XtSetArg(al[ac], XmNmarginHeight, 0); ac++; - XtSetArg(al[ac], XmNspacing, 13); ac++; - XtSetArg(al[ac], XmNadjustLast, False); ac++; - XtSetArg(al[ac], XmNalignment, XmALIGNMENT_CENTER); ac++; - XtSetArg(al[ac], XmNisAligned, True); ac++; - XtSetArg(al[ac], XmNtopAttachment, XmATTACH_NONE); ac++; - XtSetArg(al[ac], XmNbottomAttachment, XmATTACH_FORM); ac++; - XtSetArg(al[ac], XmNbottomOffset, 13); ac++; - XtSetArg(al[ac], XmNleftAttachment, XmATTACH_FORM); ac++; - XtSetArg(al[ac], XmNleftOffset, 13); ac++; - XtSetArg(al[ac], XmNrightAttachment, XmATTACH_FORM); ac++; - XtSetArg(al[ac], XmNrightOffset, 13); ac++; - row = XmCreateRowColumn (form, "row", al, ac); - - n_children = 0; - for (i = 0; i < left_buttons; i++) - { - char button_name [16]; - sprintf (button_name, "button%d", i + 1); - ac = 0; - if (i == 0) - { - XtSetArg(al[ac], XmNhighlightThickness, 1); ac++; - XtSetArg(al[ac], XmNshowAsDefault, TRUE); ac++; - } - XtSetArg(al[ac], XmNnavigationType, XmTAB_GROUP); ac++; - children [n_children] = XmCreatePushButton (row, button_name, al, ac); - DO_DND_KLUDGE (children [n_children]); - - if (i == 0) - { - button = children [n_children]; - ac = 0; - XtSetArg(al[ac], XmNdefaultButton, button); ac++; - XtSetValues (row, al, ac); - -#ifdef ARMANDACTIVATE_KLUDGE /* See comment above */ - { - XtTranslations losers = XtParseTranslationTable (button_trans); - XtOverrideTranslations (button, losers); - XtFree ((char *) losers); - } -#endif /* ARMANDACTIVATE_KLUDGE */ - } - - n_children++; - } - - /* invisible seperator button */ - ac = 0; - XtSetArg (al[ac], XmNmappedWhenManaged, FALSE); ac++; - children [n_children] = XmCreateLabel (row, "separator_button", - al, ac); - DO_DND_KLUDGE (children [n_children]); - n_children++; - - for (i = 0; i < right_buttons; i++) - { - char button_name [16]; - sprintf (button_name, "button%d", left_buttons + i + 1); - ac = 0; - XtSetArg(al[ac], XmNnavigationType, XmTAB_GROUP); ac++; - children [n_children] = XmCreatePushButton (row, button_name, al, ac); - DO_DND_KLUDGE (children [n_children]); - if (! button) button = children [n_children]; - n_children++; - } - - XtManageChildren (children, n_children); - - ac = 0; - XtSetArg(al[ac], XmNtopAttachment, XmATTACH_NONE); ac++; - XtSetArg(al[ac], XmNbottomAttachment, XmATTACH_WIDGET); ac++; - XtSetArg(al[ac], XmNbottomOffset, 13); ac++; - XtSetArg(al[ac], XmNbottomWidget, row); ac++; - XtSetArg(al[ac], XmNleftAttachment, XmATTACH_FORM); ac++; - XtSetArg(al[ac], XmNleftOffset, 0); ac++; - XtSetArg(al[ac], XmNrightAttachment, XmATTACH_FORM); ac++; - XtSetArg(al[ac], XmNrightOffset, 0); ac++; - separator = XmCreateSeparator (form, "", al, ac); - - ac = 0; - XtSetArg(al[ac], XmNlabelType, XmPIXMAP); ac++; - XtSetArg(al[ac], XmNtopAttachment, XmATTACH_FORM); ac++; - XtSetArg(al[ac], XmNtopOffset, 13); ac++; - XtSetArg(al[ac], XmNbottomAttachment, XmATTACH_NONE); ac++; - XtSetArg(al[ac], XmNleftAttachment, XmATTACH_FORM); ac++; - XtSetArg(al[ac], XmNleftOffset, 13); ac++; - XtSetArg(al[ac], XmNrightAttachment, XmATTACH_NONE); ac++; - icon = XmCreateLabel (form, (char *) icon_name, al, ac); - DO_DND_KLUDGE (icon); - - ac = 0; - XtSetArg(al[ac], XmNmappedWhenManaged, FALSE); ac++; - XtSetArg(al[ac], XmNtopAttachment, XmATTACH_WIDGET); ac++; - XtSetArg(al[ac], XmNtopOffset, 6); ac++; - XtSetArg(al[ac], XmNtopWidget, icon); ac++; - XtSetArg(al[ac], XmNbottomAttachment, XmATTACH_WIDGET); ac++; - XtSetArg(al[ac], XmNbottomOffset, 6); ac++; - XtSetArg(al[ac], XmNbottomWidget, separator); ac++; - XtSetArg(al[ac], XmNleftAttachment, XmATTACH_NONE); ac++; - XtSetArg(al[ac], XmNrightAttachment, XmATTACH_NONE); ac++; - icon_separator = XmCreateLabel (form, "", al, ac); - DO_DND_KLUDGE (icon_separator); - - if (text_input_slot) - { - ac = 0; - XtSetArg(al[ac], XmNcolumns, 50); ac++; - XtSetArg(al[ac], XmNtopAttachment, XmATTACH_NONE); ac++; - XtSetArg(al[ac], XmNbottomAttachment, XmATTACH_WIDGET); ac++; - XtSetArg(al[ac], XmNbottomOffset, 13); ac++; - XtSetArg(al[ac], XmNbottomWidget, separator); ac++; - XtSetArg(al[ac], XmNleftAttachment, XmATTACH_WIDGET); ac++; - XtSetArg(al[ac], XmNleftOffset, 13); ac++; - XtSetArg(al[ac], XmNleftWidget, icon); ac++; - XtSetArg(al[ac], XmNrightAttachment, XmATTACH_FORM); ac++; - XtSetArg(al[ac], XmNrightOffset, 13); ac++; - value = XmCreateTextField (form, "value", al, ac); - DO_DND_KLUDGE (value); - } - else if (radio_box) - { - Widget radio_butt; - ac = 0; - XtSetArg(al[ac], XmNmarginWidth, 0); ac++; - XtSetArg(al[ac], XmNmarginHeight, 0); ac++; - XtSetArg(al[ac], XmNspacing, 13); ac++; - XtSetArg(al[ac], XmNalignment, XmALIGNMENT_CENTER); ac++; - XtSetArg(al[ac], XmNorientation, XmHORIZONTAL); ac++; - XtSetArg(al[ac], XmNbottomAttachment, XmATTACH_WIDGET); ac++; - XtSetArg(al[ac], XmNbottomOffset, 13); ac++; - XtSetArg(al[ac], XmNbottomWidget, separator); ac++; - XtSetArg(al[ac], XmNleftAttachment, XmATTACH_WIDGET); ac++; - XtSetArg(al[ac], XmNleftOffset, 13); ac++; - XtSetArg(al[ac], XmNleftWidget, icon); ac++; - XtSetArg(al[ac], XmNrightAttachment, XmATTACH_FORM); ac++; - XtSetArg(al[ac], XmNrightOffset, 13); ac++; - value = XmCreateRadioBox (form, "radiobutton1", al, ac); - ac = 0; - i = 0; - radio_butt = XmCreateToggleButtonGadget (value, "radio1", al, ac); - children [i++] = radio_butt; - radio_butt = XmCreateToggleButtonGadget (value, "radio2", al, ac); - children [i++] = radio_butt; - radio_butt = XmCreateToggleButtonGadget (value, "radio3", al, ac); - children [i++] = radio_butt; - XtManageChildren (children, i); - } - else if (list) - { - ac = 0; - XtSetArg(al[ac], XmNvisibleItemCount, 5); ac++; - XtSetArg(al[ac], XmNtopAttachment, XmATTACH_NONE); ac++; - XtSetArg(al[ac], XmNbottomAttachment, XmATTACH_WIDGET); ac++; - XtSetArg(al[ac], XmNbottomOffset, 13); ac++; - XtSetArg(al[ac], XmNbottomWidget, separator); ac++; - XtSetArg(al[ac], XmNleftAttachment, XmATTACH_WIDGET); ac++; - XtSetArg(al[ac], XmNleftOffset, 13); ac++; - XtSetArg(al[ac], XmNleftWidget, icon); ac++; - XtSetArg(al[ac], XmNrightAttachment, XmATTACH_FORM); ac++; - XtSetArg(al[ac], XmNrightOffset, 13); ac++; - value = XmCreateScrolledList (form, "list", al, ac); - - /* this is the easiest way I found to have the dble click in the - list activate the default button */ - XtAddCallback (value, XmNdefaultActionCallback, activate_button, button); - } - - ac = 0; - XtSetArg(al[ac], XmNalignment, XmALIGNMENT_BEGINNING); ac++; - XtSetArg(al[ac], XmNtopAttachment, XmATTACH_FORM); ac++; - XtSetArg(al[ac], XmNtopOffset, 13); ac++; - XtSetArg(al[ac], XmNbottomAttachment, XmATTACH_WIDGET); ac++; - XtSetArg(al[ac], XmNbottomOffset, 13); ac++; - XtSetArg(al[ac], XmNbottomWidget, - text_input_slot || radio_box || list ? value : separator); ac++; - XtSetArg(al[ac], XmNleftAttachment, XmATTACH_WIDGET); ac++; - XtSetArg(al[ac], XmNleftOffset, 13); ac++; - XtSetArg(al[ac], XmNleftWidget, icon); ac++; - XtSetArg(al[ac], XmNrightAttachment, XmATTACH_FORM); ac++; - XtSetArg(al[ac], XmNrightOffset, 13); ac++; - message = XmCreateLabel (form, "message", al, ac); - DO_DND_KLUDGE (message); - - if (list) - XtManageChild (value); - - i = 0; - children [i] = row; i++; - children [i] = separator; i++; - if (text_input_slot || radio_box) - { - children [i] = value; i++; - } - children [i] = message; i++; - children [i] = icon; i++; - children [i] = icon_separator; i++; - XtManageChildren (children, i); - - if (text_input_slot || list) - { - XtInstallAccelerators (value, button); - XmProcessTraversal(value, XmTRAVERSE_CURRENT); - } - else - { - XtInstallAccelerators (form, button); - XmProcessTraversal(value, XmTRAVERSE_CURRENT); - } - -#ifdef DND_KLUDGE - XtFree ((char *) dnd_override); -#endif -#undef DO_DND_KLUDGE - - return result; -} - -static destroyed_instance* -find_matching_instance (widget_instance* instance) -{ - destroyed_instance* cur; - destroyed_instance* prev; - char* type = instance->info->type; - char* name = instance->info->name; - - for (prev = NULL, cur = all_destroyed_instances; - cur; - prev = cur, cur = cur->next) - { - if (!strcmp (cur->name, name) - && !strcmp (cur->type, type) - && cur->parent == instance->parent - && cur->pop_up_p == instance->pop_up_p) - { - if (prev) - prev->next = cur->next; - else - all_destroyed_instances = cur->next; - return cur; - } - /* do some cleanup */ - else if (!cur->widget) - { - if (prev) - prev->next = cur->next; - else - all_destroyed_instances = cur->next; - free_destroyed_instance (cur); - cur = prev ? prev : all_destroyed_instances; - } - } - return NULL; -} - -static void -mark_dead_instance_destroyed (Widget widget, XtPointer closure, - XtPointer call_data) -{ - destroyed_instance* instance = (destroyed_instance*)closure; - instance->widget = NULL; -} - -static void -recenter_widget (Widget widget) -{ - Widget parent = XtParent (widget); - Screen* screen = XtScreen (widget); - Dimension screen_width = WidthOfScreen (screen); - Dimension screen_height = HeightOfScreen (screen); - Dimension parent_width = 0; - Dimension parent_height = 0; - Dimension child_width = 0; - Dimension child_height = 0; - Position x; - Position y; - Arg al [2]; - - XtSetArg (al [0], XtNwidth, &child_width); - XtSetArg (al [1], XtNheight, &child_height); - XtGetValues (widget, al, 2); - - XtSetArg (al [0], XtNwidth, &parent_width); - XtSetArg (al [1], XtNheight, &parent_height); - XtGetValues (parent, al, 2); - - x = (Position) ((parent_width - child_width) / 2); - y = (Position) ((parent_height - child_height) / 2); - - XtTranslateCoords (parent, x, y, &x, &y); - - if ((Dimension) (x + child_width) > screen_width) - x = screen_width - child_width; - if (x < 0) - x = 0; - - if ((Dimension) (y + child_height) > screen_height) - y = screen_height - child_height; - if (y < 0) - y = 0; - - XtSetArg (al [0], XtNx, x); - XtSetArg (al [1], XtNy, y); - XtSetValues (widget, al, 2); -} - -static Widget -recycle_instance (destroyed_instance* instance) -{ - Widget widget = instance->widget; - - /* widget is NULL if the parent was destroyed. */ - if (widget) - { - Widget focus; - Widget separator; - - /* Remove the destroy callback as the instance is not in the list - anymore */ - XtRemoveCallback (instance->parent, XtNdestroyCallback, - mark_dead_instance_destroyed, - (XtPointer)instance); - - /* Give the focus to the initial item */ - focus = XtNameToWidget (widget, "*value"); - if (!focus) - focus = XtNameToWidget (widget, "*button1"); - if (focus) - XmProcessTraversal(focus, XmTRAVERSE_CURRENT); - - /* shrink the separator label back to their original size */ - separator = XtNameToWidget (widget, "*separator_button"); - if (separator) - { - Arg al [2]; - XtSetArg (al [0], XtNwidth, 5); - XtSetArg (al [1], XtNheight, 5); - XtSetValues (separator, al, 2); - } - - /* Center the dialog in its parent */ - recenter_widget (widget); - } - free_destroyed_instance (instance); - return widget; -} - -Widget -xm_create_dialog (widget_instance* instance) -{ - char* name = instance->info->type; - Widget parent = instance->parent; - Widget widget; - Boolean pop_up_p = instance->pop_up_p; - CONST char* shell_name = 0; - CONST char* icon_name = 0; - Boolean text_input_slot = False; - Boolean radio_box = False; - Boolean list = False; - int total_buttons; - int left_buttons = 0; - int right_buttons = 1; - destroyed_instance* dead_one; - - /* try to find a widget to recycle */ - dead_one = find_matching_instance (instance); - if (dead_one) - { - Widget recycled_widget = recycle_instance (dead_one); - if (recycled_widget) - return recycled_widget; - } - - switch (name [0]){ - case 'E': case 'e': - icon_name = "dbox-error"; - shell_name = "Error"; - break; - - case 'I': case 'i': - icon_name = "dbox-info"; - shell_name = "Information"; - break; - - case 'L': case 'l': - list = True; - icon_name = "dbox-question"; - shell_name = "Prompt"; - break; - - case 'P': case 'p': - text_input_slot = True; - icon_name = "dbox-question"; - shell_name = "Prompt"; - break; - - case 'Q': case 'q': - icon_name = "dbox-question"; - shell_name = "Question"; - break; - } - - total_buttons = name [1] - '0'; - - if (name [3] == 'T' || name [3] == 't') - { - text_input_slot = False; - radio_box = True; - } - else if (name [3]) - right_buttons = name [4] - '0'; - - left_buttons = total_buttons - right_buttons; - - widget = make_dialog (name, parent, pop_up_p, - shell_name, icon_name, text_input_slot, radio_box, - list, left_buttons, right_buttons); - - XtAddCallback (widget, XmNpopdownCallback, xm_nosel_callback, - (XtPointer) instance); - return widget; -} - -#endif /* DIALOGS_MOTIF */ - -#ifdef MENUBARS_MOTIF -static Widget -make_menubar (widget_instance* instance) -{ - Arg al[10]; - int ac = 0; - - XtSetArg(al[ac], XmNmarginHeight, 0); ac++; - XtSetArg(al[ac], XmNshadowThickness, 3); ac++; - - return XmCreateMenuBar (instance->parent, instance->info->name, al, ac); -} - -static void -remove_grabs (Widget shell, XtPointer closure, XtPointer call_data) -{ - Widget menu = (Widget) closure; - XmRemoveFromPostFromList (menu, XtParent (XtParent ((Widget) menu))); -} - -static Widget -make_popup_menu (widget_instance* instance) -{ - Widget parent = instance->parent; - Window parent_window = parent->core.window; - Widget result; - - /* sets the parent window to 0 to fool Motif into not generating a grab */ - parent->core.window = 0; - result = XmCreatePopupMenu (parent, instance->info->name, NULL, 0); - XtAddCallback (XtParent (result), XmNpopdownCallback, remove_grabs, - (XtPointer)result); - parent->core.window = parent_window; - return result; -} -#endif /* MENUBARS_MOTIF */ - -#ifdef SCROLLBARS_MOTIF -static Widget -make_scrollbar (widget_instance *instance, int vertical) -{ - Arg al[20]; - int ac = 0; - static XtCallbackRec callbacks[2] = - { {xm_scrollbar_callback, NULL}, {NULL, NULL} }; - - callbacks[0].closure = (XtPointer) instance; - - XtSetArg (al[ac], XmNminimum, 1); ac++; - XtSetArg (al[ac], XmNmaximum, INT_MAX); ac++; - XtSetArg (al[ac], XmNincrement, 1); ac++; - XtSetArg (al[ac], XmNpageIncrement, 1); ac++; - XtSetArg (al[ac], XmNborderWidth, 0); ac++; - XtSetArg (al[ac], XmNorientation, vertical ? XmVERTICAL : XmHORIZONTAL); ac++; - - XtSetArg (al[ac], XmNdecrementCallback, callbacks); ac++; - XtSetArg (al[ac], XmNdragCallback, callbacks); ac++; - XtSetArg (al[ac], XmNincrementCallback, callbacks); ac++; - XtSetArg (al[ac], XmNpageDecrementCallback, callbacks); ac++; - XtSetArg (al[ac], XmNpageIncrementCallback, callbacks); ac++; - XtSetArg (al[ac], XmNtoBottomCallback, callbacks); ac++; - XtSetArg (al[ac], XmNtoTopCallback, callbacks); ac++; - XtSetArg (al[ac], XmNvalueChangedCallback, callbacks); ac++; - - return XmCreateScrollBar (instance->parent, instance->info->name, al, ac); -} - -static Widget -make_vertical_scrollbar (widget_instance *instance) -{ - return make_scrollbar (instance, 1); -} - -static Widget -make_horizontal_scrollbar (widget_instance *instance) -{ - return make_scrollbar (instance, 0); -} - -#endif /* SCROLLBARS_MOTIF */ - -/* Table of functions to create widgets */ - -#ifdef ENERGIZE - -/* interface with the XDesigner generated functions */ -typedef Widget (*widget_maker) (Widget); -extern Widget create_project_p_sheet (Widget parent); -extern Widget create_debugger_p_sheet (Widget parent); -extern Widget create_breaklist_p_sheet (Widget parent); -extern Widget create_le_browser_p_sheet (Widget parent); -extern Widget create_class_browser_p_sheet (Widget parent); -extern Widget create_call_browser_p_sheet (Widget parent); -extern Widget create_build_dialog (Widget parent); -extern Widget create_editmode_dialog (Widget parent); -extern Widget create_search_dialog (Widget parent); -extern Widget create_project_display_dialog (Widget parent); - -static Widget -make_one (widget_instance* instance, widget_maker fn) -{ - Widget result; - Arg al [64]; - int ac = 0; - - if (instance->pop_up_p) - { - XtSetArg (al [ac], XmNallowShellResize, TRUE); ac++; - result = XmCreateDialogShell (instance->parent, "dialog", NULL, 0); - XtAddCallback (result, XmNpopdownCallback, &xm_nosel_callback, - (XtPointer) instance); - (*fn) (result); - } - else - { - result = (*fn) (instance->parent); - XtRealizeWidget (result); - } - return result; -} - -static Widget -make_project_p_sheet (widget_instance* instance) -{ - return make_one (instance, create_project_p_sheet); -} - -static Widget -make_debugger_p_sheet (widget_instance* instance) -{ - return make_one (instance, create_debugger_p_sheet); -} - -static Widget -make_breaklist_p_sheet (widget_instance* instance) -{ - return make_one (instance, create_breaklist_p_sheet); -} - -static Widget -make_le_browser_p_sheet (widget_instance* instance) -{ - return make_one (instance, create_le_browser_p_sheet); -} - -static Widget -make_class_browser_p_sheet (widget_instance* instance) -{ - return make_one (instance, create_class_browser_p_sheet); -} - -static Widget -make_call_browser_p_sheet (widget_instance* instance) -{ - return make_one (instance, create_call_browser_p_sheet); -} - -static Widget -make_build_dialog (widget_instance* instance) -{ - return make_one (instance, create_build_dialog); -} - -static Widget -make_editmode_dialog (widget_instance* instance) -{ - return make_one (instance, create_editmode_dialog); -} - -static Widget -make_search_dialog (widget_instance* instance) -{ - return make_one (instance, create_search_dialog); -} - -static Widget -make_project_display_dialog (widget_instance* instance) -{ - return make_one (instance, create_project_display_dialog); -} - -#endif /* ENERGIZE */ - -widget_creation_entry -xm_creation_table [] = -{ -#ifdef MENUBARS_MOTIF - {"menubar", make_menubar}, - {"popup", make_popup_menu}, -#endif -#ifdef SCROLLBARS_MOTIF - {"vertical-scrollbar", make_vertical_scrollbar}, - {"horizontal-scrollbar", make_horizontal_scrollbar}, -#endif -#ifdef ENERGIZE - {"project_p_sheet", make_project_p_sheet}, - {"debugger_p_sheet", make_debugger_p_sheet}, - {"breaklist_psheet", make_breaklist_p_sheet}, - {"leb_psheet", make_le_browser_p_sheet}, - {"class_browser_psheet", make_class_browser_p_sheet}, - {"ctree_browser_psheet", make_call_browser_p_sheet}, - {"build", make_build_dialog}, - {"editmode", make_editmode_dialog}, - {"search", make_search_dialog}, - {"project_display", make_project_display_dialog}, -#endif /* ENERGIZE */ - {NULL, NULL} -}; - -/* Destruction of instances */ -void -xm_destroy_instance (widget_instance* instance) -{ -#ifdef DIALOGS_MOTIF - /* It appears that this is used only for dialog boxes. */ - Widget widget = instance->widget; - /* recycle the dialog boxes */ - /* Disable the recycling until we can find a way to have the dialog box - get reasonable layout after we modify its contents. */ - if (0 - && XtClass (widget) == xmDialogShellWidgetClass) - { - destroyed_instance* dead_instance = - make_destroyed_instance (instance->info->name, - instance->info->type, - instance->widget, - instance->parent, - instance->pop_up_p); - dead_instance->next = all_destroyed_instances; - all_destroyed_instances = dead_instance; - XtUnmanageChild (first_child (instance->widget)); - XFlush (XtDisplay (instance->widget)); - XtAddCallback (instance->parent, XtNdestroyCallback, - mark_dead_instance_destroyed, (XtPointer)dead_instance); - } - else - { - /* This might not be necessary now that the nosel is attached to - popdown instead of destroy, but it can't hurt. */ - XtRemoveCallback (instance->widget, XtNdestroyCallback, - xm_nosel_callback, (XtPointer)instance); - - XtDestroyWidget (instance->widget); - } -#endif /* DIALOGS_MOTIF */ -} - -/* popup utility */ -#ifdef MENUBARS_MOTIF - -void -xm_popup_menu (Widget widget, XEvent *event) -{ - if (event->type == ButtonPress || event->type == ButtonRelease) - { - /* This is so totally ridiculous: there's NO WAY to tell Motif - that *any* button can select a menu item. Only one button - can have that honor. - */ - char *trans = 0; - if (event->xbutton.state & Button5Mask) trans = "<Btn5Down>"; - else if (event->xbutton.state & Button4Mask) trans = "<Btn4Down>"; - else if (event->xbutton.state & Button3Mask) trans = "<Btn3Down>"; - else if (event->xbutton.state & Button2Mask) trans = "<Btn2Down>"; - else if (event->xbutton.state & Button1Mask) trans = "<Btn1Down>"; - if (trans) - { - Arg al [1]; - XtSetArg (al [0], XmNmenuPost, trans); - XtSetValues (widget, al, 1); - } - XmMenuPosition (widget, (XButtonPressedEvent *) event); - } - XtManageChild (widget); -} - -#endif - -#ifdef DIALOGS_MOTIF - -static void -set_min_dialog_size (Widget w) -{ - short width; - short height; - Arg al [2]; - - XtSetArg (al [0], XmNwidth, &width); - XtSetArg (al [1], XmNheight, &height); - XtGetValues (w, al, 2); - - XtSetArg (al [0], XmNminWidth, width); - XtSetArg (al [1], XmNminHeight, height); - XtSetValues (w, al, 2); -} - -#endif - -void -xm_pop_instance (widget_instance* instance, Boolean up) -{ - Widget widget = instance->widget; - -#ifdef DIALOGS_MOTIF - if (XtClass (widget) == xmDialogShellWidgetClass) - { - Widget widget_to_manage = first_child (widget); - if (up) - { - XtManageChild (widget_to_manage); - set_min_dialog_size (widget); - XmProcessTraversal(widget, XmTRAVERSE_CURRENT); - } - else - XtUnmanageChild (widget_to_manage); - } - else -#endif - { - if (up) - XtManageChild (widget); - else - XtUnmanageChild (widget); - } -} - - -/* motif callback */ - -enum do_call_type { pre_activate, selection, no_selection, post_activate }; - -static void -do_call (Widget widget, XtPointer closure, enum do_call_type type) -{ - XtPointer user_data; - widget_instance* instance = (widget_instance*)closure; - Widget instance_widget; - LWLIB_ID id; - Arg al [1]; - - if (!instance) - return; - if (widget->core.being_destroyed) - return; - - instance_widget = instance->widget; - if (!instance_widget) - return; - - id = instance->info->id; - user_data = NULL; - XtSetArg(al [0], XmNuserData, &user_data); - XtGetValues (widget, al, 1); - switch (type) - { - case pre_activate: - if (instance->info->pre_activate_cb) - instance->info->pre_activate_cb (widget, id, user_data); - break; - case selection: - if (instance->info->selection_cb) - instance->info->selection_cb (widget, id, user_data); - break; - case no_selection: - if (instance->info->selection_cb) - instance->info->selection_cb (widget, id, (XtPointer) -1); - break; - case post_activate: - if (instance->info->post_activate_cb) - instance->info->post_activate_cb (widget, id, user_data); - break; - default: - abort (); - } -} - -/* Like lw_internal_update_other_instances except that it does not do - anything if its shell parent is not managed. This is to protect - lw_internal_update_other_instances to dereference freed memory - if the widget was ``destroyed'' by caching it in the all_destroyed_instances - list */ -static void -xm_internal_update_other_instances (Widget widget, XtPointer closure, - XtPointer call_data) -{ - Widget parent; - for (parent = widget; parent; parent = XtParent (parent)) - if (XtIsShell (parent)) - break; - else if (!XtIsManaged (parent)) - return; - lw_internal_update_other_instances (widget, closure, call_data); -} - -static void -xm_generic_callback (Widget widget, XtPointer closure, XtPointer call_data) -{ -#if !defined (ENERGIZE) && (defined (MENUBARS_MOTIF) || defined (DIALOGS_MOTIF)) - /* We want the selected status to change only when we decide it - should change. Yuck but correct. */ - if (XtClass (widget) == xmToggleButtonWidgetClass - || XtClass (widget) == xmToggleButtonGadgetClass) - { - Boolean check; - Arg al [1]; - - XtSetArg (al [0], XmNset, &check); - XtGetValues (widget, al, 1); - - XtSetArg (al [0], XmNset, !check); - XtSetValues (widget, al, 1); - } -#endif - lw_internal_update_other_instances (widget, closure, call_data); - do_call (widget, closure, selection); -} - -#ifdef DIALOGS_MOTIF - -static void -xm_nosel_callback (Widget widget, XtPointer closure, XtPointer call_data) -{ - /* This callback is only called when a dialog box is dismissed with the wm's - destroy button (WM_DELETE_WINDOW.) We want the dialog box to be destroyed - in that case, not just unmapped, so that it releases its keyboard grabs. - But there are problems with running our callbacks while the widget is in - the process of being destroyed, so we set XmNdeleteResponse to XmUNMAP - instead of XmDESTROY and then destroy it ourself after having run the - callback. - */ - do_call (widget, closure, no_selection); - XtDestroyWidget (widget); -} - -#endif - -#ifdef MENUBARS_MOTIF - -static void -xm_pull_down_callback (Widget widget, XtPointer closure, XtPointer call_data) -{ -#if 0 - if (call_data) - { - /* new behavior for incremental menu construction */ - - } - else -#endif - do_call (widget, closure, pre_activate); -} - -#if 0 -static void -xm_pop_down_callback (Widget widget, XtPointer closure, XtPointer call_data) -{ - do_call (widget, closure, post_activate); -} -#endif /* 0 */ - -#endif /* MENUBARS_MOTIF */ - -#ifdef SCROLLBARS_MOTIF -static void -xm_scrollbar_callback (Widget widget, XtPointer closure, XtPointer call_data) -{ - widget_instance *instance = (widget_instance *) closure; - LWLIB_ID id; - XmScrollBarCallbackStruct *data = - (XmScrollBarCallbackStruct *) call_data; - scroll_event event_data; - scrollbar_values *val = - (scrollbar_values *) instance->info->val->scrollbar_data; - double percent; - - if (!instance || widget->core.being_destroyed) - return; - - id = instance->info->id; - - percent = (double) (data->value - 1) / (double) (INT_MAX - 1); - event_data.slider_value = - (int) (percent * (double) (val->maximum - val->minimum)) + val->minimum; - - if (event_data.slider_value > (val->maximum - val->slider_size)) - event_data.slider_value = val->maximum - val->slider_size; - else if (event_data.slider_value < 1) - event_data.slider_value = 1; - - if (data->event) - { - switch (data->event->xany.type) - { - case KeyPress: - case KeyRelease: - event_data.time = data->event->xkey.time; - break; - case ButtonPress: - case ButtonRelease: - event_data.time = data->event->xbutton.time; - break; - case MotionNotify: - event_data.time = data->event->xmotion.time; - break; - case EnterNotify: - case LeaveNotify: - event_data.time = data->event->xcrossing.time; - break; - default: - event_data.time = 0; - break; - } - } - else - event_data.time = 0; - - switch (data->reason) - { - case XmCR_DECREMENT: - event_data.action = SCROLLBAR_LINE_UP; - break; - case XmCR_INCREMENT: - event_data.action = SCROLLBAR_LINE_DOWN; - break; - case XmCR_PAGE_DECREMENT: - event_data.action = SCROLLBAR_PAGE_UP; - break; - case XmCR_PAGE_INCREMENT: - event_data.action = SCROLLBAR_PAGE_DOWN; - break; - case XmCR_TO_TOP: - event_data.action = SCROLLBAR_TOP; - break; - case XmCR_TO_BOTTOM: - event_data.action = SCROLLBAR_BOTTOM; - break; - case XmCR_DRAG: - event_data.action = SCROLLBAR_DRAG; - break; - case XmCR_VALUE_CHANGED: - event_data.action = SCROLLBAR_CHANGE; - break; - default: - event_data.action = SCROLLBAR_CHANGE; - break; - } - - if (instance->info->pre_activate_cb) - instance->info->pre_activate_cb (widget, id, (XtPointer) &event_data); -} -#endif /* SCROLLBARS_MOTIF */ - - -/* set the keyboard focus */ -void -xm_set_keyboard_focus (Widget parent, Widget w) -{ - XmProcessTraversal (w, XmTRAVERSE_CURRENT); - /* At some point we believed that it was necessary to use XtSetKeyboardFocus - instead of XmProcessTraversal when using Motif >= 1.2.1, but that's bogus. - Presumably the problem was elsewhere, and is now gone... - */ -}
--- a/man/gnus-faq.texi Mon Aug 13 09:45:48 2007 +0200 +++ b/man/gnus-faq.texi Mon Aug 13 09:46:53 2007 +0200 @@ -214,9 +214,9 @@ @file{ftp://cag.lcs.mit.edu/pub/patl/mailcrypt-3.4.tar.gz}. @item -Tiny Mime. +Tools for Mime. -Tiny Mime is an Emacs MUA interface to MIME. Installation is +Tools for Mime is an Emacs MUA interface to MIME. Installation is a two-step process unlike most other packages, so you should be prepared to move the byte-compiled code somewhere. There are currently two versions of this package available. It can
--- a/man/gnus.texi Mon Aug 13 09:45:48 2007 +0200 +++ b/man/gnus.texi Mon Aug 13 09:46:53 2007 +0200 @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @setfilename gnus -@settitle Gnus 5.4.60 Manual +@settitle Gnus 5.4.62 Manual @synindex fn cp @synindex vr cp @synindex pg cp @@ -309,7 +309,7 @@ @tex @titlepage -@title Gnus 5.4.60 Manual +@title Gnus 5.4.62 Manual @author by Lars Magne Ingebrigtsen @page @@ -345,7 +345,7 @@ spool or your mbox file. All at the same time, if you want to push your luck. -This manual corresponds to Gnus 5.4.60. +This manual corresponds to Gnus 5.4.62. @end ifinfo @@ -434,7 +434,7 @@ The @code{gnus-select-method} variable says where Gnus should look for news. This variable should be a list where the first element says @dfn{how} and the second element says @dfn{where}. This method is your -native method. All groups that are not fetched with this method are +native method. All groups not fetched with this method are foreign groups. For instance, if the @samp{news.somewhere.edu} @sc{nntp} server is where @@ -460,8 +460,7 @@ @code{NNTPSERVER} environment variable. If that variable isn't set, Gnus will see whether @code{gnus-nntpserver-file} (@file{/etc/nntpserver} by default) has any opinions on the matter. If -that fails as well, Gnus will try to use the machine that is -running Emacs as an @sc{nntp} server. That's a long shot, though. +that fails as well, Gnus will try to use the machine running Emacs as an @sc{nntp} server. That's a long shot, though. @vindex gnus-nntp-server If @code{gnus-nntp-server} is set, this variable will override @@ -943,7 +942,7 @@ @c @head The active file can be rather Huge, so if you have a slow network, you can set @code{gnus-read-active-file} to @code{nil} to prevent Gnus from -reading the active file. This variable is @code{t} by default. +reading the active file. This variable is @code{some} by default. Gnus will try to make do by getting information just on the groups that you actually subscribe to. @@ -981,17 +980,17 @@ @item gnus-load-hook @vindex gnus-load-hook -A hook that is run while Gnus is being loaded. Note that this hook will +A hook run while Gnus is being loaded. Note that this hook will normally be run just once in each Emacs session, no matter how many times you start Gnus. @item gnus-startup-hook @vindex gnus-startup-hook -A hook that is run after starting up Gnus successfully. +A hook run after starting up Gnus successfully. @item gnus-started-hook @vindex gnus-started-hook -A hook that is run as the very last thing after starting up Gnus +A hook run as the very last thing after starting up Gnus successfully. @item gnus-check-bogus-newsgroups @@ -1634,7 +1633,7 @@ @vindex gnus-keep-same-level If @code{gnus-keep-same-level} is non-@code{nil}, some movement commands -will only move to groups that are of the same level (or lower). In +will only move to groups of the same level (or lower). In particular, going from the last article in one group to the next group will go to the next group of the same level (or lower). This might be handy if you want to read the most important groups before you read the @@ -1657,7 +1656,7 @@ use this level as the ``work'' level. @vindex gnus-activate-level -Gnus will normally just activate groups that are on level +Gnus will normally just activate groups on level @code{gnus-activate-level} or less. If you don't want to activate unsubscribed groups, for instance, you might set this variable to 5. The default is 6. @@ -1982,7 +1981,7 @@ @item auto-expire @cindex auto-expire If the group parameter has an element that looks like @code{(auto-expire -. t)}, all articles that are read will be marked as expirable. For an +. t)}, all articles read will be marked as expirable. For an alternative approach, @pxref{Expiring Mail}. @item total-expire @@ -2071,7 +2070,7 @@ @section Listing Groups @cindex group listing -These commands all list various slices of the groups that are available. +These commands all list various slices of the groups available. @table @kbd @@ -2132,7 +2131,7 @@ @item A A @kindex A A (Group) @findex gnus-group-list-active -List absolutely all groups that are in the active file(s) of the +List absolutely all groups in the active file(s) of the server(s) you are connected to (@code{gnus-group-list-active}). This might very well take quite a while. It might actually be a better idea to do a @kbd{A M} to list all matching, and just give @samp{.} as the @@ -3322,7 +3321,7 @@ @item gnus-summary-selected-face @vindex gnus-summary-selected-face -This is the face (or @dfn{font} as some people call it) that is used to +This is the face (or @dfn{font} as some people call it) used to highlight the current article in the summary buffer. @item gnus-summary-highlight @@ -3532,7 +3531,7 @@ @node Choosing Variables @subsection Choosing Variables -Some variables that are relevant for moving and selecting articles: +Some variables relevant for moving and selecting articles: @table @code @item gnus-auto-extend-newsgroup @@ -4013,7 +4012,7 @@ Marking articles as @dfn{expirable} (or have them marked as such automatically) doesn't make much sense in normal groups---a user doesn't control expiring of news articles, but in mail groups, for instance, -articles that are marked as @dfn{expirable} can be deleted by Gnus at +articles marked as @dfn{expirable} can be deleted by Gnus at any time. @end table @@ -4043,12 +4042,12 @@ @item @vindex gnus-cached-mark -Articles that are stored in the article cache will be marked with an +Articles stored in the article cache will be marked with an @samp{*} in the second column (@code{gnus-cached-mark}). @item @vindex gnus-saved-mark -Articles that are ``saved'' (in some manner or other; not necessarily +Articles ``saved'' (in some manner or other; not necessarily religiously) are marked with an @samp{S} in the second column (@code{gnus-saved-mark}). @@ -4353,9 +4352,9 @@ @kindex / u (Summary) @kindex x (Summary) @findex gnus-summary-limit-to-unread -Limit the summary buffer to articles that are not marked as read +Limit the summary buffer to articles not marked as read (@code{gnus-summary-limit-to-unread}). If given a prefix, limit the -buffer to articles that are strictly unread. This means that ticked and +buffer to articles strictly unread. This means that ticked and dormant articles will also be excluded. @item / m @@ -4367,10 +4366,9 @@ @item / t @kindex / t (Summary) @findex gnus-summary-limit-to-age -Ask for a number and then limit the summary buffer to articles that are -older than (or equal to) that number of days +Ask for a number and then limit the summary buffer to articles older than (or equal to) that number of days (@code{gnus-summary-limit-to-marks}). If given a prefix, limit to -articles that are younger than that number of days. +articles younger than that number of days. @item / n @kindex / n (Summary) @@ -4459,7 +4457,7 @@ @item gnus-fetch-old-headers @vindex gnus-fetch-old-headers If non-@code{nil}, Gnus will attempt to build old threads by fetching -more old headers---headers to articles that are marked as read. If you +more old headers---headers to articles marked as read. If you would like to display as few summary lines as possible, but still connect as many loose threads as possible, you should set this variable to @code{some} or a number. If you set it to a number, no more than @@ -4795,7 +4793,7 @@ when doing thread commands. If this variable is @code{nil}, articles in the same thread with different subjects will not be included in the operation in question. If this variable is @code{fuzzy}, only articles -that have subjects that are fuzzily equal will be included (@pxref{Fuzzy +that have subjects fuzzily equal will be included (@pxref{Fuzzy Matching}). @@ -4868,7 +4866,7 @@ If you are using an unthreaded display for some strange reason or other, you have to fiddle with the @code{gnus-article-sort-functions} variable. It is very similar to the @code{gnus-thread-sort-functions}, except that -is uses slightly different functions for article comparison. Available +it uses slightly different functions for article comparison. Available sorting predicate functions are @code{gnus-article-sort-by-number}, @code{gnus-article-sort-by-author}, @code{gnus-article-sort-by-subject}, @code{gnus-article-sort-by-date}, and @code{gnus-article-sort-by-score}. @@ -4940,8 +4938,7 @@ @code{nil} on read articles. The function is called with an article data structure as the only parameter. -If, for instance, you wish to pre-fetch only unread articles that are -shorter than 100 lines, you could say something like: +If, for instance, you wish to pre-fetch only unread articles shorter than 100 lines, you could say something like: @lisp (defun my-async-short-unread-p (data) @@ -4994,7 +4991,7 @@ @vindex gnus-cache-directory @vindex gnus-use-cache To turn caching on, set @code{gnus-use-cache} to @code{t}. By default, -all articles that are ticked or marked as dormant will then be copied +all articles ticked or marked as dormant will then be copied over to your local cache (@code{gnus-cache-directory}). Whether this cache is flat or hierarchal is controlled by the @code{gnus-use-long-file-name} variable, as usual. @@ -5014,7 +5011,7 @@ variables. Both are lists of symbols. The first is @code{(ticked dormant)} by default, meaning that ticked and dormant articles will be put in the cache. The latter is @code{(read)} by default, meaning that -articles that are marked as read are removed from the cache. Possibly +articles marked as read are removed from the cache. Possibly symbols in these two lists are @code{ticked}, @code{dormant}, @code{unread} and @code{read}. @@ -5331,7 +5328,7 @@ name. Here's an example function to clean up file names somewhat. If you have -lots of mail groups that are called things like +lots of mail groups called things like @samp{nnml:mail.whatever}, you may want to chop off the beginning of these group names before creating the file name to save to. The following will do just that: @@ -5370,7 +5367,7 @@ @lisp (setq gnus-use-long-file-name '(not-save)) ; to get a hierarchy -(setq gnus-default-article-save 'gnus-summary-save-in-file) ; no encoding +(setq gnus-default-article-saver 'gnus-summary-save-in-file) ; no encoding @end lisp Then just save with @kbd{o}. You'd then read this hierarchy with @@ -6797,7 +6794,7 @@ @findex gnus-summary-expire-articles-now Delete all the expirable articles in the group (@code{gnus-summary-expire-articles-now}). This means that @strong{all} -articles that are eligible for expiry in the current group will +articles eligible for expiry in the current group will disappear forever into that big @file{/dev/null} in the sky. @item B DEL @@ -7377,7 +7374,7 @@ (setq gnus-visible-headers "^From:\\|^Subject:") @end lisp -This variable can also be a list of regexps to match headers that are to +This variable can also be a list of regexps to match headers to remain visible. @item gnus-ignored-headers @@ -7394,7 +7391,7 @@ (setq gnus-ignored-headers "^References:\\|^Xref:") @end lisp -This variable can also be a list of regexps to match headers that are to +This variable can also be a list of regexps to match headers to be removed. Note that if @code{gnus-visible-headers} is non-@code{nil}, this @@ -7416,8 +7413,7 @@ @end lisp Any headers that are to remain visible, but are not listed in this -variable, will be displayed in random order after all the headers that -are listed in this variable. +variable, will be displayed in random order after all the headers listed in this variable. @findex gnus-article-hide-boring-headers @vindex gnus-article-display-hook @@ -7755,7 +7751,7 @@ @node Mail and Post @section Mail and Post -Here's a list of variables that are relevant to both mailing and +Here's a list of variables relevant to both mailing and posting: @table @code @@ -8082,7 +8078,7 @@ @cindex foreign groups @cindex select methods -A @dfn{foreign group} is a group that is not read by the usual (or +A @dfn{foreign group} is a group not read by the usual (or default) means. It could be, for instance, a group from a different @sc{nntp} server, it could be a virtual group, or it could be your own personal mail group. @@ -8140,7 +8136,7 @@ server, that would be too much work, so Gnus offers a way of naming select methods, which is what you do in the server buffer. -To enter the server buffer, user the @kbd{^} +To enter the server buffer, use the @kbd{^} (@code{gnus-group-enter-server-mode}) command in the group buffer. @menu @@ -8296,7 +8292,7 @@ @code{nnmh} is a mail backend that reads a spool-like structure. Say you have two structures that you wish to access: One is your private mail spool, and the other is a public one. Here's the possible spec for -you private mail: +your private mail: @lisp (nnmh "private" (nnmh-directory "~/private/mail/")) @@ -8694,7 +8690,7 @@ @vindex nntp-xover-commands @cindex nov @cindex XOVER -List of strings that are used as commands to fetch @sc{nov} lines from a +List of strings used as commands to fetch @sc{nov} lines from a server. The default value of this variable is @code{("XOVER" "XOVERVIEW")}. @@ -9174,7 +9170,7 @@ @var{FIELD} and @var{VALUE} can also be lisp symbols, in that case they are expanded as specified by the variable @code{nnmail-split-abbrev-alist}. This is an alist of cons cells, where -the car of a cell contains the key, and the cdr contains the associated +the @code{car} of a cell contains the key, and the @code{cdr} contains the associated value. @vindex nnmail-split-fancy-syntax-table @@ -9343,7 +9339,7 @@ You do not have to mark articles as expirable by hand. Groups that match the regular expression @code{gnus-auto-expirable-newsgroups} will have all articles that you read marked as expirable automatically. All -articles that are marked as expirable have an @samp{E} in the first +articles marked as expirable have an @samp{E} in the first column in the summary buffer. By default, if you have auto expiry switched on, Gnus will mark all the @@ -9360,7 +9356,7 @@ @end lisp Note that making a group auto-expirable doesn't mean that all read -articles are expired---only the articles that are marked as expirable +articles are expired---only the articles marked as expirable will be expired. Also note that using the @kbd{d} command won't make groups expirable---only semi-automatic marking of articles as read will mark the articles as expirable in auto-expirable groups. @@ -9854,15 +9850,16 @@ it, you might treat it as a newsgroup. The files have to have numerical names, of course. -This might be an opportune moment to mention @code{ange-ftp}, that most -wonderful of all wonderful Emacs packages. When I wrote @code{nndir}, I -didn't think much about it---a backend to read directories. Big deal. +This might be an opportune moment to mention @code{ange-ftp} (and its +successor @code{ecf}), that most wonderful of all wonderful Emacs +packages. When I wrote @code{nndir}, I didn't think much about it---a +backend to read directories. Big deal. @code{ange-ftp} changes that picture dramatically. For instance, if you enter the @code{ange-ftp} file name @file{/ftp.hpc.uh.edu:/pub/emacs/ding-list/} as the directory name, -@code{ange-ftp} or @code{efs} will actually allow you to read this directory over at -@samp{sina} as a newsgroup. Distributed news ahoy! +@code{ange-ftp} or @code{efs} will actually allow you to read this +directory over at @samp{sina} as a newsgroup. Distributed news ahoy! @code{nndir} will use @sc{nov} files if they are present. @@ -10623,7 +10620,7 @@ sequence of articles. Sorting on date might be an option here (@pxref{Selecting a Group}). -One limitation, however---all groups that are included in a virtual +One limitation, however---all groups included in a virtual group have to be alive (i.e., subscribed or unsubscribed). Killed or zombie groups can't be component groups for @code{nnvirtual} groups. @@ -10687,7 +10684,7 @@ and the other is an additional @file{.newsrc} file to store information on what groups have been searched through to find component articles. -Articles that are marked as read in the @code{nnkiboze} group will have +Articles marked as read in the @code{nnkiboze} group will have their @sc{nov} lines removed from the @sc{nov} file. @@ -11032,8 +11029,7 @@ @cindex score cache All score files are normally cached to avoid excessive re-loading of score files. However, if this might make you Emacs grow big and -bloated, so this regexp can be used to weed out score files that are -unlikely to be needed again. It would be a bad idea to deny caching of +bloated, so this regexp can be used to weed out score files unlikely to be needed again. It would be a bad idea to deny caching of @file{all.SCORE}, while it might be a good idea to not cache @file{comp.infosystems.www.authoring.misc.ADAPT}. In fact, this variable is @samp{ADAPT$} by default, so no adaptive score files will @@ -11262,13 +11258,13 @@ @cindex date A more useful match type is @code{regexp}. With it, you can match the date string using a regular expression. The date is normalized to -ISO8601 compact format first---@samp{YYYYMMDDTHHMMSS}. If you want to -match all articles that have been posted on April 1st in every year, you -could use @samp{....0401.........} as a match string, for instance. -(Note that the date is kept in its original time zone, so this will -match articles that were posted when it was April 1st where the article -was posted from. Time zones are such wholesome fun for the whole -family, eh?) +ISO8601 compact format first---@var{YYYYMMDD}@code{T}@var{HHMMSS}. If +you want to match all articles that have been posted on April 1st in +every year, you could use @samp{....0401.........} as a match string, +for instance. (Note that the date is kept in its original time zone, so +this will match articles that were posted when it was April 1st where +the article was posted from. Time zones are such wholesome fun for the +whole family, eh?) @item Head, Body, All These three match keys use the same match types as the @code{From} (etc) @@ -11286,8 +11282,7 @@ @item Thread This match key works along the same lines as the @code{Followup} match -key. If you say that you want to score on a (sub-)thread that is -started by an article with a @code{Message-ID} @var{X}, then you add a +key. If you say that you want to score on a (sub-)thread started by an article with a @code{Message-ID} @var{X}, then you add a @samp{thread} match. This will add a new @samp{thread} match for each article that has @var{X} in its @code{References} header. (These new @samp{thread} matches will use the @code{Message-ID}s of these matching @@ -11299,6 +11294,7 @@ @end table @end enumerate +@cindex Score File Atoms @item mark The value of this entry should be a number. Any articles with a score lower than this number will be marked as read. @@ -11552,7 +11548,7 @@ @end lisp This is the default value. If you have adaption on words enabled, every -word that appears in subjects of articles that are marked with +word that appears in subjects of articles marked with @code{gnus-read-mark} will result in a score rule that increase the score with 30 points. @@ -11832,7 +11828,7 @@ @itemize @bullet @item -Articles that are heavily crossposted are probably junk. +Articles heavily crossposted are probably junk. @item To lower a single inappropriate article, lower by @code{Message-ID}. @item @@ -11881,8 +11877,8 @@ (gnus-expunge "X") @end lisp -This will mark every article written by me as read, and remove them from -the summary buffer. Very useful, you'll agree. +This will mark every article written by me as read, and remove the +marked articles from the summary buffer. Very useful, you'll agree. Other programs use a totally different kill file syntax. If Gnus encounters what looks like a @code{rn} kill file, it will take a stab at @@ -11927,7 +11923,7 @@ @file{soc.motss.KILL}. The suffix appended to the group name to get this file name is detailed by the @code{gnus-kill-file-name} variable. The ``global'' kill file (not in the score file sense of ``global'', of -course) is called just @file{KILL}. +course) is just called @file{KILL}. @vindex gnus-kill-save-kill-file @item gnus-kill-save-kill-file @@ -11985,9 +11981,9 @@ likewise and gives you a personalized prediction for each unread news article. Think of GroupLens as a matchmaker. GroupLens watches how you rate articles, and finds other people that rate articles the same way. -Once it has found for you some people you agree with it tells you, in -the form of a prediction, what they thought of the article. You can use -this prediction to help you decide whether or not you want to read the +Once it has found some people you agree with it tells you, in the form +of a prediction, what they thought of the article. You can use this +prediction to help you decide whether or not you want to read the article. @menu @@ -12004,7 +12000,7 @@ To use GroupLens you must register a pseudonym with your local Better Bit Bureau (BBB). @samp{http://www.cs.umn.edu/Research/GroupLens/bbb.html} is the only -better bit in town is at the moment. +better bit in town at the moment. Once you have registered you'll need to set a couple of variables. @@ -12026,7 +12022,7 @@ @end table -Thats the minimum of what you need to get up and running with GroupLens. +That's the minimum of what you need to get up and running with GroupLens. Once you've registered, GroupLens will start giving you scores for articles based on the average of what other people think. But, to get the real benefit of GroupLens you need to start rating articles @@ -12133,7 +12129,7 @@ Plain-old numeric value. @item confidence-plus-minus -Prediction +/i confidence. +Prediction +/- confidence. @end table @@ -12144,10 +12140,10 @@ @table @code @item gnus-summary-grouplens-line-format -The summary line format used in summary buffers that are GroupLens -enhanced. It accepts the same specs as the normal summary line format -(@pxref{Summary Buffer Lines}). The default is -@samp{%U%R%z%l%I%(%[%4L: %-20,20n%]%) %s\n}. +The summary line format used in GroupLens-enhanced summary buffers. It +accepts the same specs as the normal summary line format (@pxref{Summary +Buffer Lines}). The default is @samp{%U%R%z%l%I%(%[%4L: %-20,20n%]%) +%s\n}. @item grouplens-bbb-host Host running the bbbd server. @samp{grouplens.cs.umn.edu} is the @@ -12173,7 +12169,7 @@ Scoring on Subjects and From headers is nice enough, but what if you're really interested in what a person has to say only when she's talking -about a particular subject? Or what about if you really don't want to +about a particular subject? Or what if you really don't want to read what person A has to say when she's following up to person B, but want to read what she says when she's following up to person C? @@ -12218,16 +12214,16 @@ @itemx not @itemx ¬ This logical operator only takes a single argument. It returns the -inverse of the value of its argument. +logical negation of the value of its argument. @end table There is an @dfn{indirection operator} that will make its arguments apply to the ancestors of the current article being scored. For instance, @code{1-} will make score rules apply to the parent of the -current article. @code{2-} will make score fules apply to the +current article. @code{2-} will make score rules apply to the grandparent of the current article. Alternatively, you can write -@code{^^}, where the number of @code{^}s (carets) say how far back into +@code{^^}, where the number of @code{^}s (carets) says how far back into the ancestry you want to go. Finally, we have the match operators. These are the ones that do the @@ -12300,7 +12296,7 @@ result of the operation will be. For instance, if one of the arguments of an @code{&} evaluates to @code{false}, there's no point in evaluating the rest of the arguments. This means that you should put slow matches -(@samp{body}, @code{header}) last and quick matches (@samp{from}, +(@samp{body}, @samp{header}) last and quick matches (@samp{from}, @samp{subject}) first. The indirection arguments (@code{1-} and so on) will make their @@ -12423,7 +12419,7 @@ Many functions, among them functions for moving, decoding and saving articles, use what is known as the @dfn{Process/Prefix convention}. -This is a method for figuring out what articles that the user wants the +This is a method for figuring out what articles the user wants the command to be performed on. It goes like this: @@ -12438,7 +12434,7 @@ active, all articles in the region will be worked upon. If there is no numeric prefix, but some articles are marked with the -process mark, perform the operation on the articles that are marked with +process mark, perform the operation on the articles marked with the process mark. If there is neither a numeric prefix nor any articles marked with the @@ -12498,8 +12494,7 @@ @section Formatting Variables @cindex formatting variables -Throughout this manual you've probably noticed lots of variables that -are called things like @code{gnus-group-line-format} and +Throughout this manual you've probably noticed lots of variables called things like @code{gnus-group-line-format} and @code{gnus-summary-mode-line-format}. These control how Gnus is to output lines in the various buffers. There's quite a lot of them. Fortunately, they all use the same syntax, so there's not that much to @@ -12648,9 +12643,9 @@ Text inside the @samp{%[} and @samp{%]} specifiers will have their normal faces set using @code{gnus-face-0}, which is @code{bold} by -default. If you say @samp{%1[} instead, you'll get @code{gnus-face-1} -instead, and so on. Create as many faces as you wish. The same goes -for the @code{mouse-face} specs---you can say @samp{%3(hello%)} to have +default. If you say @samp{%1[}, you'll get @code{gnus-face-1} instead, +and so on. Create as many faces as you wish. The same goes for the +@code{mouse-face} specs---you can say @samp{%3(hello%)} to have @samp{hello} mouse-highlighted with @code{gnus-mouse-face-3}. Here's an alternative recipe for the group buffer: @@ -12967,11 +12962,10 @@ @end lisp If this variable is @code{nil} (which is the default), the mode line -strings won't be chopped off, and they won't be padded either. -Note that the default is unlikely to be desirable, as even the -percentage complete in the buffer may be crowded off the mode line; -the user should configure this variable appropriately for their -configuration. +strings won't be chopped off, and they won't be padded either. Note +that the default is unlikely to be desirable, as even the percentage +complete in the buffer may be crowded off the mode line; the user should +configure this variable appropriately for her configuration. @node Highlighting and Menus @@ -12981,7 +12975,7 @@ @cindex menus @vindex gnus-visual -The @code{gnus-visual} variable controls most of the prettifying Gnus +The @code{gnus-visual} variable controls most of the Gnus-prettifying aspects. If @code{nil}, Gnus won't attempt to create menus or use fancy colors or fonts. This will also inhibit loading the @file{gnus-vis.el} file. @@ -13021,7 +13015,7 @@ (setq gnus-visual '(article-highlight menu)) @end lisp -If you want only highlighting and no menus whatsoever, you'd say: +If you want highlighting only and no menus whatsoever, you'd say: @lisp (setq gnus-visual '(highlight)) @@ -13123,8 +13117,8 @@ @end table All the @code{buttons} variables are lists. The elements in these list -is either a cons cell where the car contains a text to be displayed and -the cdr contains a function symbol, or a simple string. +are either cons cells where the @code{car} contains a text to be displayed and +the @code{cdr} contains a function symbol, or a simple string. @node Daemons @@ -13199,7 +13193,7 @@ @findex gnus-demon-add-rescan @findex gnus-demon-add-scan-timestamps @findex gnus-demon-add-disconnection -Some ready-made functions to do this has been created: +Some ready-made functions to do this have been created: @code{gnus-demon-add-nocem}, @code{gnus-demon-add-disconnection}, @code{gnus-demon-add-scan-timestamps}, @code{gnus-demon-add-rescan}, and @code{gnus-demon-add-scanmail}. Just put those functions in your @@ -13390,7 +13384,7 @@ @node Picon Requirements @subsection Picon Requirements -To use have Gnus display Picons for you, you must be running XEmacs +To have Gnus display Picons for you, you must be running XEmacs 19.13 or greater since all other versions of Emacs aren't yet able to display images. @@ -13464,9 +13458,9 @@ @table @code @item gnus-article-display-picons @findex gnus-article-display-picons -Looks up and display the picons for the author and the author's domain -in the @code{gnus-picons-display-where} buffer. Should be added to -the @code{gnus-article-display-hook}. +Looks up and displays the picons for the author and the author's domain +in the @code{gnus-picons-display-where} buffer. Should be added to the +@code{gnus-article-display-hook}. @item gnus-group-display-picons @findex gnus-article-display-picons @@ -13483,7 +13477,7 @@ @end table Note: You must append them to the hook, so make sure to specify 't' -to the append flag of @code{add-hook}: +for the append flag of @code{add-hook}: @lisp (add-hook 'gnus-article-display-hook 'gnus-article-display-picons t) @@ -13512,7 +13506,7 @@ @item gnus-picons-user-directories @vindex gnus-picons-user-directories List of subdirectories to search in @code{gnus-picons-database} for user -faces. @code{("local" "users" "usenix" "misc/MISC")} is the default. +faces. @code{("local" "users" "usenix" "misc")} is the default. @item gnus-picons-domain-directories @vindex gnus-picons-domain-directories @@ -13549,7 +13543,7 @@ In Gnus buffers, however, it isn't that simple. The things Gnus displays in its buffer is of no value whatsoever to -Gnus---it's all just data that is designed to look nice to the user. +Gnus---it's all just data designed to look nice to the user. Killing a group in the group buffer with @kbd{C-k} makes the line disappear, but that's just a side-effect of the real action---the removal of the group in question from the internal Gnus structures. @@ -13595,7 +13589,7 @@ in your @file{.gnus.el} file. -If you are the moderation of @samp{rec.zoofle}, this is how it's +If you are the moderator of @samp{rec.zoofle}, this is how it's supposed to work: @enumerate @@ -13711,7 +13705,7 @@ The biggest problem I have with email spam is that it comes in under false pretenses. I press @kbd{g} and Gnus merrily informs me that I -have 10 new emails. I say ``Golly gee! Happy is me!'' and selects the +have 10 new emails. I say ``Golly gee! Happy is me!'' and select the mail group, only to find two pyramid schemes, seven advertisements (``New! Miracle tonic for growing full, lustrouos hair on your toes!'') and one mail asking me to repent and find some god. @@ -13832,12 +13826,12 @@ variable is @code{nil}, there is no upper read bound. If it is @code{t}, the backends won't try to read the articles piece by piece, but read the entire articles. This makes sense with some versions of -@code{ange-ftp}. +@code{ange-ftp} or @code{efs}. @item nnheader-head-chop-length @vindex nnheader-head-chop-length -This variable says how big a piece of each article to read when doing -the operation described above. +This variable (default 2048) says how big a piece of each article to +read when doing the operation described above. @item nnheader-file-name-translation-alist @vindex nnheader-file-name-translation-alist @@ -13870,7 +13864,7 @@ @item gnus-shell-command-separator @vindex gnus-shell-command-separator -String used to separate to shell commands. The default is @samp{;}. +String used to separate two shell commands. The default is @samp{;}. @end table @@ -13955,7 +13949,7 @@ On July 28th 1996 work on Red Gnus was begun, and it was released on January 25th 1997 (after 84 releases) as ``Gnus 5.4''. -If you happen upon a version of Gnus that has a name that is prefixed -- +If you happen upon a version of Gnus that has a prefixed name -- ``(ding) Gnus'', ``September Gnus'', ``Red Gnus'', ``Quassia Gnus'' -- don't panic. Don't let it know that you're frightened. Back away. Slowly. Whatever you do, don't run. Walk away, calmly, until you're @@ -13994,10 +13988,11 @@ to separate the newsreader from the backends, Gnus now offers a simple interface for anybody who wants to write new backends for fetching mail and news from different sources. I have added hooks for customizations -everywhere I could imagine useful. By doing so, I'm inviting every one -of you to explore and invent. - -May Gnus never be complete. @kbd{C-u 100 M-x hail-emacs}. +everywhere I could imagine it being useful. By doing so, I'm inviting +every one of you to explore and invent. + +May Gnus never be complete. @kbd{C-u 100 M-x all-hail-emacs} and +@kbd{C-u 100 M-x all-hail-xemacs}. @node Compatibility @@ -14018,11 +14013,11 @@ All commands have kept their names. Some internal functions have changed their names. -The @code{gnus-uu} package has changed drastically. @pxref{Decoding +The @code{gnus-uu} package has changed drastically. @xref{Decoding Articles}. One major compatibility question is the presence of several summary -buffers. All variables that are relevant while reading a group are +buffers. All variables relevant while reading a group are buffer-local to the summary buffer they belong in. Although many important variables have their values copied into their global counterparts whenever a command is executed in the summary buffer, this @@ -14108,7 +14103,7 @@ @end table -If you ever notice Gnus acting non-compliantly with regards to the texts +If you ever notice Gnus acting non-compliant with regards to the texts mentioned above, don't hesitate to drop a note to Gnus Towers and let us know. @@ -14224,9 +14219,6 @@ David Moore---rewrite of @file{nnvirtual.el} and many other things. @item -Ricardo Nassif, Mark Borges, and Jost Krieger---proof-reading. - -@item Kevin Davidson---came up with the name @dfn{ding}, so blame him. @item @@ -14234,6 +14226,9 @@ @end itemize +This manual was proof-read by Adrian Aichner, with Ricardo Nassif, Mark +Borges, and Jost Krieger proof-reading parts of the manual. + The following people have contributed many patches and suggestions: Christopher Davis, @@ -14456,7 +14451,7 @@ servers (@pxref{Browse Foreign Server}). @item -Gnus can fetch articles asynchronously on a second connection to the +Gnus can fetch articles, asynchronously, on a second connection to the server (@pxref{Asynchronous Fetching}). @item @@ -14536,7 +14531,7 @@ Picons (personal icons) can be displayed under XEmacs (@pxref{Picons}). @item -A @code{trn}-line tree buffer can be displayed (@pxref{Tree Display}). +A @code{trn}-like tree buffer can be displayed (@pxref{Tree Display}). @lisp (setq gnus-use-trees t) @@ -14597,7 +14592,7 @@ Groups}). @item -New group parameters have been introduced to set list-address and +New group parameters have been introduced to set list-addresses and expiry times (@pxref{Group Parameters}). @item @@ -14770,7 +14765,8 @@ @item New variables for specifying what score and adapt files are to be -considered home score and adapt files (@pxref{Home Score File}). +considered home score and adapt files (@pxref{Home Score File}) have +been added. @item @code{nndoc} was rewritten to be easily extendable (@pxref{Document @@ -14797,8 +14793,8 @@ another have been added (@pxref{Changing Servers}). @item -A way to specify that ``uninteresting'' fields be suppressed when -generating lines in buffers (@pxref{Advanced Formatting}). +There's a way now to specify that ``uninteresting'' fields be suppressed +when generating lines in buffers (@pxref{Advanced Formatting}). @item Several commands in the group buffer can be undone with @kbd{M-C-_} @@ -15041,7 +15037,7 @@ @item body @cindex body -The rest of an article. Everything that is not in the head is in the +The rest of an article. Everything not in the head is in the body. @item header @@ -15092,7 +15088,7 @@ @item server @cindex server -A machine than one can connect to and get news (or mail) from. +A machine one can connect to and get news (or mail) from. @item select method @cindex select method @@ -15101,8 +15097,8 @@ @item virtual server @cindex virtual server -A named select method. Since a select methods defines all there is to -know about connecting to a (physical) server, taking the things as a +A named select method. Since a select method defines all there is to +know about connecting to a (physical) server, taking the thing as a whole is a virtual server. @item washing @@ -15172,9 +15168,9 @@ @node Slow Terminal Connection @subsection Slow Terminal Connection -Let's say you use your home computer for dialing up the system that -runs Emacs and Gnus. If your modem is slow, you want to reduce the -amount of data that is sent over the wires as much as possible. +Let's say you use your home computer for dialing up the system that runs +Emacs and Gnus. If your modem is slow, you want to reduce (as much as +possible) the amount of data sent over the wires. @table @code @@ -15185,7 +15181,7 @@ horizontal and vertical recentering. @item gnus-visible-headers -Cut down on the headers that are included in the articles to the +Cut down on the headers included in the articles to the minimum. You can, in fact, make do without them altogether---most of the useful data is in the summary buffer, anyway. Set this variable to @samp{^NEVVVVER} or @samp{From:}, or whatever you feel you need. @@ -15245,7 +15241,7 @@ If you have a slow machine, or are just really impatient, there are a few things you can do to make Gnus run faster. -Set@code{gnus-check-new-newsgroups} and +Set @code{gnus-check-new-newsgroups} and @code{gnus-check-bogus-newsgroups} to @code{nil} to make startup faster. Set @code{gnus-show-threads}, @code{gnus-use-cross-reference} and @@ -15312,8 +15308,8 @@ time. It is also important to remember that I have no memory whatsoever. If -you send a bug report, and I send you a reply, and then you send back -just ``No, it's not! Moron!'', I will have no idea what you are +you send a bug report, and I send you a reply, and then you just send +back ``No, it's not! Moron!'', I will have no idea what you are insulting me about. Always over-explain everything. It's much easier for all of us---if I don't have all the information I need, I will just mail you and ask for more info, and everything takes more time. @@ -15345,7 +15341,7 @@ will be defining (in some details) the interface between Gnus and its backends (this is written in stone), the format of the score files (ditto), data structures (some are less likely to change than others) -and general method of operations. +and general methods of operation. @menu * Gnus Utility Functions:: Common functions and variable to use. @@ -15392,55 +15388,55 @@ @item gnus-get-info @findex gnus-get-info -Return the group info list for @var{group}. +Returns the group info list for @var{group}. @item gnus-add-current-to-buffer-list @findex gnus-add-current-to-buffer-list -Add the current buffer to the list of buffers to be killed on Gnus +Adds the current buffer to the list of buffers to be killed on Gnus exit. @item gnus-continuum-version @findex gnus-continuum-version -Take a Gnus version string as a parameter and returns a floating point +Takes a Gnus version string as a parameter and returns a floating point number. Earlier versions will always get a lower number than later versions. @item gnus-group-read-only-p @findex gnus-group-read-only-p -Say whether @var{group} is read-only or not. +Says whether @var{group} is read-only or not. @item gnus-news-group-p @findex gnus-news-group-p -Say whether @var{group} came from a news backend. +Says whether @var{group} came from a news backend. @item gnus-ephemeral-group-p @findex gnus-ephemeral-group-p -Say whether @var{group} is ephemeral or not. +Says whether @var{group} is ephemeral or not. @item gnus-server-to-method @findex gnus-server-to-method -Return the select method corresponding to @var{server}. +Returns the select method corresponding to @var{server}. @item gnus-server-equal @findex gnus-server-equal -Say whether two virtual servers are equal. +Says whether two virtual servers are equal. @item gnus-group-native-p @findex gnus-group-native-p -Say whether @var{group} is native or not. +Says whether @var{group} is native or not. @item gnus-group-secondary-p @findex gnus-group-secondary-p -Say whether @var{group} is secondary or not. +Says whether @var{group} is secondary or not. @item gnus-group-foreign-p @findex gnus-group-foreign-p -Say whether @var{group} is foreign or not. +Says whether @var{group} is foreign or not. @item group-group-find-parameter @findex group-group-find-parameter -Return the parameter list of @var{group}. If given a second parameter, -return the value of that parameter for @var{group}. +Returns the parameter list of @var{group}. If given a second parameter, +returns the value of that parameter for @var{group}. @item gnus-group-set-parameter @findex gnus-group-set-parameter @@ -15448,7 +15444,7 @@ @item gnus-narrow-to-body @findex gnus-narrow-to-body -Narrow the current buffer to the body of the article. +Narrows the current buffer to the body of the article. @item gnus-check-backend-function @findex gnus-check-backend-function @@ -15462,7 +15458,7 @@ @item gnus-read-method @findex gnus-read-method -Prompt the user for a select method. +Prompts the user for a select method. @end table @@ -15498,11 +15494,11 @@ The backends should be able to switch between several virtual servers. The standard backends implement this by keeping an alist of virtual -server environments that it pulls down/pushes up when needed. +server environments that they pull down/pushe up when needed. There are two groups of interface functions: @dfn{required functions}, which must be present, and @dfn{optional functions}, which Gnus will -always check whether are present before attempting to call. +always check for presence before attempting to call 'em. All these functions are expected to return data in the buffer @code{nntp-server-buffer} (@samp{ *nntpd*}), which is somewhat @@ -15513,7 +15509,7 @@ return value. Some backends could be said to be @dfn{server-forming} backends, and -some might be said to not be. The latter are backends that generally +some might be said not to be. The latter are backends that generally only operate on one group at a time, and have no concept of ``server'' -- they have a group, and they deliver info on that group and nothing more. @@ -15550,10 +15546,10 @@ This might later be expanded to @code{various}, which will be a mixture of HEADs and NOV lines, but this is currently not supported by Gnus. -If @var{fetch-old} is non-@code{nil} it says to try to fetch "extra -headers, in some meaning of the word. This is generally done by +If @var{fetch-old} is non-@code{nil} it says to try fetching "extra +headers", in some meaning of the word. This is generally done by fetching (at most) @var{fetch-old} extra headers less than the smallest -article number in @code{articles}, and fill in the gaps as well. The +article number in @code{articles}, and filling the gaps as well. The presence of this parameter can be ignored if the backend finds it cumbersome to follow the request. If this is non-@code{nil} and not a number, do maximum fetches. @@ -15599,14 +15595,14 @@ field = <text except TAB> @end example -For a closer explanation what should be in those fields, +For a closer look at what should be in those fields, @pxref{Headers}. @item (nnchoke-open-server SERVER &optional DEFINITIONS) @var{server} is here the virtual server name. @var{definitions} is a -list of @code{(VARIABLE VALUE)} pairs that defines this virtual server. +list of @code{(VARIABLE VALUE)} pairs that define this virtual server. If the server can't be opened, no error should be signaled. The backend may then choose to refuse further attempts at connecting to this @@ -15640,7 +15636,7 @@ If @var{server} is the current virtual server, and the connection to the physical server is alive, then this function should return a non-@code{nil} vlue. This function should under no circumstances -attempt to reconnect to a server that is has lost connection to. +attempt to reconnect to a server we have lost connection to. There should be no data returned. @@ -15662,15 +15658,15 @@ If @var{to-buffer} is non-@code{nil}, the result data should be returned in this buffer instead of the normal data buffer. This is to make it possible to avoid copying large amounts of data from one buffer to -another, and Gnus mainly request articles to be inserted directly into -its article buffer. +another, while Gnus mainly requests articles to be inserted directly +into its article buffer. If it is at all possible, this function should return a cons cell where -the car is the group name the article was fetched from, and the cdr is +the @code{car} is the group name the article was fetched from, and the @code{cdr} is the article number. This will enable Gnus to find out what the real group and article numbers are when fetching articles by @code{Message-ID}. If this isn't possible, @code{t} should be returned -on successful article retrievement. +on successful article retrieval. @item (nnchoke-request-group GROUP &optional SERVER FAST) @@ -15735,7 +15731,7 @@ The flag says whether the group is read-only (@samp{n}), is moderated (@samp{m}), is dead (@samp{x}), is aliased to some other group -(@samp{=other-group} or none of the above (@samp{y}). +(@samp{=other-group}) or none of the above (@samp{y}). @item (nnchoke-request-post &optional SERVER) @@ -15789,7 +15785,7 @@ When the user issues commands for ``sending news'' (@kbd{F} in the summary buffer, for instance), Gnus has to know whether the article the -user is following up is news or mail. This function should return +user is following up on is news or mail. This function should return @code{news} if @var{article} in @var{group} is news, @code{mail} if it is mail and @code{unknown} if the type can't be decided. (The @var{article} parameter is necessary in @code{nnvirtual} groups which @@ -15807,7 +15803,7 @@ @var{mark}. If the backend doesn't care, it must return the original @var{mark}, and not @code{nil} or any other type of garbage. -The only use for this that I can see is what @code{nnvirtual} does with +The only use for this I can see is what @code{nnvirtual} does with it---if a component group is auto-expirable, marking an article as read in the virtual group should result in the article being marked as expirable. @@ -15895,8 +15891,8 @@ that there will be more requests issued shortly, so that allows some optimizations. -The function should return a cons where the car is the group name and -the cdr is the article number that the article was entered as. +The function should return a cons where the @code{car} is the group name and +the @code{cdr} is the article number that the article was entered as. There should be no data returned. @@ -15907,8 +15903,8 @@ If @var{last} in @code{nil}, that means that there will be more calls to this function in short order. -The function should return a cons where the car is the group name and -the cdr is the article number that the article was entered as. +The function should return a cons where the @code{car} is the group name and +the @code{cdr} is the article number that the article was entered as. There should be no data returned. @@ -15933,7 +15929,7 @@ @item (nnchoke-request-rename-group GROUP NEW-NAME &optional SERVER) This function should rename @var{group} into @var{new-name}. All -articles that are in @var{group} should move to @var{new-name}. +articles in @var{group} should move to @var{new-name}. There should be no data returned. @@ -15949,8 +15945,8 @@ error conditions---they should not raise errors when they aren't able to perform a request. The first argument to this function is the backend symbol, and the rest are interpreted as arguments to @code{format} if -there are many of them, or just a string if there is one of them. -This function always returns @code{nil}. +there are multiple of them, or just a string if there is one of them. +This function must always returns @code{nil}. @lisp (nnheader-report 'nnchoke "You did something totally bogus") @@ -15963,9 +15959,9 @@ recently reported message for the backend in question. This function takes one argument---the server symbol. -Internally, these function access @var{backend}@code{-status-string}, so -the @code{nnchoke} backend will have its error message stored in -@code{nnchoke-status-string}. +Internally, these functions access @var{backend}@code{-status-string}, +so the @code{nnchoke} backend will have its error message stored in +@code{nnchoke-status-string}. @node Writing New Backends @@ -15988,7 +15984,6 @@ To inherit functions from other backends (and allow other backends to inherit functions from the current backend), you should use the following macros: -following. @table @code @@ -16001,7 +15996,7 @@ nnml nnmh) @end lisp -@code{nndir} has here declared that it intends to inherit functions from +@code{nndir} has declared here that it intends to inherit functions from both @code{nnml} and @code{nnmh}. @item defvoo @@ -16164,7 +16159,7 @@ @item post-mail This backend supports both mail and news. @item none -This is neither a post or mail backend---it's something completely +This is neither a post nor mail backend---it's something completely different. @item respool It supports respooling---or rather, it is able to modify its source @@ -16193,7 +16188,7 @@ (nnmail-get-new-mail 'nnml 'nnml-save-nov nnml-directory group)) @end lisp -It simply just calls @code{nnmail-get-new-mail} will a few parameters, +It simply calls @code{nnmail-get-new-mail} with a few parameters, and @code{nnmail} takes care of all the moving and splitting of the mail. @@ -16305,13 +16300,13 @@ one looong line, then that's ok. The meaning of the various atoms are explained elsewhere in this -manual. +manual (@pxref{Score File Format}). @node Headers @subsection Headers -Gnus uses internally a format for storing article headers that +Internally Gnus uses a format for storing article headers that corresponds to the @sc{nov} format in a mysterious fashion. One could almost suspect that the author looked at the @sc{nov} specification and just shamelessly @emph{stole} the entire thing, and one would be right. @@ -16563,10 +16558,9 @@ does this @code{defalias} thing with Gnus equivalents instead. Cleaner all over. -In the cases when the XEmacs function interface was obviously -cleaner, I used it instead. For example @code{gnus-region-active-p} -is an alias for @code{region-active-p} in XEmacs, whereas in Emacs -it is a function. +In the cases where the XEmacs function interface was obviously cleaner, +I used it instead. For example @code{gnus-region-active-p} is an alias +for @code{region-active-p} in XEmacs, whereas in Emacs it is a function. Of course, I could have chosen XEmacs as my native platform and done mapping functions the other way around. But I didn't. The performance @@ -16585,7 +16579,7 @@ @node Active File Format @subsubsection Active File Format -The active file lists all groups that are available on the server in +The active file lists all groups available on the server in question. It also lists the highest and lowest current article numbers in each group. @@ -16668,15 +16662,15 @@ ``Escape-Meta-Alt-Control-Shift'', and not ``Editing Macros'', as you may have heard from other disreputable sources (like the Emacs author). -The shift key is normally located near your pinky fingers, and are +The shift keys are normally located near your pinky fingers, and are normally used to get capital letters and stuff. You probably use it all the time. The control key is normally marked ``CTRL'' or something like that. The meta key is, funnily enough, never marked as such on any -keyboards. The one I'm currently at has a key that's marked ``Alt'', +keyboard. The one I'm currently at has a key that's marked ``Alt'', which is the meta key on this keyboard. It's usually located somewhere to the left hand side of the keyboard, usually on the bottom row. -Now, us Emacs people doesn't say ``press the meta-control-m key'', +Now, us Emacs people don't say ``press the meta-control-m key'', because that's just too inconvenient. We say ``press the @kbd{M-C-m} key''. @kbd{M-} is the prefix that means ``meta'' and ``C-'' is the prefix that means ``control''. So ``press @kbd{C-k}'' means ``press @@ -16726,7 +16720,7 @@ and @code{eval}ed (which is lisp-ese for ``run'') the next time you start Emacs. If you want to change the variable right away, simply say @kbd{C-x C-e} after the closing parenthesis. That will @code{eval} the -previous ``form'', which here is a simple @code{setq} statement. +previous ``form'', which is a simple @code{setq} statement here. Go ahead---just try it, if you're located at your Emacs. After you @kbd{C-x C-e}, you will see @samp{4} appear in the echo area, which
--- a/man/message.texi Mon Aug 13 09:45:48 2007 +0200 +++ b/man/message.texi Mon Aug 13 09:46:53 2007 +0200 @@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @setfilename message -@settitle Message 5.4.60 Manual +@settitle Message 5.4.62 Manual @synindex fn cp @synindex vr cp @synindex pg cp @@ -39,7 +39,7 @@ @tex @titlepage -@title Message 5.4.60 Manual +@title Message 5.4.62 Manual @author by Lars Magne Ingebrigtsen @page @@ -79,7 +79,7 @@ * Key Index:: List of Message mode keys. @end menu -This manual corresponds to Message 5.4.60. Message is distributed with +This manual corresponds to Message 5.4.62. Message is distributed with the Gnus distribution bearing the same version number as this manual has.
--- a/man/w3.texi Mon Aug 13 09:45:48 2007 +0200 +++ b/man/w3.texi Mon Aug 13 09:46:53 2007 +0200 @@ -0,0 +1,3607 @@ +\input texinfo +@c +@c Please note that this file uses some constructs not supported by earlier +@c versions of TeX-info. You must be running one of the newer TeX-info +@c releases (I currently use version 3.9 from ftp://prep.ai.mit.edu/pub/gnu/) +@c +@c Please do not send in bug reports about not being able to format the +@c document with 'makeinfo' or 'tex', just upgrade your installation. +@c +@c Info formatted files are provided in the distribution, and you can +@c retrieve dvi, postscript, and PDF versions from the web site or FTP +@c site: http://www.cs.indiana.edu/elisp/w3/docs.html +@c +@setfilename w3.info +@settitle Emacs/W3 v3.0.93 User's Manual +@iftex +@finalout +@end iftex +@c @setchapternewpage odd +@c @smallbook +@tex +\overfullrule=0pt +%\global\baselineskip 30pt % for printing in double space +@end tex +@synindex cp fn +@synindex vr fn +@dircategory World Wide Web +@dircategory GNU Emacs Lisp +@direntry +* W3: (w3). Emacs/W3 World Wide Web browser. +@end direntry +@ifinfo +This file documents the Emacs/W3 World Wide Web browser. + +Copyright (C) 1993, 1994, 1995, 1996 William M. Perry +Copyright (C) 1996, 1997 Free Software Foundation + +Permission is granted to make and distribute verbatim copies of +this manual provided the copyright notice and this permission notice +are preserved on all copies. + +@ignore +Permission is granted to process this file through Tex and print the +results, provided the printed document carries copying permission +notice identical to this one except for the removal of this paragraph +(this paragraph not being relevant to the printed manual). + +@end ignore +@end ifinfo +@c +@titlepage +@sp 6 +@center @titlefont{Emacs/W3} +@center @titlefont{User's Manual} +@sp 4 +@center Third Edition, Emacs/W3 Version 3.0 +@sp 1 +@center March 1997 +@sp 5 +@center William M. Perry +@center @i{wmperry@@cs.indiana.edu} +@page +@vskip 0pt plus 1filll +Copyright @copyright{} 1993, 1994, 1995 William M. Perry@* +Copyright @copyright{} 1996, 1997 Free Software Foundation + +Permission is granted to make and distribute verbatim copies of@* +this manual provided the copyright notice and this permission notice@* +are preserved on all copies. + +@end titlepage +@page +@ifinfo +@node Top, Getting Started, (dir), (dir) +@top W3 + +Users can browse the World Wide Web from within Emacs by using Emacs/W3. +All of the widely used (and even some not very widely used) @sc{url} +schemes are supported, and it is very easy to add new methods as the +need arises. + +Emacs/W3 provides some core functionality that can be readily re-used +from any program in Emacs. Users and other package writers are +encouraged to @i{Web-enable} their applications and daily work routines +with the library. + +Emacs/W3 is completely customizable, both from Emacs-Lisp and from +stylesheets @xref{Stylesheets} If there is any aspect of Emacs/W3 that +cannot be modified to your satisfaction, please send mail to the +@t{w3-beta@@indiana.edu} mailing list with any suggestions. +@xref{Reporting Bugs} + +This manual corresponds to Emacs/W3 v3.0.93 + +@menu +* Getting Started:: Getting up and running with Emacs/W3 +* Basic Usage:: Basic movement and usage of Emacs/W3. +* Compatibility:: Explanation of compatibility with + other browsers. +* Stylesheets:: How to control the look of web pages +* Supported URLs:: What @sc{URL} schemes are supported. +* MIME Support:: Support for @sc{mime} +* Security:: Various security methods supported +* Non-Unix Operating Systems:: Special considerations necessary to get + up and running correctly under non-unix + OS's. +* Speech Integration:: Outputting to a speech synthesizer. +* Advanced Features:: Some of the more arcane features. +* More Help:: How to get more help---mailing lists, + newsgroups, etc. +* Future Directions:: Plans for future revisions + +Appendices: +* Reporting Bugs:: How to report a bug in Emacs/W3. +* Dealing with Firewalls:: How to get around your firewall. +* Proxy Gateways:: Using a proxy gateway with Emacs/W3. +* Installing SSL:: Turning on @sc{ssl} support. +* Mailcap Files:: An explanation of Mailcap files. +* Down with DoubleClick:: Annoyed by advertisements? Read this! + +Indices: +* General Index:: General Index. +* Key Index:: Menus of command keys and their references. +@end menu +@end ifinfo + +@node Getting Started, Basic Usage, Top, Top +@chapter Getting Started +@cindex Clueless in Seattle +@cindex Getting Started +@kindex M-x w3 +@vindex w3-default-homepage +@findex w3 +If installed correctly, starting Emacs/W3 is quite painless. Just type +@kbd{M-x w3} in a running Emacs session. This will retrieve the default +page that has been configured (@pxref{Preferences Panel}) - by default the +documentation for Emacs/W3 at Indiana University. + +If the default page is not retrieved correctly at startup, you will have +to do some customization (@pxref{Preferences Panel}). + +Once started, you can use the mouse and the menu or use the following +key commands (for more commands and more detail, @pxref{Basic Usage, , +Basic Usage}). + +@table @asis +@item move forward +press the space bar, + +@item move backwards +press the backspace key, + +@item move to the next HTML reference on the page +press the @kbd{TAB} key, + +@item move to the previous HTML reference on the page +press the @kbd{SHIFT} and @kbd{TAB} keys at the same time. If this does +not work (some text terminals cannot distinguish between @kbd{TAB} and +@kbd{SHIFT-TAB}, pressing the @kbd{ALT} and @kbd{TAB} keys should also +work. + +@item follow a link +put the cursor over it +and press the @kbd{RETURN} key, or @* +click the left mouse button on it, + +@item fetch a @sc{url} +press the @kbd{Control} and @kbd{o} keys at the same time,@* +type the @sc{url}, and then press the @kbd{RETURN} key, + +@item return to the last URL you were at +press the @kbd{l} key, + +@item quit W3 mode +press the @kbd{q} key. +@end table + +@menu +* Downloading:: Where to download Emacs/W3. +* Building and Installing:: Compiling and installing from source. +* Startup Files:: What is where, and why. +* Preferences Panel:: Quick configuration of common options. +@end menu + +@node Downloading, Building and Installing, Getting Started, Getting Started +@section Downloading + +:: WORK :: What you need, and why@* +:: WORK :: Where to download Emacs, XEmacs, various platforms@* +:: WORK :: Where to download Emacs/W3@* +:: WORK :: Where to download related utilities (netpbm, xv, gimp, etc.) + +@node Building and Installing, Startup Files, Downloading, Getting Started +@section Building and Installing + +:: WORK :: Document makefile variables@* +:: WORK :: Document what gets installed where, why + +@node Startup Files, Preferences Panel, Building and Installing, Getting Started +@section Startup Files +@cindex Startup files +@cindex Default stylesheet + +:: WORK :: startup files@* +This section should document where Emacs/W3 looks for its startup files, +and what each one does. 'profile' 'stylesheet' 'hotlist' 'history' etc. + +@node Preferences Panel, , Startup Files, Getting Started +@section Preferences Panel +@cindex Preferences +@kindex M-x w3-preferences-edit + +:: WORK :: pref panel@* +This should document the quick preferences panel. M-x w3-preferences-edit + +@node Basic Usage, Compatibility, Getting Started, Top +@chapter Basic Usage +@cindex Basic Usage +@kindex space +@kindex backspace +@kindex return +@kindex tab +@kindex M-tab +Emacs/W3 is similar to the Info package all Emacs users hold near and +dear to their hearts (@xref{Top,,Info,info, The Info Manual}, for a +description of Info). Basically, @kbd{space} and @kbd{backspace} +control scrolling, and @kbd{return} or the middle mouse button follows a +hypertext link. The @kbd{tab} and @kbd{Meta-tab} keys maneuver around the +various links on the page. + +@b{NOTE:} Starting with Emacs/W3 3.0, form entry areas in a page can be +typed directly into. This is one of the main differences in navigation +from version 2.0. If you are used to using the @kbd{f} and @kbd{b} keys +to navigate around a buffer, I suggest training yourself to always use +@kbd{tab} and @kbd{M-tab} - it will save time and frustration on pages +with lots of form fields. + +By default, hypertext links are surrounded by '[[' and ']]' on +non-graphic terminals (VT100, DOS window, etc.). On a graphics +terminal, the links are in shown in different colors. +@xref{Stylesheets} for information on how to change this. + +There are approximately 50 keys bound to special Emacs/W3 functions. +The basic rule of thumb regarding keybindings in Emacs/W3 is that a +lowercase key takes an action on the @b{current document}, and an +uppercase key takes an action on the document pointed to by the +hypertext link @b{under the cursor}. + +There are several areas that the keybindings fall into: movement, +information, action, and miscellaneous. + +@menu +* Movement:: Moving around in the buffer. +* Information:: Getting information about a document. +* Action:: Following links, printing, etc. +* Miscellaneous:: Everything else. +@end menu + +@node Movement, Information, Basic Usage, Basic Usage +@section Movement + +All the standard Emacs bindings for movement are still in effect, with a +few additions for convenience. + +@table @kbd +@findex w3-scroll-up +@kindex space +@item space +Scroll downward in the buffer. With prefix arg, scroll down that many +screenfuls. +@kindex backspace +@findex scroll-down +@item backspace +Scroll upward in the buffer. With prefix arg, scroll up that many +screenfuls. +@kindex < +@findex w3-start-of-document +@item < +Goes to the start of document +@kindex > +@findex w3-end-of-document +@item > +Goes to the end of document +@kindex b +@kindex Meta-tab +@findex w3-widget-backward +@item Meta-tab, Shift-tab, b +Attempts to move backward one link area in the current document. +Signals an error if no previous links are found. +@kindex f +@kindex tab +@kindex n +@findex w3-widget-forward +@item tab, f, n +Attempts to move forward one link area in the current document. Signals +an error if no more links are found. +@kindex B +@findex w3-backward-in-history +@item B +Move backwards in the history stack. +@kindex F +@findex w3-forward-in-history +@item F +Move forwards in the history stack. +@kindex l +@findex w3-goto-last-buffer +@item l +Return to the last buffer shown before this buffer. +@kindex q +@findex w3-quit +@item q +Kill this buffer. +@kindex Q, u +@findex w3-leave-buffer +@item Q, u +Bury this buffer, but don't kill it +@end table + +@node Information, Action, Movement, Basic Usage +@section Information + +These functions relate information about one or more links on the +current document. + +@table @kbd +@kindex v +@findex url-view-url +@item v +This shows the @sc{url} of the current document in the minibuffer. +@kindex V +@findex w3-view-this-url +@item V +This shows the @sc{url} of the hypertext link under point in the +minibuffer. +@kindex i +@findex w3-document-information +@item i +Shows miscellaneous information about the currently displayed document. +This includes the @sc{url}, the last modified date, @sc{mime} headers, +the @sc{http} response code, and any relationships to other documents. +Any security information is also displayed. +@kindex I +@findex w3-document-information-this-url +@item I +Shows information about the @sc{url} at point. +@kindex s +@findex w3-source-document +@item s +This shows the @sc{html} source of the current document in a separate buffer. +The buffer's name is based on the document's @sc{url}. +@kindex S +@findex w3-source-document-at-point +@item S +Shows the @sc{html} source of the hypertext link under point in a separate +buffer. The buffer's name is based on the document's @sc{url}. +@kindex k +@findex w3-save-url +@item k +This stores the current document's @sc{url} in the kill ring, and also in the +current window-system's clipboard, if possible. +@kindex K +@findex w3-save-this-url +@item K +Stores the @sc{url} of the document under point in the kill ring, and also in +the current window-system's clipboard, if possible. +@end table + +@node Action, Miscellaneous, Information, Basic Usage +@section Action + +First, here are the keys and functions that bring up a new hypertext +page, usually creating a new buffer. +@table @kbd +@kindex m +@findex w3-complete-link +@item m +Choose a link from the current buffer and follow it. A completing-read +is done on all the links, so @kbd{space} and @kbd{TAB} can be used for +completion. +@kindex return +@findex w3-follow-link +@item return +Pressing return when over a hyperlink attempts to follow the link +under the cursor. With a prefix argument (@kbd{C-u}), this forces the +file to be saved to disk instead of being passed off to other viewers +or being parsed as @sc{html}. + +Pressing return when over a form input field can cause auto-submission +of the form. This is for Mosaic and Netscape compatibility. If there +is only one item in the form other than submit or reset buttons, then + +minibuffer for the data to insert into the input field. Type checking +is done, and the data is only entered into the form when data of the +correct type is entered (ie: cannot enter 44 for 'date' field, etc). + +@kindex Middle Mouse Button +@findex w3-follow-mouse +@item Middle Mouse Button +Attempt to follow a hypertext link under the mouse cursor. Clicking on +a form input field will prompt in the minibuffer for the data to insert +into the input field. Type checking is done, and the data is only +entered into the form when data of the correct type is entered (ie: +cannot enter 44 for 'date' field, etc). + +@kindex Control Middle Mouse Button +@kindex Meta return +@findex w3-follow-inlined-image +@item Control Middle Mouse Button, Meta return +Tries to retrieve the inlined image that is under point. It ignores any +form entry areas or hyperlinks, and blindly follows any inlined image. +Useful for seeing images that are meant to be used as hyperlinks when +not on a terminal capable of displaying graphics. + +@kindex p +@findex w3-print-this-url +@item p +Prints out the current buffer in a variety of formats, including +PostScript, @sc{html} source, or formatted text. +@kindex P +@findex w3-print-url-under-point +@item P +Prints out the @sc{url} under point in a variety of formats, including +PostScript, @sc{html} source, or formatted text. +@kindex m +@findex w3-complete-link +@item m +Selects a destination from a list of all the hyperlinks in the current +buffer. Use @kbd{space} and @kbd{tab} to complete on the links. + +@kindex r +@kindex g +@findex w3-reload-document +@item r, g +Reloads the current document. The position within the buffer remains +the same (unless the document has changed since it was last retrieved, +in which case it should be relatively close). This causes an +unconditional reload from the remote server - the locally cached copy is +not consulted. +@kindex C-o +@findex w3-fetch +@item C-o +Prompts for a @sc{url} in the minibuffer, and attempts to fetch +it. If there are any errors, or Emacs/W3 cannot understand the type of link +requested, the errors are displayed in a hypertext buffer. +@kindex o +@findex w3-open-local +@vindex url-use-hypertext-dired +@item o +Opens a local file, interactively. This prompts for a local file name +to open. The file must exist, and may be a directory. If the requested +file is a directory and @code{url-use-hypertext-dired} is @code{nil}, +then a dired-mode buffer is displayed. If non@code{nil}, then Emacs/W3 +automatically generates a hypertext listing of the directory. The +hypertext mode is the default, so that all the keys and functions remain +the same. + +@kindex M-s +@findex w3-save-as +@item M-s +Save a document to the local disk as HTML Source, Formatted Text, LaTeX +Source, or Binary. + +@kindex Hv +@findex w3-show-history-list +@vindex w3-keep-history +@item Hv +If @code{url-keep-history} is non-@code{nil}, then Emacs/W3 keeps track +of all the @sc{url}s visited in an Emacs session. This function takes all +the links that are in that internal list, and formats them as hypertext +links in a list. +@end table + +@cindex Buffer movement +And here are the commands to move around between Emacs/W3 buffers: + +@table @kbd +@kindex l +@findex w3-goto-last-buffer +@item l +Goes to the last WWW buffer seen. +@kindex q +@findex w3-quit +@item q +Quits WWW mode. This kills the current buffer and goes to the most +recently visited buffer. +@kindex Q +@findex w3-leave-buffer +@item u +This is similar to w3-quit, but the buffer is not killed, it is moved to +the bottom of the buffer list (so it is the least likely to show up as +the default with switch-to-buffer). This is different from +@code{w3-goto-last-buffer} in that it does not return to the last WWW +page visited - it is the same as using @code{switch-to-buffer} - the +buffer left in the window is fairly random. +@kindex HB +@kindex B +@findex w3-backward-in-history +@item HB, B +Takes one step back along the path in the current history. Has no +effect if at the beginning of the session history. +@kindex HF +@kindex F +@findex w3-forward-in-history +@item HF, F +Takes one step forward along the path in the current history. Has no +effect if at the end of the session history. +@end table + +@node Miscellaneous, , Action, Basic Usage +@section Miscellaneous + +@table @kbd +@kindex M-m +@findex w3-mail-current-document +@item M-m +Mails the current document to someone. Choose from several different +formats to mail: formatted text, @sc{html} source, PostScript, or LaTeX source. +When the @sc{html} source is mailed, then an appropriate <base> tag is inserted +at the beginning of the document so that relative links may be followed +correctly by whoever receives the mail. +@kindex M-M +@findex w3-mail-document-under-point +@item M-M +Mails the document pointed to by the hypertext link under point to someone. +Choose from several different formats to mail: formatted text, @sc{html} source, +PostScript, or LaTeX source. When the @sc{html} source is mailed, then an +appropriate <base> tag is inserted at the beginning of the document so that +relative links may be followed correctly by whoever receives the +mail. +@kindex p +@findex w3-print-this-url +@item p +Prints the current document. Choose from several different formats to +print: formatted text, @sc{html} source, PostScript (with ps-print), or by using +LaTeX and dvips). + +@findex lpr-buffer +@vindex lpr-command +@vindex lpr-switches +When the formatted text is printed, the normal @code{lpr-buffer} function +is called, and the variables @code{lpr-command} and @code{lpr-switches} +control how the document is printed. + +When the @sc{html} source is printed, then an appropriate <base> tag is +inserted at the beginning of the document. +@vindex w3-print-commnad +@vindex w3-latex-docstyle +When postscript is printed, then the @sc{html} source of the document is +converted into LaTeX source. There are several variables controlling +what the final LaTeX document looks like. + +:: WORK :: Document the new LaTeX backend + +@table @code +@item w3-latex-use-latex2e +@vindex w3-latex-use-latex2e +If non-@code{nil}, configures the LaTeX engine to use the LaTeX2e +syntax. A @code{nil} value indicates that LaTeX 2.0.9 compabibility +will be used instead. +@item w3-latex-docstyle +@vindex w3-latex-docstyle +The document style to use when printing or mailing converted @sc{html} files +in LaTeX. Good defaults are: @{article@}, [psfig,twocolumn]@{article@}, +etc. +@item w3-latex-packages +@vindex w3-latex-packages +List of LaTeX packages to include. Currently this is only used if +@code{w3-latex-use-latex2e} is non-@code{nil}. +@item w3-latex-use-maketitle +@vindex w3-latex-use-maketitle +If non-@code{nil}, the LaTeX engine will use real LaTeX title pages for +document titles. +@item w3-latex-print-links +@vindex w3-latex-print-links +If non-@code{nil}, prints the @sc{url}s of hypertext links as endnotes at the +end of the document. If set to @code{footnote}, prints the @sc{url}'s as +footnotes on each page. +@end table + +@kindex P +@findex w3-print-url-under-point +@item P +Prints the document pointed to by the hypertext link under point. +Please see the previous item for more information. +@kindex M-x w3-insert-formatted-url +@findex w3-insert-formatted-url +@item M-x w3-insert-formatted-url +Insert a fully formatted @sc{html} link into another buffer. This gets the +name and @sc{url} of either the current buffer, or, with a prefix arg, of the +link under point, and construct the appropriate <a...>...</a> markup and +insert it into the desired buffer. +@kindex M-tab +@findex w3-insert-this-url +@item M-tab +Inserts the @sc{url} of the current document into another buffer. Buffer is +prompted for in the minibuffer. With prefix arg, uses the @sc{url} of the +link under point. +@kindex U +@findex w3-use-links +@item U +Selects one of the <LINK> tags from this document and fetch it. Links +are attributes of a specific document, and can tell such things as who +made the document, where a table of contents is located, etc. + +Link tags specify relationships between documents in two ways. Normal +(forward) relationships (where the link has a REL="xxx" attribute), and +reverse relationships (where the link has a REV="xxx" attribute). This +first asks what type of link to follow (Normal or Reverse), then does +a @code{completing-read} on only the links that have that type of +relationship. +@end table + +@node Compatibility, Stylesheets, Basic Usage, Top +@chapter Compatibility with other Browsers +Due to the popularity of several other browsers, Emacs/W3 offers an easy +transition to its much better way of life. This ranges from being able +to share the same preferences files and disk cache to actually emulating +the keybindings used in other browsers. + +@menu +* Emulation:: Emacs/W3 can emulate the keybindings and + other behaviours of other browsers. +* Hotlist Handling:: A hotlist is an easy way to keep track of + interesting Web pages without having to + remember the exact path to get there. +* Session History:: Keeping a history of documents visited + in one Emacs sessions allows the use of + 'forward' and 'back' buttons easily. +* Global History:: Keeping a history of all the places ever + visited on the web. +@end menu + +@node Emulation, Hotlist Handling, Compatibility, Compatibility +@section Emulation +@cindex Browser emulation +@cindex Emulation of other browsers +@cindex Netscape emulation +@cindex Lynx emulation +@findex turn-on-netscape-emulation +@findex turn-on-lynx-emulation +@findex w3-netscape-emulation-minor-mode +@findex w3-lynx-emulation-minor-mode +@vindex w3-mode-hook + +:: WORK :: Document lynx emulation@* +@table @kbd +@item Down arrow +Highlight next topic +@item Up arrow +Highlight previous topic +@item Right arrow, Return, Enter +Jump to highlighted topic +@item Left arrow +Return to previous topic +@item + +Scroll down to next page (Page-Down) +@item - +Scroll up to previous page (Page-Up) +@item SPACE +Scroll down to next page (Page-Down) +@item b +Scroll up to previous page (Page-Up) +@item C-A +Go to first page of the current document (Home) +@item C-E +Go to last page of the current document (End) +@item C-B +Scroll up to previous page (Page-Up) +@item C-F +Scroll down to next page (Page-Down) +@item C-N +Go forward two lines in the current document +@item C-P +Go back two lines in the current document +@item ) +Go forward half a page in the current document +@item ( +Go back half a page in the current document +@item # +Go to Toolbar or Banner in the current document +@item ?, h +Help (this screen) +@item a +Add the current link to a bookmark file +@item c +Send a comment to the document owner +@item d +Download the current link +@item e +Edit the current file +@item g +Goto a user specified @sc{url} or file +@item i +Show an index of documents +@item j +Execute a jump operation +@item k +Show a list of key mappings +@item l +List references (links) in current document +@item m +Return to main screen +@item o +Set your options +@item p +Print the current document +@item q +Quit +@item / +Search for a string within the current document +@item s +Enter a search string for an external search +@item n +Go to the next search string +@item v +View a bookmark file +@item V +Go to the Visited Links Page +@item x +Force submission of form or link with no-cache +@item z +Cancel transfer in progress +@item [backspace] +Go to the history Page +@item = +Show file and link info +@item \ +Toggle document source/rendered view +@item ! +Spawn your default shell +@item * +Toggle image_links mode on and off +@item [ +Toggle pseudo_inlines mode on and off +@item ] +Send an @sc{http} @sc{head} request for the current doc or link +@item C-R +Reload current file and refresh the screen +@item C-W +Refresh the screen +@item C-U +Erase input line +@item C-G +Cancel input or transfer +@item C-T +Toggle trace mode on and off +@item C-K +Invoke the Cookie Jar Page +@end table + +:: WORK :: Document netscape emulation@* +Uh, turn this into pretty tables about what keys are emulated. + +@example +(define-key w3-netscape-emulation-minor-mode-map "\M-s" 'w3-save-as) +(define-key w3-netscape-emulation-minor-mode-map "\M-m" 'w3-mailto) +(define-key w3-netscape-emulation-minor-mode-map "\M-n" 'make-frame) +(define-key w3-netscape-emulation-minor-mode-map "\M-l" 'w3-fetch) +(define-key w3-netscape-emulation-minor-mode-map "\M-o" 'w3-open-local) +(define-key w3-netscape-emulation-minor-mode-map "\M-p" 'w3-print-this-url) +(define-key w3-netscape-emulation-minor-mode-map "\M-q" 'w3-quit) +(define-key w3-netscape-emulation-minor-mode-map "\M-f" 'w3-search-forward) +(define-key w3-netscape-emulation-minor-mode-map "\M-g" 'w3-search-again) +(define-key w3-netscape-emulation-minor-mode-map "\M-r" 'w3-reload-document) +(define-key w3-netscape-emulation-minor-mode-map "\M-i" 'w3-load-delayed-images) +(define-key w3-netscape-emulation-minor-mode-map "\M-a" 'w3-hotlist-add-document) +(define-key w3-netscape-emulation-minor-mode-map "\M-b" 'w3-show-hotlist) +(define-key w3-netscape-emulation-minor-mode-map "\M-h" 'w3-show-history-list) + +@end example + +@node Hotlist Handling, Session History, Emulation, Compatibility +@section Hotlist Handling + +:: WORK :: Document that it supports different types of hotlist formats@* +:: WORK :: Make sure everything hotlist related can be accessed via 'h'@* +In order to avoid having to traverse many documents to get to the same +document over and over, Emacs/W3 supports a ``hotlist'' like Mosaic. This is +a file that contains @sc{url}s and aliases. Hotlists allow quick access to any +document in the Web, providing it has been visited and added to the hotlist. +The variable @code{w3-hotlist-file} determines where this information +is saved. The structure of the file is compatible with Mosaic's +hotlist file, so this defaults to @file{~/.mosaic-hotlist-default}. + +Hotlist commands are: +@table @kbd +@kindex hi +@findex w3-hotlist-add-document +@vindex w3-hotlist-file +@item a +Adds the current document to the hotlist, with the buffer name as its +identifier. Modifies the file specified by @code{w3-hotlist-file}. If +this is given a prefix-argument (via @kbd{C-u}), the title is prompted +for instead of automatically defaulting to the document title. + +@findex w3-hotlist-refresh +@vindex w3-hotlist-file +@kindex hR +@item hR +This rereads the default hostlist file specified by +@code{w3-hotlist-file}. +@findex w3-hotlist-delete +@vindex w3-hotlist-file +@kindex hd +@item d +Prompts for the alias of the entry to kill. Pressing the spacebar or +tab will list out partial completions. The internal representation of +the hotlist and the file specified by @code{w3-hotlist-file} are +updated. +@item hr +@kindex hr +@findex w3-hotlist-rename-entry +@vindex w3-hotlist-file +Some hotlist item names can be very unwieldy (`Mosaic for X level 2 fill +out form support'), or uninformative (`Index of /'). Prompts for the +item to rename in the minibuffer---use the spacebar or tab key for +completion. After having chosen an item to rename, prompts for a new +title until a unique title is entered. Modifies the file specified by +@code{w3-hotlist-file}. + +@item hu +@kindex hu +@findex w3-use-hotlist +Prompts for the alias to jump to. Pressing the @key{spacebar} or +@key{tab} key shows partial completions. + +@item hv +@kindex hv +@findex w3-show-hotlist +Converts the hotlist into @sc{html} and displays it. +@item ha +@kindex ha +@findex w3-hotlist-apropos +Shows the hotlist entries matching a regular expression. +@item hA +@kindex hA +@findex w3-hotlist-append +Appends another hotlist file to the one currently in memory. +@end table +@node Session History, Global History, Hotlist Handling, Compatibility +@section History +@cindex History Lists + +Almost all web browsers keep track of the @sc{url}s followed from a page, so +that it can provide @b{forward} and @b{back} buttons to keep a @i{path} +of @sc{url}s that can be traversed easily. + +@vindex url-keep-history +If the variable @code{url-keep-history} is @code{t}, then Emacs/W3 +keeps a list of all the @sc{url}s visited in a session. + +@findex w3-show-history +To view a listing of the history for this session of Emacs/W3, use +@code{M-x w3-show-history} from any buffer, and Emacs/W3 generates an +@sc{html} document showing every @sc{url} visited since Emacs started (or +cleared the history list), and then format it. Any of the links can +be chosen and followed to the original document. To clear the history +list, choose 'Clear History' from the 'Options' menu. + +@findex w3-forward-in-history +@findex w3-backward-in-history +@findex w3-fetch +Another twist on the history list mechanism is the fact that all +Emacs/W3 buffers remember what @sc{url}, buffer, and buffer position of the +last document, and also keeps track of the next location jumped @b{to} +from that buffer. This means that the user can go forwards and +backwards very easily along the path taken to reach a particular +document. To go forward, use the function @code{w3-forward-in-history}, +to go backward, use the function @code{w3-backward-in-history}. + +@node Global History, , Session History, Compatibility +@section Global History + +:: WORK :: Document that the global history can have diff. formats@* +Most web browsers also support the idea of a ``history'' of @sc{url}s the +user has visited, and it displays them in a different style than normal +@sc{url}s. + +@vindex url-keep-history +@vindex url-global-history-file +If the variable @code{url-keep-history} is @code{t}, then Emacs/W3 +keeps a list of all the @sc{url}s visited in a session. The file is +automatically written to disk when exiting emacs. The list is added to +those already in the file specified by @code{url-global-history-file}, +which defaults to @file{~/.mosaic-global-history}. + +If any @sc{url} in the list is found in the file, it is not saved, but new +ones are added at the end of the file. + +The function that saves the global history list is smart enough to +notice what style of history list is being used (Netscape, Emacs/W3, or +XMosaic), and writes out the new additions appropriately. + +@cindex Completion of URLs +@cindex Usefulness of global history +One of the nice things about keeping a global history files is that Emacs/W3 +can use it as a completion table. When doing @kbd{M-x w3-fetch}, pressing +the @kbd{tab} or @kbd{space} key will show all completions for a +partial @sc{url}. This is very useful, especially for very long @sc{url}s that +are not in a hotlist, or for seeing all the pages from a particular web +site before choosing which to retrieve. + +@node Stylesheets, Supported URLs, Compatibility, Top +@chapter Stylesheets +The way in which Emacs/W3 formats a document is very customizable. All +formatting is now controlled by a default stylesheet set by the user +with the @code{w3-default-stylesheet} variable. Emacs/W3 currently +supports the @sc{W3C} recommendation for Cascading Style Sheets, Level 1 +(commonly known as @sc{CSS1}) with a few experimental items from other +W3C proposals. Wherever Emacs/W3 diverges from the specification, it +will be clearly documented, and will be changed once a full standard is +available. + +Support for @sc{DSSSL} is progressing, but spare time is at an all-time +low. If anyone would like to help, please contact the author. + +The following sections closely parallel the @sc{CSS1} specification so +it should be very easy to look up what Emacs/W3 supports when browsing +through the @sc{CSS1} specification. Please note that a lot of the text +in the following sections comes directly from the specification as +well. + +@menu +* Terminology:: Terms used in the rest of this chapter. +* Basic Concepts:: Why are stylesheets useful? Getting started. +* Pseudo-Classes/Elements:: Special classes for elements. +* The Cascade:: How stylesheets are combined. +* Properties:: What properties you can set on elements. +* Units:: What you can set them to. +@end menu + +@node Terminology, Basic Concepts, Stylesheets, Stylesheets +@section Terminology + +@table @dfn +@item attribute +HTML attribute, ie: @samp{align=center} - align is the attribute. +@item author +The author of an HTML document. +@item block-level element +An element which has a line break before and after (e.g. 'H1' in @sc{HTML}). +@item canvas +The part of the UA's drawing surface onto which documents are rendered. +@item child element +A subelement in @sc{sgml} terminology. +@item contextual selector +A selector that matches elements based on their position in the document +structure. A contextual selector consists of several simple +selectors. E.g., the contextual selector 'H1.initial B' consists of two +simple selectors, 'H1.initial' and 'B'. +@item @sc{css} +Cascading Style Sheets. +@item declaration +A property (e.g. 'font-size') and a corresponding value (e.g. '12pt'). +@item designer +The designer of a style sheet. +@item document +@sc{html} document. +@item element +@sc{html} element. +@item element type +A generic identifier in @sc{sgml} terminology. +@item fictional tag sequence +A tool for describing the behavior of pseudo-classes and pseudo-elements. +@item font size +The size for which a font is designed. Typically, the size of a font is +approximately equal to the distance from the bottom of the lowest letter +with a descender to the top of the tallest letter with an ascender and +(optionally) with a diacritical mark. +@item @sc{html} extension +Markup introduced by UA vendors, most often to support certain visual +effects. The @sc{font}, @sc{center} and @sc{blink} elements are examples +of HTML extensions, as is the @sc{bgcolor} attribute. One of the goals +of @sc{css} is to provide an alternative to @sc{html} extensions. +@item inline element +An element which does not have a line break before and after +(e.g. '@sc{strong}' in @sc{html}) +@item intrinsic dimensions +The width and height as defined by the element itself, not imposed by +the surroundings. In this specification it is assumed that all replaced +elements -- and only replaced elements -- come with intrinsic +dimensions. +@item parent element +The containing element in @sc{sgml} terminology. +@item pseudo-element +Pseudo-elements are used in @sc{css} selectors to address typographical +items (e.g. the first line of an element) rather than structural +elements. +@item pseudo-class +Pseudo-classes are used in @sc{css} selectors to allow information +external to the @sc{html} source (e.g. the fact that an anchor has been +visited or not) to classify elements. +@item property +A stylistic parameter that can be influenced through @sc{css}. +@item reader +The person for whom the document is rendered. +@item replaced element +An element that the @sc{css} formatter only knows the intrinsic +dimensions of. In @sc{html}, @sc{img}, @sc{input}, @sc{textarea}, +@sc{select} and @sc{object} elements can be examples of replaced +elements. E.g., the content of the @sc{img} element is often replaced by +the image that the @sc{src} attribute points to. @sc{css1} does not +define how the intrinsic dimensions are found. +@item rule +A declaration (e.g. 'font-family: helvetica') and its selector +(e.g. @sc{'H1'}). +@item selector +A string that identifies what elements the corresponding rule applies +to. A selector can either be a simple selector (e.g. 'H1') or a +contextual selector (e.g. @sc{'h1 b'}) which consists of several simple +selectors. +@item @sc{sgml} +Standard Generalized Markup Language, of which @sc{html} is an +application. +@item simple selector +A selector that matches elements based on the element type and/or +attributes, and not the element's position in the document +structure. E.g., 'H1.initial' is a simple selector. +@item style sheet +A collection of rules. +@item @sc{ua} +User Agent, often a web browser or web client. +@item user +Synonymous with reader. +@item weight +The priority of a rule. +@end table + +@node Basic Concepts, Pseudo-Classes/Elements, Terminology, Stylesheets +@section Basic Concepts + +Designing simple style sheets is easy. One needs only to know a little +HTML and some basic desktop publishing terminology. E.g., to set the +text color of 'H1' elements to blue, one can say: + +@example + H1 @{ color: blue @} +@end example + +The example above is a simple CSS rule. A rule consists of two main +parts: selector ('H1') and declaration ('color: blue'). The declaration +has two parts: property ('color') and value ('blue'). While the example +above tries to influence only one of the properties needed for rendering +an HTML document, it qualifies as a style sheet on its own. Combined +with other style sheets (one fundamental feature of CSS is that style +sheets are combined) it will determine the final presentation of the +document. + +The selector is the link between the HTML document and the style sheet, and +all HTML element types are possible selectors. + +@node Pseudo-Classes/Elements, The Cascade, Basic Concepts, Stylesheets +@section Pseudo-Classes/Elements + +In @sc{css1}, style is normally attached to an element based on its +position in the document structure. This simple model is sufficient for +a wide variety of styles, but doesn't cover some common effects. The +concept of pseudo-classes and pseudo-elements extend addressing in +@sc{css1} to allow external information to influence the formatting +process. + +Pseudo-classes and pseudo-elements can be used in @sc{css} selectors, +but do not exist in the @sc{html} source. Rather, they are "inserted" by +the @sc{ua} under certain conditions to be used for addressing in style +sheets. They are referred to as "classes" and "elements" since this is a +convenient way of describing their behavior. More specifically, their +behavior is defined by a fictional tag sequence. + +Pseudo-elements are used to address sub-parts of elements, while +pseudo-classes allow style sheets to differentiate between different +element types. + +The only support pseudo-classes in Emacs/W3 are on the anchor tag +(<a>...</a>). + +User agents commonly display newly visited anchors differently from +older ones. In @sc{css1}, this is handled through pseudo-classes on the +'A' element: + +@example + A:link @{ color: red @} /* unvisited link */ + A:visited @{ color: blue @} /* visited links */ + A:active @{ color: lime @} /* active links */ +@end example + +All 'A' elements with an 'HREF' attribute will be put into one and only +one of these groups (i.e. target anchors are not affected). UAs may +choose to move an element from 'visited' to 'link' after a certain +time. An 'active' link is one that is currently being selected (e.g. by +a mouse button press) by the reader. + +The formatting of an anchor pseudo-class is as if the class had been +inserted manually. A @sc{ua} is not required to reformat a currently +displayed document due to anchor pseudo-class transitions. E.g., a style +sheet can legally specify that the 'font-size' of an 'active' link +should be larger that a 'visited' link, but the UA is not required to +dynamically reformat the document when the reader selects the 'visited' +link. + +Pseudo-class selectors do not match normal classes, and vice versa. The +style rule in the example below will therefore not have any influence: + +@example + A:link @{ color: red @} + + <A CLASS=link NAME=target5> ... </A> +@end example + +In @sc{css1}, anchor pseudo-classes have no effect on elements other +than 'A'. Therefore, the element type can be omitted from the selector: + +@example + A:link @{ color: red @} + :link @{ color: red @} +@end example + +The two selectors above will select the same elements in CSS1. + +Pseudo-class names are case-insensitive. + +Pseudo-classes can be used in contextual selectors: + +@example + A:link IMG @{ border: solid blue @} +@end example + +Also, pseudo-classes can be combined with normal classes: + +@example + A.external:visited @{ color: blue @} + + <A CLASS=external HREF="http://out.side/">external link</A> +@end example + +If the link in the above example has been visited, it will be rendered +in blue. Note that normal class names precede pseudo-classes in the +selector. + +@node The Cascade, Properties, Pseudo-Classes/Elements, Stylesheets +@section The Cascade + +In @sc{css}, more than one style sheet can influence the presentation +simultaneously. There are two main reasons for this feature: modularity +and author/reader balance. + +@table @i +@item modularity +A style sheet designer can combine several (partial) style sheets to +reduce redundancy: + +@example + @@import url(http://www.style.org/pastoral); + @@import url(http://www.style.org/marine); + + H1 @{ color: red @} /* override imported sheets */ +@end example +@item author/reader balance +Both readers and authors can influence the presentation through style +sheets. To do so, they use the same style sheet language thus reflecting +a fundamental feature of the web: everyone can become a publisher. The +@sc{ua} is free to choose the mechanism for referencing personal style +sheets. +@end table + +Sometimes conflicts will arise between the style sheets that influence +the presentation. Conflict resolution is based on each style rule having +a weight. By default, the weights of the reader's rules are less than +the weights of rules in the author's documents. I.e., if there are +conflicts between the style sheets of an incoming document and the +reader's personal sheets, the author's rules will be used. Both reader +and author rules override the @sc{ua}'s default values. + +The imported style sheets also cascade with each other, in the order +they are imported, according to the cascading rules defined below. Any +rules specified in the style sheet itself override rules in imported +style sheets. That is, imported style sheets are lower in the cascading +order than rules in the style sheet itself. Imported style sheets can +themselves import and override other style sheets, recursively. + +In @sc{css1}, all '@@import' statements must occur at the start of a +style sheet, before any declarations. This makes it easy to see that +rules in the style sheet itself override rules in the imported style +sheets. + +NOTE: The use of !important in @sc{css} stylesheets is unsupported at +this time. + +Conflicting rules are intrinsic to the CSS mechanism. To find the value +for an element/property combination, the following algorithm must be +followed: + +@enumerate +@item +Find all declarations that apply to the element/property in +question. Declarations apply if the selector matches the element in +question. If no declarations apply, the inherited value is used. If +there is no inherited value (this is the case for the 'HTML' element and +for properties that do not inherit), the initial value is used. +@item +Sort the declarations by explicit weight: declarations marked +'!important' carry more weight than unmarked (normal) declarations. +@item +Sort by origin: the author's style sheets override the reader's style +sheet which override the UA's default values. An imported style sheet +has the same origin as the style sheet from which it is imported. +@item +Sort by specificity of selector: more specific selectors will override +more general ones. To find the specificity, count the number of ID +attributes in the selector (a), the number of CLASS attributes in the +selector (b), and the number of tag names in the selector +(c). Concatenating the three numbers (in a number system with a large +base) gives the specificity. Some examples: +@example + LI @{...@} /* a=0 b=0 c=1 -> specificity = 1 */ + UL LI @{...@} /* a=0 b=0 c=2 -> specificity = 2 */ + UL OL LI @{...@} /* a=0 b=0 c=3 -> specificity = 3 */ + LI.red @{...@} /* a=0 b=1 c=1 -> specificity = 11 */ + UL OL LI.red @{...@} /* a=0 b=1 c=3 -> specificity = 13 */ + #x34y @{...@} /* a=1 b=0 c=0 -> specificity = 100 */ +@end example +Pseudo-elements and pseudo-classes are counted as normal elements and +classes, respectively. +@item +Sort by order specified: if two rules have the same weight, the latter +specified wins. Rules in imported style sheets are considered to be +before any rules in the style sheet itself. +@end enumerate + +The search for the property value can be terminated whenever one rule +has a higher weight than the other rules that apply to the same +element/property combination. + +This strategy gives author's style sheets considerably higher weight +than those of the reader. It is therefore important that the reader has +the ability to turn off the influence of a certain style sheet, +e.g. through a pull-down menu. + +A declaration in the 'STYLE' attribute of an element has the same weight +as a declaration with an ID-based selector that is specified at the end +of the style sheet: + +@example +<STYLE TYPE="text/css"> + #x97z @{ color: blue @} +</STYLE> + +<P ID=x97z STYLE="color: red"> +@end example + +In the above example, the color of the 'P' element would be +red. Although the specificity is the same for both declarations, the +declaration in the 'STYLE' attribute will override the one in the +'STYLE' element because of cascading rule number 5. + +The @sc{ua} may choose to honor other stylistic @sc{html} attributes, +for example 'ALIGN'. If so, these attributes are translated to the +corresponding @sc{css} rules with specificity equal to 1. The rules are +assumed to be at the start of the author style sheet and may be +overridden by subsequent style sheet rules. In a transition phase, this +policy will make it easier for stylistic attributes to coexist with +style sheets. + +@node Properties, Units, The Cascade, Stylesheets +@section Properties + +In the text below, the allowed values for each property are listed +with a syntax like the following: + +@example + Value: N | NW | NE + Value: [ <length> | thick | thin ]@{1,4@} + Value: <uri>? <color> [ / <color> ]? + Value: <uri> || <color> +@end example + +The words between < and > give a type of value. The most common types +are <length>, <percentage>, <url>, <number>and <color> these are +described in the section on [[units]]. The more specialized types +(e.g. <font-family>and <border-style>) are described under the property +where they appear. + +Other words are keywords that must appear literally, without quotes. The +slash (/) and the comma (,) must also appear literally. + +Several things juxtaposed mean that all of them must occur, in the given +order. A bar (|) separates alternatives: one of them must occur. A +double bar (A || B) means that either A or B or both must occur, in any +order. Brackets ([]) are for grouping. Juxtaposition is stronger than +the double bar, and the double bar is stronger than the bar. Thus "a b | +c || d e" is equivalent to "[ a b ] | [ c || [ d e ]]". + +Every type, keyword, or bracketed group may be followed by one of the +following modifiers: + +@itemize @bullet +@item +An asterisk (*) indicates that the preceding type, word or group is +repeated zero or more times. +@item +A plus (+) indicates that the preceding type, word or group is repeated +one or more times. +@item +A question mark (?) indicates that the preceding type, word or group is +optional. +@item +A pair of numbers in curly braces (@{A,B@}) indicates that the preceding +type, word or group is repeated at least A and at most B times. +@end itemize + +Other than the value the following information is also shown. + +@multitable @columnfractions .20 .8 +@item Supported Values: @tab If this is present, it lists the parts of +the specification that Emacs/W3 currently supports. +@item Unsupported Values: @tab If this is present, it represents the +parts of the specifcation that Emacs/W3 does not support. +@item Initial: @tab The default value for the property, unless +explicitly set in a stylesheet. +@item Applies to: @tab What type of elements this property can be attached to. +@item Inherited: @tab Yes or no +@item Percentage values: @tab What a percentage value applies to when given. +@end multitable + +@menu +* Font Properties:: Selecting fonts, styles, and sizes. +* Colors and Backgrounds:: Controlling colors, front and back. +* Text Properties:: Alignment, decoration, and more! +* Box Properties:: Borders, padding, and margins, oh my! +* Classification:: Changing whitespace and display policies. +* Media Selection:: Conditionalize stylesheets on media-type. +* Speech Properties:: Speech output controlled by stylesheets. +@end menu + +@node Font Properties, Colors and Backgrounds, Properties, Properties +@subsection Font Properties + +Setting font properties will be among the most common uses of style +sheets. Unfortunately, there exists no well-defined and universally +accepted taxonomy for classifying fonts, and terms that apply to one +font family may not be appropriate for others. E.g. 'italic' is commonly +used to label slanted text, but slanted text may also be labeled as +being @b{Oblique}, @b{Slanted}, @b{Incline}, @b{Cursive} or +@b{Kursiv}. Therefore it is not a simple problem to map typical font +selection properties to a specific font. + +The properties defined by CSS1 are described in the following sections. +@menu +* font-family:: Groups of fonts. +* font-style:: Normal, italic, or oblique? +* font-variant:: Small-caps, etc. +* font-weight:: How bold can you go? +* font-size:: How big is yours? +* font:: Shorthand for all of the above. +@end menu + +@node font-family, font-style, Font Properties, Font Properties +@subsubsection font-family + +@multitable @columnfractions .20 .8 +@item Supported Values: @tab [[<family-name> | <generic-family>],]* [<family-name> | <generic-family>] +@item Initial: @tab User specific +@item Applies to: @tab all elements +@item Inherited: @tab yes +@item Percentage values: @tab N/A +@end multitable +The value is a prioritized list of font family names and/or generic +family names. Unlike most other CSS1 properties, values are separated +by a comma to indicate that they are alternatives: + +@example + BODY @{ font-family: gill, helvetica, sans-serif @} +@end example + +There are two types of list values: + +@table @b +@item <family-name> +The name of a font family of choice. In the last example, "gill" and +"helvetica" are font families. +@item <generic-family> +In the example above, the last value is a generic family name. The +following generic families are defined: +@itemize @bullet +@item +'serif' (e.g. Times) +@item +'sans-serif' (e.g. Helvetica) +@item +'cursive' (e.g. Zapf-Chancery) +@item +'fantasy' (e.g. Western) +@item +'monospace' (e.g. Courier) +@end itemize +@end table + +Style sheet designers are encouraged to offer a generic font family as a +last alternative. + +Font names containing whitespace should be quoted: + +@example + BODY @{ font-family: "new century schoolbook", serif @} + + <BODY STYLE="font-family: 'My own font', fantasy"> +@end example + +If quoting is omitted, any whitespace characters before and after the +font name are ignored and any sequence of whitespace characters inside +the font name is converted to a single space. + +@node font-style, font-variant, font-family, Font Properties +@subsubsection font-style + +@multitable @columnfractions .2 .8 +@item Supported Values: @tab normal | italic | oblique +@item Initial: @tab normal +@item Applies to: @tab all elements +@item Inherited: @tab yes +@item Percentage values: @tab N/A +@end multitable + +The 'font-style' property selects between normal (sometimes referred to +as "roman" or "upright"), italic and oblique faces within a font family. + +A value of 'normal' selects a font that is classified as 'normal' in the +UA's font database, while 'oblique' selects a font that is labeled +'oblique'. A value of 'italic' selects a font that is labeled 'italic', +or, if that is not available, one labeled 'oblique'. + +The font that is labeled 'oblique' in the UA's font database may +actually have been generated by electronically slanting a normal font. + +Fonts with Oblique, Slanted or Incline in their names will typically be +labeled 'oblique' in the UA's font database. Fonts with Italic, Cursive +or Kursiv in their names will typically be labeled 'italic'. + +@example + H1, H2, H3 @{ font-style: italic @} + H1 EM @{ font-style: normal @} +@end example + +In the example above, emphasized text within 'H1' will appear in a +normal face. + +@node font-variant, font-weight, font-style, Font Properties +@subsubsection font-variant + +@multitable @columnfractions .2 .8 +@item Value: @tab normal | small-caps +@item Initial: @tab normal +@item Applies to: @tab all elements +@item Inherited: @tab yes +@item Percentage values: @tab N/A +@end multitable + +Another type of variation within a font family is the small-caps. In a +small-caps font the lower case letters look similar to the uppercase +ones, but in a smaller size and with slightly different proportions. The +'font-variant' property selects that font. + +A value of 'normal' selects a font that is not a small-caps font, +'small-caps' selects a small-caps font. It is acceptable (but not +required) in CSS1 if the small-caps font is a created by taking a normal +font and replacing the lower case letters by scaled uppercase +characters. As a last resort, uppercase letters will be used as +replacement for a small-caps font. + +The following example results in an 'H3' element in small-caps, with +emphasized words in oblique small-caps: + +@example + H3 @{ font-variant: small-caps @} + EM @{ font-style: oblique @} +@end example + +There may be other variants in the font family as well, such as fonts +with old-style numerals, small-caps numerals, condensed or expanded +letters, etc. CSS1 has no properties that select those. + +@node font-weight, font-size, font-variant, Font Properties +@subsubsection font-weight + +@multitable @columnfractions .2 .8 +@item Supported Values: @tab normal | bold | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900 +@item Unsupported Values: @tab bolder | lighter +@item Initial: @tab normal +@item Applies to: @tab all elements +@item Inherited: @tab yes +@item Percentage values: @tab N/A +@end multitable + +The 'font-weight' property selects the weight of the font. The values +'100' to '900' form an ordered sequence, where each number indicates a +weight that is at least as dark as its predecessor. The keyword 'normal' +is synonymous with '400', and 'bold' is synonymous with '700'. Keywords +other than 'normal' and 'bold' have been shown to be often confused with +font names and a numerical scale was therefore chosen for the 9-value +list. + +@example + P @{ font-weight: normal @} /* 400 */ + H1 @{ font-weight: 700 @} /* bold */ +@end example + +The 'bolder' and 'lighter' values select font weights that are relative +to the weight inherited from the parent: + +@example + STRONG @{ font-weight: bolder @} +@end example + +There is no guarantee that there will be a darker face for each of the +'font-weight' values; for example, some fonts may have only a normal and +a bold face, others may have eight different face weights. There is no +guarantee on how a UA will map font faces within a family to weight +values. The only guarantee is that a face of a given value will be no +less dark than the faces of lighter values. + +@node font-size, font, font-weight, Font Properties +@subsubsection font-size + +@multitable @columnfractions .2 .8 +@item Supported Values: @tab <absolute-size> | <length> +@item Unsupported Values: @tab <percentage> | <relative-size> +@item Initial: @tab medium +@item Applies to: @tab all elements +@item Inherited: @tab yes +@item Percentage values: @tab relative to parent element's font size +@end multitable + +@table @b +@item <absolute-size> +An <absolute-size> keyword is an index to a table of font sizes computed +and kept by the UA. Possible values are: +@itemize @bullet +@item +xx-small +@item +x-small +@item +small +@item +medium +@item +large +@item +x-large +@item +xx-large +@end itemize + +On a computer screen a scaling factor of 1.5 is suggested between +adjacent indexes; if the 'medium' font is 10pt, the 'large' font could +be 15pt. Different media may need different scaling factors. Also, the +UA should take the quality and availability of fonts into account when +computing the table. The table may be different from one font family to +another. +@item <relative-size> +A <relative-size> keyword is interpreted relative to the table of font +sizes and the font size of the parent element. Possible values are +@b{larger} or @b{smaller}. For example, if the parent element has a font +size of 'medium', a value of 'larger' will make the font size of the +current element be 'large'. If the parent element's size is not close to +a table entry, the UA is free to interpolate between table entries or +round off to the closest one. The UA may have to extrapolate table +values if the numerical value goes beyond the keywords. +@end table + +Length and percentage values should not take the font size table into +account when calculating the font size of the element. + +Negative values are not allowed. + +On all other properties, 'em' and 'ex' length values refer to the font +size of the current element. On the 'font-size' property, these length +units refer to the font size of the parent element. + +Note that an application may reinterpret an explicit size, depending on +the context. E.g., inside a VR scene a font may get a different size +because of perspective distortion. + +Examples: + +@example + P @{ font-size: 12pt; @} + BLOCKQUOTE @{ font-size: larger @} + EM @{ font-size: 150% @} + EM @{ font-size: 1.5em @} +@end example + +If the suggested scaling factor of 1.5 is used, the last three +declarations are identical. + +@node font, , font-size, Font Properties +@subsubsection font + +@multitable @columnfractions .2 .8 +@item Value: @tab [ <font-style> || <font-variant> || <font-weight> ]? <font-size> [ / <line-height> ]? <font-family> +@item Initial: @tab not defined for shorthand properties +@item Applies to: @tab all elements +@item Inherited: @tab yes +@item Percentage values: @tab allowed on <font-size> and <line-height> +@end multitable +The 'font' property is a shorthand property for setting 'font-style' +'font-variant' 'font-weight' 'font-size', 'line-height' and +'font-family' at the same place in the style sheet. The syntax of this +property is based on a traditional typographical shorthand notation to +set multiple properties related to fonts. + +For a definition of allowed and initial values, see the previously +defined properties. Properties for which no values are given are set to +their initial value. + +@example + P @{ font: 12pt/14pt sans-serif @} + P @{ font: 80% sans-serif @} + P @{ font: x-large/110% "new century schoolbook", serif @} + P @{ font: bold italic large Palatino, serif @} + P @{ font: normal small-caps 120%/120% fantasy @} +@end example + +In the second rule, the font size percentage value ('80%') refers to the +font size of the parent element. In the third rule, the line height +percentage refers to the font size of the element itself. + +In the first three rules above, the 'font-style', 'font-variant' and +'font-weight' are not explicitly mentioned, which means they are all +three set to their initial value ('normal'). The fourth rule sets the +'font-weight' to 'bold', the 'font-style' to 'italic' and implicitly +sets 'font-variant' to 'normal'. + +The fifth rule sets the 'font-variant' ('small-caps'), the 'font-size' +(120% of the parent's font), the 'line-height' (120% times the font +size) and the 'font-family' ('fantasy'). It follows that the keyword +'normal' applies to the two remaining properties: 'font-style' and +'font-weight'. + +@node Colors and Backgrounds, Text Properties, Font Properties, Properties +@subsection Colors and Backgrounds + +These properties describe the color (often called foreground color) and +background of an element (i.e. the surface onto which the content is +rendered). One can set a background color and/or a background image. The +position of the image, if/how it is repeated, and whether it is fixed or +scrolled relative to the canvas can also be set. + +The 'color' property inherits normally. The background properties do not +inherit, but the parent element's background will shine through by +default because of the initial 'transparent' value on +'background-color'. + +NOTE: Currently, Emacs/W3 can only show background images under XEmacs. +Emacs 19 doesn't have the support in its display code yet. + +@menu +* color:: Foreground colors. +* background-color:: Background colors. +* background-image:: Background images. +* background-repeat:: Controlling repeating of background images. +* background-attachment:: Where background images are drawn. +* background-position:: Where background images are drawn. +* background:: Shorthand for all background properties. +@end menu + +@node color, background-color, Colors and Backgrounds, Colors and Backgrounds +@subsubsection color + +@multitable @columnfractions .2 .8 +@item Value: @tab <color> +@item Initial: @tab User specific +@item Applies to: @tab all elements +@item Inherited: @tab yes +@item Percentage values: @tab N/A +@end multitable + +This property describes the text color of an element (often referred to +as the foreground color). There are different ways to specify red: + +@example + EM @{ color: red @} /* natural language */ + EM @{ color: rgb(255,0,0) @} /* RGB range 0-255 */ +@end example + +See @ref{Color Units} for a description of possible color values. + +@node background-color, background-image, color, Colors and Backgrounds +@subsubsection background-color + +@multitable @columnfractions .2 .8 +@item Value: @tab <color> | transparent +@item Initial: @tab transparent +@item Applies to: @tab all elements +@item Inherited: @tab no +@item Percentage values: @tab N/A +@end multitable + +This property sets the background color of an element. + +@example + H1 @{ background-color: #F00 @} +@end example + +@node background-image, background-repeat, background-color, Colors and Backgrounds +@subsubsection background-image + +@multitable @columnfractions .2 .8 +@item Value: @tab <url> | none +@item Initial: @tab none +@item Applies to: @tab all elements +@item Inherited: @tab no +@item Percentage values: @tab N/A +@end multitable + +This property sets the background image of an element. When setting a +background image, one should also set a background color that will be +used when the image is unavailable. When the image is available, it is +overlaid on top of the background color. + +@example + BODY @{ background-image: url(marble.png) @} + P @{ background-image: none @} +@end example + +@node background-repeat, background-attachment, background-image, Colors and Backgrounds +@subsubsection background-repeat + +This property is not supported at all under Emacs/W3. + +@node background-attachment, background-position, background-repeat, Colors and Backgrounds +@subsubsection background-attachment + +This property is not supported at all under Emacs/W3. + +@node background-position, background, background-attachment, Colors and Backgrounds +@subsubsection background-position + +This property is not supported at all under Emacs/W3. + +@node background, , background-position, Colors and Backgrounds +@subsubsection background + +@multitable @columnfractions .2 .8 +@item Value: @tab <background-color> || <background-image> || <background-repeat> || <background-attachment> || <background-position> +@item Initial: @tab not defined for shorthand properties +@item Applies to: @tab all elements +@item Inherited: @tab no +@item Percentage values: @tab allowed on <background-position> +@end multitable + +The 'background' property is a shorthand property for setting the +individual background properties (i.e., 'background-color', +'background-image', 'background-repeat', 'background-attachment' and +'background-position') at the same place in the style sheet. + +Possible values on the 'background' properties are the set of all +possible values on the individual properties. + +@example + BODY @{ background: red @} + P @{ background: url(chess.png) gray 50% repeat fixed @} +@end example + +The 'background' property always sets all the individual background +properties. In the first rule of the above example, only a value for +'background-color' has been given and the other individual properties +are set to their initial value. In the second rule, all individual +properties have been specified. + +@node Text Properties, Box Properties, Colors and Backgrounds, Properties +@subsection Text Properties + +@menu +* word-spacing:: +* letter-spacing:: +* text-decoration:: +* vertical-align:: +* text-transform:: +* text-align:: +* text-indent:: +* line-height:: +@end menu + +@node word-spacing, letter-spacing, Text Properties, Text Properties +@subsubsection word-spacing + +@multitable @columnfractions .2 .8 +@item Supported Values: @tab normal +@item Unsupported Values: @tab <length> +@item Initial: @tab normal +@item Applies to: @tab all elements +@item Inherited: @tab yes +@item Percentage values: @tab N/A +@end multitable + +The length unit indicates an addition to the default space between +words. Values can be negative, but there may be implementation-specific +limits. The UA is free to select the exact spacing algorithm. The word +spacing may also be influenced by justification (which is a value of the +'align' property). + +@example + H1 @{ word-spacing: 0.4em @} +@end example + +Here, the word-spacing between each word in 'H1' elements would be +increased by '1em'. + +NOTE: Emacs/W3 cannot currently support this, due to limitations in +Emacs. It may be implemented in the future. + +@node letter-spacing, text-decoration, word-spacing, Text Properties +@subsubsection letter-spacing + +@multitable @columnfractions .2 .8 +@item Supported Values: @tab normal +@item Unsupported Values: @tab <length> +@item Initial: @tab normal +@item Applies to: @tab all elements +@item Inherited: @tab yes +@item Percentage values: @tab N/A +@end multitable + +The length unit indicates an addition to the default space between +characters. Values can be negative, but there may be +implementation-specific limits. The UA is free to select the exact +spacing algorithm. The letter spacing may also be influenced by +justification (which is a value of the 'align' property). + +@example + BLOCKQUOTE @{ letter-spacing: 0.1em @} +@end example + +Here, the letter-spacing between each character in 'BLOCKQUOTE' elements +would be increased by '0.1em'. + +NOTE: Emacs/W3 cannot currently support this, due to limitations in +Emacs. It may be implemented in the future. + +@node text-decoration, vertical-align, letter-spacing, Text Properties +@subsubsection text-decoration + +@multitable @columnfractions .2 .8 +@item Supported Values: @tab none | underline | line-through | blink +@item Unsupported Values: @tab overline +@item Initial: @tab none +@item Applies to: @tab all elements +@item Inherited: @tab no, but see clarification below +@item Percentage values: @tab N/A +@end multitable + +This property describes decorations that are added to the text of an +element. If the element has no text (e.g. the 'IMG' element in HTML) or +is an empty element (e.g. '<EM></EM>'), this property has no effect. A +value of 'blink' causes the text to blink. + +The color(s) required for the text decoration should be derived from the +'color' property value. + +This property is not inherited, but elements should match their +parent. E.g., if an element is underlined, the line should span the +child elements. The color of the underlining will remain the same even +if descendant elements have different 'color' values. + +@example + A:link, A:visited, A:active @{ text-decoration: underline @} +@end example + +The example above would underline the text of all links (i.e., all 'A' +elements with a 'HREF' attribute). + +NOTE: The 'line-through' property is only supported under XEmacs +currently. A patch has been sent to the Emacs maintainers to add +support for this, but it has not made it into the main distribution +yet. + +@node vertical-align, text-transform, text-decoration, Text Properties +@subsubsection vertical-align + +This is currently unsupported in Emacs/W3. + +@node text-transform, text-align, vertical-align, Text Properties +@subsubsection text-transform + +@multitable @columnfractions .2 .8 +@item Supported Values: @tab none +@item Unsupported Values: @tab capitalize | uppercase | lowercase +@item Initial: @tab none +@item Applies to: @tab all elements +@item Inherited: @tab yes +@item Percentage values: @tab N/A +@end multitable + +@table @b +@item 'capitalize' +Uppercases the first character of each word. +@item 'uppercase' +Uppercases all letters of the element. +@item 'lowercase' +Lowercases all letters of the element. +@item 'none' +Neutralizes inherited value. +@end table + +The actual transformation in each case is human language dependent. + +@example + H1 @{ text-transform: uppercase @} +@end example + +The example above would put 'H1' elements in uppercase text. + +NOTE: This capability was in the previous version of Emacs/W3, but has +not been reimplemented in the new display code yet. Please feel free to +send me patches. + +@node text-align, text-indent, text-transform, Text Properties +@subsubsection text-align + +@multitable @columnfractions .2 .8 +@item Value: @tab left | right | center | justify +@item Initial: @tab User specific +@item Applies to: @tab block-level elements +@item Inherited: @tab yes +@item Percentage values: @tab N/A +@end multitable + +This property describes how text is aligned within the element. The +actual justification algorithm used is UA and human language dependent. + +Example: +@example + DIV.center @{ text-align: center @} +@end example + +Since 'text-align' inherits, all block-level elements inside the 'DIV' +element with 'CLASS=center' will be centered. Note that alignments are +relative to the width of the element, not the canvas. + +@node text-indent, line-height, text-align, Text Properties +@subsubsection text-indent + +Not currently implemented in Emacs/W3. + +@node line-height, , text-indent, Text Properties +@subsubsection line-height + +Not currently implemented in Emacs/W3. + +@node Box Properties, Classification, Text Properties, Properties +@subsection Box Properties + +@multitable @columnfractions .2 .8 +@end multitable + +@node Classification, Media Selection, Box Properties, Properties +@subsection Classification + +These properties classify elements into categories more than they set +specific visual parameters. + +The list-style properties describe how list items (i.e. elements with a +'display' value of 'list-item') are formatted. The list-style properties +can be set on any element, and it will inherit normally down the +tree. However, they will only be have effect on elements with a +'display' value of 'list-item'. In HTML this is typically the case for +the 'LI' element. + +@menu +* display:: +* white-space:: +* list-style-type:: +* list-style-image:: +* list-style-position:: +* list-style:: +@end menu + +@node display, white-space, Classification, Classification +@subsubsection display + +@multitable @columnfractions .2 .8 +@item Value: @tab block | inline | list-item | none +@item Extensions: @tab line +@item Initial: @tab inline +@item Applies to: @tab all elements +@item Inherited: @tab no +@item Percentage values: @tab N/A +@end multitable + +This property describes how/if an element is displayed on the canvas +(which may be on a printed page, a computer display etc.). + +An element with a 'display' value of 'block' opens whitespace suitable +for a paragraph break. Typically, elements like 'H1' and 'P' are of +type 'block'. A value of 'list-item' is similar to 'block' except that a +list-item marker is added. In HTML, 'LI' will typically have this value. + +An element with a 'display' value of 'inline' results in a new inline +box on the same line as the previous content. + +A value of 'none' turns off the display of the element, including +children elements and the surrounding box. + +@example + P @{ display: block @} + EM @{ display: inline @} + LI @{ display: list-item @} + IMG @{ display: none @} +@end example + +The last rule turns off the display of images. + +A value of 'line' results in a single line break. Emacs/W3 needs this +extension to be able to fully specify the behaviour of @sc{br} and +@sc{hr} elements within a stylesheet. + +NOTE: Emacs/W3 defaults to using 'inline' for this property, which is a +slight deviation from the specification. + +@node white-space, list-style-type, display, Classification +@subsubsection white-space + +@multitable @columnfractions .2 .8 +@item Value: @tab normal | pre | nowrap +@item Initial: @tab normal +@item Applies to: @tab block-level elements +@item Inherited: @tab yes +@item Percentage values: @tab N/A +@end multitable + +This property declares how whitespace inside the element is handled: the +'normal' way (where whitespace is collapsed), as 'pre' (which behaves +like the 'PRE' element in HTML) or as 'nowrap' (where wrapping is done +only through BR elements): + +@example + PRE @{ white-space: pre @} + P @{ white-space: normal @} +@end example + +@node list-style-type, list-style-image, white-space, Classification +@subsubsection list-style-type + +@multitable @columnfractions .2 .8 +@item Value: @tab disc | circle | square | decimal | lower-roman | upper-roman | lower-alpha | upper-alpha | none +@item Initial: @tab disc +@item Applies to: @tab elements with 'display' value 'list-item' +@item Inherited: @tab yes +@item Percentage values: @tab N/A +@end multitable + +This property is used to determine the appearance of the list-item +marker if 'list-style-image' is 'none' or if the image pointed to by the +URL cannot be displayed. + +Fo example: +@example + OL @{ list-style-type: decimal @} /* 1 2 3 4 5 etc. */ + OL @{ list-style-type: lower-alpha @} /* a b c d e etc. */ + OL @{ list-style-type: lower-roman @} /* i ii iii iv v etc. */ +@end example + +@node list-style-image, list-style-position, list-style-type, Classification +@subsubsection list-style-image + +@multitable @columnfractions .2 .8 +@item Value: @tab <url> | none +@item Initial: @tab none +@item Applies to: @tab elements with 'display' value 'list-item' +@item Inherited: @tab yes +@item Percentage values: @tab N/A +@end multitable + +This property sets the image that will be used as the list-item +marker. When the image is available it will replace the marker set with +the 'list-style-type' marker. + +NOTE: This is currently unimplemented in Emacs/W3. + +@example + UL @{ list-style-image: url(http://png.com/ellipse.png) @} +@end example + +@node list-style-position, list-style, list-style-image, Classification +@subsubsection list-style-position + +@multitable @columnfractions .2 .8 +@item Supported Values: @tab outside +@item Unsupported Values: @tab inside +@item Initial: @tab outside +@item Applies to: @tab elements with 'display' value 'list-item' +@item Inherited: @tab yes +@item Percentage values: @tab N/A +@end multitable + +The value of 'list-style-position' determines how the list-item marker +is drawn with regard to the content. For a formatting example see +section 4.1.3. + +@node list-style, , list-style-position, Classification +@subsubsection list-style + +@multitable @columnfractions .2 .8 +@item Value: @tab <keyword> || <position> || <url> +@item Initial: @tab not defined for shorthand properties +@item Applies to: @tab elements with 'display' value 'list-item' +@item Inherited: @tab yes +@item Percentage values: @tab N/A +@end multitable + +The 'list-style' property is a shorthand notation for setting the three +properties 'list-style-type', 'list-style-image' and +'list-style-position' at the same place in the style sheet. + +@example + UL @{ list-style: upper-roman inside @} + UL UL @{ list-style: circle outside @} + LI.square @{ list-style: square @} +@end example + +Setting 'list-style' directly on 'LI' elements can have unexpected +results. Consider: + +@example + <STYLE TYPE="text/css"> + OL.alpha LI @{ list-style: lower-alpha @} + UL LI @{ list-style: disc @} + </STYLE> + <BODY> + <OL CLASS=alpha> + <LI>level 1 + <UL> + <LI>level 2 + </UL> + </OL> + </BODY> +@end example + +Since the specificity (as defined in the cascading order) is higher for +the first rule in the style sheet in the example above, it will override +the second rule on all 'LI' elements and only 'lower-alpha' list styles +will be used. It is therefore recommended to set 'list-style' only on +the list type elements: + +@example + OL.alpha @{ list-style: lower-alpha @} + UL @{ list-style: disc @} +@end example + +In the above example, inheritance will transfer the 'list-style' values +from 'OL' and 'UL' elements to 'LI' elements. + +A URL value can be combined with any other value: + +@example + UL @{ list-style: url(http://png.com/ellipse.png) disc @} +@end example + +In the example above, the 'disc' will be used when the image is +unavailable. + +@node Media Selection, Speech Properties, Classification, Properties +@subsection Media Selection + +To specify that a stylesheet declaration should only apply when using a +certain media type (ie: different font families preferred when printing +versus on-screen presentation), the declarations should be wrapped in +the proposed @b{@@media} directive. + +The @@media directive takes two arguments, the media type, and a block +of style declarations. + +@example + @@media print @{ + BODY @{ font-size: 10pt @} + H1 @{ font-size: 14pt @} + @} +@end example +The '@@media' construct also allows to put include style sheet rules +for various media in the same style sheet: + +@example + @@media print @{ + BODY @{ font-size: 10pt @} + @} + @@media screen @{ + BODY @{ font-size: 12pt @} + @} +@end example + +Currently, the following media types are defined. +@table @b +@item Print +Output for paged opaque material, and for documents viewed on screen in +print preview mode. +@item Screen +A continuous presentation for computer screens. +@item Projector +Paged presentation for projected presentations. +@item Braille +For braille tactile feedback devices. +@item Speech +Aural presentation. +@item Light +The stylesheet will only be applied if the user is using a light background. +@item Dark +The stylesheet will only be applied if the user is using a dark background. +@item Emacs +The stylesheet will only be applied if the user is running in Emacs 19. +@item XEmacs +The stylesheet will only be applied if the user is running in XEmacs 19. +@item All +The default value, the style sheet applies to all output devices. +@end table + +@node Speech Properties, , Media Selection, Properties +@subsection Speech Properties + +Those of us who are sighted are accustomed to visual presentation of +@sc{html} documents, frequently on a bitmapped display. This is not the +only possible presentation method, however. Aural presentation, using a +combination of speech synthesis and 'audio icons', provides an +alternative presentation. This form of presentation is in current use by +the blind and print-impaired communities. + +Often such aural presentation occurs by converting the document to plain +text and feeding this to a 'screen reader' -- software or hardware that +simply reads all the characters on the screen. This results in less +effective presentation than would be the case if the document structure +were retained. + +There are other large markets for aural presentation, including in-car +and home entertainment use; aurual or mixed aural/visual presentation is +thus likely to increase in importance over the next few years. Realizing +that that the aural rendering is essentially independent of the visual +rendering: + +@itemize @bullet +@item +Allows orthogonal aural and visual views. +@item +Allows browsers to optionally implement both aural and visual views to +produce truly multimodal documents. +@end itemize + +@menu +* volume:: +* pause-before:: +* pause-after:: +* pause:: +* cue-before:: +* cue-after:: +* cue:: +* play-during:: +* speed:: +* voice-family:: +* pitch:: +* pitch-range:: +* stress:: +* richness:: +* speak-punctuation:: +* speak-date:: +* speak-numeral:: +* speak-time:: +@end menu + +@node volume, pause-before, Speech Properties, Speech Properties +@subsubsection volume + +@multitable @columnfractions .2 .8 +@item Value: @tab <percentage> | mute | x-soft | soft | medium | loud | x-loud +@item Initial: @tab medium +@item Applies to: @tab all elements +@item Inherited: @tab yes +@item Percentage values: @tab relative to user-specified mapping +@end multitable + +The legal range of percentage values is 0% to 100%. There is a fixed +mapping between keyword values and percentages: + +@itemize @bullet +@item +'x-soft' = '0%' +@item +'soft' = '25%' +@item +'medium' = '50%' +@item +'loud' = '75%' +@item +'x-loud' = '100%' +@end itemize + +Volume refers to the median volume of the waveform. In other words, a +highly inflected voice at a volume of 50 might peak well above +that. Note that '0%' does not mean the same as "mute". 0% represents the +minimum audible volume level and 100% corresponds to the maximum +comfortable level. The UA should allow the values corresponding to 0% +and 100% to be set by the user. Suitable values depend on the equipment +in use (speakers, headphones), the environment (in car, home theater, +library) and personal preferences. Some examples: + +@itemize @bullet +@item +A browser for in-car use has a setting for when there is lots of +background noise . 0% would map to a fairly high level and 100% to a +quite high level. The overall values are likely to be human adjustable +for comfort, for example with a physical volume control: what this +proposal does is adjust the dynamic range. +@item +Another speech browser is being used in the home, late at night, (don't +annoy the neighbors) or in a shared study room. 0% is set to very quiet +and 100% to a fairly quiet level, too. As with the first example, there +is a low slope; the dynamic range is reduced. The actual volumes are low +here, wheras they were high in the first example. +@item +In a quiet and isolated house, an expensive hifi home theatre setup. 0% +is set fairly low and 100% to quite high; there is wide dynamic range. +@end itemize + +The same authors stylesheet could be used in all cases, simply by +mapping the 0 and 100 points suitably at the client side. + +@node pause-before, pause-after, volume, Speech Properties +@subsubsection pause-before + +@multitable @columnfractions .2 .8 +@item Value: @tab <time> | <percentage> +@item Initial: @tab UA specific +@item Applies to: @tab all elements +@item Inherited: @tab no +@item Percentage values: @tab speed +@end multitable + +This property specifies the pause before elements. It may be given in an +absolute units (seconds, milliseconds) or as a relative value in which +case it is relative to the reciprocal of the 'speed' property: if speed +is 120 words per minute (ie a word takes half a second -- 500 +milliseconds) then a pause-before of 100% means a pause of 500 ms and a +pause-before of 20% means 100ms. + +Using relative units gives more robust stylesheets in the face of large +changes in speed. + +@node pause-after, pause, pause-before, Speech Properties +@subsubsection pause-after + +@multitable @columnfractions .2 .8 +@item Value: @tab <time> | <percentage> +@item Applies to: @tab all elements +@item Inherited: @tab no +@item Percentage values: @tab speed +@end multitable + +This property specifies the pause after elements. Values are specified +the same way as 'pause-before'. + +@node pause, cue-before, pause-after, Speech Properties +@subsubsection pause + +@multitable @columnfractions .2 .8 +@item Value: @tab [<time> | <percentage> ]@{1,2@}; +@item Applies to: @tab all elements +@item Inherited: @tab no +@item Percentage values: @tab speed +@end multitable + +The 'pause' property is a shorthand for setting 'pause-before' and +'pause-after'. The first value is pause-before and the second is +pause-after. If only one value is given, it applies to both properties. + +Examples: + +@example + H1 @{ pause: 20ms @} /* pause-before: 20ms; pause-after: 20ms */ + H2 @{ pause: 30ms 40ms @} /* pause-before: 30ms; pause-after: 40ms */ + H3 @{ pause-after: 10ms @} /* pause-before: ?; pause-after: 10ms */ +@end example + +@node cue-before, cue-after, pause, Speech Properties +@subsubsection cue-before + +@multitable @columnfractions .2 .8 +@item Value: @tab <url> | none +@item Initial: @tab none +@item Applies to: @tab all elements +@item Inherited: @tab no +@end multitable +Auditory icons are another way to distinguish semantic elements. Sounds +may be played before, and/or after the element to delimit it. The same +sound can be used both before and after, using the cue property. + +Examples: + +@example + A @{ cue-before: url(bell.aiff); cue-after: url(dong.wav) @} + H1 @{ cue-before: url(pop.au); cue-after: url(pop.au) @} + H1 @{ cue: url(pop.au) @} /* same as previous */ +@end example + +@node cue-after, cue, cue-before, Speech Properties +@subsubsection cue-after + +@xref{cue-before} + +@node cue, play-during, cue-after, Speech Properties +@subsubsection cue + +@xref{cue-before} + +@node play-during, speed, cue, Speech Properties +@subsubsection cue-during + +@multitable @columnfractions .2 .8 +@item Value: @tab <url> | mix | none +@item Initial: @tab mix +@item Applies to: @tab all elements +@item Inherited: @tab no +@end multitable +Similar to the cue-before and cue-after properties, this indicates sound +to be played during an element as a background (ie the sound is mixed in +with the speech). + +Examples: + +@example + BLOCKQUOTE.sad @{ cue-during: url(violins.aiff) @} +@end example + +@node speed, voice-family, play-during, Speech Properties +@subsubsection speed + +@multitable @columnfractions .2 .8 +@item Value: @tab <words-per-minute> | x-slow | slow | medium | fast | x-fast | faster | slower +@item Initial: @tab medium +@item Applies to: @tab all elements +@item Inherited: @tab yes +@end multitable + +Specifies the speaking rate. Note that both absolute and relative +keyword values are allowed (compare with @ref{font-weight}). + +@node voice-family, pitch, speed, Speech Properties +@subsubsection voice-family + +@multitable @columnfractions .2 .8 +@item Value: @tab [[<specific-voice> | <generic-voice>],]* [<specific-voice> | <generic-voice>] +@item Initial: @tab device-specific +@item Applies to: @tab all elements +@item Inherited: @tab yes +@end multitable + +The value is a prioritized list of voice family names. Generic families +are male, female, and child. + +Examples of specific voice families are: comedian, paul, lisa + +Examples + +@example + H1 @{ voice-family: announcer, male @} + P.part.romeo @{ voice-family: romeo, male @} + P.part.juliet @{ voice-family: juliet, female @} +@end example + +@node pitch, pitch-range, voice-family, Speech Properties +@subsubsection pitch + +@multitable @columnfractions .2 .8 +@end multitable + +@node pitch-range, stress, pitch, Speech Properties +@subsubsection pitch-range + +@multitable @columnfractions .2 .8 +@end multitable + +@node stress, richness, pitch-range, Speech Properties +@subsubsection stress + +@multitable @columnfractions .2 .8 +@item Value: @tab <percentage> +@item Initial: @tab medium +@item Applies to: @tab all elements +@item Inherited: @tab yes +@end multitable + +Specifies the level of stress (assertiveness or emphasis) of the +speaking voice. English is a stressed language, and different parts of a +sentence are assigned primary, secondary or tertiary stress. The value +of property 'stress' controls the amount of inflection that results from +these stress markers. + +Increasing the value of this property results in the speech being more +strongly inflected. It is in a sense dual to property 'pitch-range' and +is provided to allow developers to exploit higher-end auditory displays. + +@node richness, speak-punctuation, stress, Speech Properties +@subsubsection richness + +@multitable @columnfractions .2 .8 +@item Value: @tab <percentage> +@item Initial: @tab medium (50%) +@item Applies to: @tab all elements +@item Inherited: @tab yes +@end multitable + +Specifies the richness (brightness) of the speaking voice. Different +speech devices may require the setting of one or more device-specific +parameters to achieve this effect. + +The effect of increasing richness is to produce a voice that carries -- +reducing richness produces a soft, mellifluous voice. + +@node speak-punctuation, speak-date, richness, Speech Properties +@subsubsection speak-punctuation + +@multitable @columnfractions .2 .8 +@item Value: @tab code | none +@item Initial: @tab none +@item Applies to: @tab all elements +@item Inherited: @tab yes +@end multitable + +'code' indicates that punctuation such as semicolons, braces, and so on +are to be spoken literally. The default value of 'none' means that +punctuation is not spoken but instead is rendered naturally as various +pauses. + +@node speak-date, speak-numeral, speak-punctuation, Speech Properties +@subsubsection speak-date + +@multitable @columnfractions .2 .8 +@item Value: @tab myd | dmy | ymd | none +@item Initial: @tab none +@item Applies to: @tab all elements +@item Inherited: @tab no +@end multitable + +This is a hint that the element contains a date and also how that date +should be spoken. month-day-year is common in the USA, while +day-month-year is common in Europe and year-month-day is also used. + +This should really be an HTML tag not a stylesheet property, since it +gives semantic information about the content. + +@node speak-numeral, speak-time, speak-date, Speech Properties +@subsubsection speak-numeral + +@multitable @columnfractions .2 .8 +@item Value: @tab digits | continous +@item Initial: @tab none +@item Applies to: @tab all elements +@item Inherited: @tab yes +@end multitable + +@node speak-time, , speak-numeral, Speech Properties +@subsubsection speak-time + +@multitable @columnfractions .2 .8 +@item Value: @tab 24 | 12 | none +@item Initial: @tab none +@item Applies to: @tab all elements +@item Inherited: @tab yes +@end multitable + +@node Units, , Properties, Stylesheets +@section Units + +@menu +* Length Units:: +* Percentage Units:: +* Color Units:: +* URLs:: +* Angle Units:: +* Time Units:: +@end menu + +@node Length Units, Percentage Units, Units, Units +@subsection Length Units + +@node Percentage Units, Color Units, Length Units, Units +@subsection Percentage Units + +@node Color Units, URLs, Percentage Units, Units +@subsection color Units + +@node URLs, Angle Units, Color Units, Units +@subsection URLs + +@node Angle Units, Time Units, URLs, Units +@subsection Angle Units + +These are the legal angle units: +@itemize @bullet +@item +deg: degrees +@item +grad +@item +rad: radians +@end itemize + +@node Time Units, , Angle Units, Units +@subsection Time Units + +These are the legal time units: + +@itemize @bullet +@item +ms: milliseconds +@item +s: seconds +@end itemize + +@node Supported URLs, MIME Support, Stylesheets, Top +@chapter Supported URLs + +::WORK:: List supported URL types, specific RFCs, etc. + +@menu +* file:: Local file access. +* ftp:: Remote file access via ftp. +* nfs:: Remote file access via NFS. +* info:: Access to the Emacs Info system. +* http/https:: @sc{http/1.0} support. +* mailto:: Sending simple electronic mail. +* news/nntp/snews:: Reading and sending Usenet news. +* rlogin/telnet/tn3270:: Legacy host connections. +* irc:: Internet Relay Chat. +* data:: Embedding the data within the URL itself. +* mailserver:: Slightly more complicated electronic mail. +* gopher:: Gopher and Gopher+. +* finger:: The old favorite. +@end menu + +@node file, ftp, Supported URLs, Supported URLs +@section file + +@node ftp, nfs, file, Supported URLs +@section ftp + +@node nfs, info, ftp, Supported URLs +@section nfs + +@node info, http/https, nfs, Supported URLs +@section info + +@node http/https, mailto, info, Supported URLs +@section http/https + +@node mailto, news/nntp/snews, http/https, Supported URLs +@section mailto + +@node news/nntp/snews, rlogin/telnet/tn3270, mailto, Supported URLs +@section news/nntp/snews + +@node rlogin/telnet/tn3270, irc, news/nntp/snews, Supported URLs +@section rlogin/telnet/tn3270 + +@node irc, data, rlogin/telnet/tn3270, Supported URLs +@section irc + +@node data, mailserver, irc, Supported URLs +@section data + +@node mailserver, gopher, data, Supported URLs +@section mailserver + +@node gopher, finger, mailserver, Supported URLs +@section gopher + +@node finger, , gopher, Supported URLs +@section finger + +@node MIME Support, Security, Supported URLs, Top +@chapter MIME Support +@sc{mime} is an emerging standard for multimedia mail. It offers a very +flexible typing mechanism. The type of a file or message is specified +in two parts, separated by a '/'. The first part is the general +category of the data (text, application, image, etc.). The second part +is the specific type of data (postscript, png, jpeg, etc.). So +@samp{text/html} specifies an @sc{html} document, whereas +@samp{image/x-xwindowdump} specifies an image of an Xwindow taken with +the @file{xwd} program. + + +This typing allows much more flexibility in naming files. @sc{http}/1.0 +servers can now send back content-type headers in response to a request, +and not have the client second-guess it based on file extensions. @sc{html} +files can now be named @file{something.png} (not a great idea, but +possible). + +@menu +* Adding MIME types based on file extensions:: How to map file + extensions onto MIME + types (e.g., @samp{.png -> + image/png)}. +* Specifying Viewers:: How to specify external and internal viewers + for files that Emacs/W3 cannot handle natively. +@end menu + +@node Adding MIME types based on file extensions, Specifying Viewers, MIME Support, MIME Support +@section Adding MIME types based on file extensions + +@vindex mm-mime-extensions +For some protocols however, it is still necessary to guess the content +of a file based on the file extension. This type of guess-work should +only be needed when accessing files via @sc{ftp}, local file access, or old +@sc{http}/0.9 servers. + +Instead of specifying how to view things twice, once based on +content-type and once based on the file extension, it is easier to map +file extensions to MIME content-types. The variable that controls this +is @code{mm-mime-extensions}. + +This variable is an assoc list of file extensions and the corresponding +MIME content-type. A sample entry looks like: @samp{(".movie" +. "video/x-sgi-movie")} This makes all files that end in @file{.movie} +(@file{foo.movie} and @file{bar.movie}) be interpreted as SGI animation +files. If a content-type is defined for the document, then this is +over-ridden. Regular expressions can @b{NOT} be used. + +@cindex mime-types file +@findex mm-parse-mimetypes +Both Mosaic and the NCSA @sc{http} daemon rely on a separate file for mapping +file extensions to MIME types. Instead of having the users of Emacs/W3 +duplicate this in lisp, this file can be parsed using the +@code{url-parse-mimetypes} function. This function is called each time +w3 is loaded. It tries to locate mimetype files in several places. If +the environment variable @code{MIMETYPES} is nonempty, then this is +assumed to specify a UNIX-like path of mimetype files (this is a colon +separated string of pathnames). If the @code{MIMETYPES} environment +variable is empty, then Emacs/W3 looks for these files: + +@enumerate +@item +@file{~/.mime-types} +@item +@file{/etc/mime-types} +@item +@file{/usr/etc/mime-types} +@item +@file{/usr/local/etc/mime-types} +@item +@file{/usr/local/www/conf/mime-types} +@end enumerate + +Each line contains information for one @sc{http} type. These types resemble +MIME types. To add new ones, use subtypes beginning with x-, such as +application/x-myprogram. Lines beginning with # are comment lines, and +suitably ignored. Each line consists of: + +type/subtype ext1 ext2 ... ext@var{n} + +type/subtype is the MIME-like type of the document. ext* is any number +of space-separated filename extensions which correspond to the MIME +type. + +@node Specifying Viewers, , Adding MIME types based on file extensions, MIME Support +@section Specifying Viewers + +Not all files look as they should when parsed as an @sc{html} document +(whitespace is stripped, paragraphs are reformatted, and lots of little +changes that make the document look unrecognizable). Files may be +passed to external programs or Emacs Lisp functions to be viewed. + +Not all files can be viewed accurately from within an Emacs session (PNG +files for example, or audio files). For this reason, the user can +specify file "viewers" based on MIME content-types. This is done with +a standard mailcap file. @xref{Mailcap Files} + +@findex mm-add-mailcap-entry +As an alternative, the function @code{mm-add-mailcap-entry} can also be +used from an appropriate hook.@xref{Hooks} This functions takes three +arguments, the major type ("@i{image}"), the minor type ("@i{png}"), and +an assoc list of information about the viewer. Please see the @sc{url} +documentation for more specific information on what this assoc list +should look like. + +@node Security, Non-Unix Operating Systems, MIME Support, Top +@chapter Security +@cindex Security +@cindex Paranoia +There are an increasing number of ways to authenticate a user to a web +service. Emacs/W3 tries to support as many as possible. Emacs/W3 +currently supports: + +@table @b +@item Basic Authentication +@cindex Security, Basic +@cindex HTTP/1.0 Authentication +@cindex Authentication, Basic +The weakest authentication available, not recommended if serious +security is necessary. This is simply a string that looks like +@samp{user:password} that has been Base64 encoded, as defined in RFC +1421. +@item Digest Authentication +@cindex Security, Digest +@cindex HTTP/1.0 Authentication +@cindex Authentication, Digest +Jeffery L. Hostetler, John Franks, Philip Hallam-Baker, Ari Luotonen, +Eric W. Sink, and Lawrence C. Stewart have an internet draft for a new +authentication mechanism. For the complete specification, please see +draft-ietf-http-digest-aa-01.txt in the nearest internet drafts +archive@footnote{One is ftp://ds.internic.net/internet-drafts}. +@item SSL Encryption +@cindex HTTP/1.0 Authentication +@cindex Secure Sockets Layer +@cindex SSL +@cindex Gag Puke Retch +@cindex Exportability +@cindex Export Restrictions +SSL is the @code{Secure Sockets Layer} interface developed by Netscape +Communications @footnote{http://www.netscape.com/}. Emacs/W3 supports +@sc{http} transfers over an SSL encrypted channel, if the appropriate files +have been installed.@xref{Installing SSL} +@end table + +@node Non-Unix Operating Systems, Speech Integration, Security, Top +@chapter Non-Unix Operating Systems +@cindex Non-Unix Operating Systems + +@menu +* VMS:: The wonderful world of VAX|AXP-VMS! +* OS/2:: The next-best thing to Unix. +* MS-DOS:: The wonderful world of MS-DOG! +* Windows:: Windows NT, Chicago/Windows 95. +@end menu + +@node VMS, OS/2, Non-Unix Operating Systems, Non-Unix Operating Systems +@section VMS +@cindex VAX-VMS +@cindex AXP-VMS +@cindex Digital VMS +@cindex VMS + +:: WORK :: VMS Specific instriuctions + +@node OS/2, MS-DOS, VMS, Non-Unix Operating Systems +@section OS/2 +@cindex OS/2 +@cindex Warp + +:: WORK :: OS/2 Specific instructions + +@node MS-DOS, Windows, OS/2, Non-Unix Operating Systems +@section MS-DOS +@cindex MS-DOS +@cindex Microsloth +@cindex DOS +@cindex MS-DOG + +:: WORK :: DOS Specific instructions + +@node Windows, , MS-DOS, Non-Unix Operating Systems +@section Windows +@cindex Windows (32-Bit) +@cindex 32-Bit Windows +@cindex Microsloth +@cindex Windows '95 + +:: WORK :: 32bit Windows Specific instructions + +@node Speech Integration, Advanced Features, Non-Unix Operating Systems, Top +@chapter Speech Integration + +:: WORK :: Emacspeak integration + +@node Advanced Features, More Help, Speech Integration, Top +@chapter Advanced Features + +@menu +* Disk Caching:: Improving performance by using a local disk cache +* Interfacing to Mail/News:: How to make VM understand hypertext links +* Debugging HTML:: How to make Emacs/W3 display warnings about invalid + @sc{html}/@sc{html}+ constructs. +* Hooks:: Various hooks to use throughout Emacs/W3 +* Other Variables:: Miscellaneous variables that control the real + guts of Emacs/W3. +@end menu + +@node Disk Caching, Interfacing to Mail/News, Advanced Features, Advanced Features +@section Disk Caching +@cindex Caching +@cindex Persistent Cache +@cindex Disk Cache + +A cache stores the information on a page on the local machine. When +requesting a page that is in the cache, Emacs/W3 can retrieve the page +from the cache more quickly than retrieving the page again from its +location out on the network. With a well-populated cache, browsing the +web is dramatically faster. + +The first time a page is requested, Emacs/W3 retrieves the page from the +network. When requesting a page that is in the cache, Emacs/W3 checks +to see if the page has changed since it was last retrieved from the +remote machine. If it has not changed, the local copy is used, saving +the transmission of the file over the network. + +@vindex url-automatic-caching +@cindex Turning on caching +@cindex Cleaning the cache +@cindex Clearing the cache +@cindex Cache cleaning +@cindex Limiting the size of the cache +To turn on disk caching, set the variable @code{url-automatic-caching} +to non-@code{nil}, or choose the 'Caching' menu item (under `Options'). +That is all there is to it. Running the @code{clean-cache} shell script +fist is recommended, to allow for future cleaning of the cache. This +shell script will remove all files that have not been accessed since it +was last run. To keep the cache pared down, it is recommended that this +script be run from @i{at} or @i{cron} (see the manual pages for +crontab(5) or at(1) for more information) + + +@cindex Relying on cache +@cindex Cache only mode +@cindex Standalone mode +@cindex Browsing with no network connection +@cindex Netless browsing +@vindex url-standalone-mode +With a large cache of documents on the local disk, it can be very handy +when traveling, or any other time the network connection is not active +(a laptop with a dial-on-demand PPP connection, etc). Emacs/W3 can rely +solely on its cache, and avoid checking to see if the page has changed +on the remote server. In the case of a dial-on-demand PPP connection, +this will keep the phone line free as long as possible, only bringing up +the PPP connection when asking for a page that is not located in the +cache. This is very useful for demonstrations as well. To turn this +feature on, set the variable @code{url-standalone-mode} to +non-@code{nil}, or choose the `Use Cache Only' menu item (under +`Options') + +@node Interfacing to Mail/News, Debugging HTML, Disk Caching, Advanced Features +@section Interfacing to Mail/News +@cindex Interfacing to Mail/News +@cindex VM +@cindex Using Emacs/W3 with VM +@cindex GNUS +@cindex Using Emacs/W3 with Gnus +@cindex RMAIL +@cindex Using Emacs/W3 with RMAIL + +More and more people are including @sc{url}s in their signatures, and within +the body of mail messages. It can get quite tedious to type these into +the minibuffer to follow one. + +@vindex browse-url-browser-function +With the latest versions of VM (the 5.9x series of betas) and Gnus +(5.x), @sc{url}s are automatically highlighted, and can be followed with the +mouse or the return key. How the @sc{url}s are viewed is determined by the +variable @code{browse-url-browser-function}, and it should be set to the +symbol @code{browse-url-w3}. + +To access @sc{url}s from within RMAIL, the following hook should do the +trick. +@example +(add-hook 'rmail-mode-hook + (function + (lambda () + (define-key rmail-mode-map [mouse-2] 'w3-maybe-follow-link-mouse) + (define-key rmail-mode-map "\r" 'w3-maybe-follow-link)))) +@end example + +@node Debugging HTML, Hooks, Interfacing to Mail/News, Advanced Features +@section Debugging HTML +@cindex Debugging +@cindex Invalid HTML +@cindex Bad HTML +@vindex w3-debug-buffer +@vindex w3-debug-html + +For those people that are adventurous, or are just as anal as I am about +people writing valid @sc{html}, set the variable @code{w3-debug-html} to +@code{t} and see what happens. + + +If a Emacs/W3 thinks it has encountered invalid @sc{html}, then a debugging +message is displayed. + +:: WORK :: Need to list the different values w3-debug-html can have, and@* +:: WORK :: what they do :: + +@node Hooks, Other Variables, Debugging HTML, Advanced Features +@section Hooks +@cindex Hooks + +These are the various hooks that can be used to customize some of +Emacs/W3's behavior. They are arranged in the order in which they would +happen when retrieving a document. These are all 'normal hooks' in +standard Emacs-terminology, meaning they are functions (or lists of +functions) that are called consecutively. + +@table @code +@vindex w3-load-hook +@item w3-load-hook +These hooks are run the first time a @sc{url} is fetched. All the +Emacs/W3 variables are initialized before this hook is run. +@item w3-mode-hook +These hooks are run after a buffer has been parsed and displayed, but +before any inlined images are downloaded and converted. +@item w3-source-file-hook +These hooks are run after displaying a document's source. +@end table + +@node Other Variables, , Hooks, Advanced Features +@section Miscellaneous variables + +There are lots of variables that control the real nitty-gritty of Emacs/W3 +that the beginning user probably shouldn't mess with. Here they are. + +@table @code +@item url-bad-port-list +@vindex url-bad-port-list +List of ports to warn the user about connecting to. Defaults to just +the mail and @sc{nntp} ports so a malicious @sc{html} author cannot spoof mail or +news to other people. +@item url-confirmation-func +@vindex url-confirmation-func +What function to use for asking yes or no functions. Possible values +are @code{'yes-or-no-p} or @code{'y-or-n-p}, or any function that takes +a single argument (the prompt), and returns @code{t} only if a positive +answer is gotten. Defaults to @code{'yes-or-no-p}. +@item w3-default-action +@vindex w3-default-action +A lisp symbol specifying what action to take for files with extensions +that are not in the @code{mm-mime-extensions} assoc list. This is +useful in case Emacs/W3 ever run across files with weird extensions +(.foo, .README, .READMEFIRST, etc.). In most circumstances, this should +not be required anymore. + +Possible values: any lisp symbol. Should be a function that takes no +arguments. The return value does not matter, it is ignored. Some examples +are @code{'w3-prepare-buffer} or @code{'indented-text-mode}. +@ignore +@item w3-icon-directory-list +@vindex w3-icon-directory-list +A list of directorys to look in for the w3 standard icons... must end +in a /! If the directory @code{data-directory}/w3 exists, then this is +automatically added to the default value of +http://cs.indiana.edu/elisp/w3/icons/. +@end ignore +@item w3-keep-old-buffers +@vindex w3-keep-old-buffers +Whether to keep old buffers around when following links. To avoid lots +of buffers in one Emacs session, set this variable to @code{nil}. I +recommend setting it to @code{t}, so that backtracking from one link to +another is faster. + +@item url-passwd-entry-func +@vindex url-passwd-entry-func +This is a symbol indicating which function to call to read in a +password. If this variable is @code{nil} at startup, it is initialized +depending on whether @dfn{EFS} or @dfn{ange-ftp} is being used. This +function should accept the prompt string as its first argument, and the +default value as its second argument. + +@item w3-reuse-buffers +@vindex w3-reuse-buffers +Determines what happens when @code{w3-fetch} is called on a document +that has already been loaded into another buffer. Possible values are: +@code{nil}, @code{yes}, and @code{no}. @code{nil} will ask the user if +Emacs/W3 should reuse the buffer (this is the default value). A value of +@code{yes} means assume the user wants to always reuse the buffer. A +value of @code{no} means assume the user always wants to re-fetch the +document. +@item w3-show-headers +@vindex w3-show-headers +This is a list of @sc{http}/1.0 headers to show at the end of a buffer. All +the headers should be in lowercase. They are inserted at the end of the +buffer in a <UL> list. Alternatively, if this is simply @code{t}, then +all the @sc{http}/1.0 headers are shown. The default value is +@code{nil}. +@item w3-show-status, url-show-status +@vindex url-show-status +@vindex w3-show-status +Whether to show progress messages in the minibuffer. +@code{w3-show-status} controls if messages about the parsing are +displayed, and @code{url-show-status} controls if a running total of the +number of bytes transferred is displayed. These Can cause a large +performance hit if using a remote X display over a slow link, or a +terminal with a slow modem. +@item mm-content-transfer-encodings +@vindex mm-content-transfer-encodings +An assoc list of @var{Content-Transfer-Encodings} or +@var{Content-Encodings} and the appropriate decoding algorithms for each. +If the @code{cdr} of a node is a list, then this specifies the decoder is +an external program, with the program as the first item in the list, and +the rest of the list specifying arguments to be passed on the command line. +If using an external decoder, it must accept its input from @code{stdin} +and send its output to @code{stdout}. + +If the @code{cdr} of a node is a symbol whose function definition is +non-@code{nil}, then that encoding can be handled internally. The function +is called with 2 arguments, buffer positions bounding the region to be +decoded. The function should completely replace that region with the +unencoded information. + +Currently supported transfer encodings are: base64, x-gzip, 7bit, 8bit, +binary, x-compress, x-hqx, and quoted-printable. +@item url-uncompressor-alist +@vindex url-uncompressor-alist +An assoc list of file extensions and the appropriate uncompression +programs for each. This is used to build the Accept-encoding header for +@sc{http}/1.0 requests. +@end table + +@node More Help, Future Directions, Advanced Features, Top +@chapter More Help +@cindex Relevant Newsgroups +@cindex Newsgroups +@cindex Support +For more help on Emacs/W3, please send me mail +(@i{wmperry@@cs.indiana.edu}). Several discussion lists have also been +created for Emacs/W3. To subscribe, send mail to +@i{majordomo@@indiana.edu}, with the body of the message 'subscribe +@var{listname} @var{<email addres>}'. All other mail should go to +@i{<listname>@@indiana.edu}. + + +@itemize @bullet +@item +w3-announce -- this list is for anyone interested in Emacs/W3, and +should in general only be used by me. The gnu.emacs.sources newsgroup +and a few other mailing lists are included on this. Please only use +this list for major package releases related to Emacs/W3. +(@i{www-announce@@w3.org} is included on this list). +@item +w3-beta -- this list is for beta testers of Emacs/W3. These brave souls test +out not-quite stable code. +@item +w3-dev -- a list consisting of myself and a few other people who are +interested in the internals of Emacs/W3, and doing active development work. +Pretty dead right now, but I hope it will grow. +@end itemize + +For more help on the World Wide Web in general, please refer to the +comp.infosystems.www.* newsgroups. There are also several discussion +lists concerning the Web. Send mail to @i{<listname>-request@@w3.org} +with a subject line of 'subscribe <listname>'. All mail should go to +@i{<listname>@@w3.org}. Administrative mail should go to +@i{www-admin@@w3.org}. The lists are: + + +@itemize @bullet +@item +www-talk -- for general discussion of the World Wide Web, where its +going, new features, etc. All the major developers are subscribed to +this list. +@item +www-announce -- for announcements concerning the World Wide Web. Server +changes, new servers, new software, etc. +@end itemize + +As a last resort, mail me. I'll try to answer as quickly as I can. + +@node Future Directions, Reporting Bugs, More Help, Top +@chapter Future Directions +Changes are constantly being made to the Emacs browser (hopefully all +for the better). This is a list of the things that are being worked on +right now. + +:: WORK :: Revamp the todo list + +@node Reporting Bugs, Dealing with Firewalls, Future Directions, Top +@appendix Reporting Bugs +@cindex Reporting Bugs +@cindex Bugs +@cindex Contacting the author + +If any bugs are discovered in Emacs/W3, please report them to the +mailing list @t{w3-beta@@indiana.edu} - this is where the brave souls +who beta test the latest versions of Emacs/W3 reside, and are generally +very responsive to bug reports. + +@kindex w +Please make sure to use the bug submission feature of Emacs/W3, so that +all relevant information will be sent along with your bug report. By +default this is bound to the `@key{w}' key when in an Emacs/W3 buffer, +or you can use @key{M-x w3-submit-bug} from anywhere within Emacs. + +For problems that are causing emacs to signal and error, please send a +backtrace. You can get a backtrace by @kbd{M-x setvariable RET +debug-on-error RET t RET}, and then reproduce the error. + +If the problem is visual, please capture a copy of the output and mail +it along with the bug report (preferably as a MIME attachment, but +anything will do). You can use the @code{xwd} program under X-windows +for this, or @key{Alt-PrintScreen} under Windows 95/NT. Sorry, but I +don't remember what the magic incarnation is for doing a screen dump +under NeXTstep or OS/2. + +If the problem is actually causing Emacs to crash, then you will need to +also mail the maintainers of the various Emacs distributions with the +bug. Please use the @t{gnu.emacs.bug} newgroup for reporting bugs with +GNU Emacs 19, and @t{comp.emacs.xemacs} for reporting bugs with XEmacs +19 or XEmacs 20. I am actively involved with the beta testing of the +latest versions of both branches of Emacs, and if I can reproduce the +problem, I will do my best to see it gets fixed in the next release. + +It is also important to always maintain as much context as possible in +your responses. I get so much email from my various Emacs-activities +and work, that I cannot remember everything. If you send a bug report, +and I send you a reply, and you reply with 'no that didn't work', then +odds are I will have no clue what didn't work, much less what that was +trying to fix in the first place. It will be much quicker and less +painful if I don't have to waste a round-trip email exchange saying +'what are you talking about'. + +@node Dealing with Firewalls, Proxy Gateways, Reporting Bugs, Top +@appendix Dealing with Firewalls +By default, Emacs can support standard @sc{tcp}/@sc{ip} network +connections on almost all the platforms it runs on (Unix, @sc{vms}, +Windows, etc). However, there are several situations where it is not +sufficient. + +@table @b +@cindex Firewalls +@item Firewalls +It is becoming more and more common to be behind a firewall or some +other system that restricts your outbound network activity, especially +if you are like me and away from the wonderful world of academia. +Emacs/W3 has several different methods to get around firewalls (not to +worry though - none of them should get you in trouble with the local +@sc{mis} department.) + +@item Emacs cannot resolve hostnames. +@cindex Faulty hostname resolvers +@cindex Broken SunOS libc +@cindex Hostname resolution +This happens quite often on SunOS workstations and some ULTRIX machines. +Some C libraries do not include the hostname resolver routines in their +static libraries. If Emacs was linked statically, and was not linked +with the resolver libraries, it wil not be able to get to any machines +off the local network. This is characterized by being able to reach +someplace with a raw ip number, but not its hostname +(@url{http://129.79.254.191/} works, but +@url{http://www.cs.indiana.edu/} doesn't). + +The best solution for this problem is to recompile Emacs, making sure to +either link dynamically (if available on your operating system), or +include the @file{-lresolv}. + +@cindex url-gateway-broken-resolution +If you do not have the disk space or the appropriate permissions to +recompile Emacs, another alternative is using the @file{nslookup} +program to do hostname resolution. To turn this on, set the variable +@code{url-gateway-broken-resolution} in your @file{~/.emacs} file. This +runs the program specified by @code{url-gateway-nslookup-program} (by +default "@code{nslookup}" to do hostname resolution. This program should +expect a single argument on the command line - the hostname to resolve, +and should produce output similar to the standard Unix @file{nslookup} +program: + +@example +Name: www.cs.indiana.ed +Address: 129.79.254.191 +@end example + +@cindex @sc{term} +@item Using @sc{term} (or @sc{term}-like) Networking Software +@sc{term} @footnote{@sc{term} is a user-level protocol for emulating +@sc{ip} over a serial line. More information is available at +@url{ftp://sunsite.unc.edu/pub/Linux/apps/comm/term}} for slip-like +access to the internet. + +@sc{note}: XEmacs and Emacs 19.22 or later have patches to enable native +@sc{term} networking. To enable it, @code{#define TERM} in the +appropriate s/*.h file for the operating system, then change the +@code{SYSTEM_LIBS} definition to include the @file{termnet} library that +comes with the latest versions of @sc{term}. + +If you run into any problems with the native @sc{term} networking +support in Emacs or XEmacs, please let @t{wmperry@@cs.indiana.edu} know, +as he is responsible for the original support. +@end table + +@vindex url-gateway-local-host-regexp +Emacs/W3 has support for using the gateway mechanism for certain +domains, and directly connecting to others. The variable +@code{url-gateway-local-host-regexp} controls this behaviour. This is a +regular expression @footnote{Please see the full Emacs distribution for +a description of regular expressions} that matches local hosts that do +not require the use of a gateway. If @code{nil}, then all connections +are made through the gateway. + +@vindex url-gateway-method +Emacs/W3 supports several methods of getting around gateways. The +variable @code{url-gateway-method} controls which of these methods is +used. This variable can have several values (use these as symbol names, +not strings), ie: @samp{(setq url-gateway-method 'telnet)}. Possible +values are: + +@table @dfn +@item telnet +Use this method if you must first telnet and log into a gateway host, +and then run telnet from that host to connect to outside machines. + +:: WORK :: document telnet gw variables@* +This section needs more information, specifically documenting the +following variables. For now, please do @key{C-h v} on the variable for +more information. + +@table @code +@item url-gateway-telnet-host +@item url-gateway-telnet-parameters +@item url-gateway-telnet-password-prompt +@item url-gateway-telnet-puser-name +@item url-gateway-prompt-pattern +@end table + +@item rlogin +This method is identical to the @code{telnet} method, but uses +@file{rlogin} to log into the remote machine without having to send the +username and password over the wire every time. + +:: WORK :: document rlogin gw variables@* +This section needs more information, specifically documenting the +following variables. For now, please do @key{C-h v} on the variable for +more information. + +@table @code +@item url-gateway-rlogin-host +@item url-gateway-rlogin-parameters +@item url-gateway-rlogin-user-name +@item url-gateway-prompt-pattern +@end table + +@item tcp +Masanobu UMEDA (@i{umerin@@mse.kyutech.ac.jp}) has written a very small +application that you can run in a subprocess to do the network +connections. + +@item @sc{socks} +Use if the firewall has a @sc{socks} gateway running on it. + +:: WORK :: document socks variables@* +This section needs more information, specifically documenting the +following variables. For now, please do @key{C-h v} on the variable for +more information. + +@table @code +@item socks-host +@item socks-password +@item socks-username +@item socks-port +@item socks-timeout +@end table + +@c @item ssl +@c This probably shouldn't be documented + +@item native +This means that Emacs/W3 should use the builtin networking code of +Emacs. This should be used only if there is no firewall, or the Emacs +source has already been hacked to get around the firewall. +@end table + +Emacs/W3 should now be able to get outside the local network. If none +of this makes sense, its probably my fault. Please check with the +network administrators to see if they have a program that does most of +this already, since somebody somewhere at the company has probably been +through something similar to this before, and would be much more +helpful/knowledgeable about the local setup than I would be. But feel +free to mail me as a last resort. + +@node Proxy Gateways, Installing SSL, Dealing with Firewalls, Top +@appendix Proxy Gateways +@vindex url-proxy-services +@cindex Proxy Servers +@cindex Proxies +@cindex Proxies, environment variables +@cindex HTTP Proxy + +In late January 1993, Kevin Altis and Lou Montulli proposed and +implemented a new proxy service. This service requires the use of +environment variables to specify a gateway server/port # to send +protocol requests to. Each protocol (@sc{http}, @sc{wais}, gopher, +@sc{ftp}, etc.) can have a different gateway server. The environment +variables are @code{PROTOCOL}_proxy, where @code{PROTOCOL} is one of the +supported network protocols (gopher, file, @sc{http}, @sc{ftp}, etc.) + +@cindex No Proxy +@cindex Proxies, exclusion lists +@vindex NO_PROXY +For companies with internal intranets, it will usually be helpful to +define a list of hosts that should be contacted directly, @b{not} sent +through the proxy. The @code{NO_PROXY} environment variable controls +what hosts are able to be contacted directly. This should be a comma +separated list of hostnames, domain names, or a mixture of both. +Asterisks can be used as a wildcard. For example: + +@example +NO_PROXY=*.aventail.com,home.com,*.seanet.com +@end example + +tells Emacs/W3 to contact all machines in the @b{aventail.com} and +@b{seanet.com} domains directly, as well as the machine named +@b{home.com}. + +@vindex url-proxy-services +@cindex Proxies, setting from lisp +For those adventurous souls who enjoy writing regular expressions, all +the proxy settings can be manipulated from Emacs-Lisp. The variable +@code{url-proxy-services} controls this. This is an assoc list, keyed +on the protocol type (@sc{http}, gopher, etc) in all lowercase. The +@code{cdr} of each entry should be the fully-specified @sc{url} of the proxy +server to contact, or, in the case of the special "no_proxy" entry, a +regular expression that matches any hostnames that should be contacted +directly. + +@example +(setq url-proxy-services '(("http" . "http://proxy.aventail.com/") + ("no_proxy" . "^.*\\(aventail\\|seanet\\)\.com"))) +@end example + +@node Installing SSL, Mailcap Files, Proxy Gateways, Top +@appendix Installing SSL +@cindex HTTP/1.0 Authentication +@cindex Secure Sockets Layer +@cindex SSL +@cindex Gag Puke Retch +@cindex Exportability +@cindex Export Restrictions +In order to use SSL in Emacs/W3, an implementation of SSL is necessary. +Emacs/W3 is configued to work out of the box with SSLeay 0.6.6 or later. +For best results, you should apply a patch that makes the SSLeay client +much quieter about what it reports. + +You can download SSLeay from +@url{ftp://ftp.psy.uq.oz.au/pub/Crypto/SSL/} + +The following variables control how the external program is invoked. + +@table @code +@item ssl-program-name +@vindex ssl-program-name +The name of the program to run, as a string. + +@example +(setq ssl-program-name "s_client") +@end example + +@item ssl-program-arguments +@vindex ssl-program-arguments +This should be used if your SSL program needs command line switches to +specify any behaviour (certificate file locations, etc). This is a list +of strings and symbols. + +The special symbols 'host and 'port may be used in the list of arguments +and will be replaced with the hostname and service/port that will be +connected to. + +@example +(setq ssl-program-arguments '("-host" host "-port" service "-verify" "4" + "-CApath /usr/local/ssl/certs")) +@end example +@end table + +@node Mailcap Files, Down with DoubleClick, Installing SSL, Top +@appendix Mailcap Files +NCSA Mosaic and almost all other WWW browsers rely on a separate file +for mapping MIME types to external viewing programs. This takes some of +the burden off of browser developers, so each browser does not have to +support all image formats, or postscript, etc. Instead of having the +users of Emacs/W3 duplicate this in lisp, this file can be parsed using +the @code{mm-parse-mailcaps} function. This function is called each +time Emacs/W3 is loaded. It tries to locate mimetype files in several +places. If the environment variable @code{MAILCAPS} is nonempty, then +this is assumed to specify a UNIX-like path of mimetype files (this is a +colon separated string of pathnames). If the @code{MAILCAPS} +environment variable is empty, then Emacs/W3 looks for these +files: + +@enumerate +@item +@file{~/.mailcap} +@item +@file{/etc/mailcap} +@item +@file{/usr/etc/mailcap} +@item +@file{/usr/local/etc/mailcap} +@end enumerate + +This format of this file is specified in RFC 1343, but a brief synopsis +follows (this is taken verbatim from sections of RFC 1343). + +Each mailcap file consists of a set of entries that describe the proper +handling of one media type at the local site. For example, one line +might tell how to display a message in Group III fax format. A mailcap +file consists of a sequence of such individual entries, separated by +newlines (according to the operating system's newline +conventions). Blank lines and lines that start with the "#" character +(ASCII 35) are considered comments, and are ignored. Long entries may +be continued on multiple lines if each non-terminal line ends with a +backslash character ('\', ASCII 92), in which case the multiple lines +are to be treated as a single mailcap entry. Note that for such +"continued" lines, the backslash must be the last character on the line +to be continued. + +Each mailcap entry consists of a number of fields, separated by +semi-colons. The first two fields are required, and must occur in the +specified order. The remaining fields are optional, and may appear in +any order. + +The first field is the content-type, which indicates the type of data +this mailcap entry describes how to handle. It is to be matched against +the type/subtype specification in the "Content-Type" header field of an +Internet mail message. If the subtype is specified as "*", it is +intended to match all subtypes of the named content-type. + +The second field, view-command, is a specification of how the message or +body part can be viewed at the local site. Although the syntax of this +field is fully specified, the semantics of program execution are +necessarily somewhat operating system dependent. + +The optional fields, which may be given in any order, are as follows: +@itemize @bullet +@item +The "compose" field may be used to specify a program that can be used to +compose a new body or body part in the given format. Its intended use +is to support mail composing agents that support the composition of +multiple types of mail using external composing agents. As with the +view- command, the semantics of program execution are operating system +dependent. The result of the composing program may be data that is not +yet suitable for mail transport---that is, a Content-Transfer-Encoding +may need to be applied to the data. +@item +The "composetyped" field is similar to the "compose" field, but is to be +used when the composing program needs to specify the Content-type header +field to be applied to the composed data. The "compose" field is +simpler, and is preferred for use with existing (non-mail-oriented) +programs for composing data in a given format. The "composetyped" field +is necessary when the Content-type information must include auxilliary +parameters, and the composition program must then know enough about mail +formats to produce output that includes the mail type +information. +@item +The "edit" field may be used to specify a program that can be used to +edit a body or body part in the given format. In many cases, it may be +identical in content to the "compose" field, and shares the +operating-system dependent semantics for program execution. +@item +The "print" field may be used to specify a program that can be used to +print a message or body part in the given format. As with the +view-command, the semantics of program execution are operating system +dependent. +@item +The "test" field may be used to test some external condition (e.g. the +machine architecture, or the window system in use) to determine whether +or not the mailcap line applies. It specifies a program to be run to +test some condition. The semantics of execution and of the value +returned by the test program are operating system dependent. If the +test fails, a subsequent mailcap entry should be sought. Multiple test +fields are not permitted---since a test can call a program, it can +already be arbitrarily complex. +@item +The "needsterminal" field indicates that the view-command must be run on +an interactive terminal. This is needed to inform window-oriented user +agents that an interactive terminal is needed. (The decision is not +left exclusively to the view-command because in some circumstances it +may not be possible for such programs to tell whether or not they are on +interactive terminals.) The needsterminal command should be assumed to +apply to the compose and edit commands, too, if they exist. Note that +this is NOT a test---it is a requirement for the environment in which +the program will be executed, and should typically cause the creation of +a terminal window when not executed on either a real terminal or a +terminal window. +@item +The "copiousoutput" field indicates that the output from the +view-command will be an extended stream of output, and is to be +interpreted as advice to the UA (User Agent mail- reading program) that +the output should be either paged or made scrollable. Note that it is +probably a mistake if needsterminal and copiousoutput are both +specified. +@item +The "description" field simply provides a textual description, +optionally quoted, that describes the type of data, to be used +optionally by mail readers that wish to describe the data before +offering to display it. +@item +The "x11-bitmap" field names a file, in X11 bitmap (xbm) format, which +points to an appropriate icon to be used to visually denote the presence +of this kind of data. +@item +Any other fields beginning with "x-" may be included for local or +mailer-specific extensions of this format. Implementations should +simply ignore all such unrecognized fields to permit such extensions, +some of which might be standardized in a future version of this +document. +@end itemize + +@node Down with DoubleClick, General Index, Mailcap Files, Top +@appendix Down with DoubleClick +:: WORK :: Document why doubleclick is evil@* +:: WORK :: Document how you can never see another ad from them again + +@node General Index, Key Index, Down with DoubleClick, Top +@appendix General Index +@printindex fn +@node Key Index, , General Index, Top +@appendix Key Index +@printindex ky +@contents +@bye
--- a/man/xemacs-faq.texi Mon Aug 13 09:45:48 2007 +0200 +++ b/man/xemacs-faq.texi Mon Aug 13 09:46:53 2007 +0200 @@ -8,10 +8,10 @@ @titlepage @title XEmacs FAQ @subtitle Frequently asked questions about XEmacs -@subtitle Last Modified: 1997-06-18 +@subtitle Last Modified: 1997-07-02 @sp 1 @author Tony Rossini <arossini@@stat.sc.edu> -@author Ben Wing <wing@@netcom.com> +@author Ben Wing <wing@@666.com> @author Chuck Thompson <cthomp@@cs.uiuc.edu> @author Steve Baur <steve@@miranova.com> @author Andreas Kaempf <andreas@@sccon.com> @@ -4893,15 +4893,10 @@ read this question/answer again. @end quotation -Hrvoje Niksic <hniksic@@srce.hr> writes: - -@quotation -I consider this a bug. I may attempt to fix it one day (and add a -variable to revert to the current behavior). - -If many people wants to see this fixed, send me mails---they will move -me to start hacking sooner. -@end quotation +Newsflash: this restriction has been lifted, starting with XEmacs 20.3, +which is currently in beta. Hrvoje Niksic <hniksic@@srce.hr> will +appreciate it if you download a beta, try out whether abbreviations work +like you expect them to, and let him know. @node Q5.3.10, Q5.3.11, Q5.3.9, Miscellaneous @section How can I get those oh-so-neat X-Face lines?
--- a/nt/ChangeLog Mon Aug 13 09:45:48 2007 +0200 +++ b/nt/ChangeLog Mon Aug 13 09:46:53 2007 +0200 @@ -1,3 +1,27 @@ +Thu June 31 21:16:21 1997 davidh + + * nt/TODO created. + + * nt/X11.patch created to help with the X build. + + * August Hill provided: + a patch to fix the _WRETCODE undefined symbol, + a patch to fix a problem with dired + + and generally helped clarify the build instructions. + + * Synced with 20.3b10 (Athens). + + * Made DIRECTORY_SEP be '\\'. Until I can change all code to + use the macro, I decided this would be easiest. + + * Modified src/fileio.c to only open files in O_BINARY. This + causes files to be opened and written without automatically + writing ^M 's to the end of each line. MULE ought to sort this + in theory, but I am less than convinced. + + * Updated the nt/README to provide a little more help. + Thu May 29 23:11:21 1997 davidh * Synced with 20.3b2.
--- a/nt/README Mon Aug 13 09:45:48 2007 +0200 +++ b/nt/README Mon Aug 13 09:46:53 2007 +0200 @@ -1,34 +1,27 @@ - Building and Installing XEmacs - on Windows NT - - David Hobley <david_hobley@optusvision.com.au> - <davidh@wr.com.au> - Marc Paquette <marcpa@cam.org> + Building and Installing XEmacs on Windows NT -You need a compiler package to build and install XEmacs on NT or Win95. -Microsoft Visual C++ 4.2 has been successfuly used to build it on NT: we -recommend this specific version (VC++ 4.1 has trouble with some macro -definitions in XEmacs sources). + David Hobley + Marc Paquette -This is an extremely early release. Any help we can provide we will do -so. Note however that, as of XEmacs 20.3 beta4, only X is supported -and some things might not work well at first. +Currently XEmacs for NT is in an early stage of development. Only X support +works at the moment, although native GUI/terminal support will be added at a +later date. If anyone wants to help with this, please contact us. -Two methods to try it: jumpstart with pre-compiled X libraries (NT4 -for Intel) or the long route with X11R6.3 re-compiled from scratch. -The jumpstart method is not in place yet, but the files will probably -appear somewhere at ftp.xemacs.org. Here are some instructions for -recompiling X: +The port was made much easier by the groundbreaking work of Geoff Voelker +and others who worked on the GNU Emacs port to NT. Their version is available +from http://www.cs.washington.edu/homes/voelker/ntemacs.html + +To get it working you will need: -1. Get X11R6.3 (Note: you need *a lots* of free space on your drive). -Modify its Win32.cf and site.def configuration files -to use the single-threaded, statically linked C run-time library -(libc.lib instead of msvcrt.dll). Samples Win32.cf and site.def are -provided in the XEmacs nt/ directory. -2. Build X11R6.3 and install it. -3. Apply the following patch to include/X11/Xmd.h in the installed -directory. Note: this could conceivably be better done before -compiling X, but this is the order I (marcpa) used. +1. An X server. MI/X is available on the Internet for free; It is + available from: http://www.microimages.com/www/html/freestuf/mixdlfrm.htm +2. The MIT X11R6.3 libraries available from: ftp.x.org +3. You'll need to compile the MIT libraries without multi-thread support. + To do this, there is an example Win32.cf and site.def provided which + set the relevant flags. You will also need to apply the patch in + nt/X11.patch in the xc/lib/X11 directory which will fix the DLL definition + file. Once compiled and installed, you will need to apply the following + patch to Xmd.h. This is messy and better solutions would be appreciated. --- Xmd.h~ Thu Jun 08 23:20:40 1995 +++ Xmd.h Sun Mar 16 13:09:10 1997 @@ -41,32 +34,34 @@ - +#endif - -4. Edit the xemacs.mak Makefile and ensure variables point to the -correct place. -5. copy the files ad2c.sed, config.h, paths.h and xemacs.mak from nt/ -into src/. -6. Run nmake using xemacs.mak (nmake -f xemacs.mak) while in src/. -7. Manually run the resulting temacs executable to create xemacs: -temacs.exe -batch -l loadup.el dump -8. You should be able to use MSDEV to run and debug temacs.exe: open a - workspace by specifying "Executable files", select "temacs.exe", set -the debug "Program arguments" settings (Build->Settings->Debug) to "-batch -l -loadup.el run-temacs" and run it. You should be able to open any -source file and set a breakpoint in it. +4. You will need Visual C++ V4.2 or later to compile everything. Personally we + have tested V4.2 and V5.0. +5. Grab the latest XEmacs beta from ftp.xemacs.org if necessary. All nt + support is in the nt/ subdirectory. +6. Edit the xemacs.mak file and ensure variables point to the correct place. + Note that Visual C++ assumes a couple of environment variables INCLUDE and + LIB to be set which specify the location of the includes and libraries. +7. Copy the files Emacs.ad.h, config.h and paths.h from nt/ to src/. + Note, to rebuild Emacs.ad.h a sed script is run. SED for NT is available + from the Virtually Unix site: http://www.itribe.net/virtunix + This is not required however in normal operation. +8. Run make. I simply use nmake -f xemacs.mak. +9. Change directory to the src/ directory and run the temacs executable + manually: + temacs -batch -l loadup.el dump + This will produce an xemacs.exe which can be run in conjunction with your + X server. -Problems: -- Haven't got rid of some symbol problems which may be causing problems. -- Still seems to use fork, which fails without /force option on link. I am - trying to work out where it should be removed. -- To make it work on X, usage of XtAppAddInput had to be commented out. - This is expected to break some parts of XEmacs, so beware. +Known Problems: +Please look at the TODO list for the current list of problems and people +working on them. + +Any other problems you need clarified, please email us and we will endeavour +to provide any assistance we can: -Any problems/questions, mail us: +David Hobley david_hobley@optusvision.com.au -- work email. + davidh@wr.com.au -- home account. -David Hobley -david_hobley@optusvision.com.au -- work email. -davidh@wr.com.au -- home account. +Marc Paquette marcpa@cam.org -- home account. -Marc Paquette -marcpa@cam.org -- home account. +August Hill awhill@inlink.com
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/nt/Todo Mon Aug 13 09:46:53 2007 +0200 @@ -0,0 +1,18 @@ +# List of problems with XEmacs. If anyone wants to work on these, please +# mail me and I'll update the table below. + +1. vfork references +2. provide working select which supports handles as well as sockets +3. make "Save Options" actually save options to home directory. Currently I get + it trying to save in g:\home\davidh\~davidh +4. build a binary distribution (just install temacs and get user to _easily_ + build an xemacs.exe on their system. This will ensure heap problems do not + occur) +5. provide option for dired to use dir/attrib on Win32 platforms +6. verify MULE supports CRLF correctly +7. get subprocesses working + + +Issue - Person +2 David Hobley +3 August Hill
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/nt/x11.patch Mon Aug 13 09:46:53 2007 +0200 @@ -0,0 +1,27 @@ +*** X11.def.old Thu Apr 10 07:29:27 1997 +--- X11.def Wed Jul 02 22:20:16 1997 +*************** +*** 5,15 **** + VERSION 6.1 + EXPORTS + _Xdebug_p=_Xdebug CONSTANT +- _XCreateMutex_fn_p=_XCreateMutex_fn CONSTANT +- _XFreeMutex_fn_p=_XFreeMutex_fn CONSTANT +- _XLockMutex_fn_p=_XLockMutex_fn CONSTANT +- _XUnlockMutex_fn_p=_XUnlockMutex_fn CONSTANT +- _Xglobal_lock_p=_Xglobal_lock CONSTANT + XActivateScreenSaver + XAddConnectionWatch + XAddExtension +--- 5,10 ---- +*************** +*** 623,630 **** + _XUnregisterFilter + _XUnregisterInternalConnection + _XVIDtoVisual +- _Xthread_init +- _Xthread_waiter + XkbIgnoreExtension + XkbOpenDisplay + XkbQueryExtension +--- 618,623 ----
--- a/pkg-src/tree-x/Makefile.in.in Mon Aug 13 09:45:48 2007 +0200 +++ b/pkg-src/tree-x/Makefile.in.in Mon Aug 13 09:46:53 2007 +0200 @@ -25,6 +25,7 @@ CPPFLAGS=@CPPFLAGS@ LDFLAGS=@LDFLAGS@ +INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ c_switch_all=@c_switch_all@
--- a/pkg-src/tree-x/dbl.c Mon Aug 13 09:45:48 2007 +0200 +++ b/pkg-src/tree-x/dbl.c Mon Aug 13 09:46:53 2007 +0200 @@ -31,7 +31,7 @@ XColor *colors, int num_colors) { - int i, j, k, l, m, offset, mask, size; + int i, j, k, l, offset, mask, size; int max_planes; char *string; @@ -44,7 +44,7 @@ if ((db = (DoubleBuffer *)calloc(1, sizeof(DoubleBuffer))) == 0) { printf("DBLopen_double_buffer : memory allocation error\n"); - return (NULL); + return NULL; } /* note the display */ @@ -143,7 +143,7 @@ else { printf("DBLcreate_double_buffer : memory allocation error\n"); DBLdelete_double_buffer(db); - return(NULL); + return NULL; } surface->offset = offset + i * (db->num_planes >> 1); @@ -245,7 +245,7 @@ DBLbegin_frame(db); DBLend_frame(db, 1); - return (db); + return db; } /* ------------------------------------------------------------------------- */ @@ -288,9 +288,9 @@ DBLinq_background(DoubleBuffer *db) { if (db->num_surfaces > 0) - return(db->surface[0]->color[0].pixel); + return db->surface[0]->color[0].pixel; else - return(WhitePixelOfScreen(db->screen)); + return WhitePixelOfScreen(db->screen); } /* ------------------------------------------------------------------------- */
--- a/pkg-src/tree-x/defs.h Mon Aug 13 09:45:48 2007 +0200 +++ b/pkg-src/tree-x/defs.h Mon Aug 13 09:46:53 2007 +0200 @@ -11,7 +11,7 @@ #define NASSERT(x, msg) \ if ((x) == NULL) { fprintf(stderr, "%s: %s\n", ProgramName, msg); \ - return (NULL); } + return NULL; } #define WARN(msg) \ fprintf(stderr, "%s: %s\n", ProgramName, msg)
--- a/pkg-src/tree-x/dissolve.c Mon Aug 13 09:45:48 2007 +0200 +++ b/pkg-src/tree-x/dissolve.c Mon Aug 13 09:46:53 2007 +0200 @@ -19,6 +19,65 @@ #include "dissolve.h" +#define NUM_DISSOLVE_STEPS 8 +#define NUM_LINE_STEPS 4 + +#define first_width 16 +#define first_height 16 +static unsigned char first_bits[] = { + 0x88, 0x04, 0x00, 0x80, 0x20, 0x10, 0x00, 0x81, 0x12, 0x00, 0x00, 0x00, + 0x00, 0x02, 0x82, 0x40, 0x00, 0x00, 0x12, 0x14, 0x00, 0x00, 0x0a, 0x28, + 0x40, 0x01, 0x05, 0x00, 0xa0, 0x92, 0x08, 0x00 }; + +#define second_width 16 +#define second_height 16 +static unsigned char second_bits[] = { + 0x51, 0x20, 0x04, 0x02, 0x00, 0x88, 0x02, 0x00, 0x08, 0x09, 0x40, 0x00, + 0x04, 0x04, 0x00, 0xa0, 0x80, 0x08, 0x08, 0x00, 0x00, 0xa8, 0x00, 0x00, + 0x28, 0x28, 0x00, 0x80, 0x01, 0x00, 0x10, 0x82 }; + +#define third_width 16 +#define third_height 16 +static unsigned char third_bits[] = { + 0x00, 0x01, 0x12, 0x44, 0x00, 0x01, 0x00, 0x08, 0x00, 0x42, 0x2a, 0x08, + 0x80, 0x00, 0x04, 0x10, 0x01, 0x04, 0x00, 0x80, 0xa9, 0x04, 0x00, 0x00, + 0x00, 0x10, 0x0a, 0x05, 0x40, 0x00, 0x00, 0x50 }; + +#define fourth_width 16 +#define fourth_height 16 +static unsigned char fourth_bits[] = { + 0x02, 0x88, 0x80, 0x00, 0x04, 0x40, 0x11, 0x02, 0x40, 0x90, 0x05, 0x00, + 0x00, 0x08, 0x11, 0x01, 0x40, 0x00, 0x00, 0x41, 0x14, 0x00, 0x00, 0x12, + 0x10, 0x00, 0x40, 0x40, 0x08, 0x00, 0xa0, 0x04 }; + +#define fifth_width 16 +#define fifth_height 16 +static unsigned char fifth_bits[] = { + 0x24, 0x00, 0x00, 0x08, 0x09, 0x20, 0x20, 0x04, 0x00, 0x00, 0x00, 0x85, + 0x10, 0x20, 0x40, 0x02, 0x14, 0x40, 0x00, 0x08, 0x02, 0x01, 0x10, 0x40, + 0x04, 0x04, 0x20, 0x20, 0x00, 0x00, 0x42, 0x29 }; + +#define sixth_width 16 +#define sixth_height 16 +static unsigned char sixth_bits[] = { + 0x00, 0x12, 0x28, 0x00, 0x02, 0x00, 0x88, 0x00, 0x01, 0x20, 0x90, 0x02, + 0x01, 0x50, 0x20, 0x04, 0x08, 0xa0, 0x41, 0x00, 0x00, 0x00, 0x24, 0x05, + 0x00, 0x80, 0x00, 0x10, 0x10, 0x40, 0x05, 0x00 }; + +#define seventh_width 16 +#define seventh_height 16 +static unsigned char seventh_bits[] = { + 0x00, 0x40, 0x01, 0x10, 0x90, 0x02, 0x00, 0x50, 0xa4, 0x04, 0x00, 0x20, + 0x20, 0x80, 0x08, 0x08, 0x00, 0x01, 0x04, 0x00, 0x40, 0x52, 0x00, 0x00, + 0x81, 0x42, 0x10, 0x00, 0x04, 0x25, 0x00, 0x00 }; + +#define eighth_width 16 +#define eighth_height 16 +static unsigned char eighth_bits[] = { + 0x00, 0x00, 0x40, 0x21, 0x40, 0x04, 0x44, 0x20, 0x00, 0x00, 0x00, 0x50, + 0x4a, 0x01, 0x00, 0x00, 0x22, 0x12, 0xa0, 0x22, 0x00, 0x00, 0xc1, 0x80, + 0x02, 0x00, 0x80, 0x0a, 0x02, 0x08, 0x00, 0x00 }; + static Pixmap DissolvePixmaps[NUM_DISSOLVE_STEPS]; static GC DissolveInGC; static GC DissolveOutGC;
--- a/pkg-src/tree-x/dissolve.h Mon Aug 13 09:45:48 2007 +0200 +++ b/pkg-src/tree-x/dissolve.h Mon Aug 13 09:46:53 2007 +0200 @@ -3,66 +3,6 @@ * ---------------------------------------------------------------------------- */ -#define NUM_DISSOLVE_STEPS 8 -#define NUM_LINE_STEPS 4 - -#define first_width 16 -#define first_height 16 - -static unsigned char first_bits[] = { - 0x88, 0x04, 0x00, 0x80, 0x20, 0x10, 0x00, 0x81, 0x12, 0x00, 0x00, 0x00, - 0x00, 0x02, 0x82, 0x40, 0x00, 0x00, 0x12, 0x14, 0x00, 0x00, 0x0a, 0x28, - 0x40, 0x01, 0x05, 0x00, 0xa0, 0x92, 0x08, 0x00 }; -#define second_width 16 -#define second_height 16 - -static unsigned char second_bits[] = { - 0x51, 0x20, 0x04, 0x02, 0x00, 0x88, 0x02, 0x00, 0x08, 0x09, 0x40, 0x00, - 0x04, 0x04, 0x00, 0xa0, 0x80, 0x08, 0x08, 0x00, 0x00, 0xa8, 0x00, 0x00, - 0x28, 0x28, 0x00, 0x80, 0x01, 0x00, 0x10, 0x82 }; -#define third_width 16 -#define third_height 16 - -static unsigned char third_bits[] = { - 0x00, 0x01, 0x12, 0x44, 0x00, 0x01, 0x00, 0x08, 0x00, 0x42, 0x2a, 0x08, - 0x80, 0x00, 0x04, 0x10, 0x01, 0x04, 0x00, 0x80, 0xa9, 0x04, 0x00, 0x00, - 0x00, 0x10, 0x0a, 0x05, 0x40, 0x00, 0x00, 0x50 }; -#define fourth_width 16 -#define fourth_height 16 - -static unsigned char fourth_bits[] = { - 0x02, 0x88, 0x80, 0x00, 0x04, 0x40, 0x11, 0x02, 0x40, 0x90, 0x05, 0x00, - 0x00, 0x08, 0x11, 0x01, 0x40, 0x00, 0x00, 0x41, 0x14, 0x00, 0x00, 0x12, - 0x10, 0x00, 0x40, 0x40, 0x08, 0x00, 0xa0, 0x04 }; -#define fifth_width 16 -#define fifth_height 16 - -static unsigned char fifth_bits[] = { - 0x24, 0x00, 0x00, 0x08, 0x09, 0x20, 0x20, 0x04, 0x00, 0x00, 0x00, 0x85, - 0x10, 0x20, 0x40, 0x02, 0x14, 0x40, 0x00, 0x08, 0x02, 0x01, 0x10, 0x40, - 0x04, 0x04, 0x20, 0x20, 0x00, 0x00, 0x42, 0x29 }; -#define sixth_width 16 -#define sixth_height 16 - -static unsigned char sixth_bits[] = { - 0x00, 0x12, 0x28, 0x00, 0x02, 0x00, 0x88, 0x00, 0x01, 0x20, 0x90, 0x02, - 0x01, 0x50, 0x20, 0x04, 0x08, 0xa0, 0x41, 0x00, 0x00, 0x00, 0x24, 0x05, - 0x00, 0x80, 0x00, 0x10, 0x10, 0x40, 0x05, 0x00 }; -#define seventh_width 16 -#define seventh_height 16 - -static unsigned char seventh_bits[] = { - 0x00, 0x40, 0x01, 0x10, 0x90, 0x02, 0x00, 0x50, 0xa4, 0x04, 0x00, 0x20, - 0x20, 0x80, 0x08, 0x08, 0x00, 0x01, 0x04, 0x00, 0x40, 0x52, 0x00, 0x00, - 0x81, 0x42, 0x10, 0x00, 0x04, 0x25, 0x00, 0x00 }; -#define eighth_width 16 -#define eighth_height 16 - -static unsigned char eighth_bits[] = { - 0x00, 0x00, 0x40, 0x21, 0x40, 0x04, 0x44, 0x20, 0x00, 0x00, 0x00, 0x50, - 0x4a, 0x01, 0x00, 0x00, 0x22, 0x12, 0xa0, 0x22, 0x00, 0x00, 0xc1, 0x80, - 0x02, 0x00, 0x80, 0x0a, 0x02, 0x08, 0x00, 0x00 }; - void InitializeDissolveEffect(Display *dpy, Drawable drawable,
--- a/pkg-src/tree-x/draw.c Mon Aug 13 09:45:48 2007 +0200 +++ b/pkg-src/tree-x/draw.c Mon Aug 13 09:46:53 2007 +0200 @@ -619,7 +619,7 @@ FOREACH_CHILD(child, tree) num_nodes += CountNodes(child); } - return (num_nodes); + return num_nodes; } @@ -790,20 +790,20 @@ Tree *child; if (tree == NULL) - return (FALSE); + return FALSE; if (PT_IN_RECT(x, y, tree->pos.x, tree->pos.y, tree->pos.x + tree->width, tree->pos.y + tree->height)) { *node = tree; - return (TRUE); + return TRUE; } if (tree->child && (PT_IN_EXTENT(x, y, tree->subextent))) FOREACH_CHILD(child, tree) { if (SearchTree(child, x, y, node)) - return (TRUE); + return TRUE; } - return (FALSE); + return FALSE; }
--- a/pkg-src/tree-x/input.c Mon Aug 13 09:45:48 2007 +0200 +++ b/pkg-src/tree-x/input.c Mon Aug 13 09:46:53 2007 +0200 @@ -43,7 +43,6 @@ register char *curbuf = lexbuf; register int charct = 0; register int c; - int done = FALSE; prevTokDepth = tokDepth; tokDepth = 0; @@ -63,11 +62,11 @@ switch (c) { case EOF: - return (TOKEN_EOF); + return TOKEN_EOF; case '\n': *curbuf = '\0'; *lexeme = strdup(lexbuf); - return (TOKEN_LABEL); + return TOKEN_LABEL; default: *curbuf++ = c; charct++; @@ -82,7 +81,7 @@ c = getc(fp); if (c == EOF) ungetc(c, fp); - return (TOKEN_LABEL); + return TOKEN_LABEL; } else c = getc(fp); @@ -150,7 +149,7 @@ if (infile == NULL) { *error = ERR_OPENFAIL; - return (NULL); + return NULL; } /* first line of file is Envir file name, save */ @@ -159,7 +158,7 @@ { *error = ERR_EMPTYFILE; fclose(infile); - return (NULL); + return NULL; } else if (token == TOKEN_LABEL) { @@ -167,7 +166,7 @@ { *error = ERR_MEMALLOC; fclose(infile); - return (NULL); + return NULL; } EnvNm = strdup(label); } @@ -178,7 +177,7 @@ { *error = ERR_EMPTYFILE; fclose(infile); - return (NULL); + return NULL; } else if (token == TOKEN_LABEL) { @@ -186,7 +185,7 @@ { *error = ERR_MEMALLOC; fclose(infile); - return (NULL); + return NULL; } tree = MakeNode(); if (tree == NULL) @@ -194,7 +193,7 @@ *error = ERR_MEMALLOC; fclose(infile); free(label); - return(NULL); + return NULL; } SetNodeLabelAndValue(tree, label); tree->parent = NULL; @@ -204,7 +203,7 @@ { *error = ERR_NOROOT; fclose(infile); - return (NULL); + return NULL; } /* add children and siblings */ @@ -225,7 +224,7 @@ { *error = ERR_NOBEGIN; fclose(infile); - return (tree); + return tree; } else while (tokDepth < inside_list) @@ -239,14 +238,14 @@ { *error = ERR_MEMALLOC; fclose(infile); - return (tree); + return tree; } if (parent == NULL) { *error = ERR_MANYROOT; fclose(infile); free(label); - return (tree); + return tree; } else { @@ -256,7 +255,7 @@ *error = ERR_MEMALLOC; fclose(infile); free(label); - return (tree); + return tree; } SetNodeLabelAndValue(new_node, label); new_node->parent = parent; @@ -277,7 +276,7 @@ } } fclose(infile); - return (tree); + return tree; } @@ -297,7 +296,7 @@ outfile = fopen(fname, "w"); if (outfile == NULL) - return (FALSE); + return FALSE; fprintf(outfile, "%s\n", EnvNm); /* Save Env File Name */ fprintf(outfile, "%s\n", tree->label.text); @@ -305,7 +304,7 @@ SaveSubtree(tree->child, 0, outfile); fclose(outfile); - return (TRUE); + return TRUE; }
--- a/pkg-src/tree-x/intf.c Mon Aug 13 09:45:48 2007 +0200 +++ b/pkg-src/tree-x/intf.c Mon Aug 13 09:46:53 2007 +0200 @@ -105,23 +105,16 @@ static Tree *PopupNode; /* node selected for popup */ static NodePosition NodePos; -static Widget mainWindow; -static Widget topForm; - -static Widget statusLabel; static Widget statusText; static Widget scrolledWindow; static Widget helpShell; static Widget helpForm; -static Widget helpScrollWindow; static Widget helpText; static Widget helpDoneButton; static Widget helpTitle; -static Widget helpFrame; -static Widget treeMenubar; static Widget treeMenus[NUM_MENUS]; static Widget treeMenuBtns[NUM_MENUS - 1]; /* don't need button for */ /* node popup menu */ @@ -392,64 +385,53 @@ static void BuildPopupMenus(Widget parent) { - Arg args[2]; - String xstr; + Arg al[2]; labelStr[STR_NODE_COLLAPSE] = "Collapse Node"; labelStr[STR_NODE_EXPAND] = "Expand Node"; - treeMenus[NODE_MENU] = XtVaCreatePopupShell("nodeMenu", - simpleMenuWidgetClass, - parent, - XtNlabel, " ", - NULL); + XtSetArg (al [0], XtNlabel, " "); + treeMenus[NODE_MENU] = + XtCreatePopupShell("nodeMenu", simpleMenuWidgetClass, parent, al, 1); - (void) XtVaCreateManagedWidget("nodeMenuAddChild", smeLineObjectClass, - treeMenus[NODE_MENU], - NULL); + XtCreateManagedWidget("nodeMenuAddChild", smeLineObjectClass, + treeMenus[NODE_MENU], NULL, 0); + XtSetArg (al [0], XtNlabel, "Add Child"); nodeMenuItems[NODE_MENU_ADD_CHILD] = - XtVaCreateManagedWidget("nodeMenuAddChild", smeBSBObjectClass, - treeMenus[NODE_MENU], - XtNlabel, "Add Child", - NULL); + XtCreateManagedWidget("nodeMenuAddChild", smeBSBObjectClass, + treeMenus[NODE_MENU], al, 1); XtAddCallback(nodeMenuItems[NODE_MENU_ADD_CHILD], XtNcallback, NodeMenu_CB, (XtPointer) NODE_MENU_ADD_CHILD); + XtSetArg (al [0], XtNlabel, "Add Sibling Before"); nodeMenuItems[NODE_MENU_ADD_BEFORE] = - XtVaCreateManagedWidget("nodeMenuAddSiblingBefore", smeBSBObjectClass, - treeMenus[NODE_MENU], - XtNlabel, "Add Sibling Before", - NULL); + XtCreateManagedWidget("nodeMenuAddSiblingBefore", smeBSBObjectClass, + treeMenus[NODE_MENU], al, 1); XtAddCallback(nodeMenuItems[NODE_MENU_ADD_BEFORE], - XtNcallback, NodeMenu_CB, (XtPointer) NODE_MENU_ADD_BEFORE); + XtNcallback, NodeMenu_CB, (XtPointer) NODE_MENU_ADD_BEFORE); - nodeMenuItems[NODE_MENU_ADD_AFTER] = - XtVaCreateManagedWidget("nodeMenuAddSiblingAfter", smeBSBObjectClass, - treeMenus[NODE_MENU], - XtNlabel, "Add Sibling After", - NULL); - XtAddCallback(nodeMenuItems[NODE_MENU_ADD_AFTER], - XtNcallback, NodeMenu_CB, (XtPointer) NODE_MENU_ADD_AFTER); + XtSetArg (al [0], XtNlabel, "Add Sibling After"); + nodeMenuItems[NODE_MENU_ADD_AFTER] = + XtCreateManagedWidget("nodeMenuAddSiblingAfter", smeBSBObjectClass, + treeMenus[NODE_MENU], al, 1); + XtAddCallback(nodeMenuItems[NODE_MENU_ADD_AFTER], + XtNcallback, NodeMenu_CB, (XtPointer) NODE_MENU_ADD_AFTER); - nodeMenuItems[NODE_MENU_ELISION] = - XtVaCreateManagedWidget("nodeMenuElision", smeBSBObjectClass, - treeMenus[NODE_MENU], - XtNlabel, labelStr[STR_NODE_COLLAPSE], - NULL); - XtAddCallback(nodeMenuItems[NODE_MENU_ELISION], - XtNcallback, NodeMenu_CB, (XtPointer) NODE_MENU_ELISION); + XtSetArg (al [0], XtNlabel, labelStr[STR_NODE_COLLAPSE]); + nodeMenuItems[NODE_MENU_ELISION] = + XtCreateManagedWidget("nodeMenuElision", smeBSBObjectClass, + treeMenus[NODE_MENU], al, 1); + XtAddCallback(nodeMenuItems[NODE_MENU_ELISION], + XtNcallback, NodeMenu_CB, (XtPointer) NODE_MENU_ELISION); - nodeMenuItems[NODE_MENU_DELETE] = - XtVaCreateManagedWidget("nodeMenuDeleteNode", smeBSBObjectClass, - treeMenus[NODE_MENU], - XtNlabel, "Delete Node", - NULL); - XtAddCallback(nodeMenuItems[NODE_MENU_DELETE], - XtNcallback, NodeMenu_CB, (XtPointer) NODE_MENU_DELETE); - - + XtSetArg (al [0], XtNlabel, "Delete Node"); + nodeMenuItems[NODE_MENU_DELETE] = + XtCreateManagedWidget("nodeMenuDeleteNode", smeBSBObjectClass, + treeMenus[NODE_MENU], al, 1); + XtAddCallback(nodeMenuItems[NODE_MENU_DELETE], + XtNcallback, NodeMenu_CB, (XtPointer) NODE_MENU_DELETE); } /* ---------------------------------------------------------------------------- @@ -463,155 +445,128 @@ static void BuildMenubar(Widget parent) { - Arg al[4]; - int i; - Widget box; + Arg al[4]; + Widget box; - XtSetArg (al [0], XtNshowGrip, FALSE); - XtSetArg (al [1], XtNborderWidth, 0); - box = XtCreateManagedWidget("menuBox", - boxWidgetClass, - parent, - al, 2); + XtSetArg (al [0], XtNshowGrip, FALSE); + XtSetArg (al [1], XtNborderWidth, 0); + box = XtCreateManagedWidget("menuBox", boxWidgetClass, parent, al, 2); - /* menu button widgets */ - XtSetArg (al [0], XtNmenuName, "treeMenu"); - treeMenuBtns[TREE_MENU] = - XtCreateManagedWidget("treeMenuBtn", - menuButtonWidgetClass, - box, al, 1); - XtSetArg (al [0], XtNmenuName, "layoutMenu"); - treeMenuBtns[LAYOUT_MENU] = - XtCreateManagedWidget("layoutMenuBtn", - menuButtonWidgetClass, - box, al, 1); + /* menu button widgets */ + XtSetArg (al [0], XtNmenuName, "treeMenu"); + treeMenuBtns[TREE_MENU] = + XtCreateManagedWidget("treeMenuBtn", menuButtonWidgetClass, box, al, 1); + XtSetArg (al [0], XtNmenuName, "layoutMenu"); + treeMenuBtns[LAYOUT_MENU] = + XtCreateManagedWidget("layoutMenuBtn", menuButtonWidgetClass, box, al, 1); + + helpBtn = XtCreateManagedWidget("helpBtn", commandWidgetClass, box, NULL, 0); - helpBtn = XtCreateManagedWidget("helpBtn", - commandWidgetClass, - box, NULL, 0); + XtAddCallback(helpBtn, XtNcallback, Help_CB, NULL); - XtAddCallback(helpBtn, XtNcallback, Help_CB, NULL); - - /* create pulldown menus */ + /* create pulldown menus */ - treeMenus[TREE_MENU] = XtCreatePopupShell("treeMenu", - simpleMenuWidgetClass, - treeMenuBtns[TREE_MENU], - NULL, 0); + treeMenus[TREE_MENU] = + XtCreatePopupShell("treeMenu", simpleMenuWidgetClass, + treeMenuBtns[TREE_MENU], NULL, 0); - treeMenus[LAYOUT_MENU] = XtCreatePopupShell("layoutMenu", - simpleMenuWidgetClass, - treeMenuBtns[LAYOUT_MENU], - NULL, 0); + treeMenus[LAYOUT_MENU] = + XtCreatePopupShell("layoutMenu", simpleMenuWidgetClass, + treeMenuBtns[LAYOUT_MENU], NULL, 0); - /* adding menu entries */ + /* adding menu entries */ - /* Tree menu */ + /* Tree menu */ - treeMenuItems[TREE_MENU_NEW] = - XtCreateManagedWidget("treeMenuNew", smeBSBObjectClass, - treeMenus[TREE_MENU], NULL, 0); - XtAddCallback(treeMenuItems[TREE_MENU_NEW], - XtNcallback, TreeMenu_CB, TREE_MENU_NEW); + treeMenuItems[TREE_MENU_NEW] = + XtCreateManagedWidget("treeMenuNew", smeBSBObjectClass, + treeMenus[TREE_MENU], NULL, 0); + XtAddCallback(treeMenuItems[TREE_MENU_NEW], + XtNcallback, TreeMenu_CB, TREE_MENU_NEW); - treeMenuItems[TREE_MENU_LOAD] = - XtVaCreateManagedWidget("treeMenuLoad", smeBSBObjectClass, - treeMenus[TREE_MENU], - NULL); - XtAddCallback(treeMenuItems[TREE_MENU_LOAD], - XtNcallback, TreeMenu_CB, (XtPointer) TREE_MENU_LOAD); + treeMenuItems[TREE_MENU_LOAD] = + XtCreateManagedWidget("treeMenuLoad", smeBSBObjectClass, + treeMenus[TREE_MENU], NULL, 0); + XtAddCallback(treeMenuItems[TREE_MENU_LOAD], + XtNcallback, TreeMenu_CB, (XtPointer) TREE_MENU_LOAD); - treeMenuItems[TREE_MENU_SAVE] = - XtVaCreateManagedWidget("treeMenuSave", smeBSBObjectClass, - treeMenus[TREE_MENU], - NULL); - XtAddCallback(treeMenuItems[TREE_MENU_SAVE], - XtNcallback, TreeMenu_CB, (XtPointer) TREE_MENU_SAVE); + treeMenuItems[TREE_MENU_SAVE] = + XtCreateManagedWidget("treeMenuSave", smeBSBObjectClass, + treeMenus[TREE_MENU], NULL, 0); + XtAddCallback(treeMenuItems[TREE_MENU_SAVE], + XtNcallback, TreeMenu_CB, (XtPointer) TREE_MENU_SAVE); - treeMenuItems[TREE_MENU_SEP1] = - XtVaCreateManagedWidget("treeMenuSep1", smeLineObjectClass, - treeMenus[TREE_MENU], - NULL); + treeMenuItems[TREE_MENU_SEP1] = + XtCreateManagedWidget("treeMenuSep1", smeLineObjectClass, + treeMenus[TREE_MENU], NULL, 0); #ifdef COMMENT - treeMenuItems[TREE_MENU_STATS] = - XtVaCreateManagedWidget("treeMenuStats", smeBSBObjectClass, - treeMenus[TREE_MENU], - XtNlabel, labelStr[STR_SHOW_STATS], - NULL); + XtSetArg (al [0], XtNlabel, labelStr[STR_SHOW_STATS]); + treeMenuItems[TREE_MENU_STATS] = + XtCreateManagedWidget("treeMenuStats", smeBSBObjectClass, + treeMenus[TREE_MENU], al, 1); + XtAddCallback(treeMenuItems[TREE_MENU_STATS], + XtNcallback, TreeMenu_CB, (XtPointer) TREE_MENU_STATS); + XtSetSensitive(treeMenuItems[TREE_MENU_STATS], FALSE); - XtAddCallback(treeMenuItems[TREE_MENU_STATS], - XtNcallback, TreeMenu_CB, (XtPointer) TREE_MENU_STATS); - - XtSetSensitive(treeMenuItems[TREE_MENU_STATS], FALSE); - - treeMenuItems[TREE_MENU_SEP2] = - XtVaCreateManagedWidget("treeMenuSep2", smeLineObjectClass, - treeMenus[TREE_MENU], - NULL); + treeMenuItems[TREE_MENU_SEP2] = + XtCreateManagedWidget("treeMenuSep2", smeLineObjectClass, + treeMenus[TREE_MENU], NULL, 0); #endif /* COMMENT */ - treeMenuItems[TREE_MENU_QUIT] = - XtVaCreateManagedWidget("treeMenuQuit", smeBSBObjectClass, - treeMenus[TREE_MENU], - NULL); - XtAddCallback(treeMenuItems[TREE_MENU_QUIT], - XtNcallback, TreeMenu_CB, (XtPointer) TREE_MENU_QUIT); + treeMenuItems[TREE_MENU_QUIT] = + XtCreateManagedWidget("treeMenuQuit", smeBSBObjectClass, + treeMenus[TREE_MENU], NULL, 0); + XtAddCallback(treeMenuItems[TREE_MENU_QUIT], + XtNcallback, TreeMenu_CB, (XtPointer) TREE_MENU_QUIT); - /* Layout menu */ + /* Layout menu */ #ifdef COMMENT - treeMenuItems[LAYOUT_MENU_FIXED] = - XtVaCreateManagedWidget("layoutMenuFixed", smeBSBObjectClass, - treeMenus[LAYOUT_MENU], - XtNleftMargin, 18, - NULL); + XtSetArg (al [0], XtNleftMargin, 18); + treeMenuItems[LAYOUT_MENU_FIXED] = + XtCreateManagedWidget("layoutMenuFixed", smeBSBObjectClass, + treeMenus[LAYOUT_MENU], al, 1); - XtAddCallback(treeMenuItems[LAYOUT_MENU_FIXED], - XtNcallback, LayoutMenu_CB, (XtPointer) LAYOUT_MENU_FIXED); + XtAddCallback(treeMenuItems[LAYOUT_MENU_FIXED], + XtNcallback, LayoutMenu_CB, (XtPointer) LAYOUT_MENU_FIXED); - treeMenuItems[LAYOUT_MENU_VARIABLE] = - XtVaCreateManagedWidget("layoutMenuVariable", smeBSBObjectClass, - treeMenus[LAYOUT_MENU], - XtNleftMargin, 18, - NULL); + XtSetArg (al [0], XtNleftMargin, 18); + treeMenuItems[LAYOUT_MENU_VARIABLE] = + XtCreateManagedWidget("layoutMenuVariable", smeBSBObjectClass, + treeMenus[LAYOUT_MENU], al, 1); - XtAddCallback(treeMenuItems[LAYOUT_MENU_VARIABLE], - XtNcallback, LayoutMenu_CB, (XtPointer) LAYOUT_MENU_VARIABLE); + XtAddCallback(treeMenuItems[LAYOUT_MENU_VARIABLE], + XtNcallback, LayoutMenu_CB, (XtPointer) LAYOUT_MENU_VARIABLE); - treeMenuItems[LAYOUT_MENU_SEP1] = - XtVaCreateManagedWidget("layoutSep1", smeLineObjectClass, - treeMenus[LAYOUT_MENU], - NULL); + treeMenuItems[LAYOUT_MENU_SEP1] = + XtCreateManagedWidget("layoutSep1", smeLineObjectClass, + treeMenus[LAYOUT_MENU], NULL, 0) #endif /* COMMENT */ - treeMenuItems[LAYOUT_MENU_SPACING] = - XtVaCreateManagedWidget("layoutMenuSpacing", smeBSBObjectClass, - treeMenus[LAYOUT_MENU], - XtNleftMargin, 18, - NULL); - XtAddCallback(treeMenuItems[LAYOUT_MENU_SPACING], - XtNcallback, LayoutMenu_CB, (XtPointer) LAYOUT_MENU_SPACING); + XtSetArg (al [0], XtNleftMargin, 18); + treeMenuItems[LAYOUT_MENU_SPACING] = + XtCreateManagedWidget("layoutMenuSpacing", smeBSBObjectClass, + treeMenus[LAYOUT_MENU], al, 1); + XtAddCallback(treeMenuItems[LAYOUT_MENU_SPACING], + XtNcallback, LayoutMenu_CB, (XtPointer) LAYOUT_MENU_SPACING); - treeMenuItems[LAYOUT_MENU_SEP2] = - XtVaCreateManagedWidget("layoutMenuSep2", smeLineObjectClass, - treeMenus[LAYOUT_MENU], - NULL); + treeMenuItems[LAYOUT_MENU_SEP2] = + XtCreateManagedWidget("layoutMenuSep2", smeLineObjectClass, + treeMenus[LAYOUT_MENU], NULL, 0); - /* the following is a toggle button - we hack it using a bitmap */ - treeMenuItems[LAYOUT_MENU_ALIGN_NODES] = - XtVaCreateManagedWidget("layoutMenuAlignNodes", smeBSBObjectClass, - treeMenus[LAYOUT_MENU], - XtNleftMargin, 18, - NULL); - XtAddCallback(treeMenuItems[LAYOUT_MENU_ALIGN_NODES], - XtNcallback, LayoutMenu_CB, - (XtPointer) LAYOUT_MENU_ALIGN_NODES); - + /* the following is a toggle button - we hack it using a bitmap */ + XtSetArg (al [0], XtNleftMargin, 18); + treeMenuItems[LAYOUT_MENU_ALIGN_NODES] = + XtCreateManagedWidget("layoutMenuAlignNodes", smeBSBObjectClass, + treeMenus[LAYOUT_MENU], al, 1); + XtAddCallback(treeMenuItems[LAYOUT_MENU_ALIGN_NODES], + XtNcallback, LayoutMenu_CB, + (XtPointer) LAYOUT_MENU_ALIGN_NODES); } /* ---------------------------------------------------------------------------- @@ -624,7 +579,7 @@ static void BuildDialogs (Widget parent) { - int i; + Arg al [20]; int ac; Widget tmpwidget, dlgForm, dlgValue, dlgLevelLabel, dlgSiblingLabel, @@ -642,18 +597,14 @@ errStr[ERR_MANYROOT] = "Input file has more than one root label."; - dialog[DLG_NEW] = XtVaCreatePopupShell("dlgNewTree", - transientShellWidgetClass, - parent, - XtNresizable, TRUE, - NULL); + XtSetArg (al [0], XtNresizable, TRUE); + dialog[DLG_NEW] = XtCreatePopupShell("dlgNewTree", transientShellWidgetClass, + parent, al, 1); - tmpwidget = XtVaCreateManagedWidget("dlgNewTreeForm", - dialogWidgetClass, - dialog[DLG_NEW], - XtNresizable, TRUE, - XtNvalue, "", - NULL); + XtSetArg (al [0], XtNresizable, TRUE); + XtSetArg (al [1], XtNvalue, ""); + tmpwidget = XtCreateManagedWidget("dlgNewTreeForm", dialogWidgetClass, + dialog[DLG_NEW], al, 2); XawDialogAddButton(tmpwidget, "dlgNewTreeOk", NewTree_CB, (XtPointer) TRUE); @@ -667,19 +618,15 @@ ("<Key>Return:dlg_activate(dlgNewTreeOk)\n")); - dialog[DLG_NODE_NAME] = XtVaCreatePopupShell("dlgNodeName", - transientShellWidgetClass, - TreeTopLevel, - XtNresizable, TRUE, - NULL); - + XtSetArg (al [0], XtNresizable, TRUE); + dialog[DLG_NODE_NAME] = XtCreatePopupShell("dlgNodeName", + transientShellWidgetClass, + TreeTopLevel, al, 1); - tmpwidget= XtVaCreateManagedWidget("dlgNodeNameForm", - dialogWidgetClass, - dialog[DLG_NODE_NAME], - XtNresizable, TRUE, - XtNvalue, "", - NULL); + XtSetArg (al [0], XtNresizable, TRUE); + XtSetArg (al [1], XtNvalue, ""); + tmpwidget= XtCreateManagedWidget("dlgNodeNameForm", dialogWidgetClass, + dialog[DLG_NODE_NAME], al, 2); XawDialogAddButton(tmpwidget, "dlgNodeNameOk", NodeLabel_CB, (XtPointer) TRUE); @@ -693,20 +640,17 @@ ("<Key>Return: dlg_activate(dlgNodeNameOk)\n")); - dialog[DLG_FILE] = XtVaCreatePopupShell("dlgFile", - transientShellWidgetClass, - TreeTopLevel, - XtNresizable, TRUE, - NULL); + XtSetArg (al [0], XtNresizable, TRUE); + dialog[DLG_FILE] = XtCreatePopupShell("dlgFile", + transientShellWidgetClass, + TreeTopLevel, al, 1); - tmpwidget = XtVaCreateManagedWidget("dlgFileForm", - dialogWidgetClass, - dialog[DLG_FILE], - XtNresizable, TRUE, - XtNvalue, "", - NULL); + XtSetArg (al [0], XtNresizable, TRUE); + XtSetArg (al [1], XtNvalue, ""); + tmpwidget = XtCreateManagedWidget("dlgFileForm", dialogWidgetClass, + dialog[DLG_FILE], al, 2); - XawDialogAddButton(tmpwidget, "dlgFileOk", File_CB, (XtPointer) TRUE); + XawDialogAddButton(tmpwidget, "dlgFileOk", File_CB, (XtPointer) TRUE); XawDialogAddButton(tmpwidget, "dlgFileCancel", File_CB, (XtPointer) FALSE); dlgValue = XtNameToWidget(tmpwidget, "value"); @@ -716,95 +660,88 @@ ("<Key>Return:dlg_activate(dlgFileOk)\n")); - dialog[DLG_INFO] = XtVaCreatePopupShell("dlgInfo", - transientShellWidgetClass, - TreeTopLevel, - XtNresizable, TRUE, - NULL); + XtSetArg (al [0], XtNresizable, TRUE); + dialog[DLG_INFO] = XtCreatePopupShell("dlgInfo", + transientShellWidgetClass, + TreeTopLevel, al, 1); - tmpwidget = XtVaCreatePopupShell("dlgInfoForm", - dialogWidgetClass, - dialog[DLG_INFO], - XtNresizable, TRUE, - XtNvalue, "", - NULL); + XtSetArg (al [0], XtNresizable, TRUE); + XtSetArg (al [1], XtNvalue, ""); + tmpwidget = XtCreatePopupShell("dlgInfoForm", + dialogWidgetClass, + dialog[DLG_INFO], al, 2); XawDialogAddButton(tmpwidget, "dlgInfoButton", Popdown_CB, (XtPointer) dialog[DLG_INFO]); - dialog[DLG_ERROR] = XtVaCreatePopupShell("dlgError", - transientShellWidgetClass, - TreeTopLevel, - XtNresizable, TRUE, - NULL); + XtSetArg (al [0], XtNresizable, TRUE); + dialog[DLG_ERROR] = XtCreatePopupShell("dlgError", + transientShellWidgetClass, + TreeTopLevel, al, 1); - tmpwidget = XtVaCreateManagedWidget("dlgErrorForm", + XtSetArg (al [0], XtNresizable, TRUE); + XtSetArg (al [1], XtNvalue, ""); + tmpwidget = XtCreateManagedWidget("dlgErrorForm", dialogWidgetClass, - dialog[DLG_ERROR], - XtNresizable, TRUE, - XtNvalue, "", - NULL); + dialog[DLG_ERROR], al, 2); XawDialogAddButton(tmpwidget, "dlgErrorButton", Popdown_CB, (XtPointer) dialog[DLG_ERROR]); - dialog[DLG_SPACING] = XtVaCreatePopupShell("dlgSpacing", - transientShellWidgetClass, - TreeTopLevel, - XtNresizable, FALSE, - NULL); - dlgForm = XtVaCreateManagedWidget("dlgSpacingForm", - formWidgetClass, - dialog[DLG_SPACING], - XtNresizable, FALSE, - NULL); + XtSetArg (al [0], XtNresizable, FALSE); + dialog[DLG_SPACING] = XtCreatePopupShell("dlgSpacing", + transientShellWidgetClass, + TreeTopLevel, al, 1); + + XtSetArg (al [0], XtNresizable, FALSE); + dlgForm = XtCreateManagedWidget("dlgSpacingForm", + formWidgetClass, + dialog[DLG_SPACING], al, 1); - dlgLevelLabel = XtVaCreateManagedWidget("dlgLevelLabel", - labelWidgetClass, - dlgForm, - XtNfromVert, NULL, - XtNfromHoriz, NULL, - XtNtop, XawChainTop, - XtNbottom, XawChainTop, - XtNleft, XawChainLeft, - XtNright, XawChainLeft, - XtNborderWidth, 0, - NULL); + ac = 0; + XtSetArg (al [ac], XtNfromVert, NULL); ac++; + XtSetArg (al [ac], XtNfromHoriz, NULL); ac++; + XtSetArg (al [ac], XtNtop, XawChainTop); ac++; + XtSetArg (al [ac], XtNbottom, XawChainTop); ac++; + XtSetArg (al [ac], XtNleft, XawChainLeft); ac++; + XtSetArg (al [ac], XtNright, XawChainLeft); ac++; + XtSetArg (al [ac], XtNborderWidth, 0); ac++; + dlgLevelLabel = XtCreateManagedWidget("dlgLevelLabel", labelWidgetClass, + dlgForm, al, ac); - dlgLevelValuator = XtVaCreateManagedWidget("dlgLevelValuator", - labelWidgetClass, - dlgForm, - XtNfromVert, NULL, - XtNfromHoriz, dlgLevelLabel, - XtNtop, XawChainTop, - XtNbottom, XawChainTop, - XtNleft, XawChainLeft, - XtNright, XawChainLeft, - XtNlabel, " ", - NULL); - + ac = 0; + XtSetArg (al [ac], XtNfromVert, NULL); ac++; + XtSetArg (al [ac], XtNfromHoriz, dlgLevelLabel); ac++; + XtSetArg (al [ac], XtNtop, XawChainTop); ac++; + XtSetArg (al [ac], XtNbottom, XawChainTop); ac++; + XtSetArg (al [ac], XtNleft, XawChainLeft); ac++; + XtSetArg (al [ac], XtNright, XawChainLeft); ac++; + XtSetArg (al [ac], XtNlabel, " "); ac++; + dlgLevelValuator = XtCreateManagedWidget("dlgLevelValuator", + labelWidgetClass, + dlgForm, al, ac); - dlgLevelScale = XtVaCreateManagedWidget("dlgLevelScale", - pannerWidgetClass, - dlgForm, - XtNfromVert, dlgLevelLabel, - XtNfromHoriz, NULL, - XtNtop, XawChainTop, - XtNbottom, XawChainTop, - XtNleft, XawChainLeft, - XtNright, XawChainLeft, - XtNcanvasWidth, 110, - XtNdefaultScale, 1, - XtNinternalSpace, 1, - XtNrubberBand, FALSE, - XtNshadowThickness, 0, - XtNallowOff, FALSE, - XtNwidth, 200, - XtNsliderWidth, 10, - XtNheight, 15, - NULL); + ac = 0; + XtSetArg (al [ac], XtNfromVert, dlgLevelLabel); ac++; + XtSetArg (al [ac], XtNfromHoriz, NULL); ac++; + XtSetArg (al [ac], XtNtop, XawChainTop); ac++; + XtSetArg (al [ac], XtNbottom, XawChainTop); ac++; + XtSetArg (al [ac], XtNleft, XawChainLeft); ac++; + XtSetArg (al [ac], XtNright, XawChainLeft); ac++; + XtSetArg (al [ac], XtNcanvasWidth, 110); ac++; + XtSetArg (al [ac], XtNdefaultScale, 1); ac++; + XtSetArg (al [ac], XtNinternalSpace, 1); ac++; + XtSetArg (al [ac], XtNrubberBand, FALSE); ac++; + XtSetArg (al [ac], XtNshadowThickness, 0); ac++; + XtSetArg (al [ac], XtNallowOff, FALSE); ac++; + XtSetArg (al [ac], XtNwidth, 200); ac++; + XtSetArg (al [ac], XtNsliderWidth, 10); ac++; + XtSetArg (al [ac], XtNheight, 15); ac++; + dlgLevelScale = XtCreateManagedWidget("dlgLevelScale", + pannerWidgetClass, + dlgForm, al, ac); XtOverrideTranslations(dlgLevelScale, XtParseTranslationTable("\ <Btn2Down>: start()\n\ @@ -817,48 +754,49 @@ XtAddCallback(dlgLevelScale, XtNreportCallback, levelvalue_CB, (XtPointer) &dlgLevelValue); - dlgSiblingLabel = XtVaCreateManagedWidget("dlgSiblingLabel", - labelWidgetClass, - dlgForm, - XtNfromVert, dlgLevelScale, - XtNfromHoriz, NULL, - XtNtop, XawChainTop, - XtNbottom, XawChainTop, - XtNleft, XawChainLeft, - XtNright, XawChainLeft, - XtNborderWidth, 0, - NULL); + ac = 0; + XtSetArg (al [ac], XtNfromVert, dlgLevelScale); ac++; + XtSetArg (al [ac], XtNfromHoriz, NULL); ac++; + XtSetArg (al [ac], XtNtop, XawChainTop); ac++; + XtSetArg (al [ac], XtNbottom, XawChainTop); ac++; + XtSetArg (al [ac], XtNleft, XawChainLeft); ac++; + XtSetArg (al [ac], XtNright, XawChainLeft); ac++; + XtSetArg (al [ac], XtNborderWidth, 0); ac++; + dlgSiblingLabel = XtCreateManagedWidget("dlgSiblingLabel", + labelWidgetClass, + dlgForm, al, ac); - dlgSiblingValuator = XtVaCreateManagedWidget("dlgLevelValuator", - labelWidgetClass, - dlgForm, - XtNfromVert, dlgLevelScale, - XtNfromHoriz, dlgSiblingLabel, - XtNtop, XawChainTop, - XtNbottom, XawChainTop, - XtNleft, XawChainLeft, - XtNright, XawChainLeft, - XtNlabel, " ", - NULL); - dlgSiblingScale = XtVaCreateManagedWidget("dlgSiblingScale", - pannerWidgetClass, - dlgForm, - XtNfromVert, dlgSiblingLabel, - XtNfromHoriz, NULL, - XtNtop, XawChainTop, - XtNbottom, XawChainTop, - XtNleft, XawChainLeft, - XtNright, XawChainLeft, - XtNcanvasWidth, 110, - XtNdefaultScale, 1, - XtNinternalSpace, 1, - XtNrubberBand, FALSE, - XtNshadowThickness, 0, - XtNallowOff, FALSE, - XtNwidth, 200, - XtNsliderWidth, 10, - XtNheight, 15, - NULL); + ac = 0; + XtSetArg (al [ac], XtNfromVert, dlgLevelScale); ac++; + XtSetArg (al [ac], XtNfromHoriz, dlgSiblingLabel); ac++; + XtSetArg (al [ac], XtNtop, XawChainTop); ac++; + XtSetArg (al [ac], XtNbottom, XawChainTop); ac++; + XtSetArg (al [ac], XtNleft, XawChainLeft); ac++; + XtSetArg (al [ac], XtNright, XawChainLeft); ac++; + XtSetArg (al [ac], XtNlabel, " "); ac++; + dlgSiblingValuator = XtCreateManagedWidget("dlgLevelValuator", + labelWidgetClass, + dlgForm, al, ac); + + ac = 0; + XtSetArg (al [ac], XtNfromVert, dlgSiblingLabel); ac++; + XtSetArg (al [ac], XtNfromHoriz, NULL); ac++; + XtSetArg (al [ac], XtNtop, XawChainTop); ac++; + XtSetArg (al [ac], XtNbottom, XawChainTop); ac++; + XtSetArg (al [ac], XtNleft, XawChainLeft); ac++; + XtSetArg (al [ac], XtNright, XawChainLeft); ac++; + XtSetArg (al [ac], XtNcanvasWidth, 110); ac++; + XtSetArg (al [ac], XtNdefaultScale, 1); ac++; + XtSetArg (al [ac], XtNinternalSpace, 1); ac++; + XtSetArg (al [ac], XtNrubberBand, FALSE); ac++; + XtSetArg (al [ac], XtNshadowThickness, 0); ac++; + XtSetArg (al [ac], XtNallowOff, FALSE); ac++; + XtSetArg (al [ac], XtNwidth, 200); ac++; + XtSetArg (al [ac], XtNsliderWidth, 10); ac++; + XtSetArg (al [ac], XtNheight, 15); ac++; + dlgSiblingScale = XtCreateManagedWidget("dlgSiblingScale", + pannerWidgetClass, + dlgForm, al, ac); XtOverrideTranslations(dlgSiblingScale, XtParseTranslationTable("\ <Btn2Down>: start()\n\ @@ -871,29 +809,29 @@ XtAddCallback(dlgSiblingScale, XtNreportCallback, siblingvalue_CB, (XtPointer) &dlgSiblingValue); - dlgOkButton = XtVaCreateManagedWidget("dlgOkButton", - commandWidgetClass, - dlgForm, - XtNfromVert, dlgSiblingScale, - XtNfromHoriz, NULL, - XtNtop, XawChainTop, - XtNbottom, XawChainTop, - XtNleft, XawChainLeft, - XtNright, XawChainLeft, - NULL); + ac = 0; + XtSetArg (al [ac], XtNfromVert, dlgSiblingLabel); ac++; + XtSetArg (al [ac], XtNfromHoriz, NULL); ac++; + XtSetArg (al [ac], XtNtop, XawChainTop); ac++; + XtSetArg (al [ac], XtNbottom, XawChainTop); ac++; + XtSetArg (al [ac], XtNleft, XawChainLeft); ac++; + XtSetArg (al [ac], XtNright, XawChainLeft); ac++; + XtSetArg (al [ac], XtNlabel, " "); ac++; + dlgOkButton = XtCreateManagedWidget("dlgOkButton", commandWidgetClass, + dlgForm, al, ac); - dlgCancelButton = XtVaCreateManagedWidget("dlgCancelButton", - commandWidgetClass, - dlgForm, - XtNfromVert, dlgSiblingScale, - XtNfromHoriz, dlgOkButton, - XtNtop, XawChainTop, - XtNbottom, XawChainTop, - XtNleft, XawChainLeft, - XtNright, XawChainLeft, - NULL); + ac = 0; + XtSetArg (al [ac], XtNfromVert, dlgSiblingScale); ac++; + XtSetArg (al [ac], XtNfromHoriz, dlgOkButton); ac++; + XtSetArg (al [ac], XtNtop, XawChainTop); ac++; + XtSetArg (al [ac], XtNbottom, XawChainTop); ac++; + XtSetArg (al [ac], XtNleft, XawChainLeft); ac++; + XtSetArg (al [ac], XtNright, XawChainLeft); ac++; + dlgCancelButton = XtCreateManagedWidget("dlgCancelButton", + commandWidgetClass, + dlgForm, al, ac); - XtAddCallback(dlgOkButton, XtNcallback, Scale_CB, (XtPointer) TRUE); + XtAddCallback(dlgOkButton, XtNcallback, Scale_CB, (XtPointer) TRUE); XtAddCallback(dlgCancelButton, XtNcallback, Scale_CB, (XtPointer) FALSE); } @@ -909,63 +847,58 @@ static void BuildHelpWindow(Widget parent) { - int i; + Arg al [20]; int ac; + + helpShell = XtCreatePopupShell("helpShell", transientShellWidgetClass, + parent, NULL, 0); - helpShell = XtVaCreatePopupShell("helpShell", transientShellWidgetClass, - parent, - NULL); - - helpForm = XtVaCreateManagedWidget("helpForm", - formWidgetClass, - helpShell, - NULL); + helpForm = XtCreateManagedWidget("helpForm", formWidgetClass, + helpShell, NULL, 0); - helpDoneButton = XtVaCreateManagedWidget("helpDoneButton", - commandWidgetClass, - helpForm, - XtNfromVert, NULL, - XtNfromHoriz, NULL, - XtNtop, XawChainTop, - XtNbottom, XawChainTop, - XtNleft, XawChainLeft, - XtNright, XawChainLeft, - NULL); + ac = 0; + XtSetArg (al [ac], XtNfromVert, NULL); ac++; + XtSetArg (al [ac], XtNfromHoriz, NULL); ac++; + XtSetArg (al [ac], XtNtop, XawChainTop); ac++; + XtSetArg (al [ac], XtNbottom, XawChainTop); ac++; + XtSetArg (al [ac], XtNleft, XawChainLeft); ac++; + XtSetArg (al [ac], XtNright, XawChainLeft); ac++; + helpDoneButton = XtCreateManagedWidget("helpDoneButton", + commandWidgetClass, + helpForm, al, ac); XtAddCallback(helpDoneButton, XtNcallback, Popdown_CB, (XtPointer) helpShell); - helpTitle = XtVaCreateManagedWidget("helpTitle", - labelWidgetClass, - helpForm, - XtNfromVert, NULL, - XtNfromHoriz, helpDoneButton, - XtNtop, XawChainTop, - XtNbottom, XawChainTop, - XtNleft, XawChainLeft, - XtNright, XawChainLeft, - XtNborderWidth, 0, - XtNlabel, "", - NULL); + ac = 0; + XtSetArg (al [ac], XtNfromVert, NULL); ac++; + XtSetArg (al [ac], XtNfromHoriz, helpDoneButton); ac++; + XtSetArg (al [ac], XtNtop, XawChainTop); ac++; + XtSetArg (al [ac], XtNbottom, XawChainTop); ac++; + XtSetArg (al [ac], XtNleft, XawChainLeft); ac++; + XtSetArg (al [ac], XtNright, XawChainLeft); ac++; + XtSetArg (al [ac], XtNborderWidth, 0); ac++; + XtSetArg (al [ac], XtNlabel, " "); ac++; + helpTitle = XtCreateManagedWidget("helpTitle", labelWidgetClass, + helpForm, al, ac); - helpText = XtVaCreateManagedWidget("helpText", - asciiTextWidgetClass, - helpForm, - XtNfromVert, helpDoneButton, - XtNfromHoriz, NULL, - XtNtop, XawChainTop, - XtNbottom, XawChainBottom, - XtNleft, XawChainLeft, - XtNright, XawChainRight, - XtNeditType, XawtextRead, - XtNdisplayCaret, FALSE, - XtNscrollVertical, XawtextScrollAlways, - XtNscrollHorizontal, - XawtextScrollWhenNeeded, - XtNuseStringInPlace, TRUE, - XtNstring, help_text, - XtNwidth, 530, - XtNheight, 650, - NULL); + + ac = 0; + XtSetArg (al [ac], XtNfromVert, helpDoneButton); ac++; + XtSetArg (al [ac], XtNfromHoriz, NULL); ac++; + XtSetArg (al [ac], XtNtop, XawChainTop); ac++; + XtSetArg (al [ac], XtNbottom, XawChainBottom); ac++; + XtSetArg (al [ac], XtNleft, XawChainLeft); ac++; + XtSetArg (al [ac], XtNright, XawChainRight); ac++; + XtSetArg (al [ac], XtNeditType, XawtextRead); ac++; + XtSetArg (al [ac], XtNdisplayCaret, FALSE); ac++; + XtSetArg (al [ac], XtNuseStringInPlace, TRUE); ac++; + XtSetArg (al [ac], XtNstring, help_text); ac++; + XtSetArg (al [ac], XtNwidth, 530); ac++; + XtSetArg (al [ac], XtNheight, 650); ac++; + XtSetArg (al [ac], XtNscrollVertical, XawtextScrollAlways); ac++; + XtSetArg (al [ac], XtNscrollHorizontal, XawtextScrollWhenNeeded); ac++; + helpText = XtCreateManagedWidget("helpText", asciiTextWidgetClass, + helpForm, al, ac); } /* ---------------------------------------------------------------------------- @@ -981,36 +914,29 @@ static void BuildApplicationWindow(Widget parent) { - Widget topPane, box; + Widget topPane; + Arg al [20]; int ac; - topPane = XtVaCreateManagedWidget("topPane", - panedWidgetClass, - parent, - XtNorientation, XtorientVertical, - NULL); + XtSetArg (al [0], XtNorientation, XtorientVertical); + topPane = XtCreateManagedWidget("topPane", panedWidgetClass, parent, al, 1); BuildMenubar(topPane); - statusText = XtVaCreateManagedWidget("statusText", - labelWidgetClass, - topPane, - XtNborderWidth, 0, - NULL); + XtSetArg (al [0], XtNborderWidth, 0); + statusText = XtCreateManagedWidget("statusText", labelWidgetClass, + topPane, al, 1); - scrolledWindow = XtVaCreateManagedWidget("scrolledWindow", - viewportWidgetClass, - topPane, - XtNshowGrip, FALSE, - XtNallowHoriz, TRUE, - XtNallowVert, TRUE, - XtNuseBottom, TRUE, - XtNuseRight, TRUE, - NULL); + ac = 0; + XtSetArg (al [ac], XtNshowGrip, FALSE); ac++; + XtSetArg (al [ac], XtNallowHoriz, TRUE); ac++; + XtSetArg (al [ac], XtNallowVert, TRUE); ac++; + XtSetArg (al [ac], XtNuseBottom, TRUE); ac++; + XtSetArg (al [ac], XtNuseRight, TRUE); ac++; + scrolledWindow = XtCreateManagedWidget("scrolledWindow", viewportWidgetClass, + topPane, al, ac); - TreeDrawingArea = XtVaCreateManagedWidget("treeDrawingArea", - simpleWidgetClass, - scrolledWindow, - NULL); + TreeDrawingArea = XtCreateManagedWidget("treeDrawingArea", simpleWidgetClass, + scrolledWindow, NULL, 0); } /* ---------------------------------------------------------------------------- @@ -1077,11 +1003,11 @@ XtSetLanguageProc(NULL, NULL, NULL); */ - TreeTopLevel = XtVaAppInitialize(&app, "Xoobr", - NULL, 0, - argc, argv, - fallback_resources, - NULL); + TreeTopLevel = XtAppInitialize(&app, "Xoobr", + NULL, 0, + argc, argv, + fallback_resources, + NULL, 0); ASSERT(TreeTopLevel, "failed to open connection to X server"); @@ -1134,7 +1060,7 @@ XtSetArg (al [0], XtNbackground, applRsrcsPtr->background_color); XtSetValues(TreeDrawingArea, al, 1); - + XtRealizeWidget(TreeTopLevel); XtOverrideTranslations @@ -1440,7 +1366,6 @@ char *fname; Tree *tree; ErrCode error; - Arg args[1]; int menuItem; if (client_data == (XtPointer) TRUE) { @@ -1484,8 +1409,7 @@ static void Scale_CB(Widget w, XtPointer client_data, XtPointer call_data) { - int level_value, sibling_value; - float tmp; + int level_value, sibling_value; XtPopdown(dialog[DLG_SPACING]); @@ -1551,7 +1475,6 @@ select_action(Widget w, XEvent *event, String *params, Cardinal *num_params) { Tree *node; - int height; Boolean edit = FALSE; if ((*num_params > 0) && @@ -1586,9 +1509,9 @@ menu_popup_action(Widget w, XEvent *event, String *params, Cardinal *num_params) { char *strargs[] = {"nodeMenu", NULL}; - Widget menu = XtNameToWidget(TreeTopLevel, params[0]); - Boolean popup; - ShellWidget shell_widget = (ShellWidget) menu; + /* Widget menu = XtNameToWidget(TreeTopLevel, params[0]); */ + /* Boolean popup; */ + /* ShellWidget shell_widget = (ShellWidget) menu; */ if (nodeFound) {
--- a/pkg-src/tree-x/tree.c Mon Aug 13 09:45:48 2007 +0200 +++ b/pkg-src/tree-x/tree.c Mon Aug 13 09:46:53 2007 +0200 @@ -61,10 +61,10 @@ NumNodes++; if (node == NULL) - return (NULL); + return NULL; else { memset((char *) node, 0, sizeof(Tree)); - return (node); + return node; } } @@ -91,7 +91,7 @@ r = MakeLine(dx, dy, line2->link); line1->link = MakeLine(0, y2 + line2->dy - dy - y1, r); - return (r); + return r; } /* ---------------------------------------------------------------------------- @@ -203,7 +203,7 @@ } c1->lower.head = c2->lower.head; - return (total); + return total; } /* ---------------------------------------------------------------------------- @@ -684,9 +684,6 @@ void PetrifyTree(Tree *tree, int x, int y) { - int width, height; - int x_offset, y_offset; - tree->old_pos = tree->pos; /* used by AnimateTree */ /* fix position of each node */
--- a/src/ChangeLog Mon Aug 13 09:45:48 2007 +0200 +++ b/src/ChangeLog Mon Aug 13 09:46:53 2007 +0200 @@ -1,3 +1,39 @@ +1997-07-06 Steven L Baur <steve@altair.xemacs.org> + + * emacs.c (vars_of_emacs): Fprovide the system type as a feature. + +1997-07-03 Steven L Baur <steve@altair.xemacs.org> + + * data.c (Fstring_to_number): Fix typo. base isn't an integer. + +1997-07-01 Steven L Baur <steve@altair.xemacs.org> + + * data.c, emacsfns.h: This is the port of GNU Emacs capability. + I am still not sure what this buys us, but I guess it doesn't hurt + to have it. + From Hrvoje Niksic <hniksic@srce.hr> + + * glyphs.c (make_string_from_file): Use + insert-file-contents-literally instead of + insert-file-contents-internal. + +1997-06-30 Steven L Baur <steve@altair.xemacs.org> + + * fns.c (check_losing_bytecode): Correct reported version. + + * Makefile.in.in (${libsrc}DOC): Break up line length for stupid + make programs. + +1997-06-29 Steven L Baur <steve@altair.xemacs.org> + + * emacsfns.h: Put void in prototype. + Suggested by Ben Wing. + +1997-07-01 MORIOKA Tomohiko <morioka@jaist.ac.jp> + + * glyphs.c (make_string_from_file): must protect from + `format-alist'. + 1997-06-28 Steven L Baur <steve@altair.xemacs.org> * config.h.in: Back out previous change to LOSING_BYTECODE. It's
--- a/src/Makefile.in.in Mon Aug 13 09:45:48 2007 +0200 +++ b/src/Makefile.in.in Mon Aug 13 09:46:53 2007 +0200 @@ -321,11 +321,12 @@ cd ../dynodump && ${MAKE} ${MFLAGS} #endif /* DYNODUMP */ -${libsrc}DOC: ../lib-src/make-docfile FRC.DOC +${libsrc}DOC: temacs #ifdef NO_DOC_FILE if test -f $@; then touch $@ && exit 0; fi; \ #endif - -${DUMPENV} ./temacs -batch -l ../prim/make-docfile.el -- \ + $(RM) ${libsrc}DOC; \ + ${DUMPENV} ./temacs -batch -l ../prim/make-docfile.el -- \ -o ${libsrc}DOC -d ${srcdir} -i ${libsrc}../site-packages \ ${obj_src} ${mallocdocsrc} ${rallocdocsrc}
--- a/src/alloc.c Mon Aug 13 09:45:48 2007 +0200 +++ b/src/alloc.c Mon Aug 13 09:46:53 2007 +0200 @@ -2629,7 +2629,7 @@ message ("\n****\tPure Lisp storage exhausted!\n" "\tPurespace usage: %ld of %ld\n" "****", - PURESIZE+pure_lossage, PURESIZE); + PURESIZE+pure_lossage, (long) PURESIZE); if (die_if_pure_storage_exceeded) { PURESIZE_h(PURESIZE + pure_lossage); rc = -1;
--- a/src/balloon-x.c Mon Aug 13 09:45:48 2007 +0200 +++ b/src/balloon-x.c Mon Aug 13 09:46:53 2007 +0200 @@ -78,9 +78,9 @@ static void init (void) { - static int init; + static int init_p = 0; - if (!init) + if (!init_p) { Pixel fg, bg, shine, shadow; XFontStruct* font; @@ -95,7 +95,7 @@ font = open_font (dpy, "-adobe-helvetica-medium-r-normal--12-*"); balloon_help_create (dpy, bg, fg, shine, shadow, font); - init = 1; + init_p = 1; } }
--- a/src/balloon_help.c Mon Aug 13 09:45:48 2007 +0200 +++ b/src/balloon_help.c Mon Aug 13 09:46:53 2007 +0200 @@ -342,7 +342,7 @@ int shape; XPoint border[ 3 ]; - if (id == NULL || (id && b_timer) && b_text) + if (id == NULL || ((id && b_timer) && b_text)) { b_timer = None;
--- a/src/bytecode.c Mon Aug 13 09:45:48 2007 +0200 +++ b/src/bytecode.c Mon Aug 13 09:46:53 2007 +0200 @@ -943,13 +943,9 @@ break; case Bsave_current_buffer: - { - Lisp_Object save_current_buffer_restore (Lisp_Object); - - record_unwind_protect (save_current_buffer_restore, - Fcurrent_buffer ()); - break; - } + record_unwind_protect (save_current_buffer_restore, + Fcurrent_buffer ()); + break; case Binteractive_p: PUSH (Finteractive_p ());
--- a/src/callint.c Mon Aug 13 09:45:48 2007 +0200 +++ b/src/callint.c Mon Aug 13 09:46:53 2007 +0200 @@ -145,30 +145,30 @@ return Qnil; } -/* Quotify EXP: if EXP is constant, return it. - If EXP is not constant, return (quote EXP). */ +/* Quotify EXPR: if EXPR is constant, return it. + If EXPR is not constant, return (quote EXPR). */ static Lisp_Object -quotify_arg (Lisp_Object exp) +quotify_arg (Lisp_Object expr) { - if (!INTP (exp) && !CHARP (exp) && !STRINGP (exp) - && !NILP (exp) && !EQ (exp, Qt)) - return Fcons (Qquote, Fcons (exp, Qnil)); - - return exp; + return (INTP (expr) || + CHARP (expr) || + STRINGP (expr) || + NILP (expr) || + EQ (Qt, expr)) ? expr : Fcons (Qquote, Fcons (expr, Qnil)); } -/* Modify EXP by quotifying each element (except the first). */ +/* Modify EXPR by quotifying each element (except the first). */ static Lisp_Object -quotify_args (Lisp_Object exp) +quotify_args (Lisp_Object expr) { REGISTER Lisp_Object tail; REGISTER struct Lisp_Cons *ptr; - for (tail = exp; CONSP (tail); tail = ptr->cdr) + for (tail = expr; CONSP (tail); tail = ptr->cdr) { ptr = XCONS (tail); ptr->car = quotify_arg (ptr->car); } - return exp; + return expr; } static Bufpos
--- a/src/callproc.c Mon Aug 13 09:45:48 2007 +0200 +++ b/src/callproc.c Mon Aug 13 09:46:53 2007 +0200 @@ -186,8 +186,7 @@ int bufsize = 16384; int speccount = specpdl_depth (); struct gcpro gcpro1; - char **new_argv - = (char **) alloca ((max (2, nargs - 2)) * sizeof (char *)); + char **new_argv = (char **) alloca ((max (2, nargs - 2)) * sizeof (char *)); /* File to use for stderr in the child. t means use same as standard output. */ @@ -216,14 +215,14 @@ can't just have the child check for an error when it does the chdir, since it's in a vfork. */ { - struct gcpro gcpro1, gcpro2; + struct gcpro ngcpro1, ngcpro2; /* Do this test before building new_argv because GC in Lisp code * called by various filename-hacking routines might relocate strings */ /* Make sure that the child will be able to chdir to the current buffer's current directory. We can't just have the child check for an error when it does the chdir, since it's in a vfork. */ - GCPRO2 (current_dir, path); /* Caller gcprotects args[] */ + NGCPRO2 (current_dir, path); /* Caller gcprotects args[] */ current_dir = current_buffer->directory; current_dir = Funhandled_file_name_directory (current_dir); current_dir = expand_and_dir_to_file (current_dir, Qnil); @@ -235,15 +234,15 @@ report_file_error ("Setting current directory", Fcons (current_buffer->directory, Qnil)); #endif /* 0 */ - UNGCPRO; + NUNGCPRO; } if (nargs >= 2 && ! NILP (args[1])) { - struct gcpro gcpro1; - GCPRO1 (current_buffer->directory); + struct gcpro ngcpro1; + NGCPRO1 (current_buffer->directory); infile = Fexpand_file_name (args[1], current_buffer->directory); - UNGCPRO; + NUNGCPRO; CHECK_STRING (infile); } else @@ -453,7 +452,8 @@ fork_error = Qnil; #ifdef WINDOWSNT - pid = child_setup (filefd, fd1, fd_error, new_argv, current_dir); + pid = child_setup (filefd, fd1, fd_error, new_argv, + (char *) XSTRING_DATA (current_dir)); #else /* not WINDOWSNT */ pid = fork (); @@ -517,7 +517,7 @@ int first = 1; int total_read = 0; Lisp_Object instream; - struct gcpro gcpro1; + struct gcpro ngcpro1; /* Enable sending signal if user quits below. */ call_process_exited = 0; @@ -544,7 +544,7 @@ Fget_coding_system (Vcoding_system_for_read)); Lstream_set_character_mode (XLSTREAM (instream)); #endif /* MULE */ - GCPRO1 (instream); + NGCPRO1 (instream); while (1) { QUIT; @@ -596,7 +596,7 @@ } give_up: Lstream_close (XLSTREAM (instream)); - UNGCPRO; + NUNGCPRO; QUIT; #ifndef MSDOS
--- a/src/config.h.in Mon Aug 13 09:45:48 2007 +0200 +++ b/src/config.h.in Mon Aug 13 09:46:53 2007 +0200 @@ -68,7 +68,8 @@ /* This will be removed in 19.15. */ /* Hah! Try 20.3 ... */ /* Hah! Try never ... */ -#define LOSING_BYTECODE +/* If at first you don't succeed, try, try again. */ +/* #define LOSING_BYTECODE */ /* Does XEmacs support floating-point numbers? */ #undef LISP_FLOAT_TYPE @@ -148,6 +149,7 @@ #undef HAVE_LIBGEN_H #undef HAVE_LOCALE_H #undef HAVE_FCNTL_H +#undef HAVE_ULIMIT_H #undef HAVE_X11_XLOCALE_H #undef HAVE_LINUX_VERSION_H #undef HAVE_INTTYPES_H @@ -250,6 +252,7 @@ #undef HAVE_STRCASECMP #undef HAVE_STRERROR #undef HAVE_TZSET +#undef HAVE_ULIMIT #undef HAVE_USLEEP #undef HAVE_UTIMES #undef HAVE_WAITPID
--- a/src/data.c Mon Aug 13 09:45:48 2007 +0200 +++ b/src/data.c Mon Aug 13 09:46:53 2007 +0200 @@ -1244,18 +1244,54 @@ return build_string (buffer); } -DEFUN ("string-to-number", Fstring_to_number, 1, 1, 0, /* +static int +digit_to_number (int character, int base) +{ + int digit; + + if (character >= '0' && character <= '9') + digit = character - '0'; + else if (character >= 'a' && character <= 'z') + digit = character - 'a' + 10; + else if (character >= 'A' && character <= 'Z') + digit = character - 'A' + 10; + else + return -1; + + if (digit >= base) + return -1; + else + return digit; +} + +DEFUN ("string-to-number", Fstring_to_number, 1, 2, 0, /* Convert STRING to a number by parsing it as a decimal number. This parses both integers and floating point numbers. It ignores leading spaces and tabs. + +If BASE, interpret STRING as a number in that base. If BASE isn't +present, base 10 is used. BASE must be between 2 and 16 (inclusive). +Floating point numbers always use base 10. */ - (string)) + (string, base)) { - Lisp_Object value; char *p; + int b; + CHECK_STRING (string); + if (NILP (base)) + b = 10; + else + { + CHECK_INT (base); + b = XINT (base); + if (b < 2 || b > 16) + Fsignal (Qargs_out_of_range, Fcons (base, Qnil)); + } + p = (char *) XSTRING_DATA (string); + /* Skip any whitespace at the front of the number. Some versions of atoi do this anyway, so we might as well make Emacs lisp consistent. */ while (*p == ' ' || *p == '\t') @@ -1266,13 +1302,39 @@ return make_float (atof (p)); #endif /* LISP_FLOAT_TYPE */ - if (sizeof (int) == sizeof (EMACS_INT)) - XSETINT (value, atoi (p)); - else if (sizeof (long) == sizeof (EMACS_INT)) - XSETINT (value, atol (p)); + if (XINT(base) == 10) + { + /* Use the system-provided functions for base 10. */ + Lisp_Object value; + if (sizeof (int) == sizeof (EMACS_INT)) + XSETINT (value, atoi (p)); + else if (sizeof (long) == sizeof (EMACS_INT)) + XSETINT (value, atol (p)); + else + abort (); + return value; + } else - abort (); - return value; + { + int digit, negative = 1; + EMACS_INT v = 0; + + if (*p == '-') + { + negative = -1; + p++; + } + else if (*p == '+') + p++; + while (1) + { + digit = digit_to_number (*p++, b); + if (digit < 0) + break; + v = v * b + digit; + } + return make_int (negative * v); + } } enum arithop
--- a/src/device-x.c Mon Aug 13 09:45:48 2007 +0200 +++ b/src/device-x.c Mon Aug 13 09:46:53 2007 +0200 @@ -278,10 +278,12 @@ CONST char *locale = XrmLocaleOfDatabase (db); if (STRINGP (Vdata_directory) && XSTRING_LENGTH (Vdata_directory) > 0) - GET_C_STRING_FILENAME_DATA_ALLOCA (Vdata_directory, data_dir); - sprintf (path, "%sapp-defaults/%s/%s", data_dir, locale, app_class); - if (!access (path, R_OK)) - XrmCombineFileDatabase (path, &db, False); + { + GET_C_STRING_FILENAME_DATA_ALLOCA (Vdata_directory, data_dir); + sprintf (path, "%sapp-defaults/%s/%s", data_dir, locale, app_class); + if (!access (path, R_OK)) + XrmCombineFileDatabase (path, &db, False); + } } #endif /* MULE */
--- a/src/editfns.c Mon Aug 13 09:45:48 2007 +0200 +++ b/src/editfns.c Mon Aug 13 09:46:53 2007 +0200 @@ -491,7 +491,7 @@ } Lisp_Object -save_current_buffer_restore(Lisp_Object buffer) +save_current_buffer_restore (Lisp_Object buffer) { struct buffer *buf = XBUFFER (buffer); if (!BUFFER_LIVE_P (buf)) @@ -504,7 +504,7 @@ Save the current buffer; execute BODY; restore the current buffer. Executes BODY just like `progn'. */ - (args)) + (args)) { /* This function can GC */ int speccount = specpdl_depth ();
--- a/src/emacs.c Mon Aug 13 09:45:48 2007 +0200 +++ b/src/emacs.c Mon Aug 13 09:46:53 2007 +0200 @@ -2289,6 +2289,7 @@ Value is symbol indicating type of operating system you are using. */ ); Vsystem_type = intern (SYSTEM_TYPE); + Fprovide (intern(SYSTEM_TYPE)); #ifndef EMACS_CONFIGURATION # define EMACS_CONFIGURATION "UNKNOWN"
--- a/src/emacsfns.h Mon Aug 13 09:45:48 2007 +0200 +++ b/src/emacsfns.h Mon Aug 13 09:46:53 2007 +0200 @@ -332,7 +332,7 @@ Lisp_Object Fzerop (Lisp_Object); Lisp_Object Fnumber_to_string (Lisp_Object num); -Lisp_Object Fstring_to_number (Lisp_Object str); +Lisp_Object Fstring_to_number (Lisp_Object str, Lisp_Object base); Lisp_Object Fsubr_min_args (Lisp_Object subr); Lisp_Object Fsubr_max_args (Lisp_Object subr); @@ -503,6 +503,11 @@ extern Lisp_Object Qformat; +/* Defined in emacsfns.c */ +Lisp_Object save_current_buffer_restore (Lisp_Object buffer); + + + /* Defined in elhash.c */ Lisp_Object Fhashtablep (Lisp_Object obj); Lisp_Object Fmake_hashtable (Lisp_Object size, Lisp_Object test_fun); @@ -545,7 +550,7 @@ extern Lisp_Object Qsave_buffers_kill_emacs; extern Lisp_Object Qkill_emacs_hook; -extern Lisp_Object Frunning_temacs_p(); +extern Lisp_Object Frunning_temacs_p(void); /* Defined in eval.c */ extern Lisp_Object Qautoload, Qexit, Qinteractive, Qcommandp, Qdefun, Qmacro;
--- a/src/event-stream.c Mon Aug 13 09:45:48 2007 +0200 +++ b/src/event-stream.c Mon Aug 13 09:46:53 2007 +0200 @@ -1219,7 +1219,7 @@ } } -int +static int event_stream_wakeup_pending_p (int id, int async_p) { struct timeout *timeout; @@ -3150,8 +3150,7 @@ || (CHAR_OR_CHAR_INTP (key->keysym) && ((c = XCHAR_OR_CHAR_INT (key->keysym)), c >= 'A' && c <= 'Z'))) { - struct Lisp_Event terminal_copy; - terminal_copy = *XEVENT (terminal); + struct Lisp_Event terminal_copy = *XEVENT (terminal); if (key->modifiers & MOD_SHIFT) key->modifiers &= (~ MOD_SHIFT); @@ -3160,7 +3159,7 @@ result = command_builder_find_leaf (builder, allow_misc_user_events_p); if (!NILP (result)) - return (result); + return result; /* If there was no match with the lower-case version either, then put back the upper-case event for the error message. But make sure that function-key-map didn't
--- a/src/fileio.c Mon Aug 13 09:45:48 2007 +0200 +++ b/src/fileio.c Mon Aug 13 09:46:53 2007 +0200 @@ -1374,10 +1374,6 @@ another older version of expand-file-name; #endif -/* not a full declaration because realpath() is typed differently - on different systems */ -extern char *realpath (); - DEFUN ("file-truename", Ffile_truename, 1, 2, 0, /* Return the canonical name of the given FILE. Second arg DEFAULT is directory to start with if FILE is relative @@ -2036,7 +2032,7 @@ GCPRO1 (dirname); dirname = Fexpand_file_name (dirname, Qnil); - dirname = Fdirectory_file_name (dirname); + dirname = Fdirectory_file_name (dirname); handler = Ffind_file_name_handler (dirname, Qdelete_directory); UNGCPRO; @@ -4468,12 +4464,12 @@ pointers into buffers which may get blown away by handlers. */ { - struct gcpro gcpro1, gcpro2; - GCPRO2 (buf, tail); + struct gcpro ngcpro1, ngcpro2; + NGCPRO2 (buf, tail); condition_case_1 (Qt, auto_save_1, Qnil, auto_save_error, Qnil); - UNGCPRO; + NUNGCPRO; } /* Handler killed our saved current-buffer! Pick any. */ if (!BUFFER_LIVE_P (XBUFFER (old)))
--- a/src/fns.c Mon Aug 13 09:45:48 2007 +0200 +++ b/src/fns.c Mon Aug 13 09:46:53 2007 +0200 @@ -192,7 +192,7 @@ if (COMPILED_FUNCTIONP (seq)) error_with_frob (seq, - "As of 19.14, `%s' no longer works with compiled-function objects", + "As of 20.3, `%s' no longer works with compiled-function objects", function); } @@ -514,35 +514,24 @@ */ if (CONSP (arg)) { - Lisp_Object rest = arg; - Lisp_Object head, tail; - tail = Qnil; - while (CONSP (rest)) + Lisp_Object head = Fcons (XCAR (arg), XCDR (arg)); + Lisp_Object tail = head; + + for (arg = XCDR (arg); CONSP (arg); arg = XCDR (arg)) { - Lisp_Object new = Fcons (XCAR (rest), XCDR (rest)); - if (NILP (tail)) - head = tail = new; - else - XCDR (tail) = new, tail = new; - rest = XCDR (rest); + XCDR (tail) = Fcons (XCAR (arg), XCDR (arg)); + tail = XCDR (tail); QUIT; } - if (!NILP (tail)) - XCDR (tail) = rest; return head; } - else if (STRINGP (arg)) - return concat (1, &arg, c_string, 0); - else if (VECTORP (arg)) - return concat (1, &arg, c_vector, 0); - else if (BIT_VECTORP (arg)) - return concat (1, &arg, c_bit_vector, 0); - else - { - check_losing_bytecode ("copy-sequence", arg); - arg = wrong_type_argument (Qsequencep, arg); - goto again; - } + if (STRINGP (arg)) return concat (1, &arg, c_string, 0); + if (VECTORP (arg)) return concat (1, &arg, c_vector, 0); + if (BIT_VECTORP (arg)) return concat (1, &arg, c_bit_vector, 0); + + check_losing_bytecode ("copy-sequence", arg); + arg = wrong_type_argument (Qsequencep, arg); + goto again; } struct merge_string_extents_struct
--- a/src/frame-x.c Mon Aug 13 09:45:48 2007 +0200 +++ b/src/frame-x.c Mon Aug 13 09:46:53 2007 +0200 @@ -1104,7 +1104,7 @@ return Qnil; } -void +static void x_cde_transfer_callback (Widget widget, XtPointer clientData, XtPointer callData) { @@ -2372,7 +2372,7 @@ { XWindowAttributes xwa; Widget shell_widget; - int viewable; + int viewable = 0; assert (FRAME_X_P (f)); @@ -2398,8 +2398,8 @@ &xwa)) /* JV: it is bad to change the visibility like this, so we don't for the moment, at least change_frame_visibility should be called - Note also that under fvwm a frame can me Viewable (and thus Mapped) - but still X-invisible + Note also that under fvwm a frame can be Viewable (and thus Mapped) + but still X-invisible f->visible = xwa.map_state == IsViewable; */ viewable = xwa.map_state == IsViewable;
--- a/src/glyphs.c Mon Aug 13 09:45:48 2007 +0200 +++ b/src/glyphs.c Mon Aug 13 09:46:53 2007 +0200 @@ -401,6 +401,7 @@ GCPRO1 (temp_buffer); set_buffer_internal (XBUFFER (temp_buffer)); Ferase_buffer (Fcurrent_buffer ()); + specbind (intern ("format-alist"), Qnil); Finsert_file_contents_internal (file, Qnil, Qnil, Qnil, Qnil, Qnil, Qnil); data = Fbuffer_substring (Qnil, Qnil, Fcurrent_buffer ()); unbind_to (count, Qnil);
--- a/src/malloc.c Mon Aug 13 09:45:48 2007 +0200 +++ b/src/malloc.c Mon Aug 13 09:46:53 2007 +0200 @@ -171,6 +171,10 @@ /* Define getpagesize () if the system does not. */ #include "getpagesize.h" +#ifdef HAVE_ULIMIT_H +#include <ulimit.h> +#endif + #ifndef BSD4_2 #ifndef USG #include <sys/vlimit.h> /* warn the user when near the end */ @@ -301,7 +305,7 @@ char *_malloc_base; -static void getpool (); +static void getpool (void); /* Cause reinitialization based on job parameters; also declare where the end of pure storage is. */ @@ -447,7 +451,7 @@ } static void -getpool () +getpool (void) { int nu; char *cp = sbrk (0); @@ -798,8 +802,6 @@ static void get_lim_data () { - extern long ulimit (); - #ifdef ULIMIT_BREAK_VALUE lim_data = ULIMIT_BREAK_VALUE; #else
--- a/src/mem-limits.h Mon Aug 13 09:45:48 2007 +0200 +++ b/src/mem-limits.h Mon Aug 13 09:46:53 2007 +0200 @@ -23,6 +23,14 @@ #ifndef _XEMACS_MEM_LIMITS_H_ #define _XEMACS_MEM_LIMITS_H_ +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#ifdef HAVE_ULIMIT_H +#include <ulimit.h> +#endif + #ifdef MSDOS #include <dpmi.h> #endif @@ -123,8 +131,6 @@ static void get_lim_data (void) { - extern long ulimit (); - lim_data = -1; /* Use the ulimit call, if we seem to have it. */
--- a/src/menubar-x.c Mon Aug 13 09:45:48 2007 +0200 +++ b/src/menubar-x.c Mon Aug 13 09:46:53 2007 +0200 @@ -311,8 +311,8 @@ #ifdef LWLIB_MENUBARS_LUCID int in_menu_callback; -Lisp_Object -restore_in_menu_callback(Lisp_Object val) +static Lisp_Object +restore_in_menu_callback (Lisp_Object val) { in_menu_callback = XINT(val); return Qnil;
--- a/src/mule-wnnfns.c Mon Aug 13 09:45:48 2007 +0200 +++ b/src/mule-wnnfns.c Mon Aug 13 09:46:53 2007 +0200 @@ -2005,12 +2005,6 @@ } void -_xp (int x) -{ - printf ("%x\n", x); fflush (stdout); -} - -void w2y (w_char *w) { letter pbuf[5000], ybuf[5000];
--- a/src/ntheap.c Mon Aug 13 09:45:48 2007 +0200 +++ b/src/ntheap.c Mon Aug 13 09:46:53 2007 +0200 @@ -80,11 +80,11 @@ } /* Info for keeping track of our heap. */ -unsigned char *data_region_base = NULL; -unsigned char *data_region_end = NULL; -unsigned char *real_data_region_end = NULL; -unsigned long data_region_size = 0; -unsigned long reserved_heap_size = 0; +unsigned char *data_region_base = UNINIT_PTR; +unsigned char *data_region_end = UNINIT_PTR; +unsigned char *real_data_region_end = UNINIT_PTR; +unsigned long data_region_size = UNINIT_LONG; +unsigned long reserved_heap_size = UNINIT_LONG; /* The start of the data segment. */ unsigned char * @@ -143,6 +143,7 @@ unsigned long end = 1 << VALBITS; /* 256MB */ void *ptr = NULL; +#define NTHEAP_PROBE_BASE 1 #if NTHEAP_PROBE_BASE /* This is never normally defined */ /* Try various addresses looking for one the kernel will let us have. */ while (!ptr && (base < end)) @@ -174,7 +175,7 @@ long size = (long) increment; /* Allocate our heap if we haven't done so already. */ - if (!data_region_base) + if (data_region_base == UNINIT_PTR) { data_region_base = allocate_heap (); if (!data_region_base)
--- a/src/ntheap.h Mon Aug 13 09:45:48 2007 +0200 +++ b/src/ntheap.h Mon Aug 13 09:46:53 2007 +0200 @@ -45,10 +45,14 @@ extern unsigned long data_region_size; extern unsigned long reserved_heap_size; extern SYSTEM_INFO sysinfo_cache; -extern BOOL need_to_recreate_heap; extern int nt_major_version; extern int nt_minor_version; +/* To prevent zero-initialized variables from being placed into the bss + section, use non-zero values to represent an uninitialized state. */ +#define UNINIT_PTR ((void *) 0xF0A0F0A0) +#define UNINIT_LONG (0xF0A0F0A0L) + /* Emulation of Unix sbrk(). */ extern void *sbrk (unsigned long size);
--- a/src/process.c Mon Aug 13 09:45:48 2007 +0200 +++ b/src/process.c Mon Aug 13 09:46:53 2007 +0200 @@ -1382,7 +1382,7 @@ Lisp_Object proc; struct sockaddr_in address; int s, outch, inch; - int port; + volatile int port; struct gcpro gcpro1, gcpro2, gcpro3, gcpro4; volatile int retry = 0; int retval;
--- a/src/redisplay-tty.c Mon Aug 13 09:45:48 2007 +0200 +++ b/src/redisplay-tty.c Mon Aug 13 09:46:53 2007 +0200 @@ -425,12 +425,12 @@ struct frame *f = XFRAME (w->frame); struct console *c = XCONSOLE (FRAME_CONSOLE (f)); int line; - int y1 = WINDOW_TEXT_TOP (w); - int y2 = WINDOW_TEXT_BOTTOM (w); + int y_top = WINDOW_TEXT_TOP (w); + int y_bot = WINDOW_TEXT_BOTTOM (w); unsigned char divv = '|'; tty_turn_on_face (w, MODELINE_INDEX); - for (line = y1; line < y2; line++) + for (line = y_top; line < y_bot; line++) { cmgoto (f, line, WINDOW_TEXT_LEFT (w) - 1); send_string_to_tty_console (c, &divv, 1); @@ -438,7 +438,7 @@ } /* Draw the divider in the modeline. */ - cmgoto (f, y2, WINDOW_TEXT_LEFT (w) - 1); + cmgoto (f, y_bot, WINDOW_TEXT_LEFT (w) - 1); send_string_to_tty_console (c, &divv, 1); TTY_INC_CURSOR_X (c, 1); tty_turn_off_face (w, MODELINE_INDEX);
--- a/src/regex.c Mon Aug 13 09:45:48 2007 +0200 +++ b/src/regex.c Mon Aug 13 09:46:53 2007 +0200 @@ -1859,14 +1859,14 @@ { if (num_regs > regs_allocated_size) { - RETALLOC_IF (regstart, num_regs, CONST char *); - RETALLOC_IF (regend, num_regs, CONST char *); - RETALLOC_IF (old_regstart, num_regs, CONST char *); - RETALLOC_IF (old_regend, num_regs, CONST char *); - RETALLOC_IF (best_regstart, num_regs, CONST char *); - RETALLOC_IF (best_regend, num_regs, CONST char *); - RETALLOC_IF (reg_info, num_regs, register_info_type); - RETALLOC_IF (reg_dummy, num_regs, CONST char *); + RETALLOC_IF (regstart, num_regs, CONST char *); + RETALLOC_IF (regend, num_regs, CONST char *); + RETALLOC_IF (old_regstart, num_regs, CONST char *); + RETALLOC_IF (old_regend, num_regs, CONST char *); + RETALLOC_IF (best_regstart, num_regs, CONST char *); + RETALLOC_IF (best_regend, num_regs, CONST char *); + RETALLOC_IF (reg_info, num_regs, register_info_type); + RETALLOC_IF (reg_dummy, num_regs, CONST char *); RETALLOC_IF (reg_info_dummy, num_regs, register_info_type); regs_allocated_size = num_regs;
--- a/src/s/sol2.h Mon Aug 13 09:45:48 2007 +0200 +++ b/src/s/sol2.h Mon Aug 13 09:46:53 2007 +0200 @@ -1,34 +1,48 @@ /* Synched up with: FSF 19.31. */ -#define __EXTENSIONS__ 1 #define SOLARIS2 1 #define POSIX 1 -#if 1 + #ifndef USG #define USG #endif + #ifndef USG5_4 #define USG5_4 #endif -#if 0 -#undef SYSTEM_TYPE -#define SYSTEM_TYPE "solaris" -#endif + +#define __EXTENSIONS__ 1 + #undef _POSIX_C_SOURCE -#if 0 -#define _POSIX_C_SOURCE 199506L -#endif + +/* Solaris 2.4 math.h doesn't respect __EXTENSIONS__ */ +#ifndef NOT_C_CODE + +#if OS_RELEASE <= 54 +#include <math.h> +#endif /* <= Solaris 2.4 */ + +/* Fix understandable GCC lossage on Solaris 2.6 */ +#if OS_RELEASE >= 56 +#ifdef __GNUC__ +#define __GNUC_VA_LIST +#define _VA_LIST_ +#define _VA_LIST va_list +typedef void *__gnuc_va_list; +typedef __gnuc_va_list va_list; +#endif /* GCC */ +#endif /* >= Solaris 2.6 */ + +#endif /* C code */ + #undef _XOPEN_SOURCE +#define _XOPEN_SOURCE 1 + #undef _XOPEN_SOURCE_EXTENDED -#if OS_RELEASE >= 55 -#define _XOPEN_SOURCE 1 #define _XOPEN_SOURCE_EXTENDED 1 -#endif /* >= SunOS 5.5 */ -#endif -#if 1 /* mrb */ #include "usg5-4-2.h" /* XEmacs change from 5-4 to 5-4-2 */ -#endif +#undef PC /* Defined in x86 /usr/include/sys/reg.h */ /* SIGIO seems to be working under Solaris and it makes ^G work better... */ #undef BROKEN_SIGIO @@ -90,28 +104,42 @@ #define BROKEN_SIGCHLD #endif -#if OS_RELEASE == 55 -/* Solaris 2.5 is the first Solaris that has getpagesize(), srandom() - and random(), but they forgot to add prototypes to the header - files. */ -int getpagesize (void); -long random (void); -void srandom (unsigned int seed); -#endif /* SunOS 5.5 */ - #if OS_RELEASE < 55 /* Missing prototype, added in Solaris 2.5 */ extern void *__builtin_alloca(size_t); #endif /* before SunOS 5.5 */ +#if OS_RELEASE == 55 +/* The following functions were added in Solaris 2.5, + but they forgot to add prototypes to the system header files. */ +int getpagesize (void); +long random (void); +void srandom (unsigned int seed); +int usleep(unsigned int useconds); +#endif /* SunOS 5.5 */ + #if OS_RELEASE < 56 /* Missing prototypes, added in Solaris 2.6 */ struct timeval; int utimes (char *file, struct timeval *tvp); int gethostname(char *name, int namelen); -int usleep(unsigned int useconds); #endif /* before SunOS 5.6 */ +#if defined(__GNUC__) && OS_RELEASE >= 56 +/* Missing prototypes for functions added in Solaris 2.6 */ +struct msghdr; +struct sockaddr; +extern int __xnet_bind(int, const struct sockaddr *, size_t); +extern int __xnet_listen(int, int); +extern int __xnet_connect(int, const struct sockaddr *, size_t); +extern ssize_t __xnet_recvmsg(int, struct msghdr *, int); +extern ssize_t __xnet_sendmsg(int, const struct msghdr *, int); +extern ssize_t __xnet_sendto(int, const void *, size_t, int, const struct sockaddr *, size_t); +extern int __xnet_socket(int, int, int); +extern int __xnet_socketpair(int, int, int, int *); +extern int __xnet_getsockopt(int, int, int, void *, size_t *); +#endif /* GCC && >= SunOS 5.6 */ + #include <sys/utsname.h> /* warning: macro redefined: SYS_NMLN */ /* Get non-ANSI functions from ANSI header files in cc -Xc mode.
--- a/src/s/windowsnt.h Mon Aug 13 09:45:48 2007 +0200 +++ b/src/s/windowsnt.h Mon Aug 13 09:46:53 2007 +0200 @@ -118,6 +118,8 @@ #define DIRECTORY_SEP XINT (Vdirectory_sep_char) #endif +#define DIRECTORY_SEP '\\' + /* Define this to be the separator between devices and paths */ #define DEVICE_SEP ':'
--- a/src/specifier.c Mon Aug 13 09:45:48 2007 +0200 +++ b/src/specifier.c Mon Aug 13 09:46:53 2007 +0200 @@ -2886,16 +2886,16 @@ DEFINE_SPECIFIER_TYPE (display_table); -void -display_table_validate(instantiator) -Lisp_Object instantiator; +static void +display_table_validate (Lisp_Object instantiator) { if (!NILP(instantiator) && (!VECTORP (instantiator) || XVECTOR (instantiator)->size != DISP_TABLE_SIZE)) - dead_wrong_type_argument(display_table_specifier_methods->predicate_symbol, instantiator); - return; + dead_wrong_type_argument (display_table_specifier_methods->predicate_symbol, + instantiator); } + DEFUN ("display-table-specifier-p", Fdisplay_table_specifier_p, 1, 1, 0, /* Return non-nil if OBJECT is an display-table specifier. */
--- a/src/sunplay.c Mon Aug 13 09:45:48 2007 +0200 +++ b/src/sunplay.c Mon Aug 13 09:46:53 2007 +0200 @@ -47,18 +47,6 @@ # define CONST const #endif /* CONST */ -#if __STDC__ || defined(STDC_HEADERS) /* warning suppression */ -extern int audio__setplayhdr(); -extern int audio__setgain(); -extern int audio__flush(); -extern int audio_decode_filehdr(); -extern int audio_read_filehdr(); -extern int audio_cmp_hdr(); -extern int audio_enc_to_str(); -extern int audio_drain(); -#endif - - #ifdef emacs # include <config.h> # include "lisp.h"
--- a/src/syswait.h Mon Aug 13 09:45:48 2007 +0200 +++ b/src/syswait.h Mon Aug 13 09:46:53 2007 +0200 @@ -48,3 +48,7 @@ #ifndef WSTOPSIG #define WSTOPSIG(s) ((s) >> 8) #endif +#ifndef WRETCODE +#define WRETCODE(s) ((s) >> 8) +#endif +
--- a/src/tooltalk.c Mon Aug 13 09:45:48 2007 +0200 +++ b/src/tooltalk.c Mon Aug 13 09:46:53 2007 +0200 @@ -177,7 +177,7 @@ error ("printing unreadable object #<tooltalk_message 0x%x>", p->header.uid); - sprintf (buf, "#<tooltalk_message id:%d 0x%x>", p->m, p->header.uid); + sprintf (buf, "#<tooltalk_message id:%p 0x%x>", p->m, p->header.uid); write_c_string (buf, printcharfun); } @@ -253,7 +253,7 @@ error ("printing unreadable object #<tooltalk_pattern 0x%x>", p->header.uid); - sprintf (buf, "#<tooltalk_pattern id:%d 0x%x>", p->p, p->header.uid); + sprintf (buf, "#<tooltalk_pattern id:%p 0x%x>", p->p, p->header.uid); write_c_string (buf, printcharfun); }
--- a/src/unexnt.c Mon Aug 13 09:45:48 2007 +0200 +++ b/src/unexnt.c Mon Aug 13 09:46:53 2007 +0200 @@ -42,11 +42,17 @@ unsigned char *file_base; } file_data; +enum { + HEAP_UNINITIALIZED = 1, + HEAP_UNLOADED, + HEAP_LOADED +}; + /* Basically, our "initialized" flag. */ -BOOL need_to_recreate_heap = FALSE; +int heap_state = HEAP_UNINITIALIZED; /* So we can find our heap in the file to recreate it. */ -unsigned long heap_index_in_executable = 0; +unsigned long heap_index_in_executable = UNINIT_LONG; void open_input_file (file_data *p_file, char *name); void open_output_file (file_data *p_file, char *name, unsigned long size); @@ -57,13 +63,13 @@ void dump_bss_and_heap (file_data *p_infile, file_data *p_outfile); /* Cached info about the .data section in the executable. */ -PUCHAR data_start_va = 0; -DWORD data_start_file = 0; -DWORD data_size = 0; +PUCHAR data_start_va = UNINIT_PTR; +DWORD data_start_file = UNINIT_LONG; +DWORD data_size = UNINIT_LONG; /* Cached info about the .bss section in the executable. */ -PUCHAR bss_start = 0; -DWORD bss_size = 0; +PUCHAR bss_start = UNINIT_PTR; +DWORD bss_size = UNINIT_LONG; #ifdef HAVE_NTGUI HINSTANCE hinst = NULL; @@ -89,7 +95,7 @@ start up. (WARNING: Do not put any code before this section that relies upon malloc () and runs in the dumped version. It won't work.) */ - if (need_to_recreate_heap) + if (heap_state == HEAP_UNLOADED) { char executable_path[MAX_PATH]; @@ -98,7 +104,7 @@ exit (1); } recreate_heap (executable_path); - need_to_recreate_heap = FALSE; + heap_state = HEAP_LOADED; } /* The default behavior is to treat files as binary and patch up @@ -164,7 +170,7 @@ open_output_file (&out_file, out_filename, size); /* Set the flag (before dumping). */ - need_to_recreate_heap = TRUE; + heap_state = HEAP_UNLOADED; copy_executable_and_dump_data_section (&in_file, &out_file); dump_bss_and_heap (&in_file, &out_file); @@ -392,7 +398,7 @@ section++; } - if (!bss_start && !bss_size) + if (bss_start == UNINIT_PTR && bss_size == UNINIT_LONG) { /* Starting with MSVC 4.0, the .bss section has been eliminated and appended virtually to the end of the .data section. Our
--- a/src/xmu.c Mon Aug 13 09:45:48 2007 +0200 +++ b/src/xmu.c Mon Aug 13 09:46:53 2007 +0200 @@ -535,11 +535,10 @@ void XmuCopyISOLatin1Lowered(char *dst, char *src) { - unsigned char *dest, *source; + unsigned char *dest = (unsigned char *) dst; + unsigned char *source = (unsigned char *) src; - for (dest = (unsigned char *)dst, source = (unsigned char *)src; - *source; - source++, dest++) + for ( ; *source; source++, dest++) { if ((*source >= XK_A) && (*source <= XK_Z)) *dest = *source + (XK_a - XK_A);
--- a/src/xselect.c Mon Aug 13 09:45:48 2007 +0200 +++ b/src/xselect.c Mon Aug 13 09:46:53 2007 +0200 @@ -367,7 +367,7 @@ int dataid; /* 1.2 wants long, but 1.1.5 wants int... */ #endif XmString fmh; - String encoding = (String) "STRING"; + String encoding = "STRING"; Extbyte *data = XSTRING_DATA (selection_value); Extcount bytes = XSTRING_LENGTH (selection_value); @@ -396,21 +396,17 @@ break; } - switch (chartypes) + if (chartypes == LATIN_1) + GET_STRING_BINARY_DATA_ALLOCA (selection_value, data, bytes); + else if (chartypes == WORLD) { - case LATIN_1: - GET_STRING_BINARY_DATA_ALLOCA (selection_value, data, bytes); - break; - case WORLD: GET_STRING_CTEXT_DATA_ALLOCA (selection_value, data, bytes); - encoding = (String) "COMPOUND_TEXT"; - break; + encoding = "COMPOUND_TEXT"; } } #endif /* MULE */ - fmh = XmStringCreateLtoR ((String) "Clipboard", - XmSTRING_DEFAULT_CHARSET); + fmh = XmStringCreateLtoR ("Clipboard", XmSTRING_DEFAULT_CHARSET); while (ClipboardSuccess != XmClipboardStartCopy (display, selecting_window, fmh, thyme, #ifdef MOTIF_INCREMENTAL_CLIPBOARDS_WORK @@ -1997,11 +1993,10 @@ break; } - switch (chartypes) - { - case LATIN_1: GET_STRING_BINARY_DATA_ALLOCA (string, data, bytes); break; - case WORLD: GET_STRING_CTEXT_DATA_ALLOCA (string, data, bytes); break; - } + if (chartypes == LATIN_1) + GET_STRING_BINARY_DATA_ALLOCA (string, data, bytes); + else if (chartypes == WORLD) + GET_STRING_CTEXT_DATA_ALLOCA (string, data, bytes); #endif /* MULE */ bytes_remaining = bytes;