Mercurial > hg > xemacs-beta
changeset 171:929b76928fce r20-3b12
Import from CVS: tag r20-3b12
line wrap: on
line diff
--- a/CHANGES-beta Mon Aug 13 09:47:00 2007 +0200 +++ b/CHANGES-beta Mon Aug 13 09:47:52 2007 +0200 @@ -1,11 +1,18 @@ -*- indented-text -*- +to 20.3 beta12 "Helsinki" +-- cc-mode-5.12. +-- ~/.xemacs --> ~/.xemacs/init.el +-- ~/.xemacs-custom -> ~/.xemacs/options.el +-- Fix lossage in lwlib-Xm.c +-- Miscellaneous bug fixes + to 20.3 beta11 "Stockholm" -- Try #2 with LOSING_BYTECODE disabled. --- Interface change: value of `system-type' is provided as a feature. +-- 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'. +-- New user variable `errors-deactivate-region' -- Miscellaneous bug fixes. -- iso-acc.el-1.15 (Mule fixes) -- autoloads/custom loads generation in build updated @@ -22,7 +29,7 @@ -- Restore Show Message Log in Edit menu. -- `make autoloads' updated and should now work without Mule [untested]. -- New boolean variable `x-seppuku-on-epipe' to handle case of X Server going - away and XEmacs not exiting. Set to `t' to force immediate exit. + away and XEmacs not exiting. Set to `t' to force immediate exit -- custom-1.9940 -- gnuserv.el-3.6 -- speedbar-0.5 courtesy of Eric Ludlam
--- a/ChangeLog Mon Aug 13 09:47:00 2007 +0200 +++ b/ChangeLog Mon Aug 13 09:47:52 2007 +0200 @@ -1,3 +1,38 @@ +1997-07-08 Steven L Baur <steve@altair.xemacs.org> + + * XEmacs 20.3-beta12 is released. + +1997-07-08 Martin Buchholz <mrb@eng.sun.com> + + * configure.in: Set options differently, depending on beta-ness of + build tree. + * *Makefile*: Clean up *clean: targets, esp. Steven's beloved + distclean. + +1997-07-08 Steven L Baur <steve@altair.xemacs.org> + + * pkg-src/tree-x/Makefile.in.in (xoobr): Pass CFLAGS to the + linker. + From Olivier Galibert <Olivier.Galibert@mines.u-nancy.fr> + +1997-07-07 Steven L Baur <steve@altair.xemacs.org> + + * pkg-src/tree-x/Makefile.in.in (distclean): Add target. + +1997-07-06 Steven L Baur <steve@altair.xemacs.org> + + * lwlib/lwlib-Xm.c (xm_update_one_value): Hand application of mrb + fix. Restoration of lossage from beta10->beta11 upgrade. + + * XEmacs 20.3-beta11 is released. + +1997-07-08 MORIOKA Tomohiko <morioka@jaist.ac.jp> + + * lisp/language/english.el: Add quail-british for British. + + * lisp/language/european.el: Register input-method for various non + quail-latin-1 methods. + 1997-07-05 Martin Buchholz <mrb@eng.sun.com> * lib-src/getopt*.c: Don't redefine const - let configure do that.
--- a/Makefile.in Mon Aug 13 09:47:00 2007 +0200 +++ b/Makefile.in Mon Aug 13 09:47:52 2007 +0200 @@ -523,6 +523,7 @@ realclean: FRC.realclean for d in $(SUBDIR); do (cd $$d && $(MAKE) $(MFLAGS) $@); done -${top_distclean} + $(RM) TAGS ## This doesn't actually appear in the coding standards, but Karl ## says GCC supports it, and that's where the configuration part of
--- a/configure Mon Aug 13 09:47:00 2007 +0200 +++ b/configure Mon Aug 13 09:47:52 2007 +0200 @@ -241,14 +241,6 @@ use_system_malloc='default' energize_version='' native_sound_lib='' -error_check_default="yes" -error_check_extents=$error_check_default -error_check_typecheck=$error_check_default -error_check_bufpos=$error_check_default -error_check_gc=$error_check_default -error_check_malloc=$error_check_default -debug=$error_check_default -extra_verbose=$error_check_default use_assertions="yes" with_gif="" with_toolbars="" @@ -256,8 +248,6 @@ use_union_type="no" with_dnet="" -test -n "$CPP" -a -d "$CPP" && CPP= - usage="Usage: $progname CONFIGURATION [-OPTION[=VALUE] ...] Set compilation and installation parameters for XEmacs, and report. @@ -831,7 +821,7 @@ esac echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:835: checking whether ln -s works" >&5 +echo "configure:825: checking whether ln -s works" >&5 rm -f conftestdata if ln -s X conftestdata 2>/dev/null @@ -885,9 +875,137 @@ vpath %.in $(srcdir)' fi +. "$srcdir/version.sh" || exit 1; +version="${emacs_major_version}.${emacs_minor_version}" +{ test "$extra_verbose" = "yes" && cat << EOF + Defining EMACS_MAJOR_VERSION = $emacs_major_version +EOF +cat >> confdefs.h <<EOF +#define EMACS_MAJOR_VERSION $emacs_major_version +EOF +} + +{ test "$extra_verbose" = "yes" && cat << EOF + Defining EMACS_MINOR_VERSION = $emacs_minor_version +EOF +cat >> confdefs.h <<EOF +#define EMACS_MINOR_VERSION $emacs_minor_version +EOF +} + +if test -n "$emacs_beta_version"; then + version="${version}-b${emacs_beta_version}" + { test "$extra_verbose" = "yes" && cat << EOF + Defining EMACS_BETA_VERSION = $emacs_beta_version +EOF +cat >> confdefs.h <<EOF +#define EMACS_BETA_VERSION $emacs_beta_version +EOF +} + +fi +{ test "$extra_verbose" = "yes" && cat << EOF + Defining XEMACS_CODENAME = "$xemacs_codename" +EOF +cat >> confdefs.h <<EOF +#define XEMACS_CODENAME "$xemacs_codename" +EOF +} + +{ test "$extra_verbose" = "yes" && cat << EOF + Defining EMACS_VERSION = "$version" +EOF +cat >> confdefs.h <<EOF +#define EMACS_VERSION "$version" +EOF +} + +canonical_version=`echo ${version}_${canonical} | sed 'y/.-/__/'` +{ test "$extra_verbose" = "yes" && cat << EOF + Defining CANONICAL_VERSION = $canonical_version +EOF +cat >> confdefs.h <<EOF +#define CANONICAL_VERSION $canonical_version +EOF +} + + +if test -n "$emacs_beta_version"; then beta=yes; else beta=no; fi +test "${error_check_extents=$beta}" = yes && { test "$extra_verbose" = "yes" && cat << \EOF + Defining ERROR_CHECK_EXTENTS +EOF +cat >> confdefs.h <<\EOF +#define ERROR_CHECK_EXTENTS 1 +EOF +} + +test "${error_check_typecheck=$beta}" = yes && { test "$extra_verbose" = "yes" && cat << \EOF + Defining ERROR_CHECK_TYPECHECK +EOF +cat >> confdefs.h <<\EOF +#define ERROR_CHECK_TYPECHECK 1 +EOF +} + +test "${error_check_bufpos=$beta}" = yes && { test "$extra_verbose" = "yes" && cat << \EOF + Defining ERROR_CHECK_BUFPOS +EOF +cat >> confdefs.h <<\EOF +#define ERROR_CHECK_BUFPOS 1 +EOF +} + +test "${error_check_gc=$beta}" = yes && { test "$extra_verbose" = "yes" && cat << \EOF + Defining ERROR_CHECK_GC +EOF +cat >> confdefs.h <<\EOF +#define ERROR_CHECK_GC 1 +EOF +} + +test "${error_check_malloc=$beta}" = yes && { test "$extra_verbose" = "yes" && cat << \EOF + Defining ERROR_CHECK_MALLOC +EOF +cat >> confdefs.h <<\EOF +#define ERROR_CHECK_MALLOC 1 +EOF +} + +: "${extra_verbose=$beta}" +if test "${debug=beta}" = "yes"; then + use_assertions=yes memory_usage_stats=yes + extra_objs="$extra_objs debug.o" && if test "$extra_verbose" = "yes"; then + echo " xemacs will be linked with \"debug.o\"" + fi + { test "$extra_verbose" = "yes" && cat << \EOF + Defining DEBUG_XEMACS +EOF +cat >> confdefs.h <<\EOF +#define DEBUG_XEMACS 1 +EOF +} + +fi +test "$use_assertions" = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF + Defining USE_ASSERTIONS +EOF +cat >> confdefs.h <<\EOF +#define USE_ASSERTIONS 1 +EOF +} + +test "$memory_usage_stats" = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF + Defining MEMORY_USAGE_STATS +EOF +cat >> confdefs.h <<\EOF +#define MEMORY_USAGE_STATS 1 +EOF +} + + echo "checking "the configuration name"" 1>&6 -echo "configure:891: checking "the configuration name"" >&5 +echo "configure:1009: checking "the configuration name"" >&5 internal_configuration=`echo $configuration | sed 's/-\(energize\|workshop\)//'` if canonical=`$srcdir/config.sub "$internal_configuration"` ; then : ; else exit $? @@ -1280,13 +1398,6 @@ opsysfile="s/${opsys}.h" -if test "$debug" = "yes"; then - use_assertions=yes memory_usage_stats=yes - extra_objs="$extra_objs debug.o" && if test "$extra_verbose" = "yes"; then - echo " xemacs will be linked with \"debug.o\"" - fi -fi - test "$with_sparcworks" = "yes" && with_workshop=yes # compatibility alias if test "$with_workshop" = "yes"; then { test "$extra_verbose" = "yes" && cat << \EOF @@ -1313,7 +1424,7 @@ # 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:1317: checking for $ac_word" >&5 +echo "configure:1428: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1339,7 +1450,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:1343: checking for $ac_word" >&5 +echo "configure:1454: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1384,7 +1495,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1388: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1499: 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' @@ -1396,11 +1507,11 @@ cross_compiling=no cat > conftest.$ac_ext <<EOF -#line 1400 "configure" +#line 1511 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1404: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1515: \"$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 @@ -1420,19 +1531,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:1424: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1535: 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:1429: checking whether we are using GNU C" >&5 +echo "configure:1540: 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:1436: \"$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:1547: \"$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 @@ -1446,7 +1557,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1450: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1561: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -1475,7 +1586,7 @@ # 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:1479: checking for $ac_word" >&5 +echo "configure:1590: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1501,7 +1612,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:1505: checking for $ac_word" >&5 +echo "configure:1616: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1546,7 +1657,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1550: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1661: 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' @@ -1558,11 +1669,11 @@ cross_compiling=no cat > conftest.$ac_ext <<EOF -#line 1562 "configure" +#line 1673 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1677: \"$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 @@ -1582,19 +1693,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:1586: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1697: 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:1591: checking whether we are using GNU C" >&5 +echo "configure:1702: 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:1598: \"$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:1709: \"$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 @@ -1608,7 +1719,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1612: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1723: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -1637,7 +1748,7 @@ # 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:1641: checking for $ac_word" >&5 +echo "configure:1752: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1663,7 +1774,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:1667: checking for $ac_word" >&5 +echo "configure:1778: checking for $ac_word" >&5 if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -1708,7 +1819,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1712: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1823: 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' @@ -1720,11 +1831,11 @@ cross_compiling=no cat > conftest.$ac_ext <<EOF -#line 1724 "configure" +#line 1835 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1839: \"$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 @@ -1744,19 +1855,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:1748: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1859: 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:1753: checking whether we are using GNU C" >&5 +echo "configure:1864: 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:1760: \"$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:1871: \"$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 @@ -1770,7 +1881,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1774: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1885: checking whether ${CC-cc} accepts -g" >&5 echo 'void f(){}' > conftest.c if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then @@ -1797,10 +1908,13 @@ fi CFLAGS="$xe_save_CFLAGS" + +test -n "$CPP" -a -d "$CPP" && CPP= + test -n "$NON_GNU_CPP" -a "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP" echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:1804: checking how to run the C preprocessor" >&5 +echo "configure:1918: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -1813,13 +1927,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext <<EOF -#line 1817 "configure" +#line 1931 "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:1823: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1937: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1830,13 +1944,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext <<EOF -#line 1834 "configure" +#line 1948 "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:1840: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:1954: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then : @@ -1859,9 +1973,9 @@ echo $ac_n "checking for AIX""... $ac_c" 1>&6 -echo "configure:1863: checking for AIX" >&5 -cat > conftest.$ac_ext <<EOF -#line 1865 "configure" +echo "configure:1977: checking for AIX" >&5 +cat > conftest.$ac_ext <<EOF +#line 1979 "configure" #include "confdefs.h" #ifdef _AIX yes @@ -1888,9 +2002,9 @@ echo $ac_n "checking whether we are using SunPro C""... $ac_c" 1>&6 -echo "configure:1892: checking whether we are using SunPro C" >&5 -cat > conftest.$ac_ext <<EOF -#line 1894 "configure" +echo "configure:2006: checking whether we are using SunPro C" >&5 +cat > conftest.$ac_ext <<EOF +#line 2008 "configure" #include "confdefs.h" int main() { @@ -1901,7 +2015,7 @@ ; return 0; } EOF -if { (eval echo configure:1905: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2019: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* __sunpro_c=yes else @@ -2186,7 +2300,7 @@ fi echo $ac_n "checking for dynodump""... $ac_c" 1>&6 -echo "configure:2190: checking for dynodump" >&5 +echo "configure:2304: checking for dynodump" >&5 if test "$unexec" != "unexsol2.o"; then echo "$ac_t""no" 1>&6 else @@ -2257,19 +2371,19 @@ if test "$add_runtime_path" = "yes"; then echo $ac_n "checking "for runtime libraries flag"""... $ac_c" 1>&6 -echo "configure:2261: checking "for runtime libraries flag"" >&5 +echo "configure:2375: 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 2266 "configure" +#line 2380 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:2273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:2387: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* dash_r="$try_dash_r" else @@ -2363,7 +2477,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:2367: checking for $ac_word" >&5 +echo "configure:2481: checking for $ac_word" >&5 if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. @@ -2416,7 +2530,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:2420: checking for a BSD compatible install" >&5 +echo "configure:2534: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" @@ -2467,7 +2581,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:2471: checking for $ac_word" >&5 +echo "configure:2585: checking for $ac_word" >&5 if test -n "$YACC"; then ac_cv_prog_YACC="$YACC" # Let the user override the test. @@ -2498,15 +2612,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2502: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2505 "configure" +echo "configure:2616: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2619 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2510: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2624: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2539,15 +2653,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2543: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2546 "configure" +echo "configure:2657: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2660 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2551: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2665: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2580,15 +2694,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:2584: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2587 "configure" +echo "configure:2698: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2701 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2592: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2618,10 +2732,10 @@ done echo $ac_n "checking for sys/wait.h that is POSIX.1 compatible""... $ac_c" 1>&6 -echo "configure:2622: checking for sys/wait.h that is POSIX.1 compatible" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2625 "configure" +echo "configure:2736: checking for sys/wait.h that is POSIX.1 compatible" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2739 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/wait.h> @@ -2637,7 +2751,7 @@ s = WIFEXITED (s) ? WEXITSTATUS (s) : 1; ; return 0; } EOF -if { (eval echo configure:2641: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_sys_wait_h=yes else @@ -2661,10 +2775,10 @@ fi echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:2665: checking for ANSI C header files" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2668 "configure" +echo "configure:2779: checking for ANSI C header files" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2782 "configure" #include "confdefs.h" #include <stdlib.h> #include <stdarg.h> @@ -2672,7 +2786,7 @@ #include <float.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:2676: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -2689,7 +2803,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 2693 "configure" +#line 2807 "configure" #include "confdefs.h" #include <string.h> EOF @@ -2707,7 +2821,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 2711 "configure" +#line 2825 "configure" #include "confdefs.h" #include <stdlib.h> EOF @@ -2725,7 +2839,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 2729 "configure" +#line 2843 "configure" #include "confdefs.h" #include <ctype.h> #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -2736,7 +2850,7 @@ exit (0); } EOF -if { (eval echo configure:2740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:2854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then : else @@ -2761,10 +2875,10 @@ fi echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -echo "configure:2765: checking whether time.h and sys/time.h may both be included" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2768 "configure" +echo "configure:2879: checking whether time.h and sys/time.h may both be included" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2882 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/time.h> @@ -2773,7 +2887,7 @@ struct tm *tp; ; return 0; } EOF -if { (eval echo configure:2777: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2891: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_header_time=yes else @@ -2797,10 +2911,10 @@ fi echo $ac_n "checking for sys_siglist declaration in signal.h or unistd.h""... $ac_c" 1>&6 -echo "configure:2801: checking for sys_siglist declaration in signal.h or unistd.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2804 "configure" +echo "configure:2915: checking for sys_siglist declaration in signal.h or unistd.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2918 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -2812,7 +2926,7 @@ char *msg = *(sys_siglist + 1); ; return 0; } EOF -if { (eval echo configure:2816: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2930: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_decl_sys_siglist=yes else @@ -2837,9 +2951,9 @@ echo $ac_n "checking for struct utimbuf""... $ac_c" 1>&6 -echo "configure:2841: checking for struct utimbuf" >&5 -cat > conftest.$ac_ext <<EOF -#line 2843 "configure" +echo "configure:2955: checking for struct utimbuf" >&5 +cat > conftest.$ac_ext <<EOF +#line 2957 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME #include <sys/time.h> @@ -2858,7 +2972,7 @@ static struct utimbuf x; x.actime = x.modtime; ; return 0; } EOF -if { (eval echo configure:2862: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2976: \"$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 @@ -2878,10 +2992,10 @@ rm -f conftest* echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 -echo "configure:2882: checking return type of signal handlers" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2885 "configure" +echo "configure:2996: checking return type of signal handlers" >&5 + +cat > conftest.$ac_ext <<EOF +#line 2999 "configure" #include "confdefs.h" #include <sys/types.h> #include <signal.h> @@ -2898,7 +3012,7 @@ int i; ; return 0; } EOF -if { (eval echo configure:2902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3016: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_type_signal=void else @@ -2920,10 +3034,10 @@ echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:2924: checking for size_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2927 "configure" +echo "configure:3038: checking for size_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3041 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2954,10 +3068,10 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:2958: checking for pid_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2961 "configure" +echo "configure:3072: checking for pid_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3075 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -2988,10 +3102,10 @@ fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:2992: checking for uid_t in sys/types.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 2995 "configure" +echo "configure:3106: checking for uid_t in sys/types.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3109 "configure" #include "confdefs.h" #include <sys/types.h> EOF @@ -3027,10 +3141,10 @@ fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:3031: checking for mode_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3034 "configure" +echo "configure:3145: checking for mode_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3148 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3061,10 +3175,10 @@ fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:3065: checking for off_t" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3068 "configure" +echo "configure:3179: checking for off_t" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3182 "configure" #include "confdefs.h" #include <sys/types.h> #if STDC_HEADERS @@ -3096,9 +3210,9 @@ echo $ac_n "checking for struct timeval""... $ac_c" 1>&6 -echo "configure:3100: checking for struct timeval" >&5 -cat > conftest.$ac_ext <<EOF -#line 3102 "configure" +echo "configure:3214: checking for struct timeval" >&5 +cat > conftest.$ac_ext <<EOF +#line 3216 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME #include <sys/time.h> @@ -3114,7 +3228,7 @@ static struct timeval x; x.tv_sec = x.tv_usec; ; return 0; } EOF -if { (eval echo configure:3118: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3232: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 HAVE_TIMEVAL=yes @@ -3136,10 +3250,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:3140: checking whether struct tm is in sys/time.h or time.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3143 "configure" +echo "configure:3254: checking whether struct tm is in sys/time.h or time.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3257 "configure" #include "confdefs.h" #include <sys/types.h> #include <time.h> @@ -3147,7 +3261,7 @@ struct tm *tp; tp->tm_sec; ; return 0; } EOF -if { (eval echo configure:3151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3265: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else @@ -3171,10 +3285,10 @@ fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 -echo "configure:3175: checking for tm_zone in struct tm" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3178 "configure" +echo "configure:3289: checking for tm_zone in struct tm" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3292 "configure" #include "confdefs.h" #include <sys/types.h> #include <$ac_cv_struct_tm> @@ -3182,7 +3296,7 @@ struct tm tm; tm.tm_zone; ; return 0; } EOF -if { (eval echo configure:3186: \"$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_struct_tm_zone=yes else @@ -3205,10 +3319,10 @@ else echo $ac_n "checking for tzname""... $ac_c" 1>&6 -echo "configure:3209: checking for tzname" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3212 "configure" +echo "configure:3323: checking for tzname" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3326 "configure" #include "confdefs.h" #include <time.h> #ifndef tzname /* For SGI. */ @@ -3218,7 +3332,7 @@ atoi(*tzname); ; return 0; } EOF -if { (eval echo configure:3222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3336: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_var_tzname=yes else @@ -3244,10 +3358,10 @@ echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:3248: checking for working const" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3251 "configure" +echo "configure:3362: checking for working const" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3365 "configure" #include "confdefs.h" int main() { @@ -3296,7 +3410,7 @@ ; return 0; } EOF -if { (eval echo configure:3300: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3414: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -3321,7 +3435,7 @@ echo $ac_n "checking whether ${MAKE-make} sets \${MAKE}""... $ac_c" 1>&6 -echo "configure:3325: checking whether ${MAKE-make} sets \${MAKE}" >&5 +echo "configure:3439: checking whether ${MAKE-make} sets \${MAKE}" >&5 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y%./+-%__p_%'` cat > conftestmake <<\EOF @@ -3346,12 +3460,12 @@ echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 -echo "configure:3350: checking whether byte ordering is bigendian" >&5 +echo "configure:3464: 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 3355 "configure" +#line 3469 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -3362,11 +3476,11 @@ #endif ; return 0; } EOF -if { (eval echo configure:3366: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3480: \"$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 3370 "configure" +#line 3484 "configure" #include "confdefs.h" #include <sys/types.h> #include <sys/param.h> @@ -3377,7 +3491,7 @@ #endif ; return 0; } EOF -if { (eval echo configure:3381: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:3495: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_bigendian=yes else @@ -3394,7 +3508,7 @@ rm -f conftest* if test $ac_cv_c_bigendian = unknown; then cat > conftest.$ac_ext <<EOF -#line 3398 "configure" +#line 3512 "configure" #include "confdefs.h" main () { /* Are we little or big endian? From Harbison&Steele. */ @@ -3407,7 +3521,7 @@ exit (u.c[sizeof (long) - 1] == 1); } EOF -if { (eval echo configure:3411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:3525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_c_bigendian=no else @@ -3433,10 +3547,10 @@ echo $ac_n "checking size of short""... $ac_c" 1>&6 -echo "configure:3437: checking size of short" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3440 "configure" +echo "configure:3551: checking size of short" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3554 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3447,7 +3561,7 @@ exit(0); } EOF -if { (eval echo configure:3451: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:3565: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_sizeof_short=`cat conftestval` else @@ -3474,10 +3588,10 @@ exit 1 fi echo $ac_n "checking size of int""... $ac_c" 1>&6 -echo "configure:3478: checking size of int" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3481 "configure" +echo "configure:3592: checking size of int" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3595 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3488,7 +3602,7 @@ exit(0); } EOF -if { (eval echo configure:3492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:3606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_sizeof_int=`cat conftestval` else @@ -3509,10 +3623,10 @@ echo $ac_n "checking size of long""... $ac_c" 1>&6 -echo "configure:3513: checking size of long" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3516 "configure" +echo "configure:3627: checking size of long" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3630 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3523,7 +3637,7 @@ exit(0); } EOF -if { (eval echo configure:3527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:3641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_sizeof_long=`cat conftestval` else @@ -3544,10 +3658,10 @@ echo $ac_n "checking size of long long""... $ac_c" 1>&6 -echo "configure:3548: checking size of long long" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3551 "configure" +echo "configure:3662: checking size of long long" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3665 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3558,7 +3672,7 @@ exit(0); } EOF -if { (eval echo configure:3562: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:3676: \"$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 @@ -3579,10 +3693,10 @@ echo $ac_n "checking size of void *""... $ac_c" 1>&6 -echo "configure:3583: checking size of void *" >&5 - -cat > conftest.$ac_ext <<EOF -#line 3586 "configure" +echo "configure:3697: checking size of void *" >&5 + +cat > conftest.$ac_ext <<EOF +#line 3700 "configure" #include "confdefs.h" #include <stdio.h> main() @@ -3593,7 +3707,7 @@ exit(0); } EOF -if { (eval echo configure:3597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:3711: \"$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 @@ -3615,7 +3729,7 @@ echo $ac_n "checking for long file names""... $ac_c" 1>&6 -echo "configure:3619: checking for long file names" >&5 +echo "configure:3733: 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: @@ -3662,12 +3776,12 @@ echo $ac_n "checking for sqrt in -lm""... $ac_c" 1>&6 -echo "configure:3666: checking for sqrt in -lm" >&5 +echo "configure:3780: 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 3671 "configure" +#line 3785 "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 @@ -3678,7 +3792,7 @@ sqrt() ; return 0; } EOF -if { (eval echo configure:3682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3796: \"$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 @@ -3721,7 +3835,7 @@ echo "checking type of mail spool file locking" 1>&6 -echo "configure:3725: checking type of mail spool file locking" >&5 +echo "configure:3839: 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 @@ -3745,12 +3859,12 @@ echo $ac_n "checking for kstat_open in -lkstat""... $ac_c" 1>&6 -echo "configure:3749: checking for kstat_open in -lkstat" >&5 +echo "configure:3863: 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 3754 "configure" +#line 3868 "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 @@ -3761,7 +3875,7 @@ kstat_open() ; return 0; } EOF -if { (eval echo configure:3765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3879: \"$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 @@ -3795,12 +3909,12 @@ echo $ac_n "checking for kvm_read in -lkvm""... $ac_c" 1>&6 -echo "configure:3799: checking for kvm_read in -lkvm" >&5 +echo "configure:3913: 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 3804 "configure" +#line 3918 "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 @@ -3811,7 +3925,7 @@ kvm_read() ; return 0; } EOF -if { (eval echo configure:3815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3929: \"$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 @@ -3845,12 +3959,12 @@ echo $ac_n "checking for cma_open in -lpthreads""... $ac_c" 1>&6 -echo "configure:3849: checking for cma_open in -lpthreads" >&5 +echo "configure:3963: 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 3854 "configure" +#line 3968 "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 @@ -3861,7 +3975,7 @@ cma_open() ; return 0; } EOF -if { (eval echo configure:3865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:3979: \"$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 @@ -3897,7 +4011,7 @@ fi echo $ac_n "checking whether the -xildoff compiler flag is required""... $ac_c" 1>&6 -echo "configure:3901: checking whether the -xildoff compiler flag is required" >&5 +echo "configure:4015: 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; @@ -3908,7 +4022,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:3912: checking for \"-z ignore\" linker flag" >&5 +echo "configure:4026: 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 ;; @@ -3918,7 +4032,7 @@ echo "checking "for specified window system"" 1>&6 -echo "configure:3922: checking "for specified window system"" >&5 +echo "configure:4036: checking "for specified window system"" >&5 if test "$x_includes $x_libraries" = "NONE NONE"; then if test -n "$OPENWINHOME" \ @@ -3939,7 +4053,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:3943: checking for X" >&5 +echo "configure:4057: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -3999,12 +4113,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext <<EOF -#line 4003 "configure" +#line 4117 "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:4008: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4122: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4073,14 +4187,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <<EOF -#line 4077 "configure" +#line 4191 "configure" #include "confdefs.h" int main() { ${x_direct_test_function}() ; return 0; } EOF -if { (eval echo configure:4084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4198: \"$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. @@ -4189,17 +4303,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:4193: checking whether -R must be followed by a space" >&5 +echo "configure:4307: 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 4196 "configure" +#line 4310 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:4203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4317: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_nospace=yes else @@ -4215,14 +4329,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <<EOF -#line 4219 "configure" +#line 4333 "configure" #include "confdefs.h" int main() { ; return 0; } EOF -if { (eval echo configure:4226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_R_space=yes else @@ -4258,12 +4372,12 @@ else echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:4262: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:4376: 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 4267 "configure" +#line 4381 "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 @@ -4274,7 +4388,7 @@ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:4278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4392: \"$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 @@ -4298,12 +4412,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:4302: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:4416: 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 4307 "configure" +#line 4421 "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 @@ -4314,7 +4428,7 @@ dnet_ntoa() ; return 0; } EOF -if { (eval echo configure:4318: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4432: \"$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 @@ -4343,10 +4457,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:4347: checking for gethostbyname" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4350 "configure" +echo "configure:4461: checking for gethostbyname" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4464 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char gethostbyname(); below. */ @@ -4369,7 +4483,7 @@ ; return 0; } EOF -if { (eval echo configure:4373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -4390,12 +4504,12 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:4394: checking for gethostbyname in -lnsl" >&5 +echo "configure:4508: 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 4399 "configure" +#line 4513 "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 @@ -4406,7 +4520,7 @@ gethostbyname() ; return 0; } EOF -if { (eval echo configure:4410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4524: \"$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 @@ -4436,10 +4550,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:4440: checking for connect" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4443 "configure" +echo "configure:4554: checking for connect" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4557 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char connect(); below. */ @@ -4462,7 +4576,7 @@ ; return 0; } EOF -if { (eval echo configure:4466: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -4485,12 +4599,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:4489: checking "$xe_msg_checking"" >&5 +echo "configure:4603: 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 4494 "configure" +#line 4608 "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 @@ -4501,7 +4615,7 @@ connect() ; return 0; } EOF -if { (eval echo configure:4505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4619: \"$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 @@ -4525,10 +4639,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:4529: checking for remove" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4532 "configure" +echo "configure:4643: checking for remove" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4646 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char remove(); below. */ @@ -4551,7 +4665,7 @@ ; return 0; } EOF -if { (eval echo configure:4555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -4572,12 +4686,12 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:4576: checking for remove in -lposix" >&5 +echo "configure:4690: 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 4581 "configure" +#line 4695 "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 @@ -4588,7 +4702,7 @@ remove() ; return 0; } EOF -if { (eval echo configure:4592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4706: \"$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 @@ -4612,10 +4726,10 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:4616: checking for shmat" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4619 "configure" +echo "configure:4730: checking for shmat" >&5 + +cat > conftest.$ac_ext <<EOF +#line 4733 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char shmat(); below. */ @@ -4638,7 +4752,7 @@ ; return 0; } EOF -if { (eval echo configure:4642: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4756: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -4659,12 +4773,12 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:4663: checking for shmat in -lipc" >&5 +echo "configure:4777: 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 4668 "configure" +#line 4782 "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 @@ -4675,7 +4789,7 @@ shmat() ; return 0; } EOF -if { (eval echo configure:4679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4793: \"$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 @@ -4709,12 +4823,12 @@ # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:4713: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:4827: 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 4718 "configure" +#line 4832 "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 @@ -4725,7 +4839,7 @@ IceConnectionNumber() ; return 0; } EOF -if { (eval echo configure:4729: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:4843: \"$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 @@ -4857,7 +4971,7 @@ fi echo "checking for X defines extracted by xmkmf" 1>&6 -echo "configure:4861: checking for X defines extracted by xmkmf" >&5 +echo "configure:4975: checking for X defines extracted by xmkmf" >&5 rm -fr conftestdir if mkdir conftestdir; then cd conftestdir @@ -4889,15 +5003,15 @@ ac_safe=`echo "X11/Intrinsic.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/Intrinsic.h""... $ac_c" 1>&6 -echo "configure:4893: checking for X11/Intrinsic.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 4896 "configure" +echo "configure:5007: checking for X11/Intrinsic.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5010 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4901: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5015: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -4921,12 +5035,12 @@ echo $ac_n "checking for XOpenDisplay in -lX11""... $ac_c" 1>&6 -echo "configure:4925: checking for XOpenDisplay in -lX11" >&5 +echo "configure:5039: 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 4930 "configure" +#line 5044 "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 @@ -4937,7 +5051,7 @@ XOpenDisplay() ; return 0; } EOF -if { (eval echo configure:4941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5055: \"$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 @@ -4962,12 +5076,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:4966: checking "$xe_msg_checking"" >&5 +echo "configure:5080: 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 4971 "configure" +#line 5085 "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 @@ -4978,7 +5092,7 @@ XGetFontProperty() ; return 0; } EOF -if { (eval echo configure:4982: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5096: \"$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 @@ -5005,12 +5119,12 @@ echo $ac_n "checking for XShapeSelectInput in -lXext""... $ac_c" 1>&6 -echo "configure:5009: checking for XShapeSelectInput in -lXext" >&5 +echo "configure:5123: 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 5014 "configure" +#line 5128 "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 @@ -5021,7 +5135,7 @@ XShapeSelectInput() ; return 0; } EOF -if { (eval echo configure:5025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5139: \"$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 @@ -5044,12 +5158,12 @@ echo $ac_n "checking for XtOpenDisplay in -lXt""... $ac_c" 1>&6 -echo "configure:5048: checking for XtOpenDisplay in -lXt" >&5 +echo "configure:5162: 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 5053 "configure" +#line 5167 "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 @@ -5060,7 +5174,7 @@ XtOpenDisplay() ; return 0; } EOF -if { (eval echo configure:5064: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5178: \"$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 @@ -5083,14 +5197,14 @@ echo $ac_n "checking the version of X11 being used""... $ac_c" 1>&6 -echo "configure:5087: checking the version of X11 being used" >&5 +echo "configure:5201: checking the version of X11 being used" >&5 cat > conftest.$ac_ext <<EOF -#line 5089 "configure" +#line 5203 "configure" #include "confdefs.h" #include <X11/Intrinsic.h> main(int c, char* v[]) { return c>1 ? XlibSpecificationRelease : 0; } EOF -if { (eval echo configure:5094: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:5208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ./conftest foobar; x11_release=$? else @@ -5114,15 +5228,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5118: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5121 "configure" +echo "configure:5232: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5235 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5126: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5240: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5153,7 +5267,7 @@ echo $ac_n "checking for XFree86""... $ac_c" 1>&6 -echo "configure:5157: checking for XFree86" >&5 +echo "configure:5271: checking for XFree86" >&5 if test -d "/usr/X386/include" -o \ -f "/etc/XF86Config" -o \ -f "/etc/X11/XF86Config" -o \ @@ -5173,12 +5287,12 @@ 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 +echo "configure:5291: 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 5182 "configure" +#line 5296 "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 @@ -5189,7 +5303,7 @@ XmuReadBitmapDataFromFile() ; return 0; } EOF -if { (eval echo configure:5193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5307: \"$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 @@ -5219,19 +5333,19 @@ echo $ac_n "checking for main in -lXbsd""... $ac_c" 1>&6 -echo "configure:5223: checking for main in -lXbsd" >&5 +echo "configure:5337: 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 5228 "configure" +#line 5342 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5349: \"$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 @@ -5254,12 +5368,12 @@ echo $ac_n "checking for XawScrollbarSetThumb in -lXaw""... $ac_c" 1>&6 -echo "configure:5258: checking for XawScrollbarSetThumb in -lXaw" >&5 +echo "configure:5372: 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 5263 "configure" +#line 5377 "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 @@ -5270,7 +5384,7 @@ XawScrollbarSetThumb() ; return 0; } EOF -if { (eval echo configure:5274: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5388: \"$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 @@ -5294,15 +5408,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:5298: checking for X11/Xaw/Reports.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5301 "configure" +echo "configure:5412: checking for X11/Xaw/Reports.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5415 "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:5306: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5420: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5361,15 +5475,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:5365: checking for X11/Xauth.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5368 "configure" +echo "configure:5479: checking for X11/Xauth.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5482 "configure" #include "confdefs.h" #include <X11/Xauth.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5373: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5487: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5392,12 +5506,12 @@ } test -z "$with_xauth" && { echo $ac_n "checking for XauGetAuthByAddr in -lXau""... $ac_c" 1>&6 -echo "configure:5396: checking for XauGetAuthByAddr in -lXau" >&5 +echo "configure:5510: 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 5401 "configure" +#line 5515 "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 @@ -5408,7 +5522,7 @@ XauGetAuthByAddr() ; return 0; } EOF -if { (eval echo configure:5412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5526: \"$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 @@ -5449,15 +5563,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:5453: checking for OffiX/DragAndDrop.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5456 "configure" +echo "configure:5567: checking for OffiX/DragAndDrop.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5570 "configure" #include "confdefs.h" #include <OffiX/DragAndDrop.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5461: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5575: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5480,12 +5594,12 @@ } test -z "$with_offix" && { echo $ac_n "checking for DndInitialize in -lDnd""... $ac_c" 1>&6 -echo "configure:5484: checking for DndInitialize in -lDnd" >&5 +echo "configure:5598: 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 5489 "configure" +#line 5603 "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 @@ -5496,7 +5610,7 @@ DndInitialize() ; return 0; } EOF -if { (eval echo configure:5500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5614: \"$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 @@ -5535,15 +5649,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:5539: checking for ${dir}tt_c.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5542 "configure" +echo "configure:5653: checking for ${dir}tt_c.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5656 "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:5547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5661: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5572,12 +5686,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:5576: checking "$xe_msg_checking"" >&5 +echo "configure:5690: 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 5581 "configure" +#line 5695 "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 @@ -5588,7 +5702,7 @@ tt_message_create() ; return 0; } EOF -if { (eval echo configure:5592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5706: \"$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 @@ -5637,15 +5751,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:5641: checking for Dt/Dt.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5644 "configure" +echo "configure:5755: checking for Dt/Dt.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5758 "configure" #include "confdefs.h" #include <Dt/Dt.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5649: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5763: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5668,12 +5782,12 @@ } test -z "$with_cde" && { echo $ac_n "checking for DtDndDragStart in -lDtSvc""... $ac_c" 1>&6 -echo "configure:5672: checking for DtDndDragStart in -lDtSvc" >&5 +echo "configure:5786: 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 5677 "configure" +#line 5791 "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 @@ -5684,7 +5798,7 @@ DtDndDragStart() ; return 0; } EOF -if { (eval echo configure:5688: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5802: \"$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 @@ -5731,19 +5845,19 @@ echo $ac_n "checking for main in -lenergize""... $ac_c" 1>&6 -echo "configure:5735: checking for main in -lenergize" >&5 +echo "configure:5849: 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 5740 "configure" +#line 5854 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5861: \"$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 @@ -5775,19 +5889,19 @@ if test -z "$energize_version"; then echo $ac_n "checking for main in -lconn""... $ac_c" 1>&6 -echo "configure:5779: checking for main in -lconn" >&5 +echo "configure:5893: 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 5784 "configure" +#line 5898 "configure" #include "confdefs.h" int main() { main() ; return 0; } EOF -if { (eval echo configure:5791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:5905: \"$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 @@ -5820,15 +5934,15 @@ fi ac_safe=`echo "editorconn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for editorconn.h""... $ac_c" 1>&6 -echo "configure:5824: checking for editorconn.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5827 "configure" +echo "configure:5938: checking for editorconn.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 5941 "configure" #include "confdefs.h" #include <editorconn.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5832: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5946: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5870,7 +5984,7 @@ echo "checking for graphics libraries" 1>&6 -echo "configure:5874: checking for graphics libraries" >&5 +echo "configure:5988: checking for graphics libraries" >&5 test -z "$with_gif" && with_gif=yes; if test "$with_gif" = "yes"; then { test "$extra_verbose" = "yes" && cat << \EOF @@ -5887,10 +6001,10 @@ fi echo $ac_n "checking for Xpm - no older than 3.4f""... $ac_c" 1>&6 -echo "configure:5891: checking for Xpm - no older than 3.4f" >&5 +echo "configure:6005: checking for Xpm - no older than 3.4f" >&5 xe_check_libs=-lXpm test -z "$with_xpm" && { cat > conftest.$ac_ext <<EOF -#line 5894 "configure" +#line 6008 "configure" #include "confdefs.h" #include <X11/xpm.h> int main(int c, char **v) { @@ -5900,7 +6014,7 @@ 0 ; } EOF -if { (eval echo configure:5904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:6018: \"$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; @@ -5938,15 +6052,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:5942: checking for compface.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 5945 "configure" +echo "configure:6056: checking for compface.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6059 "configure" #include "confdefs.h" #include <compface.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5950: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6064: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -5969,12 +6083,12 @@ } test -z "$with_xface" && { echo $ac_n "checking for UnGenFace in -lcompface""... $ac_c" 1>&6 -echo "configure:5973: checking for UnGenFace in -lcompface" >&5 +echo "configure:6087: 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 5978 "configure" +#line 6092 "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 @@ -5985,7 +6099,7 @@ UnGenFace() ; return 0; } EOF -if { (eval echo configure:5989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6103: \"$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 @@ -6021,15 +6135,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:6025: checking for jpeglib.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6028 "configure" +echo "configure:6139: checking for jpeglib.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6142 "configure" #include "confdefs.h" #include <jpeglib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6033: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6147: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6052,12 +6166,12 @@ } test -z "$with_jpeg" && { echo $ac_n "checking for jpeg_destroy_decompress in -ljpeg""... $ac_c" 1>&6 -echo "configure:6056: checking for jpeg_destroy_decompress in -ljpeg" >&5 +echo "configure:6170: 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 6061 "configure" +#line 6175 "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 @@ -6068,7 +6182,7 @@ jpeg_destroy_decompress() ; return 0; } EOF -if { (eval echo configure:6072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6186: \"$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 @@ -6104,15 +6218,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:6108: checking for png.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6111 "configure" +echo "configure:6222: checking for png.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6225 "configure" #include "confdefs.h" #include <png.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6230: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6134,10 +6248,10 @@ fi } test -z "$with_png" && { echo $ac_n "checking for pow""... $ac_c" 1>&6 -echo "configure:6138: checking for pow" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6141 "configure" +echo "configure:6252: checking for pow" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6255 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char pow(); below. */ @@ -6160,7 +6274,7 @@ ; return 0; } EOF -if { (eval echo configure:6164: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_pow=yes" else @@ -6185,12 +6299,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:6189: checking "$xe_msg_checking"" >&5 +echo "configure:6303: 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 6194 "configure" +#line 6308 "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 @@ -6201,7 +6315,7 @@ png_read_image() ; return 0; } EOF -if { (eval echo configure:6205: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6319: \"$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 @@ -6251,15 +6365,15 @@ ac_safe=`echo "Xm/Xm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for Xm/Xm.h""... $ac_c" 1>&6 -echo "configure:6255: checking for Xm/Xm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6258 "configure" +echo "configure:6369: checking for Xm/Xm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6372 "configure" #include "confdefs.h" #include <Xm/Xm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6263: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6377: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6276,12 +6390,12 @@ echo "$ac_t""yes" 1>&6 echo $ac_n "checking for XmStringFree in -lXm""... $ac_c" 1>&6 -echo "configure:6280: checking for XmStringFree in -lXm" >&5 +echo "configure:6394: 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 6285 "configure" +#line 6399 "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 @@ -6292,7 +6406,7 @@ XmStringFree() ; return 0; } EOF -if { (eval echo configure:6296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6410: \"$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 @@ -6540,7 +6654,7 @@ if test "$with_mule" = "yes" ; then echo "checking for Mule-related features" 1>&6 -echo "configure:6544: checking for Mule-related features" >&5 +echo "configure:6658: checking for Mule-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining MULE EOF @@ -6557,15 +6671,15 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:6561: checking for $ac_hdr" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6564 "configure" +echo "configure:6675: checking for $ac_hdr" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6678 "configure" #include "confdefs.h" #include <$ac_hdr> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6569: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6683: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6596,12 +6710,12 @@ echo $ac_n "checking for strerror in -lintl""... $ac_c" 1>&6 -echo "configure:6600: checking for strerror in -lintl" >&5 +echo "configure:6714: 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 6605 "configure" +#line 6719 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -6612,7 +6726,7 @@ strerror() ; return 0; } EOF -if { (eval echo configure:6616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6730: \"$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 @@ -6645,19 +6759,19 @@ echo "checking for Mule input methods" 1>&6 -echo "configure:6649: checking for Mule input methods" >&5 +echo "configure:6763: 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:6653: checking for XIM" >&5 +echo "configure:6767: checking for XIM" >&5 echo $ac_n "checking for XmImMbLookupString in -lXm""... $ac_c" 1>&6 -echo "configure:6656: checking for XmImMbLookupString in -lXm" >&5 +echo "configure:6770: 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 6661 "configure" +#line 6775 "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 @@ -6668,7 +6782,7 @@ XmImMbLookupString() ; return 0; } EOF -if { (eval echo configure:6672: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6786: \"$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 @@ -6730,15 +6844,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:6734: checking for wnn/jllib.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6737 "configure" +echo "configure:6848: checking for wnn/jllib.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6851 "configure" #include "confdefs.h" #include <wnn/jllib.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6742: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -6763,10 +6877,10 @@ for ac_func in crypt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:6767: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6770 "configure" +echo "configure:6881: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 6884 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -6789,7 +6903,7 @@ ; return 0; } EOF -if { (eval echo configure:6793: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -6818,12 +6932,12 @@ test "$ac_cv_func_crypt" != "yes" && { echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -echo "configure:6822: checking for crypt in -lcrypt" >&5 +echo "configure:6936: 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 6827 "configure" +#line 6941 "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 @@ -6834,7 +6948,7 @@ crypt() ; return 0; } EOF -if { (eval echo configure:6838: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:6952: \"$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 @@ -6868,12 +6982,12 @@ fi test -z "$with_wnn" && { echo $ac_n "checking for jl_dic_list_e in -lwnn""... $ac_c" 1>&6 -echo "configure:6872: checking for jl_dic_list_e in -lwnn" >&5 +echo "configure:6986: 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 6877 "configure" +#line 6991 "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 @@ -6884,7 +6998,7 @@ jl_dic_list_e() ; return 0; } EOF -if { (eval echo configure:6888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7002: \"$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 @@ -6921,12 +7035,12 @@ fi echo $ac_n "checking for jl_fi_dic_list in -lwnn""... $ac_c" 1>&6 -echo "configure:6925: checking for jl_fi_dic_list in -lwnn" >&5 +echo "configure:7039: 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 6930 "configure" +#line 7044 "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 @@ -6937,7 +7051,7 @@ jl_fi_dic_list() ; return 0; } EOF -if { (eval echo configure:6941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7055: \"$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 @@ -6969,15 +7083,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:6973: checking for canna/RK.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 6976 "configure" +echo "configure:7087: checking for canna/RK.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7090 "configure" #include "confdefs.h" #include <canna/RK.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6981: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7095: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -7000,12 +7114,12 @@ } test -z "$with_canna" && { echo $ac_n "checking for RkBgnBun in -lRKC""... $ac_c" 1>&6 -echo "configure:7004: checking for RkBgnBun in -lRKC" >&5 +echo "configure:7118: 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 7009 "configure" +#line 7123 "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 @@ -7016,7 +7130,7 @@ RkBgnBun() ; return 0; } EOF -if { (eval echo configure:7020: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7134: \"$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 @@ -7039,12 +7153,12 @@ } test -z "$with_canna" && { echo $ac_n "checking for jrKanjiControl in -lcanna""... $ac_c" 1>&6 -echo "configure:7043: checking for jrKanjiControl in -lcanna" >&5 +echo "configure:7157: 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 7048 "configure" +#line 7162 "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 @@ -7055,7 +7169,7 @@ jrKanjiControl() ; return 0; } EOF -if { (eval echo configure:7059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7173: \"$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 @@ -7155,10 +7269,10 @@ for ac_func in acosh asinh atanh cbrt closedir dup2 eaccess fmod fpathconf frexp ftime gethostname getpagesize gettimeofday getcwd getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask strcasecmp strerror tzset ulimit usleep utimes waitpid do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7159: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7162 "configure" +echo "configure:7273: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7276 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7181,7 +7295,7 @@ ; return 0; } EOF -if { (eval echo configure:7185: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7218,10 +7332,10 @@ for ac_func in realpath do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7222: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7225 "configure" +echo "configure:7336: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7339 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7244,7 +7358,7 @@ ; return 0; } EOF -if { (eval echo configure:7248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7277,16 +7391,16 @@ esac echo $ac_n "checking whether netdb declares h_errno""... $ac_c" 1>&6 -echo "configure:7281: checking whether netdb declares h_errno" >&5 -cat > conftest.$ac_ext <<EOF -#line 7283 "configure" +echo "configure:7395: checking whether netdb declares h_errno" >&5 +cat > conftest.$ac_ext <<EOF +#line 7397 "configure" #include "confdefs.h" #include <netdb.h> int main() { return h_errno; ; return 0; } EOF -if { (eval echo configure:7290: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7404: \"$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 @@ -7306,16 +7420,16 @@ rm -f conftest* echo $ac_n "checking for sigsetjmp""... $ac_c" 1>&6 -echo "configure:7310: checking for sigsetjmp" >&5 -cat > conftest.$ac_ext <<EOF -#line 7312 "configure" +echo "configure:7424: checking for sigsetjmp" >&5 +cat > conftest.$ac_ext <<EOF +#line 7426 "configure" #include "confdefs.h" #include <setjmp.h> int main() { sigjmp_buf bar; sigsetjmp (bar, 0); ; return 0; } EOF -if { (eval echo configure:7319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7433: \"$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 @@ -7335,11 +7449,11 @@ rm -f conftest* echo $ac_n "checking whether localtime caches TZ""... $ac_c" 1>&6 -echo "configure:7339: checking whether localtime caches TZ" >&5 +echo "configure:7453: checking whether localtime caches TZ" >&5 if test "$ac_cv_func_tzset" = "yes"; then cat > conftest.$ac_ext <<EOF -#line 7343 "configure" +#line 7457 "configure" #include "confdefs.h" #include <time.h> #if STDC_HEADERS @@ -7374,7 +7488,7 @@ exit (0); } EOF -if { (eval echo configure:7378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:7492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then emacs_cv_localtime_cache=no else @@ -7403,9 +7517,9 @@ if test "$HAVE_TIMEVAL" = "yes"; then echo $ac_n "checking whether gettimeofday cannot accept two arguments""... $ac_c" 1>&6 -echo "configure:7407: checking whether gettimeofday cannot accept two arguments" >&5 -cat > conftest.$ac_ext <<EOF -#line 7409 "configure" +echo "configure:7521: checking whether gettimeofday cannot accept two arguments" >&5 +cat > conftest.$ac_ext <<EOF +#line 7523 "configure" #include "confdefs.h" #ifdef TIME_WITH_SYS_TIME @@ -7427,7 +7541,7 @@ ; return 0; } EOF -if { (eval echo configure:7431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* echo "$ac_t""no" 1>&6 else @@ -7449,19 +7563,19 @@ echo $ac_n "checking for inline""... $ac_c" 1>&6 -echo "configure:7453: checking for inline" >&5 +echo "configure:7567: checking for inline" >&5 ac_cv_c_inline=no for ac_kw in inline __inline__ __inline; do cat > conftest.$ac_ext <<EOF -#line 7458 "configure" +#line 7572 "configure" #include "confdefs.h" int main() { } $ac_kw foo() { ; return 0; } EOF -if { (eval echo configure:7465: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7579: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_inline=$ac_kw; break else @@ -7511,17 +7625,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:7515: checking for working alloca.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7518 "configure" +echo "configure:7629: checking for working alloca.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7632 "configure" #include "confdefs.h" #include <alloca.h> int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:7525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -7545,10 +7659,10 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:7549: checking for alloca" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7552 "configure" +echo "configure:7663: checking for alloca" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7666 "configure" #include "confdefs.h" #ifdef __GNUC__ @@ -7571,7 +7685,7 @@ char *p = (char *) alloca(1); ; return 0; } EOF -if { (eval echo configure:7575: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -7610,10 +7724,10 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:7614: checking whether alloca needs Cray hooks" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7617 "configure" +echo "configure:7728: checking whether alloca needs Cray hooks" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7731 "configure" #include "confdefs.h" #if defined(CRAY) && ! defined(CRAY2) webecray @@ -7637,10 +7751,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:7641: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7644 "configure" +echo "configure:7755: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7758 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7663,7 +7777,7 @@ ; return 0; } EOF -if { (eval echo configure:7667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:7781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7693,10 +7807,10 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:7697: checking stack direction for C alloca" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7700 "configure" +echo "configure:7811: checking stack direction for C alloca" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7814 "configure" #include "confdefs.h" find_stack_direction () { @@ -7715,7 +7829,7 @@ exit (find_stack_direction() < 0); } EOF -if { (eval echo configure:7719: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:7833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_c_stack_direction=1 else @@ -7743,15 +7857,15 @@ ac_safe=`echo "vfork.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for vfork.h""... $ac_c" 1>&6 -echo "configure:7747: checking for vfork.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7750 "configure" +echo "configure:7861: checking for vfork.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7864 "configure" #include "confdefs.h" #include <vfork.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7755: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -7779,10 +7893,10 @@ fi echo $ac_n "checking for working vfork""... $ac_c" 1>&6 -echo "configure:7783: checking for working vfork" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7786 "configure" +echo "configure:7897: checking for working vfork" >&5 + +cat > conftest.$ac_ext <<EOF +#line 7900 "configure" #include "confdefs.h" /* Thanks to Paul Eggert for this test. */ #include <stdio.h> @@ -7877,7 +7991,7 @@ } } EOF -if { (eval echo configure:7881: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:7995: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_func_vfork_works=yes else @@ -7902,10 +8016,10 @@ echo $ac_n "checking for working strcoll""... $ac_c" 1>&6 -echo "configure:7906: checking for working strcoll" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7909 "configure" +echo "configure:8020: checking for working strcoll" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8023 "configure" #include "confdefs.h" #include <string.h> main () @@ -7915,7 +8029,7 @@ strcoll ("123", "456") >= 0); } EOF -if { (eval echo configure:7919: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:8033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_func_strcoll_works=yes else @@ -7942,10 +8056,10 @@ for ac_func in getpgrp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:7946: checking for $ac_func" >&5 - -cat > conftest.$ac_ext <<EOF -#line 7949 "configure" +echo "configure:8060: checking for $ac_func" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8063 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char $ac_func(); below. */ @@ -7968,7 +8082,7 @@ ; return 0; } EOF -if { (eval echo configure:7972: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -7996,10 +8110,10 @@ done echo $ac_n "checking whether getpgrp takes no argument""... $ac_c" 1>&6 -echo "configure:8000: checking whether getpgrp takes no argument" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8003 "configure" +echo "configure:8114: checking whether getpgrp takes no argument" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8117 "configure" #include "confdefs.h" /* @@ -8054,7 +8168,7 @@ } EOF -if { (eval echo configure:8058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:8172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then ac_cv_func_getpgrp_void=yes else @@ -8080,10 +8194,10 @@ echo $ac_n "checking for working mmap""... $ac_c" 1>&6 -echo "configure:8084: checking for working mmap" >&5 +echo "configure:8198: checking for working mmap" >&5 case "$opsys" in ultrix* ) have_mmap=no ;; *) cat > conftest.$ac_ext <<EOF -#line 8087 "configure" +#line 8201 "configure" #include "confdefs.h" #include <stdio.h> #include <unistd.h> @@ -8116,7 +8230,7 @@ return 1; } EOF -if { (eval echo configure:8120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 +if { (eval echo configure:8234: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest && (./conftest; exit) 2>&5 then have_mmap=yes else @@ -8149,10 +8263,10 @@ echo $ac_n "checking for socket""... $ac_c" 1>&6 -echo "configure:8153: checking for socket" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8156 "configure" +echo "configure:8267: checking for socket" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8270 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char socket(); below. */ @@ -8175,7 +8289,7 @@ ; return 0; } EOF -if { (eval echo configure:8179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_socket=yes" else @@ -8190,15 +8304,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:8194: checking for netinet/in.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8197 "configure" +echo "configure:8308: checking for netinet/in.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8311 "configure" #include "confdefs.h" #include <netinet/in.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8202: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8316: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8215,15 +8329,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:8219: checking for arpa/inet.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8222 "configure" +echo "configure:8333: checking for arpa/inet.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8336 "configure" #include "confdefs.h" #include <arpa/inet.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8227: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8341: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8248,9 +8362,9 @@ } echo $ac_n "checking "for sun_len member in struct sockaddr_un"""... $ac_c" 1>&6 -echo "configure:8252: checking "for sun_len member in struct sockaddr_un"" >&5 +echo "configure:8366: checking "for sun_len member in struct sockaddr_un"" >&5 cat > conftest.$ac_ext <<EOF -#line 8254 "configure" +#line 8368 "configure" #include "confdefs.h" #include <sys/types.h> @@ -8261,7 +8375,7 @@ static struct sockaddr_un x; x.sun_len = 1; ; return 0; } EOF -if { (eval echo configure:8265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8379: \"$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 @@ -8292,10 +8406,10 @@ echo $ac_n "checking for msgget""... $ac_c" 1>&6 -echo "configure:8296: checking for msgget" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8299 "configure" +echo "configure:8410: checking for msgget" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8413 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char msgget(); below. */ @@ -8318,7 +8432,7 @@ ; return 0; } EOF -if { (eval echo configure:8322: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_msgget=yes" else @@ -8333,15 +8447,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:8337: checking for sys/ipc.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8340 "configure" +echo "configure:8451: checking for sys/ipc.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8454 "configure" #include "confdefs.h" #include <sys/ipc.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8459: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8358,15 +8472,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:8362: checking for sys/msg.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8365 "configure" +echo "configure:8476: checking for sys/msg.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8479 "configure" #include "confdefs.h" #include <sys/msg.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8370: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8484: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8404,15 +8518,15 @@ ac_safe=`echo "dirent.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dirent.h""... $ac_c" 1>&6 -echo "configure:8408: checking for dirent.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8411 "configure" +echo "configure:8522: checking for dirent.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8525 "configure" #include "confdefs.h" #include <dirent.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8530: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8439,15 +8553,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:8443: checking for sys/dir.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8446 "configure" +echo "configure:8557: checking for sys/dir.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8560 "configure" #include "confdefs.h" #include <sys/dir.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8480,15 +8594,15 @@ ac_safe=`echo "nlist.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for nlist.h""... $ac_c" 1>&6 -echo "configure:8484: checking for nlist.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8487 "configure" +echo "configure:8598: checking for nlist.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8601 "configure" #include "confdefs.h" #include <nlist.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8492: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8606: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8527,72 +8641,9 @@ break; fi done -. "$srcdir/version.sh" || exit 1; -#version=`sed -ne 's/^(defconst emacs-version "\(.*\)".*/\1/p' "$file"` -#if test -z "$version"; then -# echo "$progname: can't find current emacs version in \"$file\"." >&2 -# exit 1 -#fi -#beta=`sed -ne 's/^.*beta.*(beta\([[0-9]][[0-9]]*\)).*$/\1/p' "$file"` -#test -n "$beta" && version="${version}-b${beta}" -version="${emacs_major_version}.${emacs_minor_version}" -{ test "$extra_verbose" = "yes" && cat << EOF - Defining EMACS_MAJOR_VERSION = $emacs_major_version -EOF -cat >> confdefs.h <<EOF -#define EMACS_MAJOR_VERSION $emacs_major_version -EOF -} - -{ test "$extra_verbose" = "yes" && cat << EOF - Defining EMACS_MINOR_VERSION = $emacs_minor_version -EOF -cat >> confdefs.h <<EOF -#define EMACS_MINOR_VERSION $emacs_minor_version -EOF -} - -if test -n "$emacs_beta_version"; then - version="${version}-b${emacs_beta_version}" - { test "$extra_verbose" = "yes" && cat << EOF - Defining EMACS_BETA_VERSION = $emacs_beta_version -EOF -cat >> confdefs.h <<EOF -#define EMACS_BETA_VERSION $emacs_beta_version -EOF -} - -fi -{ test "$extra_verbose" = "yes" && cat << EOF - Defining XEMACS_CODENAME = "$xemacs_codename" -EOF -cat >> confdefs.h <<EOF -#define XEMACS_CODENAME "$xemacs_codename" -EOF -} - -{ test "$extra_verbose" = "yes" && cat << EOF - Defining EMACS_VERSION = "$version" -EOF -cat >> confdefs.h <<EOF -#define EMACS_VERSION "$version" -EOF -} - -canonical_version=`echo ${version}_${canonical} | sed 'y/.-/__/'` -{ test "$extra_verbose" = "yes" && cat << EOF - Defining CANONICAL_VERSION = $canonical_version -EOF -cat >> confdefs.h <<EOF -#define CANONICAL_VERSION $canonical_version -EOF -} - - - echo "checking "for sound support"" 1>&6 -echo "configure:8596: checking "for sound support"" >&5 +echo "configure:8647: checking "for sound support"" >&5 case "$with_sound" in native | both ) with_native_sound=yes;; nas | no ) with_native_sound=no;; @@ -8603,15 +8654,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:8607: checking for multimedia/audio_device.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8610 "configure" +echo "configure:8658: checking for multimedia/audio_device.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8661 "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:8615: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8666: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8659,12 +8710,12 @@ if test -z "$native_sound_lib"; then echo $ac_n "checking for ALopenport in -laudio""... $ac_c" 1>&6 -echo "configure:8663: checking for ALopenport in -laudio" >&5 +echo "configure:8714: 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 8668 "configure" +#line 8719 "configure" #include "confdefs.h" /* Override any gcc2 internal prototype to avoid an error. */ /* We use char because int might match the return type of a gcc2 @@ -8675,7 +8726,7 @@ ALopenport() ; return 0; } EOF -if { (eval echo configure:8679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8730: \"$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 @@ -8706,12 +8757,12 @@ if test -z "$native_sound_lib"; then echo $ac_n "checking for AOpenAudio in -lAlib""... $ac_c" 1>&6 -echo "configure:8710: checking for AOpenAudio in -lAlib" >&5 +echo "configure:8761: 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 8715 "configure" +#line 8766 "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 @@ -8722,7 +8773,7 @@ AOpenAudio() ; return 0; } EOF -if { (eval echo configure:8726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:8777: \"$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 @@ -8760,15 +8811,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:8764: checking for ${dir}/soundcard.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8767 "configure" +echo "configure:8815: checking for ${dir}/soundcard.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8818 "configure" #include "confdefs.h" #include <${dir}/soundcard.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8772: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8823: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8838,7 +8889,7 @@ fi LIBS="-laudio $LIBS" && if test "$extra_verbose" = "yes"; then echo " Prepending \"-laudio\" to \$LIBS"; fi cat > conftest.$ac_ext <<EOF -#line 8842 "configure" +#line 8893 "configure" #include "confdefs.h" #include <audio/Xtutil.h> EOF @@ -8865,7 +8916,7 @@ if test "$with_tty" = "yes" ; then echo "checking for TTY-related features" 1>&6 -echo "configure:8869: checking for TTY-related features" >&5 +echo "configure:8920: checking for TTY-related features" >&5 { test "$extra_verbose" = "yes" && cat << \EOF Defining HAVE_TTY EOF @@ -8880,15 +8931,15 @@ ac_safe=`echo "termios.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for termios.h""... $ac_c" 1>&6 -echo "configure:8884: checking for termios.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8887 "configure" +echo "configure:8935: checking for termios.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8938 "configure" #include "confdefs.h" #include <termios.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8892: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8943: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8915,15 +8966,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:8919: checking for termio.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 8922 "configure" +echo "configure:8970: checking for termio.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 8973 "configure" #include "confdefs.h" #include <termio.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8927: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8978: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -8956,12 +9007,12 @@ if test -z "$with_ncurses"; then echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -echo "configure:8960: checking for tgetent in -lncurses" >&5 +echo "configure:9011: 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 8965 "configure" +#line 9016 "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 @@ -8972,7 +9023,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:8976: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9027: \"$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 @@ -9005,15 +9056,15 @@ ac_safe=`echo "ncurses/curses.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/curses.h""... $ac_c" 1>&6 -echo "configure:9009: checking for ncurses/curses.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9012 "configure" +echo "configure:9060: checking for ncurses/curses.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9063 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9017: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9068: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9035,15 +9086,15 @@ ac_safe=`echo "ncurses/term.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for ncurses/term.h""... $ac_c" 1>&6 -echo "configure:9039: checking for ncurses/term.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9042 "configure" +echo "configure:9090: checking for ncurses/term.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9093 "configure" #include "confdefs.h" #include <ncurses/term.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9047: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9098: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9073,15 +9124,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:9077: checking for ncurses/curses.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9080 "configure" +echo "configure:9128: checking for ncurses/curses.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9131 "configure" #include "confdefs.h" #include <ncurses/curses.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9085: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9136: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9116,12 +9167,12 @@ for lib in curses termlib termcap; do echo $ac_n "checking for tgetent in -l$lib""... $ac_c" 1>&6 -echo "configure:9120: checking for tgetent in -l$lib" >&5 +echo "configure:9171: 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 9125 "configure" +#line 9176 "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 @@ -9132,7 +9183,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:9136: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9187: \"$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 @@ -9163,12 +9214,12 @@ else echo $ac_n "checking for tgetent in -lcurses""... $ac_c" 1>&6 -echo "configure:9167: checking for tgetent in -lcurses" >&5 +echo "configure:9218: 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 9172 "configure" +#line 9223 "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 @@ -9179,7 +9230,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:9183: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9234: \"$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 @@ -9197,12 +9248,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -echo "configure:9201: checking for tgetent in -ltermcap" >&5 +echo "configure:9252: 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 9206 "configure" +#line 9257 "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 @@ -9213,7 +9264,7 @@ tgetent() ; return 0; } EOF -if { (eval echo configure:9217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9268: \"$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 @@ -9261,15 +9312,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:9265: checking for gpm.h" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9268 "configure" +echo "configure:9316: checking for gpm.h" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9319 "configure" #include "confdefs.h" #include <gpm.h> EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:9273: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:9324: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out` if test -z "$ac_err"; then rm -rf conftest* @@ -9292,12 +9343,12 @@ } test -z "$with_gpm" && { echo $ac_n "checking for Gpm_Open in -lgpm""... $ac_c" 1>&6 -echo "configure:9296: checking for Gpm_Open in -lgpm" >&5 +echo "configure:9347: 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 9301 "configure" +#line 9352 "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 @@ -9308,7 +9359,7 @@ Gpm_Open() ; return 0; } EOF -if { (eval echo configure:9312: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9363: \"$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 @@ -9357,17 +9408,17 @@ echo "checking for database support" 1>&6 -echo "configure:9361: checking for database support" >&5 +echo "configure:9412: 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:9366: checking for dbm_open in -lgdbm" >&5 +echo "configure:9417: 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 9371 "configure" +#line 9422 "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 @@ -9378,7 +9429,7 @@ dbm_open() ; return 0; } EOF -if { (eval echo configure:9382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9433: \"$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 @@ -9400,10 +9451,10 @@ if test "$with_database_gnudbm" != "yes"; then echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:9404: checking for dbm_open" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9407 "configure" +echo "configure:9455: checking for dbm_open" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9458 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dbm_open(); below. */ @@ -9426,7 +9477,7 @@ ; return 0; } EOF -if { (eval echo configure:9430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9481: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dbm_open=yes" else @@ -9462,10 +9513,10 @@ if test "$with_database_dbm" != "no"; then echo $ac_n "checking for dbm_open""... $ac_c" 1>&6 -echo "configure:9466: checking for dbm_open" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9469 "configure" +echo "configure:9517: checking for dbm_open" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9520 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dbm_open(); below. */ @@ -9488,7 +9539,7 @@ ; return 0; } EOF -if { (eval echo configure:9492: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9543: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dbm_open=yes" else @@ -9509,12 +9560,12 @@ if test "$need_libdbm" != "no"; then echo $ac_n "checking for dbm_open in -ldbm""... $ac_c" 1>&6 -echo "configure:9513: checking for dbm_open in -ldbm" >&5 +echo "configure:9564: 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 9518 "configure" +#line 9569 "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 @@ -9525,7 +9576,7 @@ dbm_open() ; return 0; } EOF -if { (eval echo configure:9529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9580: \"$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 @@ -9562,10 +9613,10 @@ if test "$with_database_berkdb" != "no"; then echo $ac_n "checking for dbopen""... $ac_c" 1>&6 -echo "configure:9566: checking for dbopen" >&5 - -cat > conftest.$ac_ext <<EOF -#line 9569 "configure" +echo "configure:9617: checking for dbopen" >&5 + +cat > conftest.$ac_ext <<EOF +#line 9620 "configure" #include "confdefs.h" /* System header to define __stub macros and hopefully few prototypes, which can conflict with char dbopen(); below. */ @@ -9588,7 +9639,7 @@ ; return 0; } EOF -if { (eval echo configure:9592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then rm -rf conftest* eval "ac_cv_func_dbopen=yes" else @@ -9609,12 +9660,12 @@ if test "$need_libdb" != "no"; then echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6 -echo "configure:9613: checking for dbopen in -ldb" >&5 +echo "configure:9664: 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 9618 "configure" +#line 9669 "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 @@ -9625,7 +9676,7 @@ dbopen() ; return 0; } EOF -if { (eval echo configure:9629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9680: \"$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 @@ -9649,7 +9700,7 @@ if test "$with_database_berkdb" = "yes"; then for path in "db/db.h" "db.h"; do cat > conftest.$ac_ext <<EOF -#line 9653 "configure" +#line 9704 "configure" #include "confdefs.h" #ifdef HAVE_INTTYPES_H #define __BIT_TYPES_DEFINED__ @@ -9667,7 +9718,7 @@ ; return 0; } EOF -if { (eval echo configure:9671: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:9722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* db_h_path="$path"; break else @@ -9719,12 +9770,12 @@ if test "$with_socks" = "yes"; then echo $ac_n "checking for SOCKSinit in -lsocks""... $ac_c" 1>&6 -echo "configure:9723: checking for SOCKSinit in -lsocks" >&5 +echo "configure:9774: 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 9728 "configure" +#line 9779 "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 @@ -9735,7 +9786,7 @@ SOCKSinit() ; return 0; } EOF -if { (eval echo configure:9739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:9790: \"$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 @@ -10096,22 +10147,6 @@ EOF } -test "$use_assertions" = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF - Defining USE_ASSERTIONS -EOF -cat >> confdefs.h <<\EOF -#define USE_ASSERTIONS 1 -EOF -} - -test "$debug" = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF - Defining DEBUG_XEMACS -EOF -cat >> confdefs.h <<\EOF -#define DEBUG_XEMACS 1 -EOF -} - test "$with_quantify" = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF Defining QUANTIFY EOF @@ -10120,14 +10155,6 @@ EOF } -test "$memory_usage_stats" = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF - Defining MEMORY_USAGE_STATS -EOF -cat >> confdefs.h <<\EOF -#define MEMORY_USAGE_STATS 1 -EOF -} - test "$with_pop" = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF Defining MAIL_USE_POP EOF @@ -10153,47 +10180,6 @@ } -test "$error_check_extents" = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF - Defining ERROR_CHECK_EXTENTS -EOF -cat >> confdefs.h <<\EOF -#define ERROR_CHECK_EXTENTS 1 -EOF -} - -test "$error_check_typecheck" = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF - Defining ERROR_CHECK_TYPECHECK -EOF -cat >> confdefs.h <<\EOF -#define ERROR_CHECK_TYPECHECK 1 -EOF -} - -test "$error_check_bufpos" = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF - Defining ERROR_CHECK_BUFPOS -EOF -cat >> confdefs.h <<\EOF -#define ERROR_CHECK_BUFPOS 1 -EOF -} - -test "$error_check_gc" = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF - Defining ERROR_CHECK_GC -EOF -cat >> confdefs.h <<\EOF -#define ERROR_CHECK_GC 1 -EOF -} - -test "$error_check_malloc" = "yes" && { test "$extra_verbose" = "yes" && cat << \EOF - Defining ERROR_CHECK_MALLOC -EOF -cat >> confdefs.h <<\EOF -#define ERROR_CHECK_MALLOC 1 -EOF -} - - test "$use_union_type" != yes && { test "$extra_verbose" = "yes" && cat << \EOF Defining NO_UNION_TYPE EOF
--- a/configure.in Mon Aug 13 09:47:00 2007 +0200 +++ b/configure.in Mon Aug 13 09:47:52 2007 +0200 @@ -350,19 +350,6 @@ use_system_malloc='default' energize_version='' native_sound_lib='' -dnl make normal error-checking be the default in alpha and beta versions, so -dnl that bugs get noticed. Change this for released versions. -error_check_default="yes" -error_check_extents=$error_check_default -error_check_typecheck=$error_check_default -error_check_bufpos=$error_check_default -error_check_gc=$error_check_default -error_check_malloc=$error_check_default -dnl debug=yes must be set when error checking is present. This should be -dnl fixed up. -debug=$error_check_default -dnl Default to --extra-verbose when debugging -extra_verbose=$error_check_default dnl use-assertions should be 'yes' by default. Too many people in this dnl world have core dumps turned off by default or \"cannot find where the dnl core file went\". At least we should get some useful output ... @@ -375,11 +362,6 @@ use_union_type="no" with_dnet="" -dnl On Sun systems, people sometimes set up the variable CPP -dnl with a value that is a directory, not an executable at all. -dnl Detect that case, and ignore that value. -test -n "$CPP" -a -d "$CPP" && CPP= - dnl Usage message (get it via -help) usage="Usage: $progname CONFIGURATION [[-OPTION[=VALUE] ...]] @@ -1053,6 +1035,45 @@ vpath %.in $(srcdir)' fi +dnl ---------------------------------------- +dnl Find out which version of XEmacs this is +dnl ---------------------------------------- +. "$srcdir/version.sh" || exit 1; +version="${emacs_major_version}.${emacs_minor_version}" +AC_DEFINE_UNQUOTED(EMACS_MAJOR_VERSION, $emacs_major_version) +AC_DEFINE_UNQUOTED(EMACS_MINOR_VERSION, $emacs_minor_version) +if test -n "$emacs_beta_version"; then + version="${version}-b${emacs_beta_version}" + AC_DEFINE_UNQUOTED(EMACS_BETA_VERSION, $emacs_beta_version) +fi +AC_DEFINE_UNQUOTED(XEMACS_CODENAME, "$xemacs_codename") +AC_DEFINE_UNQUOTED(EMACS_VERSION, "$version") +canonical_version=`echo ${version}_${canonical} | sed 'y/.-/__/'` +AC_DEFINE_UNQUOTED(CANONICAL_VERSION, $canonical_version) + +dnl ---------------------------------- +dnl Error checking and debugging flags +dnl ---------------------------------- +dnl Error checking default to "yes" in beta versions, to "no" in releases. +dnl Same goes for --debug and --extra-verbosity. +if test -n "$emacs_beta_version"; then beta=yes; else beta=no; fi +test "${error_check_extents=$beta}" = yes && AC_DEFINE(ERROR_CHECK_EXTENTS) +test "${error_check_typecheck=$beta}" = yes && AC_DEFINE(ERROR_CHECK_TYPECHECK) +test "${error_check_bufpos=$beta}" = yes && AC_DEFINE(ERROR_CHECK_BUFPOS) +test "${error_check_gc=$beta}" = yes && AC_DEFINE(ERROR_CHECK_GC) +test "${error_check_malloc=$beta}" = yes && AC_DEFINE(ERROR_CHECK_MALLOC) +: "${extra_verbose=$beta}" +dnl debug=yes must be set when error checking is present. This should be +dnl fixed up. +dnl debug implies other options +if test "${debug=beta}" = "yes"; then + use_assertions=yes memory_usage_stats=yes + XE_ADD_OBJS(debug.o) + AC_DEFINE(DEBUG_XEMACS) +fi +test "$use_assertions" = "yes" && AC_DEFINE(USE_ASSERTIONS) +test "$memory_usage_stats" = "yes" && AC_DEFINE(MEMORY_USAGE_STATS) + dnl ------------------------------ dnl Determine the s&m files to use dnl ------------------------------ @@ -1566,12 +1587,6 @@ dnl Determine the compiler, set up for feature testing dnl -------------------------------------------------- -dnl debug implies other options -if test "$debug" = "yes"; then - use_assertions=yes memory_usage_stats=yes - XE_ADD_OBJS(debug.o) -fi - dnl Sun Development environment support test "$with_sparcworks" = "yes" && with_workshop=yes # compatibility alias if test "$with_workshop" = "yes"; then @@ -1605,6 +1620,13 @@ fi CFLAGS="$xe_save_CFLAGS" +dnl Figure out what C preprocessor to use. + +dnl On Sun systems, people sometimes set up the variable CPP +dnl with a value that is a directory, not an executable at all. +dnl Detect that case, and ignore that value. +test -n "$CPP" -a -d "$CPP" && CPP= + test -n "$NON_GNU_CPP" -a "$GCC" != "yes" -a -z "$CPP" && CPP="$NON_GNU_CPP" AC_PROG_CPP @@ -2866,28 +2888,6 @@ if test -r $f; then AC_DEFINE_UNQUOTED(AIX_SMT_EXP, -bI:$f) break; fi done -dnl Find out which version of XEmacs this is. -. "$srcdir/version.sh" || exit 1; -#version=`sed -ne 's/^(defconst emacs-version "\(.*\)".*/\1/p' "$file"` -#if test -z "$version"; then -# echo "$progname: can't find current emacs version in \"$file\"." >&2 -# exit 1 -#fi -#beta=`sed -ne 's/^.*beta.*(beta\([[0-9]][[0-9]]*\)).*$/\1/p' "$file"` -#test -n "$beta" && version="${version}-b${beta}" -version="${emacs_major_version}.${emacs_minor_version}" -AC_DEFINE_UNQUOTED(EMACS_MAJOR_VERSION, $emacs_major_version) -AC_DEFINE_UNQUOTED(EMACS_MINOR_VERSION, $emacs_minor_version) -if test -n "$emacs_beta_version"; then - version="${version}-b${emacs_beta_version}" - AC_DEFINE_UNQUOTED(EMACS_BETA_VERSION, $emacs_beta_version) -fi -AC_DEFINE_UNQUOTED(XEMACS_CODENAME, "$xemacs_codename") -AC_DEFINE_UNQUOTED(EMACS_VERSION, "$version") -canonical_version=`echo ${version}_${canonical} | sed 'y/.-/__/'` -AC_DEFINE_UNQUOTED(CANONICAL_VERSION, $canonical_version) - - dnl Check for sound of various sorts. dnl Autodetect native sound @@ -3321,20 +3321,11 @@ test "$with_gnu_make" = "yes" && AC_DEFINE(USE_GNU_MAKE) test "$no_doc_file" = "yes" && AC_DEFINE(NO_DOC_FILE) test "$const_is_losing" = "yes" && AC_DEFINE(CONST_IS_LOSING) -test "$use_assertions" = "yes" && AC_DEFINE(USE_ASSERTIONS) -test "$debug" = "yes" && AC_DEFINE(DEBUG_XEMACS) test "$with_quantify" = "yes" && AC_DEFINE(QUANTIFY) -test "$memory_usage_stats" = "yes" && AC_DEFINE(MEMORY_USAGE_STATS) test "$with_pop" = "yes" && AC_DEFINE(MAIL_USE_POP) test "$with_kerberos" = "yes" && AC_DEFINE(KERBEROS) test "$with_hesiod" = "yes" && AC_DEFINE(HESIOD) -test "$error_check_extents" = "yes" && AC_DEFINE(ERROR_CHECK_EXTENTS) -test "$error_check_typecheck" = "yes" && AC_DEFINE(ERROR_CHECK_TYPECHECK) -test "$error_check_bufpos" = "yes" && AC_DEFINE(ERROR_CHECK_BUFPOS) -test "$error_check_gc" = "yes" && AC_DEFINE(ERROR_CHECK_GC) -test "$error_check_malloc" = "yes" && AC_DEFINE(ERROR_CHECK_MALLOC) - test "$use_union_type" != yes && AC_DEFINE(NO_UNION_TYPE) dnl -------------------------------
--- a/dynodump/Makefile.in.in Mon Aug 13 09:47:00 2007 +0200 +++ b/dynodump/Makefile.in.in Mon Aug 13 09:47:52 2007 +0200 @@ -22,6 +22,7 @@ ## Synched up with: Not synched with FSF. SHELL = /bin/sh +RM = rm -f ## ==================== Things "configure" will edit ==================== @@ -68,20 +69,13 @@ uninit.o: ${srcdir}/$(ARCH)/uninit.c $(CC) -c $(ALL_CFLAGS) ${srcdir}/$(ARCH)/uninit.c +.PHONY: mostlyclean clean distclean realclean extraclean mostlyclean: - -rm -f *.o \#* - + $(RM) *.o *.i core clean: mostlyclean - -rm -f *.so *.so.1 - + $(RM) *.so *.so.1 distclean: clean - -rm -f Makefile Makefile.in - + $(RM) Makefile Makefile.in TAGS realclean: distclean - rm -f TAGS - -versionclean: - true - extraclean: realclean - -rm -f *~ \#* + $(RM) *~ \#*
--- a/lib-src/ChangeLog Mon Aug 13 09:47:00 2007 +0200 +++ b/lib-src/ChangeLog Mon Aug 13 09:47:52 2007 +0200 @@ -1,3 +1,12 @@ +1997-07-08 Steven L Baur <steve@altair.xemacs.org> + + * update-elc.sh (cc-mode): Don't give cc-mode special treatment. + + * update-autoloads.sh (cc-mode): Don't give cc-mode special + treatment. + + * rcs2log: Synch with Emacs/Mule zeta. + 1997-07-03 Steven L Baur <steve@altair.xemacs.org> * update-elc.sh (make_special_commands): Fix building of ilisp so
--- a/lib-src/Makefile.in.in Mon Aug 13 09:47:00 2007 +0200 +++ b/lib-src/Makefile.in.in Mon Aug 13 09:47:52 2007 +0200 @@ -230,26 +230,21 @@ (cd ${archlibdir} && \ $(RM) ${UTILITIES} ${INSTALLABLES} ${SCRIPTS} ${INSTALLABLE_SCRIPTS}) -.PHONY : mostlyclean clean distclean realclean extraclean unlock relock check +.PHONY: mostlyclean clean distclean realclean extraclean mostlyclean: - $(RM) core *.o *.i - + $(RM) *.o *.i core clean: mostlyclean $(RM) ${INSTALLABLES} ${UTILITIES} - distclean: clean $(RM) DOC *.tab.c *.tab.h aixcc.c TAGS $(RM) Makefile Makefile.in blessmail - realclean: distclean - @true - -extraclean: realclean +extraclean: distclean $(RM) *~ \#* +.PHONY: unlock relock check unlock: chmod u+w $(SOURCES) - relock: chmod u-w $(SOURCES)
--- a/lib-src/gnuclient.c Mon Aug 13 09:47:00 2007 +0200 +++ b/lib-src/gnuclient.c Mon Aug 13 09:47:52 2007 +0200 @@ -47,17 +47,18 @@ #include <stdio.h> #include <stdlib.h> +#include <sys/types.h> + #ifdef HAVE_STRING_H #include <string.h> #endif /* HAVE_STRING_H */ -#include <sys/types.h> + #ifdef HAVE_UNISTD_H #include <unistd.h> #endif /* HAVE_UNISTD_H */ + #include <signal.h> -int read_line(int, char *); - #if !defined(SYSV_IPC) && !defined(UNIX_DOMAIN_SOCKETS) && \ !defined(INTERNET_DOMAIN_SOCKETS) int
--- a/lib-src/gnuserv.c Mon Aug 13 09:47:00 2007 +0200 +++ b/lib-src/gnuserv.c Mon Aug 13 09:47:52 2007 +0200 @@ -55,6 +55,7 @@ #ifdef HAVE_UNISTD_H #include <unistd.h> #endif /* HAVE_UNISTD_H */ + #ifdef HAVE_STRING_H #include <string.h> #endif /* HAVE_STRING_H */
--- a/lib-src/gnuserv.h Mon Aug 13 09:47:00 2007 +0200 +++ b/lib-src/gnuserv.h Mon Aug 13 09:47:52 2007 +0200 @@ -208,14 +208,15 @@ #define CONN_IPC 2 /* function declarations */ -extern int make_connection (char *hostarg, int portarg, int *s); +int make_connection (char *hostarg, int portarg, int *s); #ifdef SYSV_IPC -extern void disconnect_from_ipc_server(); +void disconnect_from_ipc_server(); #endif #if defined(INTERNET_DOMAIN_SOCKETS) || defined(UNIX_DOMAIN_SOCKETS) -extern void send_string (int s, CONST char *msg); -extern void disconnect_from_server (int s, int echo); +void send_string (int s, CONST char *msg); +void disconnect_from_server (int s, int echo); +int read_line (int s, char *dest); #endif #ifdef INTERNET_DOMAIN_SOCKETS -extern int internet_addr (char *host); +int internet_addr (char *host); #endif
--- a/lib-src/gnuslib.c Mon Aug 13 09:47:00 2007 +0200 +++ b/lib-src/gnuslib.c Mon Aug 13 09:47:52 2007 +0200 @@ -223,9 +223,7 @@ /* read_line -- read a \n terminated line from a socket */ -int read_line(s,dest) - int s; - char *dest; +int read_line(int s, char *dest) { char *index = NULL; int length;
--- a/lib-src/rcs2log Mon Aug 13 09:47:00 2007 +0200 +++ b/lib-src/rcs2log Mon Aug 13 09:47:52 2007 +0200 @@ -1,8 +1,9 @@ -#!/bin/sh +#! /bin/sh # RCS to ChangeLog generator -# Generate a change log prefix from RCS files and the ChangeLog (if any). +# Generate a change log prefix from RCS files (perhaps in the CVS repository) +# and the ChangeLog (if any). # Output the new prefix to standard output. # You can edit this prefix by hand, and then prepend it to ChangeLog. @@ -10,71 +11,130 @@ # Clump together log entries that start with `{topic} ', # where `topic' contains neither white space nor `}'. -# Author: Paul Eggert <eggert@twinsun.com> +Help='The default FILEs are the files registered under the working directory. +Options: -# !Id: rcs2log,v 1.18 1994/08/15 22:44:10 eggert Exp ! + -c CHANGELOG Output a change log prefix to CHANGELOG (default ChangeLog). + -h HOSTNAME Use HOSTNAME in change log entries (default current host). + -i INDENT Indent change log lines by INDENT spaces (default 8). + -l LENGTH Try to limit log lines to LENGTH characters (default 79). + -R If no FILEs are given and RCS is used, recurse through working directory. + -r OPTION Pass OPTION to subsidiary log command. + -t TABWIDTH Tab stops are every TABWIDTH characters (default 8). + -u "LOGIN<tab>FULLNAME<tab>MAILADDR" Assume LOGIN has FULLNAME and MAILADDR. + -v Append RCS revision to file names in log lines. + --help Output help. + --version Output version number. -# Copyright 1992, 1993 Free Software Foundation, Inc. +Report bugs to <bug-gnu-emacs@prep.ai.mit.edu>.' + +Id='$Id: rcs2log,v 1.2 1997/07/09 04:31:03 steve Exp $' + +# Copyright 1992, 1993, 1994, 1995, 1996, 1997 Free Software Foundation, Inc. # This program 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. -# +# # This program 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 this program; see the file COPYING. If not, write to -# the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. +# along with this program; see the file COPYING. If not, write to the +# Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. +Copyright='Copyright 1997 Free Software Foundation, Inc. +This program comes with NO WARRANTY, to the extent permitted by law. +You may redistribute copies of this program +under the terms of the GNU General Public License. +For more information about these matters, see the files named COPYING. +Author: Paul Eggert <eggert@twinsun.com>' + +tab=' ' nl=' ' # Parse options. # defaults +: ${AWK=awk} : ${TMPDIR=/tmp} +changelog=ChangeLog # change log file name +datearg= # rlog date option hostname= # name of local host (if empty, will deduce it later) indent=8 # indent of log line -initialize_fullname= # awk assignments to set up fullname array -initialize_mailaddr= # awk assignments to set up mailaddr array length=79 # suggested max width of log line -logins= # login names for people we know fullnames and mailaddresses of -loginsout= # temporary file holding sorted logins +logins= # login names for people we know fullnames and mailaddrs of +loginFullnameMailaddrs= # login<tab>fullname<tab>mailaddr triplets +logTZ= # time zone for log dates (if empty, use local time) +recursive= # t if we want recursive rlog +revision= # t if we want revision numbers rlog_options= # options to pass to rlog tabwidth=8 # width of horizontal tab while : do case $1 in - -i) indent=${2?};; - -h) hostname=${2?};; - -l) length=${2?};; - -n) logins=$logins$nl${2?} - loginsout=$TMPDIR/rcs2log$$l - case $2${3?}${4?} in - *\"* | *\\* | *"$nl"*) - echo >&2 "$0: -n '$2' '$3' '$4': special characters not allowed" - exit 1 + -c) changelog=${2?}; shift;; + -i) indent=${2?}; shift;; + -h) hostname=${2?}; shift;; + -l) length=${2?}; shift;; + -[nu]) # -n is obsolescent; it is replaced by -u. + case $1 in + -n) case ${2?}${3?}${4?} in + *"$tab"* | *"$nl"*) + echo >&2 "$0: -n '$2' '$3' '$4': tabs, newlines not allowed" + exit 1 + esac + loginFullnameMailaddrs=$loginFullnameMailaddrs$nl$2$tab$3$tab$4 + shift; shift; shift;; + -u) + # If $2 is not tab-separated, use colon for separator. + case ${2?} in + *"$nl"*) + echo >&2 "$0: -u '$2': newlines not allowed" + exit 1;; + *"$tab"*) + t=$tab;; + *) + t=: + esac + case $2 in + *"$t"*"$t"*"$t"*) + echo >&2 "$0: -u '$2': too many fields" + exit 1;; + *"$t"*"$t"*) + ;; + *) + echo >&2 "$0: -u '$2': not enough fields" + exit 1 + esac + loginFullnameMailaddrs=$loginFullnameMailaddrs$nl$2 + shift esac - initialize_fullname="$initialize_fullname - fullname[\"$2\"] = \"$3\"" - initialize_mailaddr="$initialize_mailaddr - mailaddr[\"$2\"] = \"$4\"" - shift; shift;; - -r) rlog_options=$rlog_options$nl${2?};; - -t) tabwidth=${2?};; - -*) echo >&2 "$0: usage: $0 [options] [file ...] -Options: - [-h hostname] [-i indent] [-l length] [-n login fullname mailaddr]... - [-r rlog_option]... [-t tabwidth]" - exit 1;; + logins=$logins$nl$login + ;; + -r) rlog_options=$rlog_options$nl${2?}; shift;; + -R) recursive=t;; + -t) tabwidth=${2?}; shift;; + -v) revision=t;; + --version) + set $Id + rcs2logVersion=$3 + echo >&2 "rcs2log (GNU Emacs) $rcs2logVersion$nl$Copyright" + exit 0;; + -*) echo >&2 "Usage: $0 [OPTION]... [FILE ...]$nl$Help" + case $1 in + --help) exit 0;; + *) exit 1 + esac;; *) break esac - shift; shift + shift done month_data=' @@ -82,77 +142,90 @@ m[3]="Apr"; m[4]="May"; m[5]="Jun" m[6]="Jul"; m[7]="Aug"; m[8]="Sep" m[9]="Oct"; m[10]="Nov"; m[11]="Dec" - - # days in non-leap year thus far, indexed by month (0-12) - mo[0]=0; mo[1]=31; mo[2]=59; mo[3]=90 - mo[4]=120; mo[5]=151; mo[6]=181; mo[7]=212 - mo[8]=243; mo[9]=273; mo[10]=304; mo[11]=334 - mo[12]=365 ' -# Log into $rlogout the revisions checked in since the first ChangeLog entry. +# Put rlog output into $rlogout. -date=1970 -if test -s ChangeLog +# If no rlog options are given, +# log the revisions checked in since the first ChangeLog entry. +# Since ChangeLog is only by date, some of these revisions may be duplicates of +# what's already in ChangeLog; it's the user's responsibility to remove them. +case $rlog_options in +'') + if test -s "$changelog" + then + e=' + /^[0-9]+-[0-9][0-9]-[0-9][0-9]/{ + # ISO 8601 date + print $1 + exit + } + /^... ... [ 0-9][0-9] [ 0-9][0-9]:[0-9][0-9]:[0-9][0-9] [0-9]+ /{ + # old-fashioned date and time (Emacs 19.31 and earlier) + '"$month_data"' + year = $5 + for (i=0; i<=11; i++) if (m[i] == $2) break + dd = $3 + printf "%d-%02d-%02d\n", year, i+1, dd + exit + } + ' + d=`$AWK "$e" <"$changelog"` || exit + case $d in + ?*) datearg="-d>$d" + esac + fi +esac + +# Use TZ specified by ChangeLog local variable, if any. +if test -s "$changelog" then - # Add 1 to seconds to avoid duplicating most recent log. - e=' - /^... ... [ 0-9][0-9] [ 0-9][0-9]:[0-9][0-9]:[0-9][0-9] [0-9]+ /{ - '"$month_data"' - year = $5 - for (i=0; i<=11; i++) if (m[i] == $2) break - dd = $3 - hh = substr($0,12,2) - mm = substr($0,15,2) - ss = substr($0,18,2) - ss++ - if (ss == 60) { - ss = 0 - mm++ - if (mm == 60) { - mm = 0 - hh++ - if (hh == 24) { - hh = 0 - dd++ - monthdays = mo[i+1] - mo[i] - if (i == 1 && year%4 == 0 && (year%100 != 0 || year%400 == 0)) monthdays++ - if (dd == monthdays + 1) { - dd = 1 - i++ - if (i == 12) { - i = 0 - year++ - } - } - } - } - } - printf "%d/%02d/%02d %02d:%02d:%02d\n", year, i+1, dd, hh, mm, ss - exit + extractTZ=' + /^.*change-log-time-zone-rule['"$tab"' ]*:['"$tab"' ]*"\([^"]*\)".*/{ + s//\1/; p; q + } + /^.*change-log-time-zone-rule['"$tab"' ]*:['"$tab"' ]*t.*/{ + s//UTC0/; p; q } ' - d=`awk "$e" <ChangeLog` || exit - case $d in - ?*) date=$d + logTZ=`tail "$changelog" | sed -n "$extractTZ"` + case $logTZ in + ?*) TZ=$logTZ; export TZ esac fi -datearg="-d>$date" -repository= -rlog=rlog -case $CVSROOT in -?*) - if test -d "$CVSROOT" && test -f CVS/Repository - then - r=`cat <CVS/Repository` || exit - if test -d "$CVSROOT/$r" +# If CVS is in use, examine its repository, not the normal RCS files. +if test ! -f CVS/Repository +then + rlog=rlog + repository= +else + rlog='cvs -q log' + repository=`sed 1q <CVS/Repository` || exit + test ! -f CVS/Root || CVSROOT=`cat <CVS/Root` || exit + case $CVSROOT in + *:/*) + # remote repository + ;; + *) + # local repository + case $repository in + /*) ;; + *) repository=${CVSROOT?}/$repository + esac + if test ! -d "$repository" then - repository=$CVSROOT/$r - rlog='cvs log' + echo >&2 "$0: $repository: bad repository (see CVS/Repository)" + exit 1 fi - fi + esac +fi + +# Use $rlog's -zLT option, if $rlog supports it. +case `$rlog -zLT 2>&1` in +*' option'*) ;; +*) rlog_options=-zLT$nl$rlog_options esac # With no arguments, examine all files under the RCS directory. @@ -160,30 +233,59 @@ 0) case $repository in '') - files= - for file in RCS/.* RCS/* .*,v *,v - do - case $file in - RCS/. | RCS/..) continue;; - RCS/.\* | RCS/\* | .\*,v | \*,v) test -f "$file" || continue - esac - files=$files$nl$file - done - case $files in - '') exit 0 - esac oldIFS=$IFS IFS=$nl - set $files + case $recursive in + t) + RCSdirs=`find . -name RCS -type d -print` + filesFromRCSfiles='s|,v$||; s|/RCS/|/|; s|^\./||' + files=` + { + case $RCSdirs in + ?*) find $RCSdirs \ + -type f \ + ! -name '*_' \ + ! -name ',*,' \ + ! -name '.*_' \ + ! -name .rcsfreeze.log \ + ! -name .rcsfreeze.ver \ + -print + esac + find . -name '*,v' -print + } | + sort -u | + sed "$filesFromRCSfiles" + `;; + *) + files= + for file in RCS/.* RCS/* .*,v *,v + do + case $file in + RCS/. | RCS/.. | RCS/,*, | RCS/*_) continue;; + RCS/.rcsfreeze.log | RCS/.rcsfreeze.ver) continue;; + RCS/.\* | RCS/\* | .\*,v | \*,v) test -f "$file" || continue + esac + files=$files$nl$file + done + case $files in + '') exit 0 + esac + esac + set x $files + shift IFS=$oldIFS esac esac +llogout=$TMPDIR/rcs2log$$l rlogout=$TMPDIR/rcs2log$$r trap exit 1 2 13 15 -trap "rm -f $loginsout $rlogout; exit 1" 0 +trap "rm -f $llogout $rlogout; exit 1" 0 -$rlog "$datearg" $rlog_options ${1+"$@"} >$rlogout || exit +case $datearg in +?*) $rlog $rlog_options "$datearg" ${1+"$@"} >$rlogout;; +'') $rlog $rlog_options ${1+"$@"} >$rlogout +esac || exit # Get the full name of each author the logs mention, and set initialize_fullname @@ -191,27 +293,63 @@ # Warning: foreign authors (i.e. not known in the passwd file) are mishandled; # you have to fix the resulting output by hand. -case $loginsout in -?*) sort -u -o $loginsout <<EOF || exit +initialize_fullname= +initialize_mailaddr= + +case $loginFullnameMailaddrs in +?*) + case $loginFullnameMailaddrs in + *\"* | *\\*) + sed 's/["\\]/\\&/g' >$llogout <<EOF || exit +$loginFullnameMailaddrs +EOF + loginFullnameMailaddrs=`cat $llogout` + esac + + oldIFS=$IFS + IFS=$nl + for loginFullnameMailaddr in $loginFullnameMailaddrs + do + case $loginFullnameMailaddr in + *"$tab"*) IFS=$tab;; + *) IFS=: + esac + set x $loginFullnameMailaddr + login=$2 + fullname=$3 + mailaddr=$4 + initialize_fullname="$initialize_fullname + fullname[\"$login\"] = \"$fullname\"" + initialize_mailaddr="$initialize_mailaddr + mailaddr[\"$login\"] = \"$mailaddr\"" + done + IFS=$oldIFS +esac + +case $llogout in +?*) sort -u -o $llogout <<EOF || exit $logins EOF esac +output_authors='/^date: / { + if ($2 ~ /^[0-9]*[-\/][0-9][0-9][-\/][0-9][0-9]$/ && $3 ~ /^[0-9][0-9]:[0-9][0-9]:[0-9][0-9][-+0-9:]*;$/ && $4 == "author:" && $5 ~ /^[^;]*;$/) { + print substr($5, 1, length($5)-1) + } +}' authors=` - sed -n 's|^date: *[0-9]*[-/][0-9][0-9][-/][0-9][0-9] [0-9][0-9]:[0-9][0-9]:[0-9][0-9][-+0-9]*; *author: *\([^; ]*\).*|\1|p' <$rlogout | - case $loginsout in + $AWK "$output_authors" <$rlogout | + case $llogout in '') sort -u;; - ?*) sort -u | comm -23 - $loginsout + ?*) sort -u | comm -23 - $llogout esac ` case $authors in ?*) - initialize_author= - for author in $authors - do - initialize_author="$initialize_author - author[\"$author\"] = 1 - " - done + cat >$llogout <<EOF || exit +$authors +EOF + initialize_author_script='s/["\\]/\\&/g; s/.*/author[\"&\"] = 1/' + initialize_author=`sed -e "$initialize_author_script" <$llogout` awkscript=' BEGIN { alphabet = "abcdefghijklmnopqrstuvwxyz" @@ -239,15 +377,39 @@ if (i) A = substr(ALPHABET, i, 1) fullname = substr(fullname, 1, abbr-1) A substr($1, 2) substr(fullname, abbr+1) } - printf "fullname[\"%s\"] = \"%s\"\n", $1, fullname + + # Quote quotes and backslashes properly in full names. + # Do not use gsub; traditional awk lacks it. + quoted = "" + rest = fullname + for (;;) { + p = index(rest, "\\") + q = index(rest, "\"") + if (p) { + if (q && q<p) p = q + } else { + if (!q) break + p = q + } + quoted = quoted substr(rest, 1, p-1) "\\" substr(rest, p, 1) + rest = substr(rest, p+1) + } + + printf "fullname[\"%s\"] = \"%s%s\"\n", $1, quoted, rest author[$1] = 0 } } ' initialize_fullname=` - (cat /etc/passwd; ypmatch $authors passwd) 2>/dev/null | - awk -F: "$awkscript" + ( + cat /etc/passwd + for author in $authors + do nismatch $author passwd.org_dir + done + ypmatch $authors passwd + ) 2>/dev/null | + $AWK -F: "$awkscript" `$initialize_fullname esac @@ -278,7 +440,7 @@ # Print each line of the log, transliterating \r to \n. while ((i = index(Log, CR)) != 0) { logline = substr(Log, 1, i-1) - if (logline ~ /[^ ]/) { + if (logline ~ /[^'"$tab"' ]/) { printf "%s%s\n", sep, logline } else { print "" @@ -288,6 +450,9 @@ } }' +# Pattern to match the `revision' line of rlog output. +rlog_revision_pattern='^revision [0-9]+\.[0-9]+(\.[0-9]+\.[0-9]+)*(['"$tab"' ]+locked by: [^'"$tab"' $,.0-9:;@]*[^'"$tab"' $,:;@][^'"$tab"' $,.0-9:;@]*;)?['"$tab"' ]*$' + case $hostname in '') hostname=`( @@ -296,6 +461,15 @@ echo >&2 "$0: cannot deduce hostname" exit 1 } + + case $hostname in + *.*) ;; + *) + domainname=`(domainname) 2>/dev/null` && + case $domainname in + *.*) hostname=$hostname.$domainname + esac + esac esac @@ -304,44 +478,74 @@ # First, reformat the rlog output so that each line contains one log entry. # Transliterate \n to \r so that multiline entries fit on a single line. # Discard irrelevant rlog output. -awk <$rlogout ' - /^Working file:/ { filename = $3 } - /^date: /, /^(-----------*|===========*)$/ { - if ($0 ~ /^branches: /) { next } +$AWK <$rlogout ' + BEGIN { repository = "'"$repository"'" } + /^RCS file:/ { + if (repository != "") { + filename = $3 + if (substr(filename, 1, length(repository) + 1) == repository "/") { + filename = substr(filename, length(repository) + 2) + } + if (filename ~ /,v$/) { + filename = substr(filename, 1, length(filename) - 2) + } + if (filename ~ /(^|\/)Attic\/[^\/]*$/) { + i = length(filename) + while (substr(filename, i, 1) != "/") i-- + filename = substr(filename, 1, i - 6) substr(filename, i + 1) + } + } + rev = "?" + } + /^Working file:/ { if (repository == "") filename = $3 } + /'"$rlog_revision_pattern"'/, /^(-----------*|===========*)$/ { + if ($0 ~ /'"$rlog_revision_pattern"'/) { + rev = $2 + next + } if ($0 ~ /^date: [0-9][- +\/0-9:]*;/) { date = $2 - if (date ~ /-/) { - # An ISO format date. Replace all "-"s with "/"s. + if (date ~ /\//) { + # This is a traditional RCS format date YYYY/MM/DD. + # Replace "/"s with "-"s to get ISO format. newdate = "" - while ((i = index(date, "-")) != 0) { - newdate = newdate substr(date, 1, i-1) "/" + while ((i = index(date, "/")) != 0) { + newdate = newdate substr(date, 1, i-1) "-" date = substr(date, i+1) } date = newdate date } - # Ignore any time zone; ChangeLog has no room for it. - time = substr($3, 1, 8) + time = substr($3, 1, length($3) - 1) author = substr($5, 1, length($5)-1) - printf "%s %s %s %s %c", filename, date, time, author, 13 + printf "%s %s %s %s %s %c", filename, rev, date, time, author, 13 + rev = "?" next } + if ($0 ~ /^branches: /) { next } if ($0 ~ /^(-----------*|===========*)$/) { print ""; next } + if ($0 == "Initial revision" || $0 ~ /^file .+ was initially added on branch .+\.$/) { + $0 = "New file." + } printf "%s%c", $0, 13 } ' | # Now each line is of the form -# FILENAME YYYY/MM/DD HH:MM:SS AUTHOR \rLOG +# FILENAME REVISION YYYY-MM-DD HH:MM:SS[+-TIMEZONE] AUTHOR \rLOG # where \r stands for a carriage return, # and each line of the log is terminated by \r instead of \n. # Sort the log entries, first by date+time (in reverse order), -# then by author, then by log entry, and finally by file name (just in case). -sort +1 -3r +3 +0 | +# then by author, then by log entry, and finally by file name and revision +# (just in case). +sort +2 -4r +4 +0 | # Finally, reformat the sorted log entries. -awk ' +$AWK ' BEGIN { - # Some awks do not understand "\r" or "\013", so we have to + logTZ = "'"$logTZ"'" + revision = "'"$revision"'" + + # Some awk variants do not understand "\r" or "\013", so we have to # put a carriage return directly in the file. CR=" " # <-- There is a single CR between the " chars here. @@ -357,19 +561,6 @@ indent_string = indent_string "\t" while (1 <= i--) indent_string = indent_string " " - - # Set up date conversion tables. - # RCS uses a nice, clean, sortable format, - # but ChangeLog wants the traditional, ugly ctime format. - - # January 1, 0 AD (Gregorian) was Saturday = 6 - EPOCH_WEEKDAY = 6 - # Of course, there was no 0 AD, but the algorithm works anyway. - - w[0]="Sun"; w[1]="Mon"; w[2]="Tue"; w[3]="Wed" - w[4]="Thu"; w[5]="Fri"; w[6]="Sat" - - '"$month_data"' } { @@ -378,7 +569,7 @@ # Ignore log entries prefixed by "#". if (newlog ~ /^#/) { next } - if (Log != newlog || date != $2 || author != $4) { + if (Log != newlog || date != $3 || author != $5) { # The previous log and this log differ. @@ -392,10 +583,10 @@ newclumpname = "" sep = "\n" if (date == "") sep = "" - if (newlog ~ /^\{[^ }]*}[ ]/) { + if (newlog ~ /^\{[^'"$tab"' }]*}['"$tab"' ]/) { i = index(newlog, "}") newclumpname = substr(newlog, 1, i) - while (substr(newlog, i+1) ~ /^[ ]/) i++ + while (substr(newlog, i+1) ~ /^['"$tab"' ]/) i++ newlog = substr(newlog, i+1) if (clumpname == newclumpname) sep = "" } @@ -409,33 +600,25 @@ filesknown[i] = 0 files = "" } - if (date != $2 || author != $4) { + if (date != $3 || author != $5) { # The previous date+author and this date+author differ. # Print the new one. - date = $2 - author = $4 + date = $3 + time = $4 + author = $5 - # Convert nice RCS date like "1992/01/03 00:03:44" - # into ugly ctime date like "Fri Jan 3 00:03:44 1992". - # Calculate day of week from Gregorian calendar. - i = index($2, "/") - year = substr($2, 1, i-1) + 0 - monthday = substr($2, i+1) - i = index(monthday, "/") - month = substr(monthday, 1, i-1) + 0 - day = substr(monthday, i+1) + 0 - leap = 0 - if (2 < month && year%4 == 0 && (year%100 != 0 || year%400 == 0)) leap = 1 - days_since_Sunday_before_epoch = EPOCH_WEEKDAY + year * 365 + int((year + 3) / 4) - int((year + 99) / 100) + int((year + 399) / 400) + mo[month-1] + leap + day - 1 + zone = "" + if (logTZ && ((i = index(time, "-")) || (i = index(time, "+")))) + zone = " " substr(time, i) - # Print "date fullname (email address)". + # Print "date[ timezone] fullname <email address>". # Get fullname and email address from associative arrays; # default to author and author@hostname if not in arrays. if (fullname[author]) auth = fullname[author] else auth = author - printf "%s %s %2d %s %d %s ", w[days_since_Sunday_before_epoch%7], m[month-1], day, $3, year, auth + printf "%s%s %s ", date, zone, auth if (mailaddr[author]) printf "<%s>\n\n", mailaddr[author] else @@ -445,6 +628,7 @@ filesknown[$1] = 1 if (files == "") files = " " $1 else files = files ", " $1 + if (revision && $2 != "?") files = files " " $2 } } END { @@ -459,4 +643,8 @@ # Exit successfully. -exec rm -f $loginsout $rlogout +exec rm -f $llogout $rlogout + +# Local Variables: +# tab-width:4 +# End:
--- a/lib-src/update-autoloads.sh Mon Aug 13 09:47:00 2007 +0200 +++ b/lib-src/update-autoloads.sh Mon Aug 13 09:47:52 2007 +0200 @@ -75,7 +75,7 @@ else make_special auctex autoloads MULE_EL=tex-jp.elc fi -make_special cc-mode autoloads +#make_special cc-mode autoloads make_special efs autoloads #make_special eos autoloads # EOS doesn't have custom or autoloads #make_special gnus autoloads
--- a/lib-src/update-elc.sh Mon Aug 13 09:47:00 2007 +0200 +++ b/lib-src/update-elc.sh Mon Aug 13 09:47:52 2007 +0200 @@ -113,7 +113,7 @@ else make_special auctex some MULE_ELC=tex-jp.elc fi -make_special cc-mode all +#make_special cc-mode all make_special efs x20 make_special eos -k # not strictly necessary... make_special gnus some
--- a/lisp/ChangeLog Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/ChangeLog Mon Aug 13 09:47:52 2007 +0200 @@ -1,3 +1,205 @@ +Tue Jul 8 23:47:47 1997 Barry A. Warsaw <cc-mode-help@python.org> + + * cc-mode/Release 5.12 + +Mon Jul 7 23:47:02 1997 Barry A. Warsaw <cc-mode-help@python.org> + + * cc-mode/cc-styles.el, cc-mode/cc-mode.el, cc-mode/cc-menus.el, + cc-mode/cc-langs.el, cc-mode/cc-engine.el, cc-mode/cc-compat.el, + cc-mode/cc-cmds.el, cc-mode/cc-align.el: + Reorganization to support byte-recompile-directory. + + * cc-mode/Release: Don't put release number in tar file + +Thu Jul 3 22:54:03 1997 Barry A. Warsaw <cc-mode-help@python.org> + + * cc-mode/cc-langs.el (c-mode-base-map): + Proper binding of c-electric-backspace and + c-electric-delete, based on the policy of the various maintainers. + Thank goodness for delete-key-deletes-forward! + + * cc-mode/cc-vars.el (c-tab-always-indent, c-hanging-braces-alist): + Minor changes to the cutomize format. + + * cc-mode/cc-mode-19.el: Initial revision + + * cc-mode/cc-menus.el, cc-mode/cc-engine.el, cc-mode/cc-compat.el, + cc-mode/cc-cmds.el, cc-mode/cc-align.el: + Major Ebola eradication. + +Wed Jul 2 21:33:04 1997 Barry A. Warsaw <cc-mode-help@python.org> + + * cc-mode/cc-engine.el (c-crosses-statement-barrier-p, + c-guess-basic-syntax): Ebola eradication. + + * cc-mode/cc-cmds.el (c-indent-region): + Call c-echo-parsing-error to echo last parsing + error that may have occurred. + + * cc-mode/cc-engine.el (c-echo-parsing-error): New function. + + * cc-mode/cc-engine.el (c-parsing-error): new variable + + (c-parse-state): When an unbalanced close brace is discovered, don't + raise an error (prevents insertion of character). Insert the + character, display a warning message, and set c-parsing-error so + syntax echoing will be disabled. + + (c-show-syntactic-information, c-indent-line): Suppress syntax echoing + if c-parsing-error is non-nil. + + * cc-styles.el: Added require of cl to pick up definition of copy-tree. + +Mon Jun 30 21:41:00 1997 Barry A. Warsaw <cc-mode-help@python.org> + + * cc-mode/cc-langs.el, cc-mode/cc-mode.el (c-mode-map, + c++-mode-map, objc-mode-map, java-mode-map): + Moved + defvars from cc-langs.el to cc-mode.el for use in c-mode, c++-mode, + objc-mode, and java-mode docstrings. Actual population of these mode + maps remains in cc-langs.el. + + * cc-mode/cc-mode.el: + Require cc-langs at top level, so as to get the definitions for + c-mode-map, et al. that are used in the *-mode docstrings. + +Fri Jun 27 17:33:32 1997 Barry A. Warsaw <cc-mode-help@python.org> + + * cc-mode/cc-langs.el (c-mode-syntax-table): + Added autoload cookie for gdb-mode. + +Thu Jun 26 21:12:56 1997 Barry A. Warsaw <cc-mode-help@python.org> + + * cc-mode/cc-engine.el (c-guess-basic-syntax): + CASE 5H: Whack one ebola infection (e.g. using + memq with the results of following-char in XEmacs 20). + + * cc-mode/cc-styles.el: + Added two require's that make autoload call of (c-set-style) work. + +Sun Jun 22 16:40:30 1997 Barry A. Warsaw <cc-mode-help@python.org> + + * cc-mode/cc-cmds.el (c-electric-delete): + Don't call c-electric-backspace interactively. + +Fri Jun 20 20:40:33 1997 Barry A. Warsaw <cc-mode-help@python.org> + + * cc-mode/cc-mode.el (c-mode, c++-mode, objc-mode, java-mode): + Make sure to call + c-update-modeline after the hooks are run, so that the modeline + accurately reflects auto-newline and delete-key minor modes if the + hooks set c-hungry-delete-key or c-auto-newline directly. + + * cc-align.el (c-lineup-java-throws): Fixed some regressions. +1997-07-08 Steven L Baur <steve@altair.xemacs.org> + + * packages/func-menu.el: Don't enable Makefile mode function menu + by default. + From Martin Buchholz <mrb@Eng.Sun.COM> + + * x11/x-menubar.el (file-menu-filter): Delete Frame should be + active when multiple frames span multiple devices. + From Aki Vehtari <Aki.Vehtari@hut.fi> + +1997-07-08 Hrvoje Niksic <hniksic@srce.hr> + + * packages/gnuserv.el: Remove RCS ID keywords. + + * utils/savehist.el: Cosmetic changes. Hopefully, not + user-visible. + + * prim/debug.el (debug-convert-byte-code): Use compiled-function + accessor functions. + +1997-07-08 Steven L Baur <steve@altair.xemacs.org> + + * modes/hideif.el (hide-ifdef-mode): Include modemap in call to + `add-minor-mode'. + +1997-07-08 Tomasz Cholewo <tjchol01@mecca.spd.louisville.edu> + + * packages/add-log.el: Require add-log for accessing + add-log-mailing-address and add-log-full-name variables. + +1997-07-08 Steven L Baur <steve@altair.xemacs.org> + + * bytecomp/disass.el (disassemble-1): Use functional interface + instead of indexing into vector. + From Hrvoje Niksic <hniksic@srce.hr> + + * prim/startup.el (emacs-user-extension-dir): New variable. + (load-user-init-file): Use it. .xemacs and .xemacs-custom are + moved into `emacs-user-extension-dir' and renamed to init.el and + options.el respectively. + + * prim/packages.el (packages-hardcoded-lisp): Remove "startup" + since it is mentioned in dumped-lisp.el. + + * cl/cl-macs.el (keymap-name): New defsetf. + (keymap-prompt): Ditto. + (keymap-default-binding): Ditto. + From Hrvoje Niksic <hniksic@srce.hr> + +1997-07-07 Karl M. Hegbloom <karlheg@inetarena.com> + + * packages/dabbrev.el: replace `buffer-substring' with + `buffer-substring-no-properties' so that unwanted text + properties (like read-only) are stripped from inserted + dabbrev expansions. + +1997-07-08 Steven L Baur <steve@altair.xemacs.org> + + * comint/comint.el (comint-replace-by-expanded-history): Change + buggy history test regexp. + From Simon Marshall <simon@spiff.gnu.ai.mit.edu> (Emacs/Mule zeta) + +1997-07-07 Steven L Baur <steve@altair.xemacs.org> + + * oobr/br-clos-ft.el (clos-scan-routine-arglist): Don't reference + bytecode object as vector. + + * hypberbole/hact.el (action:commandp): Don't reference bytecode + objects as vectors. + (action:params): Ditto. + + * hyperbole/hypb.el (hypb:function-copy): Don't reference byte + code objects as vectors. + (hypb:function-symbol-replace): Document as broken. The + substition cannot be done without some thinking I'm not in the + mood for. + + * efs/efs-ovwrt.el (efs-overwrite-fn): Attempt to correctly deal + with the interactive spec. + + * packages/apropos.el (apropos-safe-documentation): Use + `compiled-function-doc-string' instead of referencing a bytecode + object as an array. + + * prim/subr.el (buffer-substring-no-properties): Undo previous + change removing extents. set-text-properties works now. + From Hrvoje Niksic <hniksic@srce.hr> + + * packages/hyper-apropos.el (hyper-apropos-get-doc): Get the + argument list through a function instead of indexing into + bytecode. + + * utils/easymenu.el (easy-menu-add): Oops, wrong sense in + comparison. + + * comint/gdb.el (gdb-mode-syntax-table): New variable. Initialize + with the logic currently in CC Mode 5.11. + (gdb-mode): Use it. + + * modes/hideif.el (hide-ifdef-mode-submap): Correctly specify the + current local map. + +1997-07-08 MORIOKA Tomohiko <morioka@jaist.ac.jp> + + * language/english.el: Add quail-british for British. + + * language/european.el: Register input-method for various non + quail-latin-1 methods. + 1997-07-06 Steven L Baur <steve@altair.xemacs.org> * prim/cmdloop.el (errors-deactivate-region): Default to no error
--- a/lisp/auctex/auto-autoloads.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/auctex/auto-autoloads.el Mon Aug 13 09:47:52 2007 +0200 @@ -14,18 +14,6 @@ ;;;*** -;;;### (autoloads (japanese-latex-mode japanese-plain-tex-mode) "tex-jp" "auctex/tex-jp.el") - -(autoload 'japanese-plain-tex-mode "tex-jp" "\ -Major mode for editing files of input for Japanese plain TeX. -Set japanese-TeX-mode to t, and enters plain-tex-mode." t nil) - -(autoload 'japanese-latex-mode "tex-jp" "\ -Major mode for editing files of input for Japanese plain TeX. -Set japanese-TeX-mode to t, and enters latex-mode." t nil) - -;;;*** - ;;;### (autoloads (TeX-submit-bug-report TeX-insert-quote TeX-auto-generate-global TeX-auto-generate ams-tex-mode) "tex" "auctex/tex.el") (autoload 'ams-tex-mode "tex" "\
--- a/lisp/auctex/custom-load.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/auctex/custom-load.el Mon Aug 13 09:47:52 2007 +0200 @@ -1,11 +1,11 @@ -(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" )) +(custom-put 'LaTeX-macro 'custom-loads '("latex")) +(custom-put 'LaTeX-math 'custom-loads '("latex")) +(custom-put 'LaTeX-indentation 'custom-loads '("latex")) +(custom-put 'LaTeX-label 'custom-loads '("latex")) +(custom-put 'LaTeX-environment 'custom-loads '("latex")) +(custom-put 'TeX-command-name 'custom-loads '("tex")) +(custom-put 'TeX-output 'custom-loads '("tex" "tex-buf")) +(custom-put 'LaTeX 'custom-loads '("tex" "latex")) +(custom-put 'TeX-command 'custom-loads '("tex")) +(custom-put 'TeX-file 'custom-loads '("tex")) +(custom-put 'AUC-TeX 'custom-loads '("tex"))
--- a/lisp/bytecomp/disass.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/bytecomp/disass.el Mon Aug 13 09:47:52 2007 +0200 @@ -175,8 +175,8 @@ (if (consp obj) (setq bytes (car (cdr obj)) ; the byte code constvec (car (cdr (cdr obj)))) ; constant vector - (setq bytes (elt obj 1) - constvec (elt obj 2))) + (setq bytes (compiled-function-instructions obj) + constvec (compiled-function-constants obj))) (let ((lap (byte-decompile-bytecode bytes constvec)) op arg opname pc-value) (let ((tagno 0)
--- a/lisp/cc-mode/ANNOUNCEMENT Mon Aug 13 09:47:00 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,54 +0,0 @@ -Release Announcement -CC Mode Version 5.11 -Barry A. Warsaw <cc-mode-help@python.org> - -This message announces the available of a new version of CC Mode, a -GNU Emacs mode for editing C (ANSI and K&R), C++, Objective-C, and -Java code. A list of user visible changes is available from -<http://www.python.org/ftp/emacs/cc-details.html>. - -Since the distribution is fairly large and since it is readily -available via the Web, anonymous ftp, and email, the source code is -not being posted here. Downloading instructions are provided further -down in this message. - -If you want to become a beta tester send subscribe requests to -cc-mode-victims-request@python.org. If you just want announcements of -new versions, send subscribe requests to -cc-mode-announce-request@python.org. You do not need to subscribe to -both of these lists! These mailing lists are maintained by the -Majordomo automated mailing list software. - -Getting CC Mode -=============== - -The canonical ftp site for the full CC Mode tar distribution is: - - <ftp://ftp.python.org/pub/emacs/cc-mode.tar.gz> - -This is a gzip'd tar file containing the .el source code and -documentation, along with sundry other useful files. See the MANIFEST -a complete list of the contained files. You can get individual files -from the directory: - - <ftp://ftp.python.org/pub/emacs/cc-mode/> - -Find out more about CC Mode on the Web: - - <http://www.python.org/ftp/emacs/> - -For those of you without anon-ftp access, you can use the DEC -ftpmail'er at the address ftpmail@decwrl.dec.com. Send the following -message in the body of your mail to that address to get CC Mode: - -reply <a valid net address back to you> -connect ftp.python.org -binary -uuencode -chdir pub/emacs -get cc-mode.tar.gz - -or just send the message "help" for more information on ftpmail. -Response times will vary with the number of requests in the queue. -Note that I am in no way connected with the DEC ftpmail'er so you are -own your own with this route.
--- a/lisp/cc-mode/MANIFEST Mon Aug 13 09:47:00 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -Manifest for CC Mode 5.11 -Barry A. Warsaw <cc-mode-help@python.org> - -You should have received the following files in this distribution: - - MANIFEST: This file. - - README: Quick intro into how to get CC Mode up and running. - - Makefile: for byte-compiling the source code - - cc-align.el, cc-auto.el, cc-cmds.el, cc-engine.el, cc-langs.el, - cc-menus.el, cc-mode.el, cc-styles.el, cc-vars.el: The source code - - cc-compat.el: Helps ease the transition from c-mode.el to cc-mode - style indentation control. This is provided for your convenience - only, and is completely unguaranteed and unsupported. - - cc-guess.el: Experiments in style guessing. This is provided for - your convenience only, and is completely unguaranteed and - unsupported. - - cc-lobotomy.el: Performance vs. accuracy trade-offs. - - cc-mode.texi: The latest CC-Mode Texinfo manual. - - ANNOUNCEMENT: Release announcement as it appeared on various - forums.
--- a/lisp/cc-mode/Makefile Mon Aug 13 09:47:00 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,30 +0,0 @@ -# Modified by slb for integration with XEmacs. - -EMACS = xemacs - -OPTS = -batch -q -no-site-file - -CMD = -f batch-byte-compile - -PRELOADS = -l ./cc-vars.el -l ./cc-mode.el -l ./cc-menus.el -l ./cc-langs.el - -.el.elc: - $(EMACS) $(OPTS) $(PRELOADS) $(CMD) $< - -ALL_ELCS = \ - cc-align.elc cc-auto.elc cc-cmds.elc cc-compat.elc \ - cc-engine.elc cc-langs.elc cc-menus.elc cc-mode.elc \ - cc-styles.elc cc-vars.elc - -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/README Mon Aug 13 09:47:00 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,28 +0,0 @@ -README for CC Mode 5.11 -Barry A. Warsaw <cc-mode-help@python.org> - -Please read the cc-mode.texi manual for details on using CC Mode. - -As of this writing (23-May-1997), CC Mode version 5 currently works -out of the box only with XEmacs 19.15 and XEmacs 20.0. Emacs 19.34 is -missing some stuff that CC Mode requires, and while Emacs 19.35 has -not yet been release, it is expected to work with CC Mode. Check the -CC Mode web pages <http://www.python.org/~bwarsaw/betas/index.html> -for details. - -Preformatted versions of the manual in DVI, PostScript, and Info, are -all available at <http://www.python.org/~bwarsaw/betas/index.html>. - -To build the manual yourself, you will need the latest Texinfo release -(currently Texinfo 3.9). Specifically, you must make sure that your -are using at least version 2.185 of the texinfo.tex file. To build -the Info manual, simply type: - - % makeinfo cc-mode.texi - -To make the DVI version, simply type: - - % texi2dvi cc-mode.texi - -The MANIFEST file contains a description of all the files you should -have gotten with this distribution.
--- a/lisp/cc-mode/cc-align.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/cc-mode/cc-align.el Mon Aug 13 09:47:52 2007 +0200 @@ -7,7 +7,7 @@ ;; 1985 Richard M. Stallman ;; Maintainer: cc-mode-help@python.org ;; Created: 22-Apr-1997 (split from cc-mode.el) -;; Version: 5.11 +;; Version: 5.12 ;; Keywords: c languages oop ;; This file is part of GNU Emacs. @@ -27,19 +27,11 @@ ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. - (eval-when-compile - (load-file "./cc-engine.el")) - -(defsubst c-langelem-col (langelem &optional preserve-point) - ;; convenience routine to return the column of langelem's relpos. - ;; Leaves point at the relpos unless preserve-point is non-nil. - (let ((here (point))) - (goto-char (cdr langelem)) - (prog1 (current-column) - (if preserve-point - (goto-char here)) - ))) + (require 'cc-defs) + (require 'cc-vars) + (require 'cc-engine) + (require 'cc-langs)) ;; Standard indentation line-ups @@ -72,7 +64,7 @@ (- (current-column) langelem-col)) (goto-char containing-sexp) (or (eolp) - (not (memq (following-char) '(?{ ?\( ))) + (not (memq (char-after) '(?{ ?\( ))) (let ((eol (c-point 'eol)) (here (progn (forward-char 1) @@ -225,7 +217,7 @@ (defun c-lineup-runin-statements (langelem) ;; line up statements in coding standards which place the first ;; statement on the same line as the block opening brace. - (if (= (char-after (cdr langelem)) ?{) + (if (eq (char-after (cdr langelem)) ?{) (save-excursion (let ((langelem-col (c-langelem-col langelem))) (forward-char 1) @@ -239,7 +231,7 @@ (let ((equalp (save-excursion (goto-char (c-point 'boi)) (skip-chars-forward "^=" (c-point 'eol)) - (and (= (following-char) ?=) + (and (eq (char-after) ?=) (- (point) (c-point 'boi))))) (langelem-col (c-langelem-col langelem)) donep) @@ -249,7 +241,7 @@ (if (c-in-literal (cdr langelem)) (forward-char 1) (setq donep t))) - (if (/= (following-char) ?=) + (if (not (eq (char-after) ?=)) ;; there's no equal sign on the line c-basic-offset ;; calculate indentation column after equals and ws, unless @@ -273,7 +265,7 @@ (let* ((extra (save-excursion (back-to-indentation) (c-backward-syntactic-ws (cdr langelem)) - (if (= (preceding-char) ?:) + (if (eq (char-before) ?:) (- c-basic-offset) 0))) (open-bracket-pos (cdr langelem)) @@ -301,13 +293,13 @@ (first-col-column (progn (goto-char relpos) (skip-chars-forward "^:" eol) - (and (= (following-char) ?:) + (and (eq (char-after) ?:) (current-column))))) (if (not first-col-column) c-basic-offset (goto-char here) (skip-chars-forward "^:" eol) - (if (= (following-char) ?:) + (if (eq (char-after) ?:) (+ curcol (- first-col-column (current-column))) c-basic-offset))))) @@ -321,13 +313,13 @@ (relpos (cdr langelem)) (prev-col-column (progn (skip-chars-backward "^:" relpos) - (and (= (preceding-char) ?:) + (and (eq (char-before) ?:) (- (current-column) 1))))) (if (not prev-col-column) c-basic-offset (goto-char here) (skip-chars-forward "^:" eol) - (if (= (following-char) ?:) + (if (eq (char-after) ?:) (+ curcol (- prev-col-column (current-column))) c-basic-offset))))) @@ -343,7 +335,7 @@ (if (and (eq syntax 'block-close) (setq langelem (assq 'block-close c-syntactic-context)) (progn (goto-char (cdr langelem)) - (if (= (following-char) ?{) + (if (eq (char-after) ?{) (c-safe (forward-sexp -1))) (looking-at "\\<do\\>[^_]"))) '(before) @@ -385,12 +377,12 @@ exactly the old newline insertion behavior." ;; newline only after semicolon, but only if that semicolon is not ;; inside a parenthesis list (e.g. a for loop statement) - (if (/= last-command-char ?\;) + (if (not (eq last-command-char ?\;)) nil ; continue checking (if (condition-case nil (save-excursion (up-list -1) - (/= (following-char) ?\()) + (not (eq (char-after) ?\())) (error t)) t 'stop)))
--- a/lisp/cc-mode/cc-auto.el Mon Aug 13 09:47:00 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,60 +0,0 @@ -;;; cc-auto.el --- autoloads for CC Mode - -;; Copyright (C) 1985,87,92,93,94,95,96,97 Free Software Foundation, Inc. - -;; Authors: 1992-1997 Barry A. Warsaw -;; 1987 Dave Detlefs and Stewart Clamen -;; 1985 Richard M. Stallman -;; Maintainer: cc-mode-help@python.org -;; Created: 22-Apr-1997 (split from cc-mode.el) -;; Version: 5.11 -;; Keywords: c languages oop - -;; 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. - -(autoload 'c-mode "cc-mode" - "Major mode for editing K&R and ANSI C code." t) - -(autoload 'c++-mode "cc-mode" - "Major mode for editing C++ code." t) - -(autoload 'objc-mode "cc-mode" - "Major mode for editing Objective C code." t) - -(autoload 'java-mode "cc-mode" - "Major mode for editing Java code." t) - -(autoload 'c-add-style "cc-styles" - "Adds a style to `c-style-alist', or updates an existing one." t) - - -;; This comment was here before me: -;; -;; cmacexp is lame because it uses no preprocessor symbols. It -;; isn't very extensible either -- hardcodes /lib/cpp. -;; -;; I add it here only because c-mode had it -- BAW -;; -(autoload 'c-macro-expand "cmacexp" - "Display the result of expanding all C macros occurring in the region. -The expansion is entirely correct because it uses the C preprocessor." - t) - - -(provide 'cc-auto) -;;; cc-auto.el ends here
--- a/lisp/cc-mode/cc-cmds.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/cc-mode/cc-cmds.el Mon Aug 13 09:47:52 2007 +0200 @@ -7,7 +7,7 @@ ;; 1985 Richard M. Stallman ;; Maintainer: cc-mode-help@python.org ;; Created: 22-Apr-1997 (split from cc-mode.el) -;; Version: 5.11 +;; Version: 5.12 ;; Keywords: c languages oop ;; This file is part of GNU Emacs. @@ -27,19 +27,7 @@ ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. -(eval-when-compile - (load-file "./cc-engine.el")) - -;; Utilities -(defsubst c-update-modeline () - ;; set the c-auto-hungry-string for the correct designation on the modeline - (setq c-auto-hungry-string - (if c-auto-newline - (if c-hungry-delete-key "/ah" "/a") - (if c-hungry-delete-key "/h" nil))) - (force-mode-line-update)) - (defun c-calculate-state (arg prevstate) ;; Calculate the new state of PREVSTATE, t or nil, based on arg. If ;; arg is nil or zero, toggle the state. If arg is negative, turn @@ -49,7 +37,6 @@ (not prevstate) (> arg 0))) - ;; Auto-newline and hungry-delete (defun c-toggle-auto-state (arg) "Toggle auto-newline feature. @@ -206,7 +193,7 @@ blink-paren-function (insertion-point (point)) delete-temp-newline - (preserve-p (= 32 (char-syntax (preceding-char)))) + (preserve-p (eq 32 (char-syntax (char-before)))) ;; shut this up too (c-echo-syntactic-information-p nil) (syntax (progn @@ -245,7 +232,7 @@ (save-restriction (narrow-to-region here (point)) (if (and (c-safe (progn (backward-up-list -1) t)) - (memq (preceding-char) '(?\) ?})) + (memq (char-before) '(?\) ?})) (progn (widen) (c-safe (progn (forward-sexp -1) t)))) (setq c-state-cache @@ -304,20 +291,20 @@ ;; clean up empty defun braces (if (and c-auto-newline (memq 'empty-defun-braces c-cleanup-list) - (= last-command-char ?\}) + (eq last-command-char ?\}) (c-intersect-lists '(defun-close class-close inline-close) syntax) (progn (forward-char -1) (skip-chars-backward " \t\n") - (= (preceding-char) ?\{)) + (eq (char-before) ?\{)) ;; make sure matching open brace isn't in a comment (not (c-in-literal))) (delete-region (point) (1- here))) ;; clean up brace-else-brace (if (and c-auto-newline (memq 'brace-else-brace c-cleanup-list) - (= last-command-char ?\{) + (eq last-command-char ?\{) (re-search-backward "}[ \t\n]*else[ \t\n]*{" nil t) (progn (setq mbeg (match-beginning 0) @@ -330,7 +317,7 @@ ;; clean up brace-elseif-brace (if (and c-auto-newline (memq 'brace-elseif-brace c-cleanup-list) - (= last-command-char ?\{) + (eq last-command-char ?\{) (re-search-backward "}[ \t\n]*else[ \t\n]+if[ \t\n]*" nil t) (save-excursion (goto-char (match-end 0)) @@ -351,11 +338,11 @@ (newline) ;; update on c-state-cache (let* ((bufpos (- (point) 2)) - (which (if (= (char-after bufpos) ?{) 'open 'close)) + (which (if (eq (char-after bufpos) ?{) 'open 'close)) (c-state-cache (c-hack-state bufpos which c-state-cache))) (c-indent-line)))) ;; blink the paren - (and (= last-command-char ?\}) + (and (eq last-command-char ?\}) old-blink-paren (save-excursion (c-backward-syntactic-ws safepos) @@ -370,8 +357,8 @@ is inhibited." (interactive "P") (let ((indentp (and (not arg) - (= (preceding-char) ?/) - (= last-command-char ?/) + (eq (char-before) ?/) + (eq last-command-char ?/) (not (c-in-literal)))) ;; shut this up (c-echo-syntactic-information-p nil)) @@ -391,11 +378,11 @@ ;; current line, unless this star introduces a comment-only line. (if (and (not arg) (memq (c-in-literal) '(c)) - (= (preceding-char) ?*) + (eq (char-before) ?*) (save-excursion (forward-char -1) (skip-chars-backward "*") - (if (= (preceding-char) ?/) + (if (eq (char-before) ?/) (forward-char -1)) (skip-chars-backward " \t") (bolp))) @@ -432,15 +419,15 @@ ;; clean ups (let ((pos (- (point-max) (point)))) (if (and (or (and - (= last-command-char ?,) + (eq last-command-char ?,) (memq 'list-close-comma c-cleanup-list)) (and - (= last-command-char ?\;) + (eq last-command-char ?\;) (memq 'defun-close-semi c-cleanup-list))) (progn (forward-char -1) (skip-chars-backward " \t\n") - (= (preceding-char) ?})) + (eq (char-before) ?})) ;; make sure matching open brace isn't in a comment (not (c-in-literal lim))) (delete-region (point) here)) @@ -493,13 +480,13 @@ (here (point))) (if (and c-auto-newline (memq 'scope-operator c-cleanup-list) - (= (preceding-char) ?:) + (eq (char-before) ?:) (progn (forward-char -1) (skip-chars-backward " \t\n") - (= (preceding-char) ?:)) + (eq (char-before) ?:)) (not (c-in-literal)) - (not (= (char-after (- (point) 2)) ?:))) + (not (eq (char-after (- (point) 2)) ?:))) (delete-region (point) (1- here))) (goto-char (- (point-max) pos))) ;; lets do some special stuff with the colon character @@ -550,7 +537,7 @@ supplied, or point is inside a literal." (interactive "P") (let ((indentp (and (not arg) - (= (preceding-char) last-command-char) + (eq (char-before) last-command-char) (not (c-in-literal)))) ;; shut this up (c-echo-syntactic-information-p nil)) @@ -905,13 +892,13 @@ ;; whitespace. failing that, try to find any ;; opening brace on the current line (skip-chars-forward " \t\n") - (if (memq (following-char) '(?\( ?\[ ?\{)) + (if (memq (char-after) '(?\( ?\[ ?\{)) (point) (let ((state (parse-partial-sexp (point) (c-point 'eol)))) (and (nth 1 state) (goto-char (nth 1 state)) - (memq (following-char) '(?\( ?\[ ?\{)) + (memq (char-after) '(?\( ?\[ ?\{)) (point))))))) ;; find balanced expression end (setq end (and (c-safe (progn (forward-sexp 1) t)) @@ -951,7 +938,7 @@ ;; if we're sitting at b-o-b, it might be because there was no ;; least enclosing brace and we were sitting on the defun's open ;; brace. - (if (and (bobp) (not (= (following-char) ?\{))) + (if (and (bobp) (not (eq (char-after) ?\{))) (goto-char here)) ;; if defun-prompt-regexp is non-nil, b-o-d might not leave us at ;; the open brace. I consider this an Emacs bug. @@ -1051,6 +1038,7 @@ (setq fence (point)))))) (set-marker endmark nil) (c-progress-fini 'c-indent-region) + (c-echo-parsing-error) )))) (defun c-mark-function () @@ -1067,7 +1055,7 @@ (goto-char (cdr brace)) (goto-char brace)) (setq state (cdr state))) - (if (= (following-char) ?{) + (if (eq (char-after) ?{) (progn (forward-line -1) (while (not (or (bobp) @@ -1151,7 +1139,7 @@ (if (not delete-flag) (while (< (point) to) (end-of-line) - (if (= (preceding-char) ?\\) + (if (eq (char-before) ?\\) (progn (forward-char -1) (skip-chars-backward " \t"))) (setq column (max column (1+ (current-column)))) @@ -1181,8 +1169,7 @@ (defun c-append-backslash (column) (end-of-line) - ;; Note that "\\\\" is needed to get one backslash. - (if (= (preceding-char) ?\\) + (if (eq (char-before) ?\\) (progn (forward-char -1) (delete-horizontal-space) (indent-to column)) @@ -1292,8 +1279,8 @@ ;; kludge alert, watch out for */, in ;; which case fill-prefix should *not* ;; be "*"! - (if (and (= (following-char) ?/) - (= (preceding-char) ?*)) + (if (and (eq (char-after) ?/) + (eq (char-before) ?*)) (forward-char -1)) (point)))
--- a/lisp/cc-mode/cc-compat.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/cc-mode/cc-compat.el Mon Aug 13 09:47:52 2007 +0200 @@ -5,7 +5,7 @@ ;; Author: 1994-1997 Barry A. Warsaw ;; Maintainer: cc-mode-help@python.org ;; Created: August 1994, split from cc-mode.el -;; Version: 5.11 +;; Version: 5.12 ;; Keywords: c languages oop ;; This file is part of GNU Emacs. @@ -40,8 +40,8 @@ ;;; Code: (eval-when-compile - (load-file "./cc-styles.el") - (load-file "./cc-engine.el")) + (require 'cc-styles) + (require 'cc-engine)) ;; In case c-mode.el isn't loaded @@ -88,7 +88,7 @@ ;; taken directly from calculate-c-indent confusion (save-excursion (c-backward-syntactic-ws) - (if (= (preceding-char) ?{) + (if (eq (char-before) ?{) (forward-char -1) (goto-char (cdr langelem))) (let* ((curcol (save-excursion @@ -113,7 +113,7 @@ ;; move to the beginning of that; possibly a different ;; line (progn - (if (eq (preceding-char) ?\)) + (if (eq (char-before) ?\)) (forward-sexp -1)) ;; Get initial indentation of the line we are on. (current-indentation))))) @@ -129,7 +129,7 @@ (current-column))) (bocm-lossage (progn (goto-char (cdr langelem)) - (if (= (following-char) ?{) + (if (eq (char-after) ?{) (setq bracep t) (goto-char here) (beginning-of-line)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/lisp/cc-mode/cc-defs.el Mon Aug 13 09:47:52 2007 +0200 @@ -0,0 +1,185 @@ +;;; cc-defs.el --- definitions for CC Mode + +;; Copyright (C) 1985,87,92,93,94,95,96,97 Free Software Foundation, Inc. + +;; Authors: 1992-1997 Barry A. Warsaw +;; 1987 Dave Detlefs and Stewart Clamen +;; 1985 Richard M. Stallman +;; Maintainer: cc-mode-help@python.org +;; Created: 22-Apr-1997 (split from cc-mode.el) +;; Version: 5.12 +;; Keywords: c languages oop + +;; 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. + + +;; Figure out what features this Emacs has +(defconst c-emacs-features + (let ((infodock-p (boundp 'infodock-version)) + (comments + ;; XEmacs 19 and beyond use 8-bit modify-syntax-entry flags. + ;; Emacs 19 uses a 1-bit flag. We will have to set up our + ;; syntax tables differently to handle this. + (let ((table (copy-syntax-table)) + entry) + (modify-syntax-entry ?a ". 12345678" table) + (cond + ;; XEmacs 19, and beyond Emacs 19.34 + ((arrayp table) + (setq entry (aref table ?a)) + ;; In Emacs, table entries are cons cells + (if (consp entry) (setq entry (car entry)))) + ;; XEmacs 20 + ((fboundp 'get-char-table) (setq entry (get-char-table ?a table))) + ;; before and including Emacs 19.34 + ((and (fboundp 'char-table-p) + (char-table-p table)) + (setq entry (car (char-table-range table [?a])))) + ;; incompatible + (t (error "CC Mode is incompatible with this version of Emacs"))) + (if (= (logand (lsh entry -16) 255) 255) + '8-bit + '1-bit)))) + (if infodock-p + (list comments 'infodock) + (list comments))) + "A list of features extant in the Emacs you are using. +There are many flavors of Emacs out there, each with different +features supporting those needed by CC Mode. Here's the current +supported list, along with the values for this variable: + + XEmacs 19: (8-bit) + XEmacs 20: (8-bit) + Emacs 19: (1-bit) + +Infodock (based on XEmacs) has an additional symbol on this list: +'infodock.") + + + +(defsubst c-point (position) + ;; Returns the value of point at certain commonly referenced POSITIONs. + ;; POSITION can be one of the following symbols: + ;; + ;; bol -- beginning of line + ;; eol -- end of line + ;; bod -- beginning of defun + ;; boi -- back to indentation + ;; ionl -- indentation of next line + ;; iopl -- indentation of previous line + ;; bonl -- beginning of next line + ;; bopl -- beginning of previous line + ;; + ;; This function does not modify point or mark. + (let ((here (point))) + (cond + ((eq position 'bol) (beginning-of-line)) + ((eq position 'eol) (end-of-line)) + ((eq position 'bod) + (beginning-of-defun) + ;; if defun-prompt-regexp is non-nil, b-o-d won't leave us at + ;; the open brace. + (and defun-prompt-regexp + (looking-at defun-prompt-regexp) + (goto-char (match-end 0))) + ) + ((eq position 'boi) (back-to-indentation)) + ((eq position 'bonl) (forward-line 1)) + ((eq position 'bopl) (forward-line -1)) + ((eq position 'iopl) + (forward-line -1) + (back-to-indentation)) + ((eq position 'ionl) + (forward-line 1) + (back-to-indentation)) + (t (error "unknown buffer position requested: %s" position)) + ) + (prog1 + (point) + (goto-char here)))) + +(defmacro c-safe (&rest body) + ;; safely execute BODY, return nil if an error occurred + (` (condition-case nil + (progn (,@ body)) + (error nil)))) + +(defmacro c-add-syntax (symbol &optional relpos) + ;; a simple macro to append the syntax in symbol to the syntax list. + ;; try to increase performance by using this macro + (` (setq syntax (cons (cons (, symbol) (, relpos)) syntax)))) + +(defsubst c-auto-newline () + ;; if auto-newline feature is turned on, insert a newline character + ;; and return t, otherwise return nil. + (and c-auto-newline + (not (c-in-literal)) + (not (newline)))) + +(defsubst c-intersect-lists (list alist) + ;; return the element of ALIST that matches the first element found + ;; in LIST. Uses assq. + (let (match) + (while (and list + (not (setq match (assq (car list) alist)))) + (setq list (cdr list))) + match)) + +(defsubst c-lookup-lists (list alist1 alist2) + ;; first, find the first entry from LIST that is present in ALIST1, + ;; then find the entry in ALIST2 for that entry. + (assq (car (c-intersect-lists list alist1)) alist2)) + +(defsubst c-langelem-col (langelem &optional preserve-point) + ;; convenience routine to return the column of langelem's relpos. + ;; Leaves point at the relpos unless preserve-point is non-nil. + (let ((here (point))) + (goto-char (cdr langelem)) + (prog1 (current-column) + (if preserve-point + (goto-char here)) + ))) + +(defsubst c-update-modeline () + ;; set the c-auto-hungry-string for the correct designation on the modeline + (setq c-auto-hungry-string + (if c-auto-newline + (if c-hungry-delete-key "/ah" "/a") + (if c-hungry-delete-key "/h" nil))) + (force-mode-line-update)) + +(defsubst c-keep-region-active () + ;; Do whatever is necessary to keep the region active in XEmacs. + ;; Ignore byte-compiler warnings you might see. This is not needed + ;; for Emacs. + (and (boundp 'zmacs-region-stays) + (setq zmacs-region-stays t))) + +(defsubst c-load-all () + ;; make sure all necessary components of CC Mode are loaded in. + (require 'cc-vars) + (require 'cc-engine) + (require 'cc-langs) + (require 'cc-menus) + (require 'cc-align) + (require 'cc-styles) + (require 'cc-cmds)) + + +(provide 'cc-defs) +;;; cc-defs.el ends here
--- a/lisp/cc-mode/cc-engine.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/cc-mode/cc-engine.el Mon Aug 13 09:47:52 2007 +0200 @@ -7,7 +7,7 @@ ;; 1985 Richard M. Stallman ;; Maintainer: cc-mode-help@python.org ;; Created: 22-Apr-1997 (split from cc-mode.el) -;; Version: 5.11 +;; Version: 5.12 ;; Keywords: c languages oop ;; This file is part of GNU Emacs. @@ -28,34 +28,6 @@ ;; Boston, MA 02111-1307, USA. -;; utilities -(defmacro c-add-syntax (symbol &optional relpos) - ;; a simple macro to append the syntax in symbol to the syntax list. - ;; try to increase performance by using this macro - (` (setq syntax (cons (cons (, symbol) (, relpos)) syntax)))) - -(defsubst c-auto-newline () - ;; if auto-newline feature is turned on, insert a newline character - ;; and return t, otherwise return nil. - (and c-auto-newline - (not (c-in-literal)) - (not (newline)))) - -(defsubst c-intersect-lists (list alist) - ;; return the element of ALIST that matches the first element found - ;; in LIST. Uses assq. - (let (match) - (while (and list - (not (setq match (assq (car list) alist)))) - (setq list (cdr list))) - match)) - -(defsubst c-lookup-lists (list alist1 alist2) - ;; first, find the first entry from LIST that is present in ALIST1, - ;; then find the entry in ALIST2 for that entry. - (assq (car (c-intersect-lists list alist1)) alist2)) - - ;; WARNING: Be *exceptionally* careful about modifications to this ;; function! Much of CC Mode depends on this Doing The Right Thing. ;; If you break it you will be sorry. @@ -74,12 +46,12 @@ (last-begin (point))) ;; first check for bare semicolon (if (and (progn (c-backward-syntactic-ws lim) - (= (preceding-char) ?\;)) + (eq (char-before) ?\;)) (c-safe (progn (forward-char -1) (setq saved (point)) t)) (progn (c-backward-syntactic-ws lim) - (memq (preceding-char) '(?\; ?{ ?} ?:))) + (memq (char-before) '(?\; ?{ ?} ?:))) ) (setq last-begin saved) (goto-char last-begin) @@ -98,7 +70,7 @@ (save-excursion (c-backward-syntactic-ws lim) (skip-chars-backward "-+!*&:.~ \t\n") - (if (= (preceding-char) ?\() + (if (eq (char-before) ?\() (setq last-begin (point)))) (goto-char last-begin) (setq last-begin (point) @@ -117,11 +89,11 @@ ((c-in-literal lim)) ;; CASE 3: are we looking at a conditional keyword? ((or (looking-at c-conditional-key) - (and (= (following-char) ?\() + (and (eq (char-after) ?\() (save-excursion (forward-sexp 1) (c-forward-syntactic-ws) - (/= (following-char) ?\;)) + (not (eq (char-after) ?\;))) (let ((here (point)) (foundp (progn (c-backward-syntactic-ws lim) @@ -226,9 +198,9 @@ (skip-chars-forward "^;{}:" to) (if (not (c-in-literal lim)) (progn - (if (memq (following-char) '(?\; ?{ ?})) + (if (memq (char-after) '(?\; ?{ ?})) (setq crossedp t) - (if (= (following-char) ?:) + (if (eq (char-after) ?:) (setq maybe-labelp t)) (forward-char 1)) (setq lim (point))) @@ -255,7 +227,7 @@ (setq here (point)) (forward-comment hugenum) ;; skip preprocessor directives - (if (and (= (following-char) ?#) + (if (and (eq (char-after) ?#) (= (c-point 'boi) (point))) (end-of-line) ))))) @@ -311,12 +283,14 @@ ;; utilities for moving and querying around syntactic elements +(defvar c-parsing-error nil) (defun c-parse-state () ;; Finds and records all open parens between some important point ;; earlier in the file and point. ;; ;; if there's a state cache, return it + (setq c-parsing-error nil) (if (boundp 'c-state-cache) c-state-cache (let* (at-bob (pos (save-excursion @@ -326,7 +300,7 @@ (let ((cnt 2)) (while (not (or at-bob (zerop cnt))) (beginning-of-defun) - (if (= (following-char) ?\{) + (if (eq (char-after) ?\{) (setq cnt (1- cnt))) (if (bobp) (setq at-bob t)))) @@ -351,7 +325,7 @@ ;; of this sexp, but we only want to record ;; the last-most of any of them before here (progn - (if (= (char-after (1- pos)) ?\{) + (if (eq (char-after (1- pos)) ?\{) (setq state (cons (cons (1- pos) sexp-end) (if (consp (car state)) (cdr state) @@ -369,12 +343,14 @@ (c-safe (scan-lists last-pos 1 1))) ;;(char-after (1- placeholder)) (<= placeholder here) - (= (char-after (1- placeholder)) ?\})) + (eq (char-after (1- placeholder)) ?\})) (while t (setq last-bod (c-safe (scan-lists last-bod -1 1))) (if (not last-bod) - (error "unbalanced close brace at position %d" - (1- placeholder)) + (progn + ;; bogus, but what can we do here? + (setq c-parsing-error (1- placeholder)) + (throw 'backup-bod nil)) (setq at-bob (= last-bod (point-min)) pos last-bod) (if (= (char-after last-bod) ?\{) @@ -472,7 +448,7 @@ (point)))) (c-backward-syntactic-ws lim) (while (and (> (point) lim) - (memq (preceding-char) '(?, ?:)) + (memq (char-before) '(?, ?:)) (progn (beginning-of-line) (setq placeholder (point)) @@ -509,14 +485,14 @@ (let ((checkpoint (or containing (point)))) (goto-char checkpoint) ;; could be looking at const specifier - (if (and (= (preceding-char) ?t) + (if (and (eq (char-before) ?t) (forward-word -1) (looking-at "\\<const\\>")) (c-backward-syntactic-ws) ;; otherwise, we could be looking at a hanging member init ;; colon (goto-char checkpoint) - (if (and (= (preceding-char) ?:) + (if (and (eq (char-before) ?:) (progn (forward-char -1) (c-backward-syntactic-ws) @@ -524,15 +500,14 @@ nil (goto-char checkpoint)) ) - (and (= (preceding-char) ?\)) + (and (eq (char-before) ?\)) ;; check if we are looking at a method def (or (not c-method-key) (progn (forward-sexp -1) (forward-char -1) (c-backward-syntactic-ws) - (not (or (= (preceding-char) ?-) - (= (preceding-char) ?+) + (not (or (memq (char-before) '(?- ?+)) ;; or a class category (progn (forward-sexp -2) @@ -681,7 +656,7 @@ ;; open brace, we are definitely not in a class (if (or (not search-end) (< search-end (point-min)) - (/= (char-after search-end) ?{)) + (not (eq (char-after search-end) ?{))) nil ;; now, we need to look more closely at search-start. if ;; search-start is nil, then our start boundary is really @@ -739,7 +714,7 @@ ;; inside a template arg list (save-excursion (skip-chars-backward "^<>" search-start) - (if (= (preceding-char) ?<) + (if (eq (char-before) ?<) (setq skipchars (concat skipchars ">")))) (skip-chars-forward skipchars search-end) (/= (point) search-end)) @@ -785,7 +760,7 @@ (forward-sexp 1) (c-forward-syntactic-ws containing-sexp)) (error (setq failedp t))) - (if (or failedp (/= (following-char) ?=)) + (if (or failedp (not (eq (char-after) ?=))) ;; lets see if we're nested. find the most nested ;; containing brace (setq containing-sexp (car brace-state) @@ -917,9 +892,9 @@ ;; the most likely position to perform the majority of tests (goto-char indent-point) (skip-chars-forward " \t") - (setq char-after-ip (following-char)) + (setq char-after-ip (char-after)) (c-backward-syntactic-ws lim) - (setq char-before-ip (preceding-char)) + (setq char-before-ip (char-before)) (goto-char indent-point) (skip-chars-forward " \t") @@ -949,7 +924,7 @@ (cond ;; CASE 5A: we are looking at a defun, class, or ;; inline-inclass method opening brace - ((= char-after-ip ?{) + ((eq char-after-ip ?{) (cond ;; CASE 5A.1: extern declaration ((save-excursion @@ -961,7 +936,7 @@ (setq placeholder (point)) (forward-sexp 1) (c-forward-syntactic-ws) - (= (following-char) ?\")))) + (eq (char-after) ?\")))) (goto-char placeholder) (c-add-syntax 'extern-lang-open (c-point 'boi))) ;; CASE 5A.2: we are looking at a class opening brace @@ -996,10 +971,10 @@ (c-forward-syntactic-ws indent-point))) (setq placeholder (c-point 'boi)) (and (or (looking-at "enum[ \t\n]+") - (= char-before-ip ?=)) + (eq char-before-ip ?=)) (save-excursion (skip-chars-forward "^;(" indent-point) - (not (memq (following-char) '(?\; ?\())) + (not (memq (char-after) '(?\; ?\())) ))) (c-add-syntax 'brace-list-open placeholder)) ;; CASE 5A.4: inline defun open @@ -1015,20 +990,20 @@ ((c-just-after-func-arglist-p) (cond ;; CASE 5B.1: a member init - ((or (= char-before-ip ?:) - (= char-after-ip ?:)) + ((or (eq char-before-ip ?:) + (eq char-after-ip ?:)) ;; this line should be indented relative to the beginning ;; of indentation for the topmost-intro line that contains ;; the prototype's open paren ;; TBD: is the following redundant? - (if (= char-before-ip ?:) + (if (eq char-before-ip ?:) (forward-char -1)) (c-backward-syntactic-ws lim) ;; TBD: is the preceding redundant? - (if (= (preceding-char) ?:) + (if (eq (char-before) ?:) (progn (forward-char -1) (c-backward-syntactic-ws lim))) - (if (= (preceding-char) ?\)) + (if (eq (char-before) ?\)) (backward-sexp 1)) (setq placeholder (point)) (save-excursion @@ -1054,16 +1029,16 @@ ;; CASE 5C: inheritance line. could be first inheritance ;; line, or continuation of a multiple inheritance ((or (and c-baseclass-key (looking-at c-baseclass-key)) - (and (or (= char-before-ip ?:) + (and (or (eq char-before-ip ?:) ;; watch out for scope operator (save-excursion - (and (= char-after-ip ?:) + (and (eq char-after-ip ?:) (c-safe (progn (forward-char 1) t)) - (/= (following-char) ?:) + (not (eq (char-after) ?:)) ))) (save-excursion (c-backward-syntactic-ws lim) - (if (= char-before-ip ?:) + (if (eq char-before-ip ?:) (progn (forward-char -1) (c-backward-syntactic-ws lim))) @@ -1091,14 +1066,14 @@ )) (cond ;; CASE 5C.1: non-hanging colon on an inher intro - ((= char-after-ip ?:) + ((eq char-after-ip ?:) (c-backward-syntactic-ws lim) (c-add-syntax 'inher-intro (c-point 'boi)) ;; don't add inclass symbol since relative point already ;; contains any class offset ) ;; CASE 5C.2: hanging colon on an inher intro - ((= char-before-ip ?:) + ((eq char-before-ip ?:) (c-add-syntax 'inher-intro (c-point 'boi)) (and inclass-p (c-add-syntax 'inclass (aref inclass-p 0)))) ;; CASE 5C.3: in a Java implements/extends @@ -1125,16 +1100,16 @@ ))) ;; CASE 5D: this could be a top-level compound statement or a ;; member init list continuation - ((= char-before-ip ?,) + ((eq char-before-ip ?,) (goto-char indent-point) (c-backward-syntactic-ws lim) (while (and (< lim (point)) - (= (preceding-char) ?,)) + (eq (char-before) ?,)) ;; this will catch member inits with multiple ;; line arglists (forward-char -1) (c-backward-syntactic-ws (c-point 'bol)) - (if (= (preceding-char) ?\)) + (if (eq (char-before) ?\)) (backward-sexp 1)) ;; now continue checking (beginning-of-line) @@ -1142,7 +1117,7 @@ (cond ;; CASE 5D.1: hanging member init colon, but watch out ;; for bogus matches on access specifiers inside classes. - ((and (= (preceding-char) ?:) + ((and (eq (char-before) ?:) (save-excursion (forward-word -1) (not (looking-at c-access-key)))) @@ -1156,7 +1131,7 @@ ;; CASE 5D.2: non-hanging member init colon ((progn (c-forward-syntactic-ws indent-point) - (= (following-char) ?:)) + (eq (char-after) ?:)) (skip-chars-forward " \t:") (c-add-syntax 'member-init-cont (point))) ;; CASE 5D.3: perhaps a multiple inheritance line? @@ -1167,7 +1142,7 @@ (skip-chars-backward "^<" lim) ;; not sure if this is the right test, but it should ;; be fast and mostly accurate. - (and (= (preceding-char) ?<) + (and (eq (char-before) ?<) (not (c-in-literal lim)))) ;; we can probably indent it just like and arglist-cont (c-add-syntax 'arglist-cont (point))) @@ -1190,12 +1165,12 @@ (c-add-syntax 'inclass (aref inclass-p 0))) ;; CASE 5F: extern-lang-close? ((and inextern-p - (= char-after-ip ?})) + (eq char-after-ip ?})) (c-add-syntax 'extern-lang-close (aref inclass-p 1))) ;; CASE 5G: we are looking at the brace which closes the ;; enclosing nested class decl ((and inclass-p - (= char-after-ip ?}) + (eq char-after-ip ?}) (save-excursion (save-restriction (widen) @@ -1223,19 +1198,18 @@ (save-excursion (c-backward-syntactic-ws limit) (setq placeholder (point)) - (while (and (memq (preceding-char) '(?\; ?,)) + (while (and (memq (char-before) '(?\; ?,)) (> (point) limit)) (beginning-of-line) (setq placeholder (point)) (c-backward-syntactic-ws limit)) - (and (= (preceding-char) ?\)) + (and (eq (char-before) ?\)) (or (not c-method-key) (progn (forward-sexp -1) (forward-char -1) (c-backward-syntactic-ws) - (not (or (= (preceding-char) ?-) - (= (preceding-char) ?+) + (not (or (memq (char-before) '(?- ?+)) ;; or a class category (progn (forward-sexp -2) @@ -1260,7 +1234,7 @@ (backward-sexp 1) (c-backward-syntactic-ws lim)) (or (bobp) - (memq (preceding-char) '(?\; ?\})))) + (memq (char-before) '(?\; ?\})))) ;; real beginning-of-line could be narrowed out due to ;; enclosure in a class block (save-restriction @@ -1290,11 +1264,11 @@ ;; CASE 6: line is an expression, not a statement. Most ;; likely we are either in a function prototype or a function ;; call argument list - ((/= (char-after containing-sexp) ?{) + ((not (eq (char-after containing-sexp) ?{)) (c-backward-syntactic-ws containing-sexp) (cond ;; CASE 6A: we are looking at the arglist closing paren - ((and (/= char-before-ip ?,) + ((and (not (eq char-before-ip ?,)) (memq char-after-ip '(?\) ?\]))) (goto-char containing-sexp) (c-add-syntax 'arglist-close (c-point 'boi))) @@ -1313,7 +1287,7 @@ (goto-char (1+ containing-sexp)) (c-forward-syntactic-ws indent-point) (c-beginning-of-statement-1 containing-sexp) - (if (= char-before-ip ?\;) + (if (eq char-before-ip ?\;) (c-add-syntax 'statement (point)) (c-add-syntax 'statement-cont (point)) )) @@ -1321,7 +1295,7 @@ ;; when we are inside a [] bracketed exp, and what precede ;; the opening bracket is not an identifier. ((and c-method-key - (= (char-after containing-sexp) ?\[) + (eq (char-after containing-sexp) ?\[) (save-excursion (goto-char (1- containing-sexp)) (c-backward-syntactic-ws (c-point 'bod)) @@ -1360,11 +1334,11 @@ (skip-chars-forward " \t") (cond ;; CASE 7A: non-hanging colon on an inher intro - ((= char-after-ip ?:) + ((eq char-after-ip ?:) (c-backward-syntactic-ws lim) (c-add-syntax 'inher-intro (c-point 'boi))) ;; CASE 7B: hanging colon on an inher intro - ((= char-before-ip ?:) + ((eq char-before-ip ?:) (c-add-syntax 'inher-intro (c-point 'boi))) ;; CASE 7C: a continued inheritance line (t @@ -1375,7 +1349,7 @@ ((setq placeholder (c-inside-bracelist-p containing-sexp state)) (cond ;; CASE 8A: brace-list-close brace - ((and (= char-after-ip ?}) + ((and (eq char-after-ip ?}) (c-safe (progn (forward-char 1) (backward-sexp 1) t)) @@ -1387,15 +1361,13 @@ (c-backward-syntactic-ws containing-sexp) (= (point) (1+ containing-sexp))) (goto-char containing-sexp) - ;;(if (= char-after-ip ?{) - ;;(c-add-syntax 'brace-list-open (c-point 'boi)) (c-add-syntax 'brace-list-intro (c-point 'boi)) ) ;;)) ; end CASE 8B ;; CASE 8C: this is just a later brace-list-entry (t (goto-char (1+ containing-sexp)) (c-forward-syntactic-ws indent-point) - (if (= char-after-ip ?{) + (if (eq char-after-ip ?{) (c-add-syntax 'brace-list-open (point)) (c-add-syntax 'brace-list-entry (point)) )) ; end CASE 8C @@ -1416,7 +1388,7 @@ (progn (c-safe (c-skip-conditional)) (c-forward-syntactic-ws) - (if (memq (following-char) '(?\;)) + (if (eq (char-after) ?\;) (progn (forward-char 1) (c-forward-syntactic-ws))) @@ -1427,11 +1399,11 @@ ((and after-cond-placeholder (>= after-cond-placeholder indent-point)) (goto-char placeholder) - (if (= char-after-ip ?{) + (if (eq char-after-ip ?{) (c-add-syntax 'substatement-open (c-point 'boi)) (c-add-syntax 'substatement (c-point 'boi)))) ;; CASE 9B: open braces for class or brace-lists - ((= char-after-ip ?{) + ((eq char-after-ip ?{) (cond ;; CASE 9B.1: class-open ((save-excursion @@ -1446,7 +1418,7 @@ ((or (save-excursion (goto-char placeholder) (looking-at "\\<enum\\>")) - (= char-before-ip ?=)) + (eq char-before-ip ?=)) (c-add-syntax 'brace-list-open placeholder)) ;; CASE 9B.3: catch-all for unknown construct. (t @@ -1514,7 +1486,7 @@ (c-add-syntax 'label (c-point 'boi))) ;; CASE 14: block close brace, possibly closing the defun or ;; the class - ((= char-after-ip ?}) + ((eq char-after-ip ?}) (let* ((lim (c-safe-position containing-sexp fullstate)) (relpos (save-excursion (goto-char containing-sexp) @@ -1578,11 +1550,11 @@ (looking-at c-switch-label-key))) (goto-char indent-point) (skip-chars-forward " \t") - (if (= (following-char) ?{) + (if (eq (char-after) ?{) (c-add-syntax 'statement-case-open placeholder) (c-add-syntax 'statement-case-intro placeholder))) ;; CASE 15B: continued statement - ((= char-before-ip ?,) + ((eq char-before-ip ?,) (c-add-syntax 'statement-cont (c-point 'boi))) ;; CASE 15C: a question/colon construct? But make sure ;; what came before was not a label, and what comes after @@ -1608,10 +1580,10 @@ (c-beginning-of-statement-1 safepos) ;; It is possible we're on the brace that opens a nested ;; function. - (if (and (= (following-char) ?{) + (if (and (eq (char-after) ?{) (save-excursion (c-backward-syntactic-ws safepos) - (/= (preceding-char) ?\;))) + (not (eq (char-before) ?\;)))) (c-beginning-of-statement-1 safepos)) (if (and inswitch-p (looking-at c-switch-label-key)) @@ -1628,7 +1600,7 @@ (setq done t)) (setq relpos (c-point 'boi))) (c-add-syntax 'statement relpos) - (if (= char-after-ip ?{) + (if (eq char-after-ip ?{) (c-add-syntax 'block-open)))) ;; CASE 15E: first statement in an inline, or first ;; statement in a top-level defun. we can tell this is it @@ -1646,7 +1618,7 @@ (if (/= (point) (c-point 'boi)) (progn (c-backward-syntactic-ws) - (c-safe (forward-sexp (if (= (preceding-char) ?\)) + (c-safe (forward-sexp (if (eq (char-before) ?\)) -1 -2))) ;; looking at a Java throws clause following a ;; method's parameter list @@ -1660,7 +1632,7 @@ (if (= (point) lim) (c-safe-position (point) state) lim))) (c-add-syntax 'statement-block-intro (c-point 'boi)) - (if (= char-after-ip ?{) + (if (eq char-after-ip ?{) (c-add-syntax 'block-open))) )) ) @@ -1679,6 +1651,14 @@ syntax)))) +(defun c-echo-parsing-error () + (if (not c-parsing-error) + nil + (message "unbalanced close brace at bufpos %d -- INDENTATION IS SUSPECT!" + c-parsing-error) + (ding)) + c-parsing-error) + ;; indent via syntactic language elements (defun c-indent-line (&optional syntax) ;; indent the current line as C/C++/ObjC code. Optional SYNTAX is the @@ -1689,6 +1669,7 @@ (indent (apply '+ (mapcar 'c-get-offset c-syntactic-context))) (shift-amt (- (current-indentation) indent))) (and c-echo-syntactic-information-p + (not (c-echo-parsing-error)) (message "syntax: %s, indent= %d" c-syntactic-context indent)) (if (zerop shift-amt) nil @@ -1711,7 +1692,8 @@ (interactive "P") (let ((syntax (c-guess-basic-syntax))) (if (not (consp arg)) - (message "syntactic analysis: %s" syntax) + (if (not (c-echo-parsing-error)) + (message "syntactic analysis: %s" syntax)) (indent-for-comment) (insert (format "%s" syntax)) ))
--- a/lisp/cc-mode/cc-guess.el Mon Aug 13 09:47:00 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,100 +0,0 @@ -;;; cc-guess.el --- guess indentation values by scanning existing code - -;; Copyright (C) 1985,87,92,93,94,95,96,97 Free Software Foundation, Inc. - -;; Author: 1994-1995 Barry A. Warsaw -;; Maintainer: Unmaintained -;; Created: August 1994, split from cc-mode.el -;; Version: 5.11 -;; Keywords: c languages oop - -;; This file is not part of GNU Emacs. - -;; This program 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 of the License, or -;; (at your option) any later version. -;; -;; This program 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. - -;;; Commentary: -;; -;; This file contains routines that help guess the cc-mode style in a -;; particular region of C, C++, or Objective-C code. It is provided -;; for example and experimentation only. It is not supported in -;; anyway. Some folks have asked for a style guesser and the best way -;; to show my thoughts on the subject is with this sample code. Feel -;; free to improve upon it in anyway you'd like. Please send me the -;; results. Note that style guessing is lossy! -;; -;; The way this is intended to be run is for you to mark a region of -;; code to guess the style of, then run the command, cc-guess-region. - -;;; Code: - -(defvar cc-guessed-style nil - "Currently guessed style.") - -(defvar cc-guess-conversions - '((c . c-lineup-C-comments) - (inher-cont . c-lineup-multi-inher) - (string . -1000) - (comment-intro . c-lineup-comment) - (arglist-cont-nonempty . c-lineup-arglist) - (cpp-macro . -1000))) - - -(defun cc-guess-region (start end &optional reset) - "Sets `c-offset-alist' indentation values based on region of code. -Every line of code in the region is examined and the indentation -values of the various syntactic symbols in `c-offset-alist' is -guessed. The first such positively identified indentation is used, so -if an inconsistent style exists in the C code, the guessed indentation -may be incorrect. - -Note that the larger the region to guess in, the slower the -guessing. Previous guesses can be concatenated together, unless the -optional RESET is provided. - -See `cc-guess-write-style' to find out how to save the guessed style, -and `cc-guess-view-style' for viewing the guessed style." - (interactive "r\nP") - (if (consp reset) - (setq cc-guessed-style nil)) - (save-excursion - (goto-char start) - (while (< (point) end) - (let* ((syntax (c-guess-basic-syntax)) - (relpos (cdr (car syntax))) - (symbol (car (car syntax))) - point-indent relpos-indent) - ;; TBD: for now I can't guess indentation when more than 1 - ;; symbol is on the list, nor for symbols without relpos's - (if (or (/= 1 (length syntax)) - (not (numberp relpos)) - ;; also, don't try to reguess an already guessed - ;; symbol - (assq symbol cc-guessed-style)) - nil - (back-to-indentation) - (setq point-indent (current-column) - relpos-indent (save-excursion - (goto-char relpos) - (current-column))) - ;; guessed indentation is the difference between point's and - ;; relpos's current-column indentation - (setq cc-guessed-style - (cons (cons symbol (- point-indent relpos-indent)) - cc-guessed-style)) - )) - (forward-line 1)))) - -;;; cc-guess.el ends here
--- a/lisp/cc-mode/cc-langs.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/cc-mode/cc-langs.el Mon Aug 13 09:47:52 2007 +0200 @@ -7,7 +7,7 @@ ;; 1985 Richard M. Stallman ;; Maintainer: cc-mode-help@python.org ;; Created: 22-Apr-1997 (split from cc-mode.el) -;; Version: 5.11 +;; Version: 5.12 ;; Keywords: c languages oop ;; This file is part of GNU Emacs. @@ -27,9 +27,6 @@ ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. -(eval-when-compile - (load-file "./cc-styles.el")) - ;; Regular expressions and other values which must be parameterized on ;; a per-language basis. @@ -189,9 +186,17 @@ For use with the variable `java-mode-hook'." (c-set-style "java")) +(defvar c-styles-are-initialized nil) + (defun c-common-init () - ;; Common initializations for c++-mode and c-mode. - ;; + ;; Common initializations for all modes. + (if c-styles-are-initialized + nil + (require 'cc-styles) + (c-initialize-builtin-style) + (if c-style-variables-are-local-p + (c-make-styles-buffer-local)) + (setq c-styles-are-initialized t)) ;; these variables should always be buffer local; they do not affect ;; indentation style. (make-local-variable 'paragraph-start) @@ -343,11 +348,22 @@ (define-key c-mode-base-map "\C-c\C-p" 'c-backward-conditional) (define-key c-mode-base-map "\C-c\C-u" 'c-up-conditional) (define-key c-mode-base-map "\t" 'c-indent-command) - ;; In XEmacs 19 and Emacs 19, this binds both the BackSpace and - ;; Delete keysyms to c-electric-backspace. In XEmacs 20 it binds - ;; only BackSpace, so we now bind them individually - (define-key c-mode-base-map [delete] 'c-electric-delete) - (define-key c-mode-base-map [backspace] 'c-electric-backspace) + ;; Caution! Enter here at your own risk. We are trying to support + ;; several behaviors and it gets disgusting. :-( + ;; + ;; In XEmacs 19, Emacs 19, and Emacs 20, we use this to bind + ;; backwards deletion behavior to DEL, which both Delete and + ;; Backspace get translated to. There's no way to separate this + ;; behavior in a clean way, so deal with it! Besides, it's been + ;; this way since the dawn of BOCM. + (if (not (boundp 'delete-key-deletes-forward)) + (define-key c-mode-base-map "\177" 'c-electric-backspace) + ;; However, XEmacs 20 actually achieved enlightenment. It is + ;; possible to sanely define both backward and forward deletion + ;; behavior under X separately (TTYs are forever beyond hope, but + ;; who cares? XEmacs 20 does the right thing with these too). + (define-key c-mode-base-map [delete] 'c-electric-delete) + (define-key c-mode-base-map [backspace] 'c-electric-backspace)) ;; these are new keybindings, with no counterpart to BOCM (define-key c-mode-base-map "," 'c-electric-semi&comma) (define-key c-mode-base-map "*" 'c-electric-star) @@ -367,6 +383,32 @@ ;;(define-key c-mode-base-map "\C-c\C-v" 'c-version) ) +;; menu support for both XEmacs and Emacs. If you don't have easymenu +;; with your version of Emacs, you are incompatible! +(require 'easymenu) + +(defvar c-c-menu nil) +(defvar c-c++-menu nil) +(defvar c-objc-menu nil) +(defvar c-java-menu nil) + +(defun c-mode-menu (modestr) + (let ((m + '(["Comment Out Region" comment-region (mark)] + ["Macro Expand Region" c-macro-expand (mark)] + ["Backslashify" c-backslash-region (mark)] + ["Indent Expression" c-indent-exp + (memq (char-after) '(?\( ?\[ ?\{))] + ["Indent Line" c-indent-command t] + ["Fill Comment Paragraph" c-fill-paragraph t] + ["Up Conditional" c-up-conditional t] + ["Backward Conditional" c-backward-conditional t] + ["Forward Conditional" c-forward-conditional t] + ["Backward Statement" c-beginning-of-statement t] + ["Forward Statement" c-end-of-statement t] + ))) + (cons modestr m))) + ;; Support for C @@ -403,6 +445,8 @@ (c-setup-dual-comments c-mode-syntax-table) (setq-default c-C-comment-start-regexp c-C++-comment-start-regexp)) +(easy-menu-define c-c-menu c-mode-map "C Mode Commands" + (c-mode-menu "C")) ;; Support for C++ @@ -439,6 +483,8 @@ ;;(modify-syntax-entry ?: "_" c++-mode-syntax-table) ) +(easy-menu-define c-c++-menu c++-mode-map "C++ Mode Commands" + (c-mode-menu "C++")) ;; Support for Objective-C @@ -467,6 +513,8 @@ (modify-syntax-entry ?@ "_" objc-mode-syntax-table) ) +(easy-menu-define c-objc-menu objc-mode-map "ObjC Mode Commands" + (c-mode-menu "ObjC")) ;; Support for Java @@ -495,6 +543,8 @@ (modify-syntax-entry ?@ "_" java-mode-syntax-table) ) +(easy-menu-define c-java-menu java-mode-map "Java Mode Commands" + (c-mode-menu "Java")) (provide 'cc-langs)
--- a/lisp/cc-mode/cc-lobotomy.el Mon Aug 13 09:47:00 2007 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,200 +0,0 @@ -;;; cc-lobotomy.el --- excise portions of cc-mode's brain... for speed - -;; Copyright (C) 1985,87,92,93,94,95,96,97 Free Software Foundation, Inc. - -;; Author: 1995 Barry A. Warsaw -;; Maintainer: Unmaintained -;; Created: March 1995, split from cc-mode.el -;; Version: 5.11 -;; Keywords: c languages oop - -;; This file is not part of GNU Emacs. - -;; This program 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 of the License, or -;; (at your option) any later version. - -;; This program 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. - -;;; Commentary: -;; -;; Every effort has been made to improve the performance of -;; cc-mode. However, due to the nature of the C, C++, and Objective-C -;; language definitions, a trade-off is often required between -;; accuracy of construct recognition and speed. I believe it is always -;; best to be correct, and that the mode is currently fast enough for -;; most normal usage. Others disagree. I have no intention of -;; including these hacks in the main distribution. When cc-mode -;; version 5 comes out, it will include a rewritten indentation engine -;; so that performance will be greatly improved automatically. This -;; was not included in this release of version 4 so that Emacs 18 -;; could still be supported. Note that this implies that cc-mode -;; version 5 will *not* work on Emacs 18! -;; -;; To use, see the variable cc-lobotomy-pith-list and the function -;; cc-lobotomize. The variable contains a good explanation of the -;; speed/accuracy trade-offs for each option. Set it to what you'd -;; like, and call cc-lobotomy in your c-mode-hook. -;; -;; This will redefine certain cc-mode functions and affect all cc-mode -;; buffers globally. -;; -;; This file is completely unsupported! I have no idea whether this -;; will work with such things as cc-mode-18.el. - - -;;; Code: -(require 'cc-mode) - -(defvar cc-lobotomy-pith-list () - "*List of things to dumb-ify to speed up cc-mode. Note that each -incurs a penalty in correct identification of certain code constructs. -Possible values to put on this list: - - 'literal -- `c-in-literal' is lobotomized. This will significantly - speed up parsing over large lists of cpp macros, as seen - for instance in header files. The penalty is that you - cannot put the `#' character as the first non-whitespace - character on a line inside other multi-line literals - (i.e. comments or strings) - - 'class -- `c-narrow-out-enclosing-class' and `c-search-uplist for - classkey' are lobotomized. This speeds up some - indenting inside and around class and struct - definitions. The penalty is that elements inside of - classes and structs may not indent correctly. - - 'lists -- `c-inside-bracelist-p' is lobotomized. This speeds up - indenting inside and around brace lists (e.g. aggregate - initializers, enum lists, etc.). The penalty is that - elements inside these lists may not indent correctly.") - -(defun cc-lobotomize () - "Perform lobotomies on cc-mode as described in `cc-lobotomy-pith-list'." - (let (pithedp) - (if (memq 'literal cc-lobotomy-pith-list) - (progn - (fset 'c-in-literal 'cc-in-literal-lobotomized) - (setq pithedp t))) - (if (memq 'class cc-lobotomy-pith-list) - (progn - (fset 'c-narrow-out-enclosing-class - 'cc-narrow-out-enclosing-class-lobotomized) - (fset 'c-search-uplist-for-classkey - 'cc-search-uplist-for-classkey-lobotomized) - (setq pithedp t))) - (if (memq 'lists cc-lobotomy-pith-list) - (progn - (fset 'c-inside-bracelist-p 'cc-inside-bracelist-p-lobotomized) - (setq pithedp t))) - (if pithedp - (fset 'c-submit-bug-report 'cc-submit-bug-report-lobotomized)) - )) - - -;; This is a faster version of c-in-literal. It trades speed for one -;; approximation, namely that within other literals, the `#' character -;; cannot be the first non-whitespace on a line. -(defun cc-in-literal-lobotomized (&optional lim) - ;; first check the cache - (if (and (boundp 'c-in-literal-cache) - c-in-literal-cache - (= (point) (aref c-in-literal-cache 0))) - (aref c-in-literal-cache 1) - ;; quickly check for cpp macro. this breaks if the `#' character - ;; appears as the first non-whitespace on a line inside another - ;; literal. - (let* (state - (char-at-boi (char-after (c-point 'boi))) - (rtn (cond - ((and char-at-boi (= char-at-boi ?#)) - 'pound) - ((nth 3 (setq state (save-excursion - (parse-partial-sexp - (or lim (c-point 'bod)) - (point))))) - 'string) - ((nth 4 state) (if (nth 7 state) 'c++ 'c)) - (t nil)))) - ;; cache this result if the cache is enabled - (and (boundp 'c-in-literal-cache) - (setq c-in-literal-cache (vector (point) rtn))) - rtn))) - -(defun cc-narrow-out-enclosing-class-lobotomized (dummy1 dummy2) nil) - -(defun cc-search-uplist-for-classkey-lobotomized (dummy) nil) - -(defun cc-inside-bracelist-p-lobotomized (dummy1 dummy2) nil) - -(defun cc-submit-bug-report-lobotomized () - "Submit via mail a bug report on cc-mode." - (interactive) - ;; load in reporter - (let ((reporter-prompt-for-summary-p t) - (reporter-dont-compact-list '(c-offsets-alist))) - (and - (y-or-n-p "Do you want to submit a report on cc-mode? ") - (require 'reporter) - (reporter-submit-bug-report - c-mode-help-address - (concat "cc-mode " c-version " (" - (cond ((eq major-mode 'c++-mode) "C++") - ((eq major-mode 'c-mode) "C") - ((eq major-mode 'objc-mode) "ObjC")) - ")") - (let ((vars (list - ;; report only the vars that affect indentation - 'c-basic-offset - 'c-offsets-alist - 'c-block-comments-indent-p - 'c-cleanup-list - 'c-comment-only-line-offset - 'c-backslash-column - 'c-delete-function - 'c-electric-pound-behavior - 'c-hanging-braces-alist - 'c-hanging-colons-alist - 'c-hanging-comment-ender-p - 'c-tab-always-indent - 'c-recognize-knr-p - 'defun-prompt-regexp - 'tab-width - ))) - (if (not (boundp 'defun-prompt-regexp)) - (delq 'defun-prompt-regexp vars) - vars)) - (function - (lambda () - (insert - (if c-special-indent-hook - (concat "\n@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n" - "c-special-indent-hook is set to '" - (format "%s" c-special-indent-hook) - ".\nPerhaps this is your problem?\n" - "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n\n") - "\n") - (format "c-emacs-features: %s\n" c-emacs-features) - ))) - (function - (lambda () - (insert - "You are using cc-lobotomy.el. You realize that by doing\n" - "so you have already made the decision to trade off accuracy\n" - "for speed? Don't set your hopes too high that your problem\n" - "will be fixed.\n\n" - ))) - "Dear Barry," - )))) - -(provide 'cc-lobotomy) -;;; cc-lobotomy.el ends here
--- a/lisp/cc-mode/cc-menus.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/cc-mode/cc-menus.el Mon Aug 13 09:47:52 2007 +0200 @@ -1,4 +1,4 @@ -;;; cc-menus.el --- menu and imenu support for CC Mode +;;; cc-menus.el --- imenu support for CC Mode ;; Copyright (C) 1985,87,92,93,94,95,96,97 Free Software Foundation, Inc. @@ -7,7 +7,7 @@ ;; 1985 Richard M. Stallman ;; Maintainer: cc-mode-help@python.org ;; Created: 22-Apr-1997 (split from cc-mode.el) -;; Version: 5.11 +;; Version: 5.12 ;; Keywords: c languages oop ;; This file is part of GNU Emacs. @@ -99,44 +99,5 @@ "Imenu generic expression for Java mode. See `imenu-generic-expression'.") -;; menu support for both XEmacs and Emacs. If you don't have easymenu -;; with your version of Emacs, you are incompatible! -(require 'easymenu) - -(defvar c-c-menu nil) -(defvar c-c++-menu nil) -(defvar c-objc-menu nil) -(defvar c-java-menu nil) - -(defun c-mode-menu (modestr) - (let ((m - '(["Comment Out Region" comment-region (mark)] - ["Macro Expand Region" c-macro-expand (mark)] - ["Backslashify" c-backslash-region (mark)] - ["Indent Expression" c-indent-exp - (memq (following-char) '(?\( ?\[ ?\{))] - ["Indent Line" c-indent-command t] - ["Fill Comment Paragraph" c-fill-paragraph t] - ["Up Conditional" c-up-conditional t] - ["Backward Conditional" c-backward-conditional t] - ["Forward Conditional" c-forward-conditional t] - ["Backward Statement" c-beginning-of-statement t] - ["Forward Statement" c-end-of-statement t] - ))) - (cons modestr m))) - -(eval-when-compile - (load-file "./cc-langs.el")) - -(easy-menu-define c-c-menu c-mode-map "C Mode Commands" - (c-mode-menu "C")) -(easy-menu-define c-c++-menu c++-mode-map "C++ Mode Commands" - (c-mode-menu "C++")) -(easy-menu-define c-objc-menu objc-mode-map "ObjC Mode Commands" - (c-mode-menu "ObjC")) -(easy-menu-define c-java-menu java-mode-map "Java Mode Commands" - (c-mode-menu "Java")) - - (provide 'cc-menus) ;;; cc-menus.el ends here
--- a/lisp/cc-mode/cc-mode.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/cc-mode/cc-mode.el Mon Aug 13 09:47:52 2007 +0200 @@ -7,7 +7,7 @@ ;; 1985 Richard M. Stallman ;; Maintainer: cc-mode-help@python.org ;; Created: a long, long, time ago. adapted from the original c-mode.el -;; Version: 5.11 +;; Version: 5.12 ;; Keywords: c languages oop ;; NOTE: Read the commentary below for the right way to submit bug reports! @@ -85,120 +85,11 @@ ;;; Code: - - -;; Figure out what features this Emacs has -(defconst c-emacs-features - (let ((infodock-p (boundp 'infodock-version)) - (comments - ;; XEmacs 19 and beyond use 8-bit modify-syntax-entry flags. - ;; Emacs 19 uses a 1-bit flag. We will have to set up our - ;; syntax tables differently to handle this. - (let ((table (copy-syntax-table)) - entry) - (modify-syntax-entry ?a ". 12345678" table) - (cond - ;; XEmacs 19, and beyond Emacs 19.34 - ((arrayp table) - (setq entry (aref table ?a)) - ;; In Emacs, table entries are cons cells - (if (consp entry) (setq entry (car entry)))) - ;; XEmacs 20 - ((fboundp 'get-char-table) (setq entry (get-char-table ?a table))) - ;; before and including Emacs 19.34 - ((and (fboundp 'char-table-p) - (char-table-p table)) - (setq entry (car (char-table-range table [?a])))) - ;; incompatible - (t (error "CC Mode is incompatible with this version of Emacs"))) - (if (= (logand (lsh entry -16) 255) 255) - '8-bit - '1-bit)))) - (if infodock-p - (list comments 'infodock) - (list comments))) - "A list of features extant in the Emacs you are using. -There are many flavors of Emacs out there, each with different -features supporting those needed by CC Mode. Here's the current -supported list, along with the values for this variable: - - XEmacs 19: (8-bit) - XEmacs 20: (8-bit) - Emacs 19: (1-bit) - -Infodock (based on XEmacs) has an additional symbol on this list: -'infodock.") - +(eval-when-compile + (require 'cc-menus)) +(require 'cc-defs) -;; important macros and subroutines -(defsubst c-point (position) - ;; Returns the value of point at certain commonly referenced POSITIONs. - ;; POSITION can be one of the following symbols: - ;; - ;; bol -- beginning of line - ;; eol -- end of line - ;; bod -- beginning of defun - ;; boi -- back to indentation - ;; ionl -- indentation of next line - ;; iopl -- indentation of previous line - ;; bonl -- beginning of next line - ;; bopl -- beginning of previous line - ;; - ;; This function does not modify point or mark. - (let ((here (point))) - (cond - ((eq position 'bol) (beginning-of-line)) - ((eq position 'eol) (end-of-line)) - ((eq position 'bod) - (beginning-of-defun) - ;; if defun-prompt-regexp is non-nil, b-o-d won't leave us at - ;; the open brace. - (and defun-prompt-regexp - (looking-at defun-prompt-regexp) - (goto-char (match-end 0))) - ) - ((eq position 'boi) (back-to-indentation)) - ((eq position 'bonl) (forward-line 1)) - ((eq position 'bopl) (forward-line -1)) - ((eq position 'iopl) - (forward-line -1) - (back-to-indentation)) - ((eq position 'ionl) - (forward-line 1) - (back-to-indentation)) - (t (error "unknown buffer position requested: %s" position)) - ) - (prog1 - (point) - (goto-char here)))) - -(defmacro c-safe (&rest body) - ;; safely execute BODY, return nil if an error occurred - (` (condition-case nil - (progn (,@ body)) - (error nil)))) - -(defsubst c-keep-region-active () - ;; Do whatever is necessary to keep the region active in XEmacs. - ;; Ignore byte-compiler warnings you might see. This is not needed - ;; for Emacs. - (and (boundp 'zmacs-region-stays) - (setq zmacs-region-stays t))) - - - -(defsubst c-load-all () - ;; make sure all necessary components of CC Mode are loaded in. - (require 'cc-vars) - (require 'cc-engine) - (require 'cc-langs) - (require 'cc-menus) - (require 'cc-align) - (require 'cc-styles) - (require 'cc-cmds)) - - ;;;###autoload (defun c-mode () "Major mode for editing K&R and ANSI C code. @@ -368,7 +259,7 @@ ;; defuns for submitting bug reports -(defconst c-version "5.11" +(defconst c-version "5.12" "CC Mode version number.") (defconst c-mode-help-address
--- a/lisp/cc-mode/cc-styles.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/cc-mode/cc-styles.el Mon Aug 13 09:47:52 2007 +0200 @@ -7,7 +7,7 @@ ;; 1985 Richard M. Stallman ;; Maintainer: cc-mode-help@python.org ;; Created: 22-Apr-1997 (split from cc-mode.el) -;; Version: 5.11 +;; Version: 5.12 ;; Keywords: c languages oop ;; This file is part of GNU Emacs. @@ -27,11 +27,6 @@ ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. -(eval-when-compile - (load-file "./cc-align.el")) - -(require 'cc-vars) -(require 'cc-align) (defconst c-style-alist @@ -553,35 +548,37 @@ -;; Dynamically append the default value of most variables. This is -;; crucial because future c-set-style calls will always reset the -;; variables first to the `cc-mode' style before instituting the new -;; style. Only do this once! -(or (assoc "cc-mode" c-style-alist) - (progn - (c-add-style "cc-mode" - (mapcar - (function - (lambda (var) - (let ((val (symbol-value var))) - (cons var (if (atom val) val - (copy-tree val) - )) - ))) - '(c-backslash-column - c-basic-offset - c-cleanup-list - c-comment-only-line-offset - c-electric-pound-behavior - c-hanging-braces-alist - c-hanging-colons-alist - c-hanging-comment-starter-p - c-hanging-comment-ender-p - c-offsets-alist - ))) - ;; the default style is now GNU. This can be overridden in - ;; c-mode-common-hook or {c,c++,objc,java}-mode-hook. - (c-set-style c-site-default-style))) +(defun c-initialize-builtin-style () + ;; Dynamically append the default value of most variables. This is + ;; crucial because future c-set-style calls will always reset the + ;; variables first to the `cc-mode' style before instituting the new + ;; style. Only do this once! + (require 'cl) + (or (assoc "cc-mode" c-style-alist) + (progn + (c-add-style "cc-mode" + (mapcar + (function + (lambda (var) + (let ((val (symbol-value var))) + (cons var (if (atom val) val + (copy-tree val) + )) + ))) + '(c-backslash-column + c-basic-offset + c-cleanup-list + c-comment-only-line-offset + c-electric-pound-behavior + c-hanging-braces-alist + c-hanging-colons-alist + c-hanging-comment-starter-p + c-hanging-comment-ender-p + c-offsets-alist + ))) + ;; the default style is now GNU. This can be overridden in + ;; c-mode-common-hook or {c,c++,objc,java}-mode-hook. + (c-set-style c-site-default-style)))) (defun c-make-styles-buffer-local () "Make all CC Mode style variables buffer local. @@ -615,10 +612,6 @@ (make-variable-buffer-local 'c-special-indent-hook) (make-variable-buffer-local 'c-indentation-style)) -(if c-style-variables-are-local-p - (c-make-styles-buffer-local)) - - (provide 'cc-styles) ;;; cc-styles.el ends here
--- a/lisp/cc-mode/cc-vars.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/cc-mode/cc-vars.el Mon Aug 13 09:47:52 2007 +0200 @@ -7,7 +7,7 @@ ;; 1985 Richard M. Stallman ;; Maintainer: cc-mode-help@python.org ;; Created: 22-Apr-1997 (split from cc-mode.el) -;; Version: 5.11 +;; Version: 5.12 ;; Keywords: c languages oop ;; This file is part of GNU Emacs. @@ -66,7 +66,7 @@ by the `c-comment-only-line-offset' variable." :type '(radio :extra-offset 8 - :format "%{Tab Always Indent%}:\n The TAB key\n%v" + :format "%{C Tab Always Indent%}:\n The TAB key:\n%v" (const :tag "always indents, never inserts TAB" t) (const :tag "indents in left margin, otherwise inserts TAB" nil) (const :tag "inserts TAB in literals, otherwise indent" other)) @@ -189,10 +189,11 @@ (const brace-list-open) (const brace-list-close) (const brace-list-intro) (const brace-list-entry)) (choice :tag "Action" - (set :format "%v" - :extra-offset 8 - (const before) (const after)) - (function :format "%v" :value c-) + (set :format "Insert a newline %v" + :extra-offset 38 + (const :tag "before brace" before) + (const :tag "after brace" after)) + (function :format "Run function %v" :value c-) ))) :group 'c)
--- a/lisp/cl/cl-macs.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/cl/cl-macs.el Mon Aug 13 09:47:52 2007 +0200 @@ -1659,6 +1659,9 @@ (defsetf get-register set-register) (defsetf global-key-binding global-set-key) (defsetf keymap-parent set-keymap-parent) +(defsetf keymap-name set-keymap-name) +(defsetf keymap-prompt set-keymap-prompt) +(defsetf keymap-default-binding set-keymap-default-binding) (defsetf local-key-binding local-set-key) (defsetf mark set-mark t) (defsetf mark-marker set-mark t)
--- a/lisp/comint/comint.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/comint/comint.el Mon Aug 13 09:47:52 2007 +0200 @@ -1103,7 +1103,7 @@ Returns t if successful." (interactive) (if (and comint-input-autoexpand - (string-match "[!^]" (funcall comint-get-old-input)) + (string-match "!\\|^\\^" (funcall comint-get-old-input)) (save-excursion (beginning-of-line) (looking-at comint-prompt-regexp))) ;; Looks like there might be history references in the command.
--- a/lisp/comint/custom-load.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/comint/custom-load.el Mon Aug 13 09:47:52 2007 +0200 @@ -1,10 +1,10 @@ -(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 'telnet 'custom-loads '("telnet")) +(custom-put 'ssh 'custom-loads '("ssh")) +(custom-put 'shell-faces 'custom-loads '("shell")) +(custom-put 'shell-directories 'custom-loads '("shell")) +(custom-put 'shell 'custom-loads '("shell")) (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")) +(custom-put 'comint-source 'custom-loads '("comint")) +(custom-put 'comint-completion 'custom-loads '("comint")) +(custom-put 'comint 'custom-loads '("comint-xemacs" "comint" "telnet")) +(custom-put 'background 'custom-loads '("background"))
--- a/lisp/comint/gdb.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/comint/gdb.el Mon Aug 13 09:47:52 2007 +0200 @@ -214,6 +214,29 @@ (not gdb-display-mode) (> (prefix-numeric-value arg) 0)))) +;; Using cc-mode's syntax table is broken. +(defvar gdb-mode-syntax-table nil + "Syntax table for GDB mode.") + +;; This is adapted from CC Mode 5.11. +(unless gdb-mode-syntax-table + (setq gdb-mode-syntax-table (make-syntax-table)) + ;; DO NOT TRY TO SET _ (UNDERSCORE) TO WORD CLASS! + (modify-syntax-entry ?_ "_" gdb-mode-syntax-table) + (modify-syntax-entry ?\\ "\\" gdb-mode-syntax-table) + (modify-syntax-entry ?+ "." gdb-mode-syntax-table) + (modify-syntax-entry ?- "." gdb-mode-syntax-table) + (modify-syntax-entry ?= "." gdb-mode-syntax-table) + (modify-syntax-entry ?% "." gdb-mode-syntax-table) + (modify-syntax-entry ?< "." gdb-mode-syntax-table) + (modify-syntax-entry ?> "." gdb-mode-syntax-table) + (modify-syntax-entry ?& "." gdb-mode-syntax-table) + (modify-syntax-entry ?| "." gdb-mode-syntax-table) + (modify-syntax-entry ?\' "\"" gdb-mode-syntax-table) + ;; add extra comment syntax + (modify-syntax-entry ?/ ". 14" gdb-mode-syntax-table) + (modify-syntax-entry ?* ". 23" gdb-mode-syntax-table)) + (defun gdb-mode () "Major mode for interacting with an inferior Gdb process. @@ -243,9 +266,7 @@ (interactive) (comint-mode) (use-local-map gdb-mode-map) - (when (not c-mode-syntax-table) - (require 'cc-lang)) - (set-syntax-table c-mode-syntax-table) + (set-syntax-table gdb-mode-syntax-table) (make-local-variable 'gdb-last-frame-displayed-p) (make-local-variable 'gdb-last-frame) (make-local-variable 'gdb-delete-prompt-marker)
--- a/lisp/custom/ChangeLog Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/custom/ChangeLog Mon Aug 13 09:47:52 2007 +0200 @@ -1,3 +1,8 @@ +1997-07-08 Steven L Baur <steve@altair.xemacs.org> + + * cus-edit.el (custom-file): Rename .xemacs-custom to something + more general. + 1997-06-28 Steven L Baur <steve@altair.xemacs.org> * cus-edit.el (customize-customized): Trap errors.
--- a/lisp/custom/auto-autoloads.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/custom/auto-autoloads.el Mon Aug 13 09:47:52 2007 +0200 @@ -99,7 +99,7 @@ (autoload 'customize-browse "cus-edit" "\ Create a tree browser for the customize hierarchy." t nil) -(defcustom custom-file (if (featurep 'xemacs) "~/.xemacs-custom" "~/.emacs") "File used for storing customization information.\nIf you change this from the default \"~/.emacs\" you need to\nexplicitly load that file for the settings to take effect." :type 'file :group 'customize) +(defcustom custom-file (if (boundp 'emacs-user-extension-dir) (concat emacs-user-extension-dir "options.el") "~/.emacs") "File used for storing customization information.\nIf you change this from the default \"~/.emacs\" you need to\nexplicitly load that file for the settings to take effect." :type 'file :group 'customize) (autoload 'customize-save-customized "cus-edit" "\ Save all user options which have been set in this session." t nil)
--- a/lisp/custom/cus-edit.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/custom/cus-edit.el Mon Aug 13 09:47:52 2007 +0200 @@ -2859,8 +2859,8 @@ ;;; The `custom-save-all' Function. ;;;###autoload -(defcustom custom-file (if (featurep 'xemacs) - "~/.xemacs-custom" +(defcustom custom-file (if (boundp 'emacs-user-extension-dir) + (concat emacs-user-extension-dir "options.el") "~/.emacs") "File used for storing customization information. If you change this from the default \"~/.emacs\" you need to
--- a/lisp/custom/custom-load.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/custom/custom-load.el Mon Aug 13 09:47:52 2007 +0200 @@ -1,53 +1,53 @@ -(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 'emacs 'custom-loads '("cus-edit")) +(custom-put 'editing 'custom-loads '("cus-edit")) +(custom-put 'abbrev 'custom-loads '("cus-edit")) +(custom-put 'matching 'custom-loads '()) +(custom-put 'mouse 'custom-loads '()) +(custom-put 'external 'custom-loads '("cus-edit")) +(custom-put 'processes 'custom-loads '("cus-edit")) +(custom-put 'programming 'custom-loads '("cus-edit")) +(custom-put 'languages 'custom-loads '("cus-edit")) +(custom-put 'lisp 'custom-loads '()) +(custom-put 'applications 'custom-loads '("cus-edit")) +(custom-put 'calendar 'custom-loads '()) +(custom-put 'development 'custom-loads '("cus-edit")) +(custom-put 'extensions 'custom-loads '("wid-edit")) +(custom-put 'internal 'custom-loads '("cus-edit")) +(custom-put 'maint 'custom-loads '()) +(custom-put 'environment 'custom-loads '("cus-edit")) +(custom-put 'i18n 'custom-loads '("cus-edit")) +(custom-put 'x 'custom-loads '()) +(custom-put 'frames 'custom-loads '()) +(custom-put 'data 'custom-loads '()) +(custom-put 'files 'custom-loads '("cus-edit")) +(custom-put 'wp 'custom-loads '("cus-edit")) +(custom-put 'faces 'custom-loads '("cus-edit" "wid-edit")) +(custom-put 'hypermedia 'custom-loads '("wid-edit")) +(custom-put 'help 'custom-loads '("cus-edit")) (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")) +(custom-put 'customize 'custom-loads '("cus-edit" "wid-edit" "cus-face")) +(custom-put 'custom-faces 'custom-loads '("cus-edit")) +(custom-put 'custom-browse 'custom-loads '("cus-edit")) +(custom-put 'custom-buffer 'custom-loads '("cus-edit")) +(custom-put 'custom-menu 'custom-loads '("cus-edit")) +(custom-put 'alloc 'custom-loads '()) +(custom-put 'undo 'custom-loads '()) +(custom-put 'modeline 'custom-loads '()) +(custom-put 'fill 'custom-loads '()) +(custom-put 'editing-basics 'custom-loads '()) +(custom-put 'display 'custom-loads '()) +(custom-put 'execute 'custom-loads '()) +(custom-put 'dired 'custom-loads '()) +(custom-put 'limits 'custom-loads '()) +(custom-put 'debug 'custom-loads '()) +(custom-put 'minibuffer 'custom-loads '()) +(custom-put 'keyboard 'custom-loads '()) +(custom-put 'auto-save 'custom-loads '()) +(custom-put 'processes-basics 'custom-loads '()) +(custom-put 'windows 'custom-loads '()) +(custom-put 'custom-magic-faces 'custom-loads '("cus-edit")) +(custom-put 'widget-browse 'custom-loads '("wid-browse")) +(custom-put 'widgets 'custom-loads '("wid-browse" "wid-edit")) +(custom-put 'widget-documentation 'custom-loads '("wid-edit")) +(custom-put 'widget-faces 'custom-loads '("wid-edit")) +(custom-put 'widget-button 'custom-loads '("wid-edit"))
--- a/lisp/efs/efs-ovwrt.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/efs/efs-ovwrt.el Mon Aug 13 09:47:52 2007 +0200 @@ -111,10 +111,10 @@ (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)))) + ndoc-str))) + spec) + (if (setq spec (compiled-function-interactive nfun)) + (setq new-code (nconc new-code (list (nth 1 spec))))) (fset new (apply 'make-byte-code new-code))))))))
--- a/lisp/gnus/custom-load.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/gnus/custom-load.el Mon Aug 13 09:47:52 2007 +0200 @@ -1,80 +1,79 @@ -(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 'smiley 'custom-loads '()) +(custom-put 'nnmail-various 'custom-loads '("nnmail")) +(custom-put 'nnmail-procmail 'custom-loads '("nnmail")) +(custom-put 'nnmail-expire 'custom-loads '("nnmail")) +(custom-put 'nnmail-files 'custom-loads '("nnmail")) +(custom-put 'nnmail-split 'custom-loads '("nnmail")) +(custom-put 'nnmail-duplicate 'custom-loads '("nnmail")) +(custom-put 'nnmail-prepare 'custom-loads '("nnmail")) +(custom-put 'nnmail-retrieve 'custom-loads '("nnmail")) +(custom-put 'nnmail 'custom-loads '("nnmail")) +(custom-put 'message-faces 'custom-loads '("message")) +(custom-put 'message-mail 'custom-loads '("message")) +(custom-put 'message-news 'custom-loads '("message")) +(custom-put 'message-headers 'custom-loads '("message")) +(custom-put 'message-insertion 'custom-loads '("message")) +(custom-put 'message-forwarding 'custom-loads '("message")) +(custom-put 'message-interface 'custom-loads '("message")) +(custom-put 'message-sending 'custom-loads '("message")) +(custom-put 'message-buffers 'custom-loads '("message")) +(custom-put 'message-various 'custom-loads '("message")) +(custom-put 'message 'custom-loads '("message")) +(custom-put 'gnus-various 'custom-loads '("gnus-sum")) +(custom-put 'gnus-message 'custom-loads '("message")) +(custom-put 'gnus-files 'custom-loads '("gnus" "nnmail")) +(custom-put 'gnus-visual 'custom-loads '("earcon" "gnus-art" "gnus-picon" "gnus" "smiley")) +(custom-put 'gnus-score-files 'custom-loads '("gnus-score")) +(custom-put 'gnus-score-decay 'custom-loads '("gnus-score")) +(custom-put 'gnus-score-expire 'custom-loads '("gnus-kill" "gnus-score")) +(custom-put 'gnus-score-default 'custom-loads '("gnus-score" "gnus-sum")) +(custom-put 'gnus-score-adapt 'custom-loads '("gnus-score")) +(custom-put 'gnus-score-kill 'custom-loads '("gnus-kill")) +(custom-put 'gnus-score 'custom-loads '("gnus-nocem" "gnus")) +(custom-put 'gnus-summary-tree 'custom-loads '("gnus-salt")) +(custom-put 'gnus-summary-pick 'custom-loads '("gnus-salt")) +(custom-put 'gnus-summary-various 'custom-loads '("gnus-sum")) +(custom-put 'gnus-summary-visual 'custom-loads '("gnus-sum" "gnus")) +(custom-put 'gnus-summary-sort 'custom-loads '("gnus-sum")) +(custom-put 'gnus-summary-mail 'custom-loads '("gnus-sum")) +(custom-put 'gnus-summary-maneuvering 'custom-loads '("gnus-sum")) +(custom-put 'gnus-summary-choose '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 '()) +(custom-put 'gnus-thread 'custom-loads '("gnus-sum")) +(custom-put 'gnus-summary-marks 'custom-loads '("gnus-sum")) +(custom-put 'gnus-summary-exit 'custom-loads '("gnus-sum")) +(custom-put 'gnus-summary 'custom-loads '("gnus-sum" "gnus")) +(custom-put 'gnus-group-various 'custom-loads '("gnus-group")) +(custom-put 'gnus-group-listing 'custom-loads '("gnus-group")) +(custom-put 'gnus-group-select 'custom-loads '("gnus-sum")) +(custom-put 'gnus-group-levels 'custom-loads '("gnus-group")) +(custom-put 'gnus-group-foreign 'custom-loads '("gnus-group")) +(custom-put 'gnus-group 'custom-loads '("gnus-topic" "gnus")) +(custom-put 'gnus-start 'custom-loads '("gnus-group" "gnus-int" "gnus-start" "gnus-util" "gnus")) +(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-xmas 'custom-loads '("gnus-xmas")) +(custom-put 'gnus-windows 'custom-loads '("gnus-win")) +(custom-put 'gnus-extract-post 'custom-loads '("gnus-uu")) +(custom-put 'gnus-extract-archive 'custom-loads '("gnus-uu")) +(custom-put 'gnus-extract-view 'custom-loads '("gnus-sum" "gnus-uu")) +(custom-put 'gnus-extract 'custom-loads '("gnus" "gnus-uu")) +(custom-put 'gnus-topic 'custom-loads '("gnus-topic")) +(custom-put 'picons 'custom-loads '("gnus-picon")) +(custom-put 'gnus-nocem 'custom-loads '("gnus-nocem")) +(custom-put 'gnus-edit-form 'custom-loads '("gnus-eform")) +(custom-put 'gnus-duplicate 'custom-loads '("gnus-dup")) +(custom-put 'gnus-demon 'custom-loads '("gnus-demon")) +(custom-put 'gnus-cite 'custom-loads '("gnus-cite")) +(custom-put 'gnus-asynchronous 'custom-loads '("gnus-async")) +(custom-put 'gnus-article-various 'custom-loads '("gnus-art" "gnus-sum")) +(custom-put 'gnus-article-buttons 'custom-loads '("gnus-art")) +(custom-put 'gnus-article-mime 'custom-loads '("gnus-art" "gnus-sum")) +(custom-put 'gnus-article-saving 'custom-loads '("gnus-art")) +(custom-put 'gnus-article-emphasis 'custom-loads '("gnus-art")) +(custom-put 'gnus-article-washing 'custom-loads '("gnus-xmas" "gnus-art")) +(custom-put 'gnus-article-headers 'custom-loads '("gnus-art" "gnus-sum")) +(custom-put 'gnus-article-signature 'custom-loads '("gnus-art")) +(custom-put 'gnus-article-highlight 'custom-loads '("gnus-art")) +(custom-put 'gnus-article-hiding 'custom-loads '("gnus-art" "gnus-sum")) +(custom-put 'gnus-article 'custom-loads '("gnus-art" "gnus-cite")) +(custom-put 'earcon 'custom-loads '("earcon"))
--- a/lisp/hyperbole/ChangeLog Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/hyperbole/ChangeLog Mon Aug 13 09:47:52 2007 +0200 @@ -1,3 +1,17 @@ +1997-07-08 Steven L Baur <steve@altair.xemacs.org> + + * hact.el (action:commandp): Don't reference bytecode objects as + vectors. + (action:params): Ditto. + +1997-07-07 Steven L Baur <steve@altair.xemacs.org> + + * hypb.el (hypb:function-copy): Don't reference bytecode objects + as vectors. + (hypb:function-symbol-replace): Document as broken. The + substition cannot be done without some thinking I'm not in the + mood for. + 1997-07-03 Steven L Baur <steve@altair.xemacs.org> * Makefile: Add autoloads dependencies.
--- a/lisp/hyperbole/hact.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/hyperbole/hact.el Mon Aug 13 09:47:52 2007 +0200 @@ -55,8 +55,10 @@ (error "(action:commandp): Autoload not supported: %s" function)) (t function)))) (if (hypb:v19-byte-code-p action) - (if (commandp action) - (list 'interactive (aref action 5))) + (cond ((fboundp 'compiled-function-interactive) + (compiled-function-interactive action)) + ((commandp action) + (list 'interactive (aref action 5)))) (commandp action)))) (defun action:create (param-list body) @@ -80,8 +82,10 @@ (error "(action:params): Autoload not supported: %s" action) (car (cdr action)))) ((hypb:v19-byte-code-p action) - ;; Turn into a list for extraction - (car (cdr (cons nil (append action nil))))))) + (if (fboundp 'compiled-function-arglist) + (compiled-function-arglist action) + ;; Turn into a list for extraction + (car (cdr (cons nil (append action nil)))))))) (defun action:param-list (action) "Returns list of actual ACTION parameters (removes '&' special forms)."
--- a/lisp/hyperbole/hypb.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/hyperbole/hypb.el Mon Aug 13 09:47:52 2007 +0200 @@ -227,8 +227,22 @@ ((subrp func) (error "(hypb:function-copy): `%s' is a primitive; can't copy body." func-symbol)) ((and (hypb:v19-byte-code-p func) (fboundp 'make-byte-code)) - (let ((new-code (append func nil))) ; turn it into a list - (apply 'make-byte-code new-code))) + (if (not (fboundp 'compiled-function-arglist)) + ;; This is evil -slb + (let ((new-code (append func nil))) ; turn it into a list + (apply 'make-byte-code new-code)) + ;; Can't reference bytecode objects as vectors in modern + ;; XEmacs. + (let ((new-code (nconc + (list (compiled-function-arglist func) + (compiled-function-instructions func) + (compiled-function-constants func) + (compiled-function-stack-depth func) + (compiled-function-doc-string func)))) + spec) + (if (setq spec (compiled-function-interactive func)) + (setq new-code (nconc new-code (list (nth 1 spec))))) + (apply 'make-byte-code new-code)))) (t (error "(hypb:function-copy): Can't copy function body: %s" func)) )) (error "(hypb:function-copy): `%s' symbol is not bound to a function." @@ -261,6 +275,7 @@ (append new-forms old-func-call) (append old-func-call new-forms))))))) +;; #### FIXME -- This code is highly broken in XEmacs 20.3 (defun hypb:function-symbol-replace (func-sym sym-to-replace replace-with-sym) "Replaces in body of FUNC-SYM SYM-TO-REPLACE with REPLACE-WITH-SYM. All occurrences within lists are replaced. Returns body of modified FUNC-SYM." @@ -277,7 +292,9 @@ arg-vector))) body)))) ;; assume V19 byte compiler (eq (compiled-function-p body) t) - (setq arg (aref body 2) + (setq arg (if (fboundp 'compiled-function-arglist) + (compiled-function-arglist body) + (aref body 2)) arg-vector (if (vectorp arg) arg)) ) (if arg-vector
--- a/lisp/language/english.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/language/english.el Mon Aug 13 09:47:52 2007 +0200 @@ -103,5 +103,7 @@ (register-input-method "English" '("quail-dvorak" quail-use-package "quail/latin")) +(register-input-method "British" + '("quail-british" quail-use-package "quail/latin")) ;;; english.el ends here
--- a/lisp/language/european.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/language/european.el Mon Aug 13 09:47:52 2007 +0200 @@ -179,4 +179,85 @@ (register-input-method (car languages) val) (setq languages (cdr languages)))) +(register-input-method "Esperanto" + '("quail-esperanto" quail-use-package "quail/latin")) + +(mapcar (function + (lambda (method) + (register-input-method "Italian" + (cons method + '(quail-use-package "quail/latin"))) + )) + '("quail-italian" "quail-itln")) + +(mapcar (function + (lambda (method) + (register-input-method "Spanish" + (cons method + '(quail-use-package "quail/latin"))) + )) + '("quail-spanish" "quail-spnsh")) + +(mapcar (function + (lambda (method) + (register-input-method "French" + (cons method + '(quail-use-package "quail/latin"))) + )) + '("quail-french" "quail-frnch" "quail-azerty")) + +(mapcar (function + (lambda (method) + (register-input-method "German" + (cons method + '(quail-use-package "quail/latin"))) + )) + '("quail-german" "quail-grmn")) + +(register-input-method "Scandinavian" + '("quail-scandinavian" quail-use-package "quail/latin")) + +(mapcar (function + (lambda (method) + (register-input-method "Icelandic" + (cons method + '(quail-use-package "quail/latin"))) + )) + '("quail-icelandic" "quail-iclndc")) + +(mapcar (function + (lambda (method) + (register-input-method "Danish" + (cons method + '(quail-use-package "quail/latin"))) + )) + '("quail-danish" "quail-dnsh")) + +(mapcar (function + (lambda (method) + (register-input-method "Norwegian" + (cons method + '(quail-use-package "quail/latin"))) + )) + '("quail-norwegian" "quail-nrwgn")) + +(mapcar (function + (lambda (method) + (register-input-method "Swedish" + (cons method + '(quail-use-package "quail/latin"))) + )) + '("quail-swedish" "quail-swdsh")) + +(mapcar (function + (lambda (method) + (register-input-method "Finish" + (cons method + '(quail-use-package "quail/latin"))) + )) + '("quail-finnish" "quail-fnnsh")) + +(register-input-method "Turkish" + '("quail-turkish" quail-use-package "quail/latin")) + ;;; european.el ends here
--- a/lisp/mh-e/custom-load.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/mh-e/custom-load.el Mon Aug 13 09:47:52 2007 +0200 @@ -1,4 +1,4 @@ -(custom-put 'mh-buffer 'custom-loads '("mh-utils")) +(custom-put 'mh-compose 'custom-loads '("mh-comp")) +(custom-put 'mh 'custom-loads '("mh-comp" "mh-e" "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")) +(custom-put 'mh-buffer 'custom-loads '("mh-utils"))
--- a/lisp/modes/auto-autoloads.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/modes/auto-autoloads.el Mon Aug 13 09:47:52 2007 +0200 @@ -503,7 +503,7 @@ ;;;### (autoloads (hide-ifdef-mode) "hideif" "modes/hideif.el") -(add-minor-mode 'hide-ifdef-mode " Ifdef") +(add-minor-mode 'hide-ifdef-mode " Ifdef" 'hide-ifdef-mode-map) (autoload 'hide-ifdef-mode "hideif" "\ Toggle Hide-Ifdef mode. This is a minor mode, albeit a large one. @@ -680,7 +680,7 @@ ;;;### (autoloads (ksh-mode) "ksh-mode" "modes/ksh-mode.el") (autoload 'ksh-mode "ksh-mode" "\ -ksh-mode $Revision: 1.3 $ - Major mode for editing (Bourne, Korn or Bourne again) +ksh-mode $Revision: 1.4 $ - Major mode for editing (Bourne, Korn or Bourne again) shell scripts. Special key bindings and commands: \\{ksh-mode-map} @@ -2037,7 +2037,7 @@ (autoload 'vhdl-mode "vhdl-mode" "\ Major mode for editing VHDL code. -vhdl-mode $Revision: 1.3 $ +vhdl-mode $Revision: 1.4 $ To submit a problem report, enter `\\[vhdl-submit-bug-report]' from a vhdl-mode buffer. This automatically sets up a mail buffer with version information already added. You just need to add a description of the
--- a/lisp/modes/hideif.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/modes/hideif.el Mon Aug 13 09:47:52 2007 +0200 @@ -138,7 +138,7 @@ (define-key hide-ifdef-mode-submap "\C-s" 'show-ifdef-block) (define-key hide-ifdef-mode-submap "\C-q" 'hide-ifdef-toggle-read-only) - (let ((where (where-is-internal 'toggle-read-only '(keymap) t))) + (let ((where (where-is-internal 'toggle-read-only nil t))) (if where (define-key hide-ifdef-mode-submap where @@ -169,7 +169,7 @@ ; minor-mode-alist))) ;; XEmacs: do it right. ;;;###autoload -(add-minor-mode 'hide-ifdef-mode " Ifdef") +(add-minor-mode 'hide-ifdef-mode " Ifdef" 'hide-ifdef-mode-map) ;; fix c-mode syntax table so we can recognize whole symbols. (defvar hide-ifdef-syntax-table
--- a/lisp/oobr/ChangeLog Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/oobr/ChangeLog Mon Aug 13 09:47:52 2007 +0200 @@ -1,3 +1,8 @@ +1997-07-08 Steven L Baur <steve@altair.xemacs.org> + + * br-clos-ft.el (clos-scan-routine-arglist): Don't reference + bytecode object as vector. + Fri Feb 21 16:45:14 1997 Bob Weiner <weiner@infodock.com> * br-c-tags (etags):
--- a/lisp/oobr/br-clos-ft.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/oobr/br-clos-ft.el Mon Aug 13 09:47:52 2007 +0200 @@ -238,8 +238,10 @@ 'compiled-function-p 'byte-code-function-p) aliased-function) - ;; Turn into a list for extraction - (car (cdr (cons nil (append aliased-function nil))))))) + (if (fboundp 'compiled-function-arglist) + (compiled-function-arglist aliased-function) + ;; Turn into a list for extraction + (car (cdr (cons nil (append aliased-function nil)))))))) (if arg-list (prin1-to-string arg-list)))))) (defun clos-sort-features (feature-list)
--- a/lisp/packages/apropos.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/packages/apropos.el Mon Aug 13 09:47:52 2007 +0200 @@ -465,8 +465,10 @@ (setq function (cdr function))) ;; XEmacs change from: (setq function (if (byte-code-function-p function) (setq function (if (compiled-function-p function) - (if (> (length function) 4) - (aref function 4)) + (if (fboundp 'compiled-function-doc-string) + (compiled-function-doc-string function) + (if (> (length function) 4) + (aref function 4))) (if (eq (car-safe function) 'autoload) (nth 2 function) (if (eq (car-safe function) 'lambda)
--- a/lisp/packages/dabbrev.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/packages/dabbrev.el Mon Aug 13 09:47:52 2007 +0200 @@ -517,7 +517,7 @@ (re-search-forward (concat "\\(\\(" dabbrev--abbrev-char-regexp "\\)+\\)")) (setq expansion - (buffer-substring dabbrev--last-expansion-location + (buffer-substring-no-properties dabbrev--last-expansion-location (point))) (if dabbrev--last-case-pattern (setq expansion (upcase expansion))) @@ -643,7 +643,7 @@ (error "No possible abbreviation preceding point")))) ;; Now find the beginning of that one. (dabbrev--goto-start-of-abbrev) - (buffer-substring dabbrev--last-abbrev-location + (buffer-substring-no-properties dabbrev--last-abbrev-location (point)))) ;;; Initializes all global variables @@ -896,7 +896,7 @@ ;; We have a truly valid match. Find the end. (re-search-forward pattern2) (setq found-string - (buffer-substring (match-beginning 1) (match-end 1))) + (buffer-substring-no-properties (match-beginning 1) (match-end 1))) (and ignore-case (setq found-string (downcase found-string))) ;; Ignore this match if it's already in the table. (if (dabbrev-filter-elements @@ -912,7 +912,7 @@ ;; Put it into `dabbrev--last-table' ;; and return it (either downcased, or as is). (let ((result - (buffer-substring (match-beginning 0) (match-end 0)))) + (buffer-substring-no-properties (match-beginning 0) (match-end 0)))) (setq dabbrev--last-table (cons found-string dabbrev--last-table)) (if (and ignore-case (eval dabbrev-case-replace))
--- a/lisp/packages/func-menu.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/packages/func-menu.el Mon Aug 13 09:47:52 2007 +0200 @@ -836,7 +836,7 @@ (defvar fume-function-name-regexp-make "^\\(\\(\\$\\s(\\)?\\(\\w\\|\\.\\)+\\(:sh\\)?\\(\\s)\\)?\\)\\s *\\(::?\\|\\+?=\\)" "Expression to get makefile target names") -(add-hook 'makefile-mode-hook 'fume-add-menubar-entry) +;;(add-hook 'makefile-mode-hook 'fume-add-menubar-entry) ;;; Directory Listings ;;;
--- a/lisp/packages/gnuserv.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/packages/gnuserv.el Mon Aug 13 09:47:52 2007 +0200 @@ -1,7 +1,7 @@ ;;; gnuserv.el --- Lisp interface code between Emacs and gnuserv ;; Copyright (C) 1989-1997 Free Software Foundation, Inc. -;; Version: 3.6 +;; Version: 3.7 ;; Author: Andy Norman (ange@hplb.hpl.hp.com), originally based on server.el ;; Hrvoje Niksic <hniksic@srce.hr> ;; Maintainer: Jan Vroonhof <vroonhof@math.ethz.ch>, @@ -79,9 +79,6 @@ ;;; Code: -(defconst gnuserv-rcs-version - "$Id: gnuserv.el,v 1.12 1997/06/29 23:13:06 steve Exp $") - (defgroup gnuserv nil "The gnuserv suite of programs to talk to Emacs from outside." :group 'environment @@ -89,7 +86,6 @@ :group 'terminals) - ;; Provide the old variables as aliases, to avoid breaking .emacs ;; files. However, they are obsolete and should be converted to the ;; new forms. This ugly crock must be before the variable
--- a/lisp/packages/hyper-apropos.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/packages/hyper-apropos.el Mon Aug 13 09:47:52 2007 +0200 @@ -735,7 +735,8 @@ (cond ((eq symtype 'lambda) (princ (or (nth 1 newsym) "()"))) ((eq symtype 'bytecode) - (princ (or (aref newsym 0) "()"))) + (princ (or (compiled-function-arglist newsym) + "()"))) ((and (eq symtype 'subr) (string-match "[\n\t ]*\narguments: ?\\((.*)\\)\n?\\'"
--- a/lisp/packages/vc.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/packages/vc.el Mon Aug 13 09:47:52 2007 +0200 @@ -1827,6 +1827,7 @@ ;; `rcs2log' will find the relevant RCS or CVS files ;; relative to the curent directory if none supplied. nil))) + (require 'add-log) ; XEmacs change (let ((odefault default-directory) (full-name (or add-log-full-name (user-full-name)
--- a/lisp/prim/cmdloop.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/prim/cmdloop.el Mon Aug 13 09:47:52 2007 +0200 @@ -164,53 +164,54 @@ ;;;; Object-oriented programming at its finest -(defun display-error (error-object stream) ;(defgeneric report-condition ...) - "Display `error-object' on `stream' in a user-friendly way." - (funcall (or (let ((type (car-safe error-object))) - (catch 'error - (and (consp error-object) - (symbolp type) - ;;(stringp (get type 'error-message)) - (consp (get type 'error-conditions)) - (let ((tail (cdr error-object))) - (while (not (null tail)) - (if (consp tail) - (setq tail (cdr tail)) - (throw 'error nil))) - t) - ;; (check-type condition condition) - (get type 'error-conditions) - ;; Search class hierarchy - (let ((tail (get type 'error-conditions))) - (while (not (null tail)) - (cond ((not (and (consp tail) - (symbolp (car tail)))) - (throw 'error nil)) - ((get (car tail) 'display-error) - (throw 'error (get (car tail) - 'display-error))) - (t - (setq tail (cdr tail))))) - ;; Default method - #'(lambda (error-object stream) - (let ((type (car error-object)) - (tail (cdr error-object)) - (first t) - (print-message-label 'error)) - (if (eq type 'error) - (progn (princ (car tail) stream) - (setq tail (cdr tail))) - (princ (or (gettext (get type 'error-message)) type) - stream)) - (while tail - (princ (if first ": " ", ") stream) - (prin1 (car tail) stream) - (setq tail (cdr tail) - first nil)))))))) - #'(lambda (error-object stream) - (princ (gettext "Peculiar error ") stream) - (prin1 error-object stream))) - error-object stream)) +;; Now in src/print.c; used by Ferror_message_string and others +;(defun display-error (error-object stream) ;(defgeneric report-condition ...) +; "Display `error-object' on `stream' in a user-friendly way." +; (funcall (or (let ((type (car-safe error-object))) +; (catch 'error +; (and (consp error-object) +; (symbolp type) +; ;;(stringp (get type 'error-message)) +; (consp (get type 'error-conditions)) +; (let ((tail (cdr error-object))) +; (while (not (null tail)) +; (if (consp tail) +; (setq tail (cdr tail)) +; (throw 'error nil))) +; t) +; ;; (check-type condition condition) +; (get type 'error-conditions) +; ;; Search class hierarchy +; (let ((tail (get type 'error-conditions))) +; (while (not (null tail)) +; (cond ((not (and (consp tail) +; (symbolp (car tail)))) +; (throw 'error nil)) +; ((get (car tail) 'display-error) +; (throw 'error (get (car tail) +; 'display-error))) +; (t +; (setq tail (cdr tail))))) +; ;; Default method +; #'(lambda (error-object stream) +; (let ((type (car error-object)) +; (tail (cdr error-object)) +; (first t) +; (print-message-label 'error)) +; (if (eq type 'error) +; (progn (princ (car tail) stream) +; (setq tail (cdr tail))) +; (princ (or (gettext (get type 'error-message)) type) +; stream)) +; (while tail +; (princ (if first ": " ", ") stream) +; (prin1 (car tail) stream) +; (setq tail (cdr tail) +; first nil)))))))) +; #'(lambda (error-object stream) +; (princ (gettext "Peculiar error ") stream) +; (prin1 error-object stream))) +; error-object stream)) (put 'file-error 'display-error #'(lambda (error-object stream)
--- a/lisp/prim/debug.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/prim/debug.el Mon Aug 13 09:47:52 2007 +0200 @@ -483,19 +483,22 @@ (defun debug-convert-byte-code (function) (let ((defn (symbol-function function))) (if (not (consp defn)) - ;; Assume a compiled code object. - (let* ((contents (append defn nil)) - (body - (list (list 'byte-code (nth 1 contents) - (nth 2 contents) (nth 3 contents))))) - (if (nthcdr 5 contents) - (setq body (cons (list 'interactive (nth 5 contents)) body))) - (if (nth 4 contents) + ;; Assume a compiled-function object. + (let* ((body + (list (list 'byte-code + (compiled-function-instructions defn) + (compiled-function-constants defn) + (compiled-function-stack-depth defn))))) + (if (compiled-function-interactive defn) + (setq body (cons (compiled-function-interactive defn) body))) + (if (compiled-function-doc-string defn) ;; Use `documentation' here, to get the actual string, ;; in case the compiled function has a reference ;; to the .elc file. (setq body (cons (documentation function) body))) - (fset function (cons 'lambda (cons (car contents) body))))))) + (fset function (cons 'lambda (cons + (compiled-function-arglist defn) + body))))))) (defun debug-on-entry-1 (function defn flag) (if (subrp defn)
--- a/lisp/prim/packages.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/prim/packages.el Mon Aug 13 09:47:52 2007 +0200 @@ -38,7 +38,7 @@ (defvar packages-hardcoded-lisp '("cl-defs" - "startup" + ;; "startup" ) "Lisp packages that are always dumped with XEmacs")
--- a/lisp/prim/startup.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/prim/startup.el Mon Aug 13 09:47:52 2007 +0200 @@ -547,7 +547,8 @@ (setq term (substring term 0 hyphend)) (setq term nil)))))) - +(defconst emacs-user-extension-dir "/.xemacs/" + "Directory where user initialization and user-installed packages may go.") (defun load-user-init-file (init-file-user) "This function actually reads the init files. @@ -556,23 +557,25 @@ (setq user-init-file (cond ((eq system-type 'ms-dos) - (concat "~" init-file-user "/_xemacs")) - ((eq system-type 'vax-vms) - "sys$login:.xemacs") + (concat "~" init-file-user emacs-user-extension-dir "init.el")) (t - (concat "~" init-file-user "/.xemacs")))) + (concat "~" init-file-user emacs-user-extension-dir "init.el")))) (unless (file-exists-p (expand-file-name user-init-file)) (setq user-init-file (cond ((eq system-type 'ms-dos) (concat "~" init-file-user "/_emacs")) - ((eq system-type 'vax-vms) - "sys$login:.emacs") (t (concat "~" init-file-user "/.emacs"))))) (load user-init-file t t t) - (when (string= custom-file (concat "~" init-file-user "/.xemacs-custom")) - (load (concat "~" init-file-user "/.xemacs-custom") t t)) + (when (string= custom-file (concat "~" + init-file-user + emacs-user-extension-dir + "options.el")) + (load (concat "~" + init-file-user + emacs-user-extension-dir + "options.el") t t)) (unless inhibit-default-init (let ((inhibit-startup-message nil)) ;; Users are supposed to be told their rights.
--- a/lisp/prim/subr.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/prim/subr.el Mon Aug 13 09:47:52 2007 +0200 @@ -519,11 +519,9 @@ ;;;; Miscellanea. (defun buffer-substring-no-properties (beg end) - "Return the text from BEG to END, without extents, as a string." + "Return the text from BEG to END, without text properties, as a string." (let ((string (buffer-substring beg end))) - (map-extents (lambda (ext &rest junk) - (delete-extent ext)) - string) + (set-text-properties 0 (length string) nil string) string)) (defun ignore (&rest ignore)
--- a/lisp/utils/auto-autoloads.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/utils/auto-autoloads.el Mon Aug 13 09:47:52 2007 +0200 @@ -819,13 +819,14 @@ ;;;### (autoloads (savehist-save savehist-load) "savehist" "utils/savehist.el") (autoload 'savehist-load "savehist" "\ -Load the histories saved to `savehist-file'. -Unless PREFIX is non-nil, the function will also add the save function to -`kill-emacs-hook'. +Load the minibuffer histories from `savehist-file'. +Unless NO-HOOK is specified, the function will also add the save function +to `kill-emacs-hook', thus ensuring that the minibuffer contents will be +saved before leaving Emacs. This function should be normally used from your Emacs init file. Since it -removes your current minibuffer histories (if any), it is unwise to call it -at any other time." t nil) +removes your current minibuffer histories, it is unwise to call it at any +other time." t nil) (autoload 'savehist-save "savehist" "\ Save the histories from `savehist-history-variables' to `savehist-file'.
--- a/lisp/utils/easymenu.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/utils/easymenu.el Mon Aug 13 09:47:52 2007 +0200 @@ -1,11 +1,11 @@ ;;; easymenu.el - Easy menu support for Emacs 19 and XEmacs. ;; -;; $Id: easymenu.el,v 1.5 1997/07/07 00:53:20 steve Exp $ +;; $Id: easymenu.el,v 1.6 1997/07/09 04:31:35 steve Exp $ ;; ;; LCD Archive Entry: ;; easymenu|Per Abrahamsen|abraham@iesd.auc.dk| ;; Easy menu support for XEmacs| -;; $Date: 1997/07/07 00:53:20 $|$Revision: 1.5 $|~/misc/easymenu.el.gz| +;; $Date: 1997/07/09 04:31:35 $|$Revision: 1.6 $|~/misc/easymenu.el.gz| ;; Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc. @@ -169,7 +169,7 @@ (if (featurep 'menubar) (progn (pushnew menu easy-menu-all-popups) - (setq mode-popup-menu (if (< (length easy-menu-all-popups) 1) + (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)))
--- a/lisp/utils/savehist.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/utils/savehist.el Mon Aug 13 09:47:52 2007 +0200 @@ -4,7 +4,7 @@ ;; Author: Hrvoje Niksic <hniksic@srce.hr> ;; Keywords: minibuffer -;; Version: 0.3 +;; Version: 0.4 ;; This file is part of XEmacs. @@ -45,7 +45,8 @@ ;; load-path, and byte-compile it. ;; This code should work on XEmacs 19.14 and later, as well as GNU -;; Emacs 19.34 and later. +;; Emacs 19.34 and later. It requires the Customize library, however +;; (shipped with XEmacs 19.15 and later, and with GNU Emacs 20.x). ;;; Code: @@ -124,7 +125,8 @@ :group 'savehist) (defcustom savehist-modes 384 - "*Default permissions of the history file." + "*Default permissions of the history file. +This is decimal, not octal. The default is 384 (0600 in octal)." :type 'integer :group 'savehist) @@ -132,16 +134,17 @@ ;; Functions ;;;###autoload -(defun savehist-load (&optional prefix) - "Load the histories saved to `savehist-file'. -Unless PREFIX is non-nil, the function will also add the save function to -`kill-emacs-hook'. +(defun savehist-load (&optional no-hook) + "Load the minibuffer histories from `savehist-file'. +Unless NO-HOOK is specified, the function will also add the save function +to `kill-emacs-hook', thus ensuring that the minibuffer contents will be +saved before leaving Emacs. This function should be normally used from your Emacs init file. Since it -removes your current minibuffer histories (if any), it is unwise to call it -at any other time." +removes your current minibuffer histories, it is unwise to call it at any +other time." (interactive "P") - (unless prefix + (unless no-hook (add-hook 'kill-emacs-hook 'savehist-save)) (load savehist-file t)) @@ -166,14 +169,18 @@ " or when\n" ";; exiting Emacs.\n" ";; Do not edit. Unless you really want to, that is.\n\n") - (dolist (sym savehist-history-variables) - (when (and (boundp sym) - (symbol-value sym)) - (prin1 - `(setq ,sym (quote ,(savehist-delimit (symbol-value sym) - savehist-length))) - (current-buffer)) - (insert ?\n))) + (let ((print-length nil) + (print-string-length nil) + (print-level nil) + (print-readably t)) + (dolist (sym savehist-history-variables) + (when (and (boundp sym) + (symbol-value sym)) + (prin1 + `(setq ,sym (quote ,(savehist-delimit (symbol-value sym) + savehist-length))) + (current-buffer)) + (insert ?\n)))) (save-buffer) (set-file-modes savehist-file savehist-modes)) (or buffer-exists-p
--- a/lisp/w3/custom-load.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/w3/custom-load.el Mon Aug 13 09:47:52 2007 +0200 @@ -1,18 +1,18 @@ -(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 'w3-scripting 'custom-loads '("w3-script")) +(custom-put 'w3-hooks 'custom-loads '("w3-cus")) +(custom-put 'w3-display 'custom-loads '("w3-cus")) +(custom-put 'w3-parsing 'custom-loads '("w3-cus")) +(custom-put 'w3-menus 'custom-loads '("w3-cus" "w3-menu")) +(custom-put 'w3-printing 'custom-loads '("w3-cus")) +(custom-put 'w3-images 'custom-loads '("w3-cus")) +(custom-put 'w3-files 'custom-loads '("w3-cus")) +(custom-put 'w3 'custom-loads '("w3-cus" "w3-script")) (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")) +(custom-put 'url-mime 'custom-loads '("url-vars")) +(custom-put 'url-cookie 'custom-loads '("url-cookie" "url-vars")) +(custom-put 'url-history 'custom-loads '("url-vars")) +(custom-put 'url-cache 'custom-loads '("url-cache" "url-vars")) +(custom-put 'url-file 'custom-loads '("url-cache" "url-vars")) +(custom-put 'url 'custom-loads '("url-gw" "url-irc" "url-vars" "url")) +(custom-put 'url-gateway 'custom-loads '("url-gw")) +(custom-put 'ssl 'custom-loads '("ssl"))
--- a/lisp/x11/x-menubar.el Mon Aug 13 09:47:00 2007 +0200 +++ b/lisp/x11/x-menubar.el Mon Aug 13 09:47:52 2007 +0200 @@ -779,7 +779,7 @@ (aset item 2 (not (not (or buffer-file-name revert-buffer-function))))) (and (string= "Delete Frame" name) - (aset item 2 (not (eq (next-frame) (selected-frame))))) + (aset item 2 (device-or-frame-p (second (frame-list))))) ))) result))
--- a/lwlib/Makefile.in.in Mon Aug 13 09:47:00 2007 +0200 +++ b/lwlib/Makefile.in.in Mon Aug 13 09:47:52 2007 +0200 @@ -95,19 +95,18 @@ cd energize && $(MAKE) $(MFLAGS) #endif -.PHONY : mostlyclean clean distclean realclean extraclean -FRC.mostlyclean: -mostlyclean: FRC.mostlyclean - $(RM) liblw.a liblw_pure_*.a *.o *.i +.PHONY: mostlyclean clean distclean realclean extraclean +mostlyclean: + $(RM) liblw.a liblw_pure_*.a *.o *.i core clean: mostlyclean #ifdef ENERGIZE cd energize && $(MAKE) $(MFLAGS) clean #endif distclean: clean - $(RM) Makefile Makefile.in config.h .pure + $(RM) Makefile Makefile.in config.h TAGS realclean: distclean extraclean: distclean - $(RM) *~ \#* m/?*~ s/?*~ + $(RM) *~ \#* CONFIG_H = ../src/config.h config.h
--- a/lwlib/lwlib-Xm.c Mon Aug 13 09:47:00 2007 +0200 +++ b/lwlib/lwlib-Xm.c Mon Aug 13 09:47:52 2007 +0200 @@ -797,3 +797,1265 @@ { 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/ChangeLog Mon Aug 13 09:47:00 2007 +0200 +++ b/man/ChangeLog Mon Aug 13 09:47:52 2007 +0200 @@ -1,3 +1,7 @@ +Thu Jul 3 22:54:03 1997 Barry A. Warsaw <cc-mode-help@python.org> + + * cc-mode.texi: Fixed spelling of Texinfo + Tue May 6 21:33:06 1997 Steven L Baur <steve@altair.xemacs.org> * lispref/files.texi (Writing to Files): Correct docstring of
--- a/man/cc-mode.texi Mon Aug 13 09:47:00 2007 +0200 +++ b/man/cc-mode.texi Mon Aug 13 09:47:52 2007 +0200 @@ -16,7 +16,7 @@ @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! @comment -@comment TeXinfo manual for CC Mode +@comment Texinfo manual for CC Mode @comment Generated from the original README file by Krishna Padmasola @comment <krishna@earth-gw.njit.edu> @comment @@ -46,7 +46,7 @@ @comment The title is printed in a large font. @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -@center @titlefont{CC Mode 5.11} +@center @titlefont{CC Mode 5.12} @sp 2 @center @subtitlefont{A GNU Emacs mode for editing C, C++, Objective-C, and Java code} @sp 2 @@ -161,7 +161,7 @@ @ccmode{}'s new indentation model. A special word of thanks goes to Krishna Padmasola for his work in -converting the original @file{README} file to texinfo format. +converting the original @file{README} file to Texinfo format. @comment !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
--- a/pkg-src/tree-x/Makefile.in.in Mon Aug 13 09:47:00 2007 +0200 +++ b/pkg-src/tree-x/Makefile.in.in Mon Aug 13 09:47:52 2007 +0200 @@ -51,9 +51,9 @@ all : xoobr xoobr: $(objs) - $(CC) $(objs) $(ldflags) -o $@ + $(CC) $(CFLAGS) $(objs) $(ldflags) -o $@ -cflags = $(CFLAGS) -DHAVE_CONFIG_H -I${build_top}/src $(CPPFLAGS) $(c_switch_all) +cflags = $(CFLAGS) -I${build_top}/src $(CPPFLAGS) $(c_switch_all) ldflags = $(LDFLAGS) $(ld_switch_all) -lXaw $(ld_libs_all) .c.o : @@ -65,8 +65,19 @@ (cd ../.. && $(INSTALL_PROGRAM) pkg-src/tree-x/$${file} ${archlibdir}/$${file}) ; \ done -clean: - $(RM) $(progs) *.o *.i *.orig *.rej core *~ +.PHONY: mostlyclean clean distclean realclean extraclean +mostlyclean: + $(RM) *.o *.i core +clean: mostlyclean + $(RM) $(progs) +distclean: clean + $(RM) Makefile Makefile.in TAGS +realclean: distclean +extraclean: distclean + $(RM) *~ \#* + +distclean: clean + $(RM) Makefile.in Makefile size: wc *.c *.h @@ -74,7 +85,7 @@ ## Dependencies dbl.o: dbl.h dissolve.o: dissolve.h -draw.o: defs.h tree.h dbl.h intf.h -input.o: defs.h tree.h input.h -intf.o: defs.h tree.h dbl.h intf.h rsrc.h input.h help.h -tree.o: defs.h tree.h intf.h +draw.o: dissolve.h defs.h tree.h dbl.h intf.h +input.o: defs.h tree.h input.h dbl.h intf.h +intf.o: defs.h tree.h dbl.h intf.h rsrc.h input.h help.h dissolve.h +tree.o: defs.h tree.h dbl.h intf.h
--- a/src/ChangeLog Mon Aug 13 09:47:00 2007 +0200 +++ b/src/ChangeLog Mon Aug 13 09:47:52 2007 +0200 @@ -1,5 +1,41 @@ +1997-07-09 Hrvoje Niksic <hniksic@srce.hr> + + * extents.c: Allow non-symbol properties of extents. + +1997-07-08 Hrvoje Niksic <hniksic@srce.hr> + + * data.c (Fstring_to_number): Use `check_int_range'. + (Fstring_to_number): Would bug out on wrong type check. + +1997-07-07 Steven L Baur <steve@altair.xemacs.org> + + * data.c (Fcompiled_function_doc_string): Implement correctly. + Was forgotten cut & paste identical clone to + Fcompiled_function_interactive? + + * Makefile.in.in (alloc.o): Remove dependency on puresize_adjust.h + so alloc.c need not be recompiled when puresize changes. + + * alloc.c (PURIFIED): Use get_PURESIZE() instead of constant. + (check_purespace): Ditto. + (alloc_pure_lrecord): Ditto. + (report_pure_usage): Ditto. + (disksave_object_finalization): Ditto. + (report_pure_usage): Modify message reported when Build is + restarted due to change in PURESIZE_ADJUSTMENT. + + * puresize.h: Remove dependency on puresize_adjust.h. + (get_PURESIZE): New function -- declare it. + + * pure.c: Move final PURESIZE computation and include of + puresize_adjust.h into here so alloc.c need not be recompiled each + time the puresize is adjusted. + (get_PURESIZE): New function. + 1997-07-06 Steven L Baur <steve@altair.xemacs.org> + * data.c (Fstring_to_number): Wrong parameter was being checked. + * emacs.c (vars_of_emacs): Fprovide the system type as a feature. 1997-07-03 Steven L Baur <steve@altair.xemacs.org>
--- a/src/Makefile.in.in Mon Aug 13 09:47:00 2007 +0200 +++ b/src/Makefile.in.in Mon Aug 13 09:47:52 2007 +0200 @@ -595,28 +595,24 @@ ## ${other_files}, $(objects_system) and $(objects_machine) ## select which of these should be compiled. */ -.PHONY : mostlyclean clean distclean realclean versionclean extraclean - +.PHONY: mostlyclean clean distclean realclean versionclean extraclean mostlyclean: - $(RM) temacs puremacs quantmacs prefix-args core depend.* \#* *.o *.i -clean: mostlyclean - $(RM) xemacs libextcli* ${libsrc}DOC + $(RM) temacs puremacs quantmacs prefix-args depend.* *.o *.i core +clean: mostlyclean versionclean + $(RM) libextcli* ## This is used in making a distribution. ## Do not use it on development directories! -distclean: clean versionclean +distclean: clean $(RM) config.h paths.h puresize_adjust.h Emacs.ad.h \ - Makefile Makefile.in .pure xemacs-version.h + Makefile Makefile.in TAGS realclean: distclean - $(RM) TAGS versionclean: $(RM) xemacs ${libsrc}DOC extraclean: realclean - $(RM) *~ \#* m/?*~ s/?*~ + $(RM) *~ \#* m/*~ m/\#* s/*~ s/\#* -## The rule for the [sm] files has to be written a little funny to -## avoid looking like a C comment to CPP. .PHONY : lock unlock -SOURCES = *.[chm] *.pswm [sm]/?* COPYING paths.h.in Makefile.in.in \ +SOURCES = *.[chm] *.pswm [sm]/* COPYING paths.h.in Makefile.in.in \ config.h.in README COPYING ChangeLog unlock: chmod u+w $(SOURCES) @@ -946,7 +942,7 @@ alloc.o: frame.h alloc.o: frameslots.h alloc.o: glyphs.h -alloc.o: puresize.h puresize_adjust.h +alloc.o: puresize.h alloc.o: redisplay.h alloc.o: scrollbar.h alloc.o: specifier.h
--- a/src/alloc.c Mon Aug 13 09:47:00 2007 +0200 +++ b/src/alloc.c Mon Aug 13 09:47:52 2007 +0200 @@ -181,11 +181,11 @@ #define PURIFIED(ptr) \ ((uintptr_t) (ptr) < \ - (uintptr_t) (PUREBEG + PURESIZE) && \ + (uintptr_t) (PUREBEG + get_PURESIZE()) && \ (uintptr_t) (ptr) >= \ (uintptr_t) PUREBEG) -/* Non-zero if pureptr > PURESIZE; accounts for excess purespace needs. */ +/* Non-zero if pureptr > get_PURESIZE(); accounts for excess purespace needs. */ static long pure_lossage; #ifdef ERROR_CHECK_TYPECHECK @@ -216,7 +216,7 @@ pure_lossage += size; return (0); } - else if (pureptr + size > PURESIZE) + else if (pureptr + size > get_PURESIZE()) { /* This can cause recursive bad behavior, we'll yell at the end */ /* when we're done. */ @@ -2520,7 +2520,7 @@ { struct lrecord_header *header = (void *) (PUREBEG + pureptr); - if (pureptr + size > PURESIZE) + if (pureptr + size > get_PURESIZE()) pure_storage_exhausted (); set_lheader_implementation (header, implementation); @@ -2629,20 +2629,20 @@ message ("\n****\tPure Lisp storage exhausted!\n" "\tPurespace usage: %ld of %ld\n" "****", - PURESIZE+pure_lossage, (long) PURESIZE); + get_PURESIZE()+pure_lossage, (long) get_PURESIZE()); if (die_if_pure_storage_exceeded) { - PURESIZE_h(PURESIZE + pure_lossage); + PURESIZE_h(get_PURESIZE() + pure_lossage); rc = -1; } } else { - int lost = (PURESIZE - pureptr) / 1024; + int lost = (get_PURESIZE() - pureptr) / 1024; char buf[200]; sprintf (buf, "Purespace usage: %ld of %ld (%d%%", - pureptr, (long) PURESIZE, - (int) (pureptr / (PURESIZE / 100.0) + 0.5)); + pureptr, (long) get_PURESIZE(), + (int) (pureptr / (get_PURESIZE() / 100.0) + 0.5)); if (lost > 2) { sprintf (buf + strlen (buf), " -- %dk wasted", lost); if (die_if_pure_storage_exceeded) { @@ -2739,7 +2739,7 @@ /* not know how to restart itself. */ /* --marcpa */ #ifndef WINDOWSNT - fatal ("Pure size adjusted, will restart `make'"); + fatal ("Pure size adjusted, Don't Panic! I will restart the `make'"); #endif } else if (pure_lossage && die_if_pure_storage_exceeded) { fatal ("Pure storage exhausted"); @@ -3917,7 +3917,7 @@ /* Zero out the unused portion of purespace */ if (!pure_lossage) memset ( (char *) (PUREBEG + pureptr), 0, - (((char *) (PUREBEG + PURESIZE)) - + (((char *) (PUREBEG + get_PURESIZE())) - ((char *) (PUREBEG + pureptr)))); /* Zero out the uninitialized (really, unused) part of the containers
--- a/src/data.c Mon Aug 13 09:47:00 2007 +0200 +++ b/src/data.c Mon Aug 13 09:47:52 2007 +0200 @@ -960,15 +960,14 @@ DEFUN ("compiled-function-doc-string", Fcompiled_function_doc_string, 1, 1, 0, /* Return the doc string of the compiled-function object, if available. +Functions that had their doc strings snarfed into the DOC file will have +an integer returned instead of a string. */ (function)) { CHECK_COMPILED_FUNCTION (function); - if (!XCOMPILED_FUNCTION (function)->flags.interactivep) - return Qnil; - return (list2 (Qinteractive, - compiled_function_interactive - (XCOMPILED_FUNCTION (function)))); + + return compiled_function_documentation (XCOMPILED_FUNCTION (function)); } #ifdef COMPILED_FUNCTION_ANNOTATION_HACK @@ -1286,8 +1285,7 @@ { CHECK_INT (base); b = XINT (base); - if (b < 2 || b > 16) - Fsignal (Qargs_out_of_range, Fcons (base, Qnil)); + check_int_range (b, 2, 16); } p = (char *) XSTRING_DATA (string); @@ -1302,7 +1300,7 @@ return make_float (atof (p)); #endif /* LISP_FLOAT_TYPE */ - if (XINT(base) == 10) + if (b == 10) { /* Use the system-provided functions for base 10. */ Lisp_Object value;
--- a/src/emacsfns.h Mon Aug 13 09:47:00 2007 +0200 +++ b/src/emacsfns.h Mon Aug 13 09:47:52 2007 +0200 @@ -550,7 +550,7 @@ extern Lisp_Object Qsave_buffers_kill_emacs; extern Lisp_Object Qkill_emacs_hook; -extern Lisp_Object Frunning_temacs_p(void); +extern Lisp_Object Frunning_temacs_p (void); /* Defined in eval.c */ extern Lisp_Object Qautoload, Qexit, Qinteractive, Qcommandp, Qdefun, Qmacro;
--- a/src/extents.c Mon Aug 13 09:47:00 2007 +0200 +++ b/src/extents.c Mon Aug 13 09:47:52 2007 +0200 @@ -2979,9 +2979,17 @@ for (; !NILP (tail); tail = Fcdr (Fcdr (tail))) { - struct Lisp_String *k = XSYMBOL (XCAR (tail))->name; + struct Lisp_String *k; Lisp_Object v = XCAR (XCDR (tail)); if (NILP (v)) continue; + if (!SYMBOLP (XCAR (tail))) + { + /* ### Fix this! */ + strcpy (bp, "non-symbol "); + bp += 11; + continue; + } + k = XSYMBOL (XCAR (tail))->name; memcpy (bp, (char *) string_data (k), string_length (k)); bp += string_length (k); *bp++ = ' '; @@ -4049,7 +4057,6 @@ if (!NILP (property)) { - CHECK_SYMBOL (property); if (!NILP (value)) value = canonicalize_extent_property (property, value); } @@ -4194,7 +4201,6 @@ if (!NILP (property)) { - CHECK_SYMBOL (property); if (!NILP (value)) value = canonicalize_extent_property (property, value); } @@ -4388,7 +4394,6 @@ object = decode_buffer_or_string (object); position = get_buffer_or_string_pos_byte (object, pos, GB_NO_ERROR_IF_BAD); - CHECK_SYMBOL (property); if (NILP (before)) before_extent = 0; else @@ -5161,7 +5166,6 @@ { /* This function can GC if property is `keymap' */ EXTENT e = decode_extent (extent, 0); - CHECK_SYMBOL (property); if (EQ (property, Qread_only)) set_extent_read_only (e, value); @@ -5243,7 +5247,6 @@ (extent, property, defalt)) { EXTENT e = decode_extent (extent, 0); - CHECK_SYMBOL (property); if (EQ (property, Qdetached)) return (extent_detached_p (e) ? Qt : Qnil); @@ -5860,7 +5863,6 @@ object = decode_buffer_or_string (object); position = get_buffer_or_string_pos_byte (object, pos, GB_NO_ERROR_IF_BAD); - CHECK_SYMBOL (prop); /* We canonicalize the start/end-open/closed properties to the non-default version -- "adding" the default property really @@ -6244,7 +6246,6 @@ object = decode_buffer_or_string (object); get_buffer_or_string_range_byte (object, start, end, &s, &e, 0); - CHECK_SYMBOL (prop); put_text_prop (s, e, object, prop, value, 1); return prop; } @@ -6265,7 +6266,6 @@ object = decode_buffer_or_string (object); get_buffer_or_string_range_byte (object, start, end, &s, &e, 0); - CHECK_SYMBOL (prop); put_text_prop (s, e, object, prop, value, 0); return prop; } @@ -6290,7 +6290,6 @@ { Lisp_Object prop = XCAR (props); Lisp_Object value = Fcar (XCDR (props)); - CHECK_SYMBOL (prop); changed |= put_text_prop (s, e, object, prop, value, 1); } return (changed ? Qt : Qnil); @@ -6319,7 +6318,6 @@ { Lisp_Object prop = XCAR (props); Lisp_Object value = Fcar (XCDR (props)); - CHECK_SYMBOL (prop); changed |= put_text_prop (s, e, object, prop, value, 0); } return (changed ? Qt : Qnil); @@ -6344,7 +6342,6 @@ for (; !NILP (props); props = Fcdr (Fcdr (props))) { Lisp_Object prop = XCAR (props); - CHECK_SYMBOL (prop); changed |= put_text_prop (s, e, object, prop, Qnil, 1); } return (changed ? Qt : Qnil); @@ -6428,7 +6425,6 @@ blim = get_buffer_or_string_pos_char (object, limit, 0); limit_was_nil = 0; } - CHECK_SYMBOL (prop); extent = Fextent_at (make_int (bpos), object, prop, Qnil, Qnil); if (!NILP (extent)) @@ -6497,8 +6493,6 @@ limit_was_nil = 0; } - CHECK_SYMBOL (prop); - /* extent-at refers to the character AFTER bpos, but we want the character before bpos. Thus the - 1. extent-at simply returns nil on bogus positions, so not to worry. */
--- a/src/print.c Mon Aug 13 09:47:00 2007 +0200 +++ b/src/print.c Mon Aug 13 09:47:52 2007 +0200 @@ -84,6 +84,9 @@ Lisp_Object Qprint_escape_newlines; Lisp_Object Qprint_readably; +Lisp_Object Qdisplay_error; +Lisp_Object Qprint_message_label; + /* Force immediate output of all printed data. Used for debugging. */ int print_unbuffered; @@ -593,14 +596,17 @@ } #include "emacsfns.h" -/* Synched with Emacs 19.34 */ + +/* Synched with Emacs 19.34 -- underlying implementation (incarnated + in print_error_message) is completely divergent, though. */ DEFUN ("error-message-string", Ferror_message_string, 1, 1, 0, /* Convert an error value (ERROR-SYMBOL . DATA) to an error message. */ (data)) { + /* This function can GC */ struct buffer *pbuf; - Lisp_Object original, printcharfun, value; + Lisp_Object value; struct gcpro gcpro1; print_error_message (data, Vprin1_to_string_buffer); @@ -616,56 +622,110 @@ return value; } -/* Print an error message for the error DATA - onto Lisp output stream STREAM (suitable for the print functions). */ +/* Print an error message for the error DATA onto Lisp output stream + STREAM (suitable for the print functions). -static void print_error_message (Lisp_Object data, Lisp_Object stream) + This is a complete implementation of `display-error', which used to + be in Lisp (see prim/cmdloop.el). It was ported to C so we can use + it in Ferror_message_string. Fdisplay_error and + Ferror_message_string are trivial wrappers to this function. */ +static void +print_error_message (Lisp_Object error_object, Lisp_Object stream) { - Lisp_Object errname, errmsg, file_error, tail; + /* This function can GC */ + Lisp_Object type; + Lisp_Object method = Qnil; + Lisp_Object tail = Qnil; struct gcpro gcpro1; - int i; + + GCPRO1 (tail); + + type = Fcar_safe (error_object); + + if (! (CONSP (error_object) && SYMBOLP (type) + && CONSP (Fget (type, Qerror_conditions, Qnil)))) + goto error_throw; - errname = Fcar (data); - - if (EQ (errname, Qerror)) + tail = XCDR (error_object); + while (!NILP (tail)) + { + if (CONSP (tail)) + tail = XCDR (tail); + else + goto error_throw; + } + tail = Fget (type, Qerror_conditions, Qnil); + while (!NILP (tail)) { - data = Fcdr (data); - if (!CONSP (data)) data = Qnil; - errmsg = Fcar (data); - file_error = Qnil; + if (!(CONSP (tail) && SYMBOLP (XCAR (tail)))) + goto error_throw; + else if (!NILP (Fget (XCAR (tail), Qdisplay_error, Qnil))) + { + method = Fget (XCAR (tail), Qdisplay_error, Qnil); + goto error_throw; + } + else + tail = XCDR (tail); + } + /* Default method */ + { + int first = 1; + Lisp_Object printcharfun = canonicalize_printcharfun (stream); + int speccount = specpdl_depth (); + + specbind (Qprint_message_label, Qerror); + tail = Fcdr (error_object); + if (EQ (type, Qerror)) + { + Fprinc (Fcar (tail), stream); + tail = Fcdr (tail); + } + else + { + Lisp_Object errmsg = Fget (type, Qerror_message, Qnil); + if (NILP (errmsg)) + Fprinc (type, stream); + else + Fprinc (errmsg, stream); + } + while (!NILP (tail)) + { + write_c_string (first ? ": " : ", ", printcharfun); + Fprin1 (Fcar (tail), stream); + tail = Fcdr (tail); + first = 0; + } + unbind_to (speccount, Qnil); + UNGCPRO; + return; + /* Unreached */ + } + + error_throw: + UNGCPRO; + if (NILP (method)) + { + write_c_string ("Peculiar error ", + canonicalize_printcharfun (stream)); + Fprin1 (error_object, stream); + return; } else { - errmsg = Fget (errname, Qerror_message, Qnil); - file_error = Fmemq (Qfile_error, - Fget (errname, Qerror_conditions, Qnil)); + call2 (method, error_object, stream); } - - /* Print an error message including the data items. */ - - tail = Fcdr_safe (data); - GCPRO1 (tail); - - /* For file-error, make error message by concatenating - all the data items. They are all strings. */ - if (!NILP (file_error) && !NILP (tail)) - errmsg = XCONS (tail)->car, tail = XCONS (tail)->cdr; +} - if (STRINGP (errmsg)) - Fprinc (errmsg, stream); - else - write_string_1 ((CONST Bufbyte *)"Peculiar error", 14, stream); +DEFUN ("display-error", Fdisplay_error, 2, 2, 0, /* +Display an error message for ERROR-OBJECT to STREAM. +*/ + (error_object, stream)) +{ + /* This function can GC */ + print_error_message (error_object, stream); + return Qnil; +} - for (i = 0; CONSP (tail); tail = Fcdr (tail), i++) - { - write_string_1 ((CONST Bufbyte *)(i ? ", " : ": "), 2, stream); - if (!NILP (file_error)) - Fprinc (Fcar (tail), stream); - else - Fprin1 (Fcar (tail), stream); - } - UNGCPRO; -} #ifdef LISP_FLOAT_TYPE @@ -1509,11 +1569,16 @@ defsymbol (&Qprint_length, "print-length"); defsymbol (&Qprint_string_length, "print-string-length"); + + defsymbol (&Qdisplay_error, "display-error"); + defsymbol (&Qprint_message_label, "print-message-label"); + DEFSUBR (Fprin1); DEFSUBR (Fprin1_to_string); DEFSUBR (Fprinc); DEFSUBR (Fprint); DEFSUBR (Ferror_message_string); + DEFSUBR (Fdisplay_error); DEFSUBR (Fterpri); DEFSUBR (Fwrite_char); DEFSUBR (Falternate_debugging_output);
--- a/src/pure.c Mon Aug 13 09:47:00 2007 +0200 +++ b/src/pure.c Mon Aug 13 09:47:52 2007 +0200 @@ -21,6 +21,23 @@ #include "puresize.h" #include "lisp.h" +/* Moved from puresize.h to here so alloc.c does not get recompiled */ + +/* Current build process on NT does not generate a puresize_adjust.h */ +/* file. --marcpa */ +#ifdef WINDOWSNT +# define PURESIZE_ADJUSTMENT 1000000 +#else +# include <puresize_adjust.h> +#endif +#define PURESIZE ((RAW_PURESIZE) + (PURESIZE_ADJUSTMENT)) + +long int +get_PURESIZE(void) +{ + return PURESIZE; +} + Lisp_Object pure[PURESIZE / sizeof (Lisp_Object)] /* Force linker to put it into data space! */ #ifdef NO_UNION_TYPE
--- a/src/puresize.h Mon Aug 13 09:47:00 2007 +0200 +++ b/src/puresize.h Mon Aug 13 09:47:52 2007 +0200 @@ -171,15 +171,7 @@ (SUNPRO_PURESIZE_EXTRA)) #endif /* !RAW_PURESIZE */ - -/* Current build process on NT does not generate a puresize_adjust.h */ -/* file. --marcpa */ -#ifdef WINDOWSNT -# define PURESIZE_ADJUSTMENT 1000000 -#else -# include <puresize_adjust.h> -#endif -#define PURESIZE ((RAW_PURESIZE) + (PURESIZE_ADJUSTMENT)) +extern long int get_PURESIZE(void); #endif /* PURESIZE_H */