Mercurial > hg > xemacs-beta
changeset 5474:4dee0387b9de
Merged with trunk.
line wrap: on
line diff
--- a/ChangeLog Thu Mar 17 23:42:59 2011 +0100 +++ b/ChangeLog Tue Mar 29 00:02:47 2011 +0200 @@ -1,3 +1,10 @@ +2011-03-24 Jerry James <james@xemacs.org> + + * INSTALL: "youself" -> "yourself". + * aclocal.m4: "dependancy" -> "dependency". + * configure.ac: "priveleges" -> "privileges". + * configure: Regenerate. + 2010-11-02 Mats Lidell <matsl@xemacs.org> * netinstall: removed
--- a/INSTALL Thu Mar 17 23:42:59 2011 +0100 +++ b/INSTALL Tue Mar 29 00:02:47 2011 +0200 @@ -481,7 +481,7 @@ For most platforms, configure or the src/s file have the preferred method for locking mail spool files preconfigured. Otherwise you must -find out for youself. Do not choose a locking protocol "on the +find out for yourself. Do not choose a locking protocol "on the objective merits." XEmacs must use the same method as other mail utilities on your system, or you WILL lose mail.
--- a/aclocal.m4 Thu Mar 17 23:42:59 2011 +0100 +++ b/aclocal.m4 Tue Mar 29 00:02:47 2011 +0200 @@ -215,7 +215,7 @@ dnl if the C compiler itself cannot create shared libraries do we try to dnl find the linker. dnl -dnl The other advantage to my scheme is that it removes the dependancy +dnl The other advantage to my scheme is that it removes the dependency dnl on a given compiler version remaining static with relation to the dnl version of XEmacs. With the libtool way, it picks up the linker that dnl gcc uses, which can be the internal collect2 that comes with gcc.
--- a/configure Thu Mar 17 23:42:59 2011 +0100 +++ b/configure Tue Mar 29 00:02:47 2011 +0200 @@ -1,13 +1,13 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65 for XEmacs 21.5. +# Generated by GNU Autoconf 2.66 for XEmacs 21.5. # # Report bugs to <xemacs-beta@xemacs.org>. # # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software +# Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -363,7 +363,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -403,19 +403,19 @@ fi # as_fn_arith -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 - fi - $as_echo "$as_me: error: $1" >&2 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -577,7 +577,7 @@ exec 6>&1 # Name of the host. -# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` @@ -1146,7 +1146,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1172,7 +1172,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" + as_fn_error $? "invalid feature name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1376,7 +1376,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1392,7 +1392,7 @@ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" + as_fn_error $? "invalid package name: $ac_useropt" ac_useropt_orig=$ac_useropt ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` case $ac_user_opts in @@ -1422,8 +1422,8 @@ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." + -*) as_fn_error $? "unrecognized option: \`$ac_option' +Try \`$0 --help' for more information" ;; *=*) @@ -1431,7 +1431,7 @@ # Reject names that are not valid shell variable names. case $ac_envvar in #( '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error "invalid variable name: \`$ac_envvar'" ;; + as_fn_error $? "invalid variable name: \`$ac_envvar'" ;; esac eval $ac_envvar=\$ac_optarg export $ac_envvar ;; @@ -1449,13 +1449,13 @@ if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error "missing argument to $ac_option" + as_fn_error $? "missing argument to $ac_option" fi if test -n "$ac_unrecognized_opts"; then case $enable_option_checking in no) ;; - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; + fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;; *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; esac fi @@ -1478,7 +1478,7 @@ [\\/$]* | ?:[\\/]* ) continue;; NONE | '' ) case $ac_var in *prefix ) continue;; esac;; esac - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" + as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1492,8 +1492,8 @@ if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 + $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1508,9 +1508,9 @@ ac_pwd=`pwd` && test -n "$ac_pwd" && ac_ls_di=`ls -di .` && ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error "working directory cannot be determined" + as_fn_error $? "working directory cannot be determined" test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error "pwd does not report name of working directory" + as_fn_error $? "pwd does not report name of working directory" # Find the source files, if location was not specified. @@ -1549,11 +1549,11 @@ fi if test ! -r "$srcdir/$ac_unique_file"; then test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" + as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir" fi ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" + cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error $? "$ac_msg" pwd)` # When building in place, set srcdir=. if test "$ac_abs_confdir" = "$ac_pwd"; then @@ -1593,7 +1593,7 @@ --help=short display options specific to this package --help=recursive display the short help of all the included packages -V, --version display version information and exit - -q, --quiet, --silent do not print \`checking...' messages + -q, --quiet, --silent do not print \`checking ...' messages --cache-file=FILE cache test results in FILE [disabled] -C, --config-cache alias for \`--cache-file=config.cache' -n, --no-create do not create output files @@ -2093,9 +2093,9 @@ if $ac_init_version; then cat <<\_ACEOF XEmacs configure 21.5 -generated by GNU Autoconf 2.65 - -Copyright (C) 2009 Free Software Foundation, Inc. +generated by GNU Autoconf 2.66 + +Copyright (C) 2010 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. @@ -2235,10 +2235,10 @@ ac_fn_c_check_header_mongrel () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + if eval "test \"\${$3+set}\"" = set; then : { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 fi eval ac_res=\$$3 @@ -2297,17 +2297,15 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( cat <<\_ASBOX -## ------------------------------------- ## +( $as_echo "## ------------------------------------- ## ## Report this to xemacs-beta@xemacs.org ## -## ------------------------------------- ## -_ASBOX +## ------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else eval "$3=\$ac_header_compiler" @@ -2371,7 +2369,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2447,7 +2445,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2506,15 +2504,18 @@ } # ac_fn_c_check_func -# ac_fn_c_check_decl LINENO SYMBOL VAR -# ------------------------------------ -# Tests whether SYMBOL is declared, setting cache variable VAR accordingly. +# ac_fn_c_check_decl LINENO SYMBOL VAR INCLUDES +# --------------------------------------------- +# Tests whether SYMBOL is declared in INCLUDES, setting cache variable VAR +# accordingly. ac_fn_c_check_decl () { as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $2 is declared" >&5 -$as_echo_n "checking whether $2 is declared... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : + as_decl_name=`echo $2|sed 's/ *(.*//'` + as_decl_use=`echo $2|sed -e 's/(/((/' -e 's/)/) 0&/' -e 's/,/) 0& (/g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $as_decl_name is declared" >&5 +$as_echo_n "checking whether $as_decl_name is declared... " >&6; } +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2523,8 +2524,12 @@ int main () { -#ifndef $2 - (void) $2; +#ifndef $as_decl_name +#ifdef __cplusplus + (void) $as_decl_use; +#else + (void) $as_decl_name; +#endif #endif ; @@ -2554,7 +2559,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 $as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$3+set}\"" = set; then : $as_echo_n "(cached) " >&6 else eval "$3=no" @@ -2608,7 +2613,7 @@ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 $as_echo_n "checking for $2.$3... " >&6; } -if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$4+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -2876,7 +2881,7 @@ running configure, to aid debugging if configure makes a mistake. It was created by XEmacs $as_me 21.5, which was -generated by GNU Autoconf 2.65. Invocation command line was +generated by GNU Autoconf 2.66. Invocation command line was $ $0 $@ @@ -2986,11 +2991,9 @@ { echo - cat <<\_ASBOX -## ---------------- ## + $as_echo "## ---------------- ## ## Cache variables. ## -## ---------------- ## -_ASBOX +## ---------------- ##" echo # The following way of writing the cache mishandles newlines in values, ( @@ -3024,11 +3027,9 @@ ) echo - cat <<\_ASBOX -## ----------------- ## + $as_echo "## ----------------- ## ## Output variables. ## -## ----------------- ## -_ASBOX +## ----------------- ##" echo for ac_var in $ac_subst_vars do @@ -3041,11 +3042,9 @@ echo if test -n "$ac_subst_files"; then - cat <<\_ASBOX -## ------------------- ## + $as_echo "## ------------------- ## ## File substitutions. ## -## ------------------- ## -_ASBOX +## ------------------- ##" echo for ac_var in $ac_subst_files do @@ -3059,11 +3058,9 @@ fi if test -s confdefs.h; then - cat <<\_ASBOX -## ----------- ## + $as_echo "## ----------- ## ## confdefs.h. ## -## ----------- ## -_ASBOX +## ----------- ##" echo cat confdefs.h echo @@ -3118,7 +3115,12 @@ ac_site_file1=NONE ac_site_file2=NONE if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE + # We do not want a PATH search for config.site. + case $CONFIG_SITE in #(( + -*) ac_site_file1=./$CONFIG_SITE;; + */*) ac_site_file1=$CONFIG_SITE;; + *) ac_site_file1=./$CONFIG_SITE;; + esac elif test "x$prefix" != xNONE; then ac_site_file1=$prefix/share/config.site ac_site_file2=$prefix/etc/config.site @@ -3133,7 +3135,11 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 $as_echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" + . "$ac_site_file" \ + || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "failed to load site script $ac_site_file +See \`config.log' for more details" "$LINENO" 5; } fi done @@ -3209,7 +3215,7 @@ $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 $as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 fi ## -------------------- ## ## Main body of script. ## @@ -5580,16 +5586,22 @@ ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - for ac_t in install-sh install.sh shtool; do - if test -f "$ac_dir/$ac_t"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/$ac_t -c" - break 2 - fi - done + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 fi # These three variables are undocumented and unsupported, @@ -5603,7 +5615,7 @@ # Make sure we can run config.sub. $SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 + as_fn_error $? "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 $as_echo_n "checking build system type... " >&6; } @@ -5614,16 +5626,16 @@ test "x$ac_build_alias" = x && ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` test "x$ac_build_alias" = x && - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 + as_fn_error $? "cannot guess build type; you must specify one" "$LINENO" 5 ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 + as_fn_error $? "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 $as_echo "$ac_cv_build" >&6; } case $ac_cv_build in *-*-*) ;; -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; +*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;; esac build=$ac_cv_build ac_save_IFS=$IFS; IFS='-' @@ -6305,8 +6317,8 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -6420,9 +6432,8 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "C compiler cannot create executables -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "C compiler cannot create executables +See \`config.log' for more details" "$LINENO" 5; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -6464,8 +6475,8 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest conftest$ac_cv_exeext { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 @@ -6522,9 +6533,9 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run C compiled programs. +as_fn_error $? "cannot run C compiled programs. If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } +See \`config.log' for more details" "$LINENO" 5; } fi fi fi @@ -6575,8 +6586,8 @@ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of object files: cannot compile -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot compute suffix of object files: cannot compile +See \`config.log' for more details" "$LINENO" 5; } fi rm -f conftest.$ac_cv_objext conftest.$ac_ext fi @@ -6930,8 +6941,8 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -6995,7 +7006,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_GREP"; then - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_GREP=$GREP @@ -7061,7 +7072,7 @@ done IFS=$as_save_IFS if test -z "$ac_cv_path_EGREP"; then - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 + as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 fi else ac_cv_path_EGREP=$EGREP @@ -7193,8 +7204,7 @@ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -7569,8 +7579,8 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -8117,8 +8127,8 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -8665,8 +8675,8 @@ test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "no acceptable C compiler found in \$PATH +See \`config.log' for more details" "$LINENO" 5; } # Provide some information about the compiler. $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 @@ -8915,8 +8925,8 @@ if test "$cross_compiling" = yes; then : { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run test program while cross compiling -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -8936,8 +8946,8 @@ if test "$cross_compiling" = yes; then : { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run test program while cross compiling -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -9116,8 +9126,8 @@ else { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details" "$LINENO" 5; } fi ac_ext=c @@ -9190,8 +9200,8 @@ if test "$cross_compiling" = yes; then : { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run test program while cross compiling -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -9673,7 +9683,7 @@ $as_echo "$as_me: WARNING: Don't use -O2 with gcc 2.8.1 and egcs 1.0 under SPARC architectures" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: without also using -fno-schedule-insns." >&5 $as_echo "$as_me: WARNING: without also using -fno-schedule-insns." >&2;} - as_fn_error "Aborting due to known problem" "$LINENO" 5 + as_fn_error $? "Aborting due to known problem" "$LINENO" 5 ;; esac ;; @@ -9686,7 +9696,7 @@ $as_echo "$as_me: WARNING: There have been reports of egcs-1.1 not compiling XEmacs correctly on" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Alpha Linux. There have also been reports that egcs-1.0.3a is O.K." >&5 $as_echo "$as_me: WARNING: Alpha Linux. There have also been reports that egcs-1.0.3a is O.K." >&2;} - as_fn_error "Aborting due to known problem" "$LINENO" 5 + as_fn_error $? "Aborting due to known problem" "$LINENO" 5 ;; *:i*86*:2.7.2*) case "$CFLAGS" in @@ -9702,7 +9712,7 @@ $as_echo "$as_me: WARNING: Don't use -O2 with gcc 2.7.2 under Intel/XXX without also using" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: -fno-strength-reduce." >&5 $as_echo "$as_me: WARNING: -fno-strength-reduce." >&2;} - as_fn_error "Aborting due to known problem" "$LINENO" 5 + as_fn_error $? "Aborting due to known problem" "$LINENO" 5 ;; esac ;; @@ -9716,7 +9726,7 @@ $as_echo "$as_me: WARNING: Don't use -O2 with gcc 2.7.2 under Intel/XXX without also using" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: -fno-caller-saves." >&5 $as_echo "$as_me: WARNING: -fno-caller-saves." >&2;} - as_fn_error "Aborting due to known problem" "$LINENO" 5 + as_fn_error $? "Aborting due to known problem" "$LINENO" 5 ;; esac ;; @@ -10529,8 +10539,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -11184,7 +11193,7 @@ $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; } set x ${MAKE-make} ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` -if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then : $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -11192,7 +11201,7 @@ all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +# GNU make sometimes prints "make[1]: Entering ...", which would confuse us. case `${MAKE-make} -f conftest.make 2>/dev/null` in *@@@%%%=?*=@@@%%%*) eval ac_cv_prog_make_${ac_make}_set=yes;; @@ -11432,7 +11441,7 @@ ;; #( *) - as_fn_error "unknown endianness + as_fn_error $? "unknown endianness presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; esac @@ -11452,9 +11461,8 @@ if test "$ac_cv_type_short" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "cannot compute sizeof (short) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (short) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_short=0 fi @@ -11492,9 +11500,8 @@ if test "$ac_cv_type_int" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "cannot compute sizeof (int) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (int) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_int=0 fi @@ -11526,9 +11533,8 @@ if test "$ac_cv_type_long" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "cannot compute sizeof (long) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (long) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_long=0 fi @@ -11560,9 +11566,8 @@ if test "$ac_cv_type_long_long" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "cannot compute sizeof (long long) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (long long) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_long_long=0 fi @@ -11594,9 +11599,8 @@ if test "$ac_cv_type_void_p" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "cannot compute sizeof (void *) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (void *) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_void_p=0 fi @@ -11628,9 +11632,8 @@ if test "$ac_cv_type_double" = yes; then { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "cannot compute sizeof (double) -See \`config.log' for more details." "$LINENO" 5; }; } +as_fn_error 77 "cannot compute sizeof (double) +See \`config.log' for more details" "$LINENO" 5; } else ac_cv_sizeof_double=0 fi @@ -11779,8 +11782,7 @@ do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -12064,8 +12066,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -12240,7 +12241,7 @@ have_x=disabled else case $x_includes,$x_libraries in #( - *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #( + *\'*) as_fn_error $? "cannot use X directory names containing '" "$LINENO" 5;; #( *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : $as_echo_n "(cached) " >&6 else @@ -12258,7 +12259,7 @@ @echo libdir='${LIBDIR}' _ACEOF if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then - # GNU make sometimes prints "make[1]: Entering...", which would confuse us. + # GNU make sometimes prints "make[1]: Entering ...", which would confuse us. for ac_var in incroot usrlibdir libdir; do eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" done @@ -13131,7 +13132,7 @@ if test "x$ac_cv_header_X11_Intrinsic_h" = x""yes; then : else - as_fn_error "Unable to find X11 header files." "$LINENO" 5 + as_fn_error $? "Unable to find X11 header files." "$LINENO" 5 fi @@ -13216,7 +13217,7 @@ if test "x$ac_cv_lib_X11_XGetFontProperty" = x""yes; then : ld_switch_x_site="-b i486-linuxaout $ld_switch_x_site" else - as_fn_error "Unable to find X11 libraries." "$LINENO" 5 + as_fn_error $? "Unable to find X11 libraries." "$LINENO" 5 fi fi @@ -13303,7 +13304,7 @@ if test "x$ac_cv_lib_Xt_XtOpenDisplay" = x""yes; then : libs_x="-lXt $libs_x" && if test "$verbose" = "yes"; then echo " Prepending \"-lXt\" to \$libs_x"; fi else - as_fn_error "Unable to find X11 libraries." "$LINENO" 5 + as_fn_error $? "Unable to find X11 libraries." "$LINENO" 5 fi @@ -13344,8 +13345,7 @@ do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -13358,8 +13358,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -13445,7 +13444,7 @@ fi if test "$with_xmu" = "no"; then - as_fn_error "We're sorry, but we thought there were no systems without Xmu by now. + as_fn_error $? "We're sorry, but we thought there were no systems without Xmu by now. You cannot build this version of XEmacs for X11 without Xmu. Please report this to xemacs-beta@xemacs.org. As a workaround, revert to XEmacs 21.5.29." "$LINENO" 5 else @@ -13783,8 +13782,8 @@ if test "$cross_compiling" = yes; then : { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run test program while cross compiling -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -14474,7 +14473,7 @@ fi if test -z "$LTLD" -a "$cc_produces_so" = no; then - as_fn_error "no acceptable linker found in \$PATH" "$LINENO" 5 + as_fn_error $? "no acceptable linker found in \$PATH" "$LINENO" 5 exit 1 fi fi @@ -14713,8 +14712,7 @@ do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -14760,8 +14758,7 @@ for dir in "" "Tt/" "desktop/" ; do as_ac_Header=`$as_echo "ac_cv_header_${dir}tt_c.h" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "${dir}tt_c.h" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : tt_c_h_file="${dir}tt_c.h"; break fi @@ -15170,8 +15167,7 @@ do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -15198,8 +15194,7 @@ for header_dir in "" "pgsql/" "postgresql/"; do as_ac_Header=`$as_echo "ac_cv_header_${header_dir}libpq-fe.h" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "${header_dir}libpq-fe.h" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : libpq_fe_h_file=${header_dir}libpq-fe.h; break fi @@ -15402,8 +15397,8 @@ if test "$cross_compiling" = yes; then : { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run test program while cross compiling -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -15886,8 +15881,8 @@ if test "$cross_compiling" = yes; then : { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run test program while cross compiling -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -16085,7 +16080,7 @@ as_ac_Lib=`$as_echo "ac_cv_lib_$athena_variant''_XawScrollbarSetThumb" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XawScrollbarSetThumb in -l$athena_variant" >&5 $as_echo_n "checking for XawScrollbarSetThumb in -l$athena_variant... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -16120,13 +16115,12 @@ eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : as_ac_Lib=`$as_echo "ac_cv_lib_$athena_variant''_XawSme3dComputeTopShadowRGB" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XawSme3dComputeTopShadowRGB in -l$athena_variant" >&5 $as_echo_n "checking for XawSme3dComputeTopShadowRGB in -l$athena_variant... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -16161,8 +16155,7 @@ eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Could not find a non-3d Athena widget library." >&5 $as_echo "$as_me: WARNING: Could not find a non-3d Athena widget library." >&2;} else @@ -16179,7 +16172,7 @@ as_ac_Lib=`$as_echo "ac_cv_lib_$athena_variant''_XawSme3dComputeTopShadowRGB" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XawSme3dComputeTopShadowRGB in -l$athena_variant" >&5 $as_echo_n "checking for XawSme3dComputeTopShadowRGB in -l$athena_variant... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -16214,8 +16207,7 @@ eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : athena_lib=$athena_variant else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XawSme3dComputeTopShadowRGB in -lXaw" >&5 @@ -16299,12 +16291,10 @@ #include <X11/Intrinsic.h> " -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : as_ac_Header=`$as_echo "ac_cv_header_X11/$athena_variant/ThreeD.h" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "X11/$athena_variant/ThreeD.h" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : athena_h_path=X11/$athena_variant fi @@ -16322,12 +16312,10 @@ #include <X11/Intrinsic.h> " -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : as_ac_Header=`$as_echo "ac_cv_header_$athena_variant/ThreeD.h" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$athena_variant/ThreeD.h" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : athena_h_path=$athena_variant fi @@ -17227,7 +17215,7 @@ as_ac_Lib=`$as_echo "ac_cv_lib_$libwnn''_jl_fi_dic_list" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jl_fi_dic_list in -l$libwnn" >&5 $as_echo_n "checking for jl_fi_dic_list in -l$libwnn... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -17262,8 +17250,7 @@ eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : with_wnn6=yes fi @@ -17548,8 +17535,7 @@ do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -17641,8 +17627,7 @@ do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF @@ -17705,8 +17690,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -18293,8 +18277,7 @@ for ac_func in _getb67 GETB67 getb67; do as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define CRAY_STACKSEG_END $ac_func @@ -18366,8 +18349,8 @@ if test "$cross_compiling" = yes; then : { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run test program while cross compiling -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -18442,8 +18425,8 @@ if test "$cross_compiling" = yes; then : { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run test program while cross compiling -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -18565,8 +18548,8 @@ if test "$cross_compiling" = yes; then : { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run test program while cross compiling -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -18956,8 +18939,7 @@ for dir in "machine" "sys" "linux"; do as_ac_Header=`$as_echo "ac_cv_header_${dir}/soundcard.h" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "${dir}/soundcard.h" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : sound_found=yes case "${ac_cv_build}" in @@ -19357,7 +19339,7 @@ as_ac_Lib=`$as_echo "ac_cv_lib_$lib''_tgetent" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for tgetent in -l$lib" >&5 $as_echo_n "checking for tgetent in -l$lib... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -19392,8 +19374,7 @@ eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : LIBS="-l${lib} $LIBS" && if test "$verbose" = "yes"; then echo " Prepending \"-l${lib}\" to \$LIBS"; fi; break fi @@ -19583,8 +19564,7 @@ do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF @@ -20206,15 +20186,14 @@ as_ac_var=`$as_echo "ac_cv_func_$dbfunc" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$dbfunc" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_var"\" = x"yes"; then : with_database_berkdb=yes need_libdb=no else as_ac_Lib=`$as_echo "ac_cv_lib_db_$dbfunc" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dbfunc in -ldb" >&5 $as_echo_n "checking for $dbfunc in -ldb... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -20249,8 +20228,7 @@ eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : with_database_berkdb=yes need_libdb=yes fi @@ -20270,7 +20248,7 @@ as_ac_Lib=`$as_echo "ac_cv_lib_db_$dbfunc" | $as_tr_sh` { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $dbfunc in -ldb" >&5 $as_echo_n "checking for $dbfunc in -ldb... " >&6; } -if { as_var=$as_ac_Lib; eval "test \"\${$as_var+set}\" = set"; }; then : +if eval "test \"\${$as_ac_Lib+set}\"" = set; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -20305,8 +20283,7 @@ eval ac_res=\$$as_ac_Lib { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 $as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_Lib - if test "x$as_val" = x""yes; then : +if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then : with_database_berkdb=yes need_libdb=yes fi @@ -20569,8 +20546,8 @@ if test "$cross_compiling" = yes; then : { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run test program while cross compiling -See \`config.log' for more details." "$LINENO" 5; } +as_fn_error $? "cannot run test program while cross compiling +See \`config.log' for more details" "$LINENO" 5; } else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -21493,6 +21470,7 @@ ac_libobjs= ac_ltlibobjs= +U= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' @@ -21655,19 +21633,19 @@ (unset CDPATH) >/dev/null 2>&1 && unset CDPATH -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- +# as_fn_error STATUS ERROR [LINENO LOG_FD] +# ---------------------------------------- # Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are # provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. +# script with STATUS, using 1 if that was 0. as_fn_error () { - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 - fi - $as_echo "$as_me: error: $1" >&2 + as_status=$1; test $as_status -eq 0 && as_status=1 + if test "$4"; then + as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4 + fi + $as_echo "$as_me: error: $2" >&2 as_fn_exit $as_status } # as_fn_error @@ -21863,7 +21841,7 @@ test -d "$as_dir" && break done test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" + } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir" } # as_fn_mkdir_p @@ -21917,7 +21895,7 @@ # values after options handling. ac_log=" This file was extended by XEmacs $as_me 21.5, which was -generated by GNU Autoconf 2.65. Invocation command line was +generated by GNU Autoconf 2.66. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -21983,10 +21961,10 @@ ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ XEmacs config.status 21.5 -configured by $0, generated by GNU Autoconf 2.65, +configured by $0, generated by GNU Autoconf 2.66, with options \\"\$ac_cs_config\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2010 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -22040,7 +22018,7 @@ ac_need_defaults=false;; --he | --h) # Conflict between --help and --header - as_fn_error "ambiguous option: \`$1' + as_fn_error $? "ambiguous option: \`$1' Try \`$0 --help' for more information.";; --help | --hel | -h ) $as_echo "$ac_cs_usage"; exit ;; @@ -22049,7 +22027,7 @@ ac_cs_silent=: ;; # This is an error. - -*) as_fn_error "unrecognized option: \`$1' + -*) as_fn_error $? "unrecognized option: \`$1' Try \`$0 --help' for more information." ;; *) as_fn_append ac_config_targets " $1" @@ -22114,7 +22092,7 @@ "lib-src/ellcc.h") CONFIG_FILES="$CONFIG_FILES lib-src/ellcc.h" ;; "default") CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac done @@ -22152,7 +22130,7 @@ { tmp=./conf$$-$RANDOM (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 +} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5 # Set up the scripts for CONFIG_FILES section. # No need to generate them if there are no CONFIG_FILES. @@ -22169,7 +22147,7 @@ fi ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\r' + ac_cs_awk_cr='\\r' else ac_cs_awk_cr=$ac_cr fi @@ -22183,18 +22161,18 @@ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && echo "_ACEOF" } >conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 +ac_delim_num=`echo "$ac_subst_vars" | grep -c '^'` ac_delim='%!_!# ' for ac_last_try in false false false false false :; do . ./conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` if test $ac_delim_n = $ac_delim_num; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -22283,20 +22261,28 @@ else cat fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 -_ACEOF - -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and + || as_fn_error $? "could not setup config files machinery" "$LINENO" 5 +_ACEOF + +# VPATH may cause trouble with some makes, so we remove sole $(srcdir), +# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and # trailing colons and then remove the whole line if VPATH becomes empty # (actually we leave an empty line to preserve line numbers). if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ + ac_vpsub='/^[ ]*VPATH[ ]*=[ ]*/{ +h +s/// +s/^/:/ +s/[ ]*$/:/ +s/:\$(srcdir):/:/g +s/:\${srcdir}:/:/g +s/:@srcdir@:/:/g +s/^:*// s/:*$// +x +s/\(=[ ]*\).*/\1/ +G +s/\n// s/^[^=]*=[ ]*$// }' fi @@ -22324,7 +22310,7 @@ if test -z "$ac_t"; then break elif $ac_last_try; then - as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 + as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5 else ac_delim="$ac_delim!$ac_delim _$ac_delim!! " fi @@ -22409,7 +22395,7 @@ _ACAWK _ACEOF cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - as_fn_error "could not setup config headers machinery" "$LINENO" 5 + as_fn_error $? "could not setup config headers machinery" "$LINENO" 5 fi # test -n "$CONFIG_HEADERS" @@ -22422,7 +22408,7 @@ esac case $ac_mode$ac_tag in :[FHL]*:*);; - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; + :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;; :[FH]-) ac_tag=-:-;; :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; esac @@ -22450,7 +22436,7 @@ [\\/$]*) false;; *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; esac || - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; + as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;; esac case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac as_fn_append ac_file_inputs " '$ac_f'" @@ -22477,7 +22463,7 @@ case $ac_tag in *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; esac ;; esac @@ -22608,22 +22594,22 @@ $ac_datarootdir_hack " eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 +which seems to be undefined. Please make sure it is defined" >&5 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} +which seems to be undefined. Please make sure it is defined" >&2;} rm -f "$tmp/stdin" case $ac_file in -) cat "$tmp/out" && rm -f "$tmp/out";; *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; esac \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;; :H) # @@ -22634,19 +22620,19 @@ $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" } >"$tmp/config.h" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 $as_echo "$as_me: $ac_file is unchanged" >&6;} else rm -f "$ac_file" mv "$tmp/config.h" "$ac_file" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 + || as_fn_error $? "could not create $ac_file" "$LINENO" 5 fi else $as_echo "/* $configure_input */" \ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ - || as_fn_error "could not create -" "$LINENO" 5 + || as_fn_error $? "could not create -" "$LINENO" 5 fi ;; @@ -22813,7 +22799,7 @@ ac_clean_files=$ac_clean_files_save test $ac_write_fail = 0 || - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 + as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5 # configure is writing to config.log, and then calls config.status. @@ -22834,7 +22820,7 @@ exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit $? + $ac_cs_success || as_fn_exit 1 fi if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
--- a/configure.ac Thu Mar 17 23:42:59 2011 +0100 +++ b/configure.ac Tue Mar 29 00:02:47 2011 +0200 @@ -4469,7 +4469,7 @@ dnl We define our own getloadavg() using lower level functions. XE_ADD_OBJS(getloadavg.o) - dnl Used by getloadavg() - does not require root priveleges + dnl Used by getloadavg() - does not require root privileges AC_CHECK_LIB(kstat, kstat_open) AC_CHECK_HEADERS(kstat.h)
--- a/lisp/ChangeLog Thu Mar 17 23:42:59 2011 +0100 +++ b/lisp/ChangeLog Tue Mar 29 00:02:47 2011 +0200 @@ -1,3 +1,87 @@ +2011-03-24 Jerry James <james@xemacs.org> + + * cl-macs.el (loop): "arbitary" -> "arbitrary". + * coding.el (force-coding-system-equivalency): "compatiblity" -> + "compatibility". + * cus-edit.el (custom-variable-pre-reset-standard): "explictly" -> + "explicitly" and fix grammar. + (custom-face-pre-reset-standard): "explictly" -> "explicitly". + * etags.el (pop-tag-mark): "seperate" -> "separate". + * files.el (make-temp-file): "analagous" -> "analogous". + * font-menu.el (font-menu-ignore-scaled-fonts): "noticably" -> + "noticeably". + * fontconfig.el (fc-pattern-get-or-compute-size): "unsucessful" -> + "unsuccessful". + * gnome-widgets.el: "writen" -> "written", "choosed" -> "chosen", + "existance" -> "existence". + * gtk-ffi.el (gtk-ffi-debug): "wiht" -> "with". + * gtk-widgets.el: "wil" -> "will", "occure" -> "occur", "efficent" -> + "efficient", "mannor" -> "manner", "negitive" -> "negative", + "particulary" -> "particularly". + * info.el (Info-suffixed-file): "independantly" -> "independently". + * minibuf.el (minibuffer): "Controling" -> "Controlling". + * mule/ccl.el (define-ccl-program): "correponding" -> "corresponding". + * mule/indian.el: "apperance" -> "appearance" and correct grammar. + * mule/kinsoku.el (kinsoku-process-extend): "permissable" -> + "permissible", "deliberatly" -> "deliberately", and correct grammar. + (kinsoku-process-shrink): "permissable" -> "permissible". + * mule/lao-util.el (lao-vowel-reordering-rule): "follwoing" -> + "following", "alwasy" -> "always". + (lao-transcribe-single-roman-syllable-to-lao): "beggining" -> + "beginning". + * mule/latin.el: "idiosyncracy" -> "idiosyncrasy". + * mule/thai-util.el: "repetion" -> "repetition". + * package-get.el (package-get-require-base): "explictly" -> + "explicitly". + * packages.el (packages-find-package-data-path): "hierachies" -> + "hierarchies". + * paragraphs.el (use-hard-newlines): "preceeding" -> "preceding". + * startup.el (command-line): "intial" -> "initial". + * toolbar-itmes.el (toolbar-news): "Unkown" -> "Unknown". + +2011-03-24 Aidan Kehoe <kehoea@parhasard.net> + + * custom.el (custom-add-to-group): + Warn if adding an option to the nil group; this is usually an + error on the part of the programmer. + * cmdloop.el (suggest-key-bindings): + Specify a group for this variable, it didn't previously have one. + +2011-03-21 Aidan Kehoe <kehoea@parhasard.net> + + * cl-macs.el (revappend, nreconc): + Add compiler macros for these two functions. (They used to be + inline, but that involves needless binding of the arguments.) + +2011-03-21 Aidan Kehoe <kehoea@parhasard.net> + + * cl-macs.el (cl-non-fixnum-number-p): + This should return t under 64-bit builds for fixnums that would + be bignums on a 32-bit machine; make it so. + +2011-03-19 Stephen J. Turnbull <stephen@xemacs.org> + + * faces.el (face-spec-set-match-display): + Protect against `display-color-cells' returning nil. + Delete unreferenced let-binding of `min-colors'. + +2011-03-17 Aidan Kehoe <kehoea@parhasard.net> + + * bytecomp.el (byte-compile-catch): + * bytecomp.el (byte-compile-throw): + Correct some minor problems in my last change. Happy St. Patrick's + day, everyone! + +2011-03-17 Aidan Kehoe <kehoea@parhasard.net> + + * bytecomp.el (byte-compile-catch): + * bytecomp.el (byte-compile-throw): + * cl-macs.el (return-from): + With `block' and `return-from', a nil NAME is perfectly + legitimate, and the corresponding `catch' statements need be + removed by the byte-compiler. 5dd1ba5e0113 , my change of + 2011-02-12, didn't do this; correct that now. + 2011-03-15 Aidan Kehoe <kehoea@parhasard.net> * bytecomp.el:
--- a/lisp/bytecomp.el Thu Mar 17 23:42:59 2011 +0100 +++ b/lisp/bytecomp.el Tue Mar 29 00:02:47 2011 +0200 @@ -4193,20 +4193,22 @@ "Byte-compile and return a `catch' from. If FORM is the result of macroexpanding a `block' form (the TAG argument is -a quoted symbol with a non-nil `cl-block-name' property) and there is no +a quoted symbol with a `cl-block-name' property) and there is no corresponding `return-from' within the block--or equivalently, it was optimized away--just byte compile and return the BODY." (let* ((symbol (car-safe (cdr-safe (nth 1 form)))) - (block (and symbol (symbolp symbol) (get symbol 'cl-block-name))) - (elt (and block (cons block nil))) + (not-present '#:not-present) + (block (and symbol (symbolp symbol) + (get symbol 'cl-block-name not-present))) + (elt (and (not (eq block not-present)) (list block))) (byte-compile-active-blocks - (if block + (if elt (cons elt byte-compile-active-blocks) byte-compile-active-blocks)) (body (byte-compile-top-level (cons 'progn (cddr form)) - (if block nil for-effect)))) - (if (and block (not (cdr elt))) + (and (not elt) for-effect)))) + (if (and elt (not (cdr elt))) ;; A lexical block without any contained return-from clauses: (byte-compile-form body) ;; A normal catch call, or a lexical block with a contained @@ -4366,14 +4368,21 @@ ;; If this form was macroexpanded from `return-from', mark the ;; corresponding block as having been referenced. (let* ((symbol (car-safe (cdr-safe (nth 1 form)))) - (block (and symbol (symbolp symbol) (get symbol 'cl-block-name))) - (assq (and block (assq block byte-compile-active-blocks)))) - (and assq (setcdr assq t))) - (byte-compile-form (nth 1 form)) ;; Push the arguments - (byte-compile-form (nth 2 form)) + (not-present '#:not-present) + (block (if (and symbol (symbolp symbol)) + (get symbol 'cl-block-name not-present) + not-present)) + (assq (and (not (eq block not-present)) + (assq block byte-compile-active-blocks)))) + (if assq + (setcdr assq t) + (if (not (eq block not-present)) + ;; No corresponding enclosing block. + (byte-compile-warn "return-from: no enclosing block named `%s'" + block)))) + (mapc 'byte-compile-form (cdr form)) ;; Push the arguments (byte-compile-out (get (car form) 'byte-opcode) 0) - (pushnew '(null (function-max-args 'throw)) - byte-compile-checks-on-load + (pushnew '(null (function-max-args 'throw)) byte-compile-checks-on-load :test #'equal))) ;;; top-level forms elsewhere
--- a/lisp/cl-macs.el Thu Mar 17 23:42:59 2011 +0100 +++ b/lisp/cl-macs.el Tue Mar 29 00:02:47 2011 +0200 @@ -765,12 +765,12 @@ This is compatible with Common Lisp, but note that `defun' and `defmacro' do not create implicit blocks as they do in Common Lisp." `(throw ',(or (cdr (assq name cl-active-block-names)) - (prog1 (copy-symbol name) - (and-fboundp 'byte-compile-warn (cl-compiling-file) - (byte-compile-warn - "return-from: no enclosing block named `%s'" - name)))) - ,result)) + ;; Tell the byte-compiler the original name of the block, + ;; leave any warning to it. + (let ((copy-symbol (copy-symbol name))) + (put copy-symbol 'cl-block-name name) + copy-symbol)) + ,result)) ;;; The "loop" macro. @@ -826,7 +826,7 @@ `return-from'.) Another extremely useful feature of loops is called \"destructuring\". If, -in place of VAR, a list (possibly dotted, possibly a tree of arbitary +in place of VAR, a list (possibly dotted, possibly a tree of arbitrary complexity) is given, the value to be assigned is assumed to have a similar structure to the list given, and variables in the list will be matched up with corresponding elements in the structure. For example: @@ -3228,14 +3228,26 @@ argns argvs))) (if lets (list 'let lets body) body)))) +;; When a 64-bit build is byte-compiling code, some of its native fixnums +;; will not be represented as fixnums if the byte-compiled code is read by +;; the Lisp reader in a 32-bit build. So in that case we need to check the +;; range of fixnums as well as their types. XEmacs doesn't support machines +;; with word size less than 32, so it's OK to have that as the minimum. +(macrolet + ((most-negative-fixnum-on-32-bit-machines () (lognot (1- (lsh 1 30)))) + (most-positive-fixnum-on-32-bit-machines () (lsh 1 30))) + (defun cl-non-fixnum-number-p (object) + "Return t if OBJECT is a number not guaranteed to be immediate." + (and (numberp object) + (or (not (fixnump object)) + (not (<= (most-negative-fixnum-on-32-bit-machines) + object + (most-positive-fixnum-on-32-bit-machines))))))) ;;; Compile-time optimizations for some functions defined in this package. ;;; Note that cl.el arranges to force cl-macs to be loaded at compile-time, ;;; mainly to make sure these macros will be present. -(defun cl-non-fixnum-number-p (object) - (and (numberp object) (not (fixnump object)))) - (define-compiler-macro eql (&whole form a b) (cond ((eq (cl-const-expr-p a) t) (let ((val (cl-const-expr-val a))) @@ -3696,6 +3708,12 @@ (define-compiler-macro pairlis (a b &optional c) `(nconc (mapcar* #'cons ,a ,b) ,c)) +(define-compiler-macro revappend (&whole form &rest args) + (if (eql 3 (length form)) `(nconc (reverse ,(pop args)) ,(pop args)) form)) + +(define-compiler-macro nreconc (&whole form &rest args) + (if (eql 3 (length form)) `(nconc (nreverse ,(pop args)) ,(pop args)) form)) + (define-compiler-macro complement (&whole form fn) (if (or (eq (car-safe fn) 'function) (eq (car-safe fn) 'quote)) (cond
--- a/lisp/cmdloop.el Thu Mar 17 23:42:59 2011 +0100 +++ b/lisp/cmdloop.el Tue Mar 29 00:02:47 2011 +0200 @@ -311,7 +311,8 @@ :type '(choice (const :tag "off" nil) (integer :tag "time" 2) - (other :tag "on"))) + (other :tag "on")) + :group 'keyboard) (dontusethis-set-symbol-value-handler 'suggest-key-bindings
--- a/lisp/coding.el Thu Mar 17 23:42:59 2011 +0100 +++ b/lisp/coding.el Tue Mar 29 00:02:47 2011 +0200 @@ -246,7 +246,7 @@ ((force-coding-system-equivalency (&rest details-list) "Certain coding-system aliases should correspond to certain variables. -This macro implements that correspondence. This gives us compatiblity with +This macro implements that correspondence. This gives us compatibility with other Mule implementations (which don't use the coding system aliases), and a certain amount of freedom of implementation for XEmacs; using a variable's value in C for every file operation or write to a terminal in C is probably
--- a/lisp/cus-edit.el Thu Mar 17 23:42:59 2011 +0100 +++ b/lisp/cus-edit.el Tue Mar 29 00:02:47 2011 +0200 @@ -2443,7 +2443,7 @@ (when (or (get symbol 'saved-value) (get symbol 'saved-variable-comment)) (put symbol 'saved-value nil) (custom-push-theme 'theme-value symbol 'user 'reset 'standard) - ;; As a special optimizations we do not (explictly) + ;; As a special optimization we do not (explicitly) ;; save resets to standard when no theme sets the value. (if (null (cdr (get symbol 'theme-value))) (put symbol 'theme-value nil)) @@ -2908,7 +2908,7 @@ (when (or (get symbol 'saved-face) (get symbol 'saved-face-comment)) (put symbol 'saved-face nil) (custom-push-theme 'theme-face symbol 'user 'reset 'standard) - ;; Do not explictly save resets to standards without themes. + ;; Do not explicitly save resets to standards without themes. (if (null (cdr (get symbol 'theme-face))) (put symbol 'theme-face nil)) (put symbol 'saved-face-comment nil)
--- a/lisp/custom.el Thu Mar 17 23:42:59 2011 +0100 +++ b/lisp/custom.el Tue Mar 29 00:02:47 2011 +0200 @@ -407,6 +407,9 @@ (defun custom-add-to-group (group option widget) "To existing GROUP add a new OPTION of type WIDGET. If there already is an entry for OPTION and WIDGET, nothing is done." + (or group (display-warning 'custom + (format "custom: widget %s, option %s has no associated group" + widget option))) (let ((members (get group 'custom-group)) (entry (list option widget))) (unless (member entry members)
--- a/lisp/etags.el Thu Mar 17 23:42:59 2011 +0100 +++ b/lisp/etags.el Tue Mar 29 00:02:47 2011 +0200 @@ -1344,7 +1344,7 @@ ;;;###autoload (defun pop-tag-mark (arg) "Go to last tag position. -`find-tag' maintains a mark-stack seperate from the \\[set-mark-command] mark-stack. +`find-tag' maintains a mark-stack separate from the \\[set-mark-command] mark-stack. This function pops (and moves to) the tag at the top of this stack." (interactive "P") (if (not arg)
--- a/lisp/faces.el Thu Mar 17 23:42:59 2011 +0100 +++ b/lisp/faces.el Tue Mar 29 00:02:47 2011 +0200 @@ -1700,7 +1700,6 @@ (type (plist-get props 'type)) (class (plist-get props 'class)) (background (plist-get props 'background)) - (min-colors (plist-get props 'min-colors)) (match t) (entries display) entry req options) @@ -1713,7 +1712,9 @@ (type (memq type options)) (class (memq class options)) (background (memq background options)) - (min-colors (>= (display-color-cells frame) + ;; `display-color-cells' can return nil (eg, TTYs). + ;; If so, assume monochrome. + (min-colors (>= (or (display-color-cells frame) 2) (car options))) (t (warn "Unknown req `%S' with options `%S'" req options)
--- a/lisp/files.el Thu Mar 17 23:42:59 2011 +0100 +++ b/lisp/files.el Tue Mar 29 00:02:47 2011 +0200 @@ -724,7 +724,7 @@ If SUFFIX is non-nil, add that at the end of the file name. -This function is analagous to mkstemp(3) under POSIX, avoiding the race +This function is analogous to mkstemp(3) under POSIX, avoiding the race condition between testing for the existence of the generated filename (under POSIX with mktemp(3), under Emacs Lisp with `make-temp-name') and creating it."
--- a/lisp/font-menu.el Thu Mar 17 23:42:59 2011 +0100 +++ b/lisp/font-menu.el Tue Mar 29 00:02:47 2011 +0200 @@ -121,7 +121,7 @@ (defcustom font-menu-ignore-scaled-fonts nil "*If non-nil, the font menu shows only bitmap fonts. -Bitmap fonts at their design size are generally noticably higher quality than +Bitmap fonts at their design size are generally noticeably higher quality than scaled fonts, unless the device is capable of interpreting antialiasing hints. In general, setting this option non-`nil' is useful mostly on older X servers.
--- a/lisp/fontconfig.el Thu Mar 17 23:42:59 2011 +0100 +++ b/lisp/fontconfig.el Tue Mar 29 00:02:47 2011 +0200 @@ -352,7 +352,7 @@ (defun fc-pattern-get-or-compute-size (pattern id) "Get the size from `pattern' associated with `id' or try to compute it. -Returns 'fc-result-no-match if unsucessful." +Returns 'fc-result-no-match if unsuccessful." ;; Many font patterns don't have a "size" property, but do have a ;; "dpi" and a "pixelsize" property". (let ((maybe (fc-pattern-get-size pattern id)))
--- a/lisp/gnome-widgets.el Thu Mar 17 23:42:59 2011 +0100 +++ b/lisp/gnome-widgets.el Tue Mar 29 00:02:47 2011 +0200 @@ -467,7 +467,7 @@ (GnomeFontPickerMode . mode)) ;; With GNOME_FONT_PICKER_MODE_FONT_INFO -;; If use_font_in_label is true, font name will be writen using font choosed by user and +;; If use_font_in_label is true, font name will be written using font chosen by user and ;; using size passed to this function (gtk-import-function nil gnome_font_picker_fi_set_use_font_in_label (GnomeFontPicker . gfp) @@ -724,7 +724,7 @@ ;;; const char *subtype, ;;; GnomeStockPixmapEntry *entry); -;; check for the existance of an entry. returns the entry if it +;; check for the existence of an entry. returns the entry if it ;; exists, or NULL otherwise ;;;GnomeStockPixmapEntry *gnome_stock_pixmap_checkfor (const char *icon, ;;; const char *subtype);
--- a/lisp/gtk-ffi.el Thu Mar 17 23:42:59 2011 +0100 +++ b/lisp/gtk-ffi.el Tue Mar 29 00:02:47 2011 +0200 @@ -38,7 +38,7 @@ really part of the object system.") (defvar gtk-ffi-debug nil - "If non-nil, all functions defined wiht `gtk-import-function' will be checked + "If non-nil, all functions defined with `gtk-import-function' will be checked for missing marshallers.") (defun gtk-ffi-check-function (func)
--- a/lisp/gtk-widgets.el Thu Mar 17 23:42:59 2011 +0100 +++ b/lisp/gtk-widgets.el Tue Mar 29 00:02:47 2011 +0200 @@ -226,8 +226,8 @@ (gtk-import-function nil gtk_clist_set_button_actions GtkCList guint guint) ;; freeze all visual updates of the list, and then thaw the list after -;; you have made a number of changes and the updates wil occure in a -;; more efficent mannor than if you made them on a unfrozen list +;; you have made a number of changes and the updates will occur in a +;; more efficient manner than if you made them on an unfrozen list (gtk-import-function nil gtk_clist_freeze GtkCList) (gtk-import-function nil gtk_clist_thaw GtkCList) @@ -343,8 +343,8 @@ (gtk-import-function GtkStyle gtk_clist_get_row_style GtkCList gint) ;; this sets a horizontal and vertical shift for drawing -;; the contents of a cell; it can be positive or negitive; -;; this is particulary useful for indenting items in a column +;; the contents of a cell; it can be positive or negative; +;; this is particularly useful for indenting items in a column (gtk-import-function nil gtk_clist_set_shift GtkCList gint gint gint gint) ;; set/get selectable flag of a single row
--- a/lisp/info.el Thu Mar 17 23:42:59 2011 +0100 +++ b/lisp/info.el Tue Mar 29 00:02:47 2011 +0200 @@ -1499,7 +1499,7 @@ nil t) (if exact nil - ;; Then, try to match the name independantly of the + ;; Then, try to match the name independently of the ;; characters case. (directory-files dir 'fullname (Info-all-case-regexp
--- a/lisp/minibuf.el Thu Mar 17 23:42:59 2011 +0100 +++ b/lisp/minibuf.el Tue Mar 29 00:02:47 2011 +0200 @@ -41,7 +41,7 @@ (require 'cl) (defgroup minibuffer nil - "Controling the behavior of the minibuffer." + "Controlling the behavior of the minibuffer." :group 'environment)
--- a/lisp/mule/ccl.el Thu Mar 17 23:42:59 2011 +0100 +++ b/lisp/mule/ccl.el Tue Mar 29 00:02:47 2011 +0200 @@ -1508,7 +1508,7 @@ | de-sjis ;; If ARG_0 and ARG_1 are the first and second code point of - ;; JISX0208 character CHAR, and SJIS is the correponding + ;; JISX0208 character CHAR, and SJIS is the corresponding ;; Shift-JIS code, ;; (REG = ARG_0 en-sjis ARG_1) means: ;; ((REG = HIGH)
--- a/lisp/mule/indian.el Thu Mar 17 23:42:59 2011 +0100 +++ b/lisp/mule/indian.el Tue Mar 29 00:02:47 2011 +0200 @@ -51,9 +51,9 @@ ;;; Code: -;; Followings are what you see when you refer to the Emacs +;; Following are what you see when you refer to the Emacs ;; representations of IS 13194 charcters. However, this is merely -;; tentative apperance, and you must convert them by +;; tentative appearance, and you must convert them with the ;; indian-to-xxxxxx(specific script) function to use them. ;; Devanagari is not an exception of this rule.
--- a/lisp/mule/kinsoku.el Thu Mar 17 23:42:59 2011 +0100 +++ b/lisp/mule/kinsoku.el Tue Mar 29 00:02:47 2011 +0200 @@ -251,13 +251,13 @@ (eol-kin (kinsoku-process-shrink)))))) (defun kinsoku-process-extend () - "Move point forward to a permissable for line-breaking. + "Move point forward to a point permissible for line-breaking. $B9T$r?-$P$7$F6XB'$K?($l$J$$E@$X0\F0$9$k!#(B" (let ((max-column (+ fill-column (if (and (numberp kinsoku-extend-limit) (>= kinsoku-extend-limit 0)) kinsoku-extend-limit - 10000))) ;;; 10000 is deliberatly unreasonably large + 10000))) ;;; 10000 is deliberately unreasonably large ch1 ch2) (while (and (setq ch1 (char-after)) (<= (+ (current-column) @@ -278,7 +278,7 @@ (kinsoku-process-shrink)))) (defun kinsoku-process-shrink () - "Move point backward to a point permissable for line-breaking. + "Move point backward to a point permissible for line-breaking. $B9T$r=L$a$F6XB'$K?($l$J$$E@$X0\F0$9$k!#(B" (let (ch1 ch2) (while (and (not (bolp))
--- a/lisp/mule/lao-util.el Thu Mar 17 23:42:59 2011 +0100 +++ b/lisp/mule/lao-util.el Tue Mar 29 00:02:47 2011 +0200 @@ -369,8 +369,8 @@ indicate the place to embed a consonant. Optional WITH-MAA-SAKOD-RULE is a rule to re-order and modify VOWEL -follwoing a consonant and preceding a maa-sakod character. If it is -nil, NO-MAA-SAKOD-RULE is used. The maa-sakod character is alwasy +following a consonant and preceding a maa-sakod character. If it is +nil, NO-MAA-SAKOD-RULE is used. The maa-sakod character is always appended at the tail. For instance, rule `(\"(1`WM(B\" (?(1`(B t ?(1W(B ?(1M(B))' tells that this vowel @@ -384,7 +384,7 @@ "Transcribe a Romanized Lao syllable in the region FROM and TO to Lao string. Only the first syllable is transcribed. The value has the form: (START END LAO-STRING), where -START and END are the beggining and end positions of the Roman Lao syllable, +START and END are the beginning and end positions of the Roman Lao syllable, LAO-STRING is the Lao character transcription of it. Optional 3rd arg STR, if non-nil, is a string to search for Roman Lao
--- a/lisp/mule/latin.el Thu Mar 17 23:42:59 2011 +0100 +++ b/lisp/mule/latin.el Tue Mar 29 00:02:47 2011 +0200 @@ -1480,7 +1480,7 @@ (string (char-syntax (make-char 'latin-iso8859-1 i))) syntax-table)) -;; Case. The Turkish case idiosyncracy is handled with its language environment. +;; Case. The Turkish case idiosyncrasy is handled with its language environment. (setup-case-pairs 'latin-iso8859-9 '((#xC0 #xE0) ;; A WITH GRAVE
--- a/lisp/mule/thai-util.el Thu Mar 17 23:42:59 2011 +0100 +++ b/lisp/mule/thai-util.el Tue Mar 29 00:02:47 2011 +0200 @@ -114,7 +114,7 @@ (?,Tc(B vowel-base "VOWEL SIGN SARA MAI MUAN") ; 0xE3 (?,Td(B vowel-base "VOWEL SIGN SARA MAI MALAI") ; 0xE4 (?,Te(B vowel-base "LAK KHANG YAO") ; 0xE5 - (?,Tf(B special "MAI YAMOK (repetion)") ; 0xE6 + (?,Tf(B special "MAI YAMOK (repetition)") ; 0xE6 (?,Tg(B vowel-upper "VOWEL SIGN MAI TAI KHU N/S-T") ; 0xE7 (?,Th(B tone "TONE MAI EK N/S-T") ; 0xE8 (?,Ti(B tone "TONE MAI THO N/S-T") ; 0xE9
--- a/lisp/package-get.el Thu Mar 17 23:42:59 2011 +0100 +++ b/lisp/package-get.el Tue Mar 29 00:02:47 2011 +0200 @@ -416,7 +416,7 @@ from a location in `package-get-remote'. Otherwise a local copy is used if available and remote access is never done. -Please use FORCE-CURRENT only when the user is explictly dealing with packages +Please use FORCE-CURRENT only when the user is explicitly dealing with packages and remote access is likely in the near future." (setq force-current (or force-current package-get-always-update)) (unless (and (boundp 'package-get-base)
--- a/lisp/packages.el Thu Mar 17 23:42:59 2011 +0100 +++ b/lisp/packages.el Tue Mar 29 00:02:47 2011 +0200 @@ -479,7 +479,7 @@ (defun packages-find-package-data-path (package-hierarchies) "Construct the data-path component for packages. -PACKAGE-HIERARCHIES is a list of package hierachies." +PACKAGE-HIERARCHIES is a list of package hierarchies." (paths-find-recursive-load-path (packages-find-package-library-path package-hierarchies '("etc"))
--- a/lisp/paragraphs.el Thu Mar 17 23:42:59 2011 +0100 +++ b/lisp/paragraphs.el Tue Mar 29 00:02:47 2011 +0200 @@ -48,7 +48,7 @@ Prefix argument says to turn mode on if positive, off if negative. When the mode is turned on, if there are newlines in the buffer but no hard -newlines, ask the user whether to mark as hard any newlines preceeding a +newlines, ask the user whether to mark as hard any newlines preceding a `paragraph-start' line. From a program, second arg INSERT specifies whether to do this; it can be `never' to change nothing, t or `always' to force marking, `guess' to try to do the right thing with no questions, nil
--- a/lisp/startup.el Thu Mar 17 23:42:59 2011 +0100 +++ b/lisp/startup.el Tue Mar 29 00:02:47 2011 +0200 @@ -769,7 +769,7 @@ ;; various other places. We could make *scratch* honour the user's ;; choice of whether font-locking is in place by adding a call to ;; font-lock-set-defaults in `lisp-interaction-mode'; but that'll - ;; break if `intial-major-mode' is anything else. + ;; break if `initial-major-mode' is anything else. ;; ;; So, despite what `font-lock-set-defaults'' docstring says, this ;; *is* where we should call it to have the user's choice of font-lock
--- a/lisp/toolbar-items.el Thu Mar 17 23:42:59 2011 +0100 +++ b/lisp/toolbar-items.el Tue Mar 29 00:02:47 2011 +0200 @@ -401,7 +401,7 @@ (let ((command (cdr-safe (assq toolbar-news-reader toolbar-news-commands-alist)))) (or command - (error "Unkown news reader %s" toolbar-news-reader)) + (error "Unknown news reader %s" toolbar-news-reader)) (if (symbolp command) (call-interactively command) (eval command))))
--- a/man/ChangeLog Thu Mar 17 23:42:59 2011 +0100 +++ b/man/ChangeLog Tue Mar 29 00:02:47 2011 +0200 @@ -1,3 +1,34 @@ +2011-03-24 Jerry James <james@xemacs.org> + + * internals/internals.texi (Creating a Window-System Type): + "desireable" -> "desirable", "neglible" -> "negligible". + (The Non-Client Area): "negotation" -> "negotiation". + (Better Rendering Support -- Modern Font Support): "anomolies" -> + "anomalies". + (Discussion -- Switching to C++): "reliablity" -> "reliability". + * lispref/mule.texi (Theory of Operation): "noticable" -> "noticeable". + * lispref/strings.texi (Creating Strings): "occurances" -> + "occurrences". + * xemacs-faq.texi (Q1.0.3: How do you pronounce XEmacs?): + "pronounciation" -> "pronunciation". + (Q1.7.2: Which external packages are there?): "withing" -> "within". + (Q2.4.3: XEmacs crashes and I compiled it myself.): "ealier" -> + "earlier". + (hg diff gives bizarre output.): "occured" -> "occurred", "relevent" + -> "relevant". + (How do I recover from a bad commit? (I already pushed.)): + "inadvertantly" -> "inadvertently". + +2011-03-19 Stephen J. Turnbull <stephen@xemacs.org> + + * lispref/customize.texi (Face Definitions): New node. + (Customization): Add entry to menu. + (Variable Definitions): Add cross-ref for `defface'. + (Customization Types): Fixup Previous link. + + * lispref/faces.texi (Faces): + Clarify that built-in properties of faces are computed at runtime. + 2011-03-15 Aidan Kehoe <kehoea@parhasard.net> * lispref/objects.texi (Character Type):
--- a/man/internals/internals.texi Thu Mar 17 23:42:59 2011 +0100 +++ b/man/internals/internals.texi Tue Mar 29 00:02:47 2011 +0200 @@ -17800,7 +17800,7 @@ and tty consoles as well as doing a complete refactoring of the console, device, and frame code.) -What is desireable is sharing console, device, and frame methods across +What is desirable is sharing console, device, and frame methods across platforms in a more general way, reducing the amount of duplicated code by pulling it back into the redisplay engine proper or the Lisp modules as appropriate. For example, we should be able to use @@ -17853,7 +17853,7 @@ there is a @samp{CONSOLE_INHERITS_METHOD} constructor, but this actually constructs the name of the parent's method pointer and stores in the derived console type's method table. Of course this is time-efficient, -and since there are few console types it is a neglible waste of space. +and since there are few console types it is a negligible waste of space. However in practice this may have contributed to breaking the various abstractions, and the variant console must be coded in the same file as the parent (because the methods are static). Another minor symptom of @@ -18045,7 +18045,7 @@ which in turn contains a menubar widget and an EmacsFrame widget, inside of which is the client area. (The division into EmacsShell and EmacsManager is due to the complex and screwy geometry-management system -in Xt [and X more generally]. The EmacsShell handles negotation with +in Xt [and X more generally]. The EmacsShell handles negotiation with the window manager; the place of the EmacsManager widget is normally assumed by a widget that manages the geometry of its child widgets, but the EmacsManager widget just lets the XEmacs redisplay mechanism do the @@ -28464,7 +28464,7 @@ @emph{convenient}. Precision means that all properties available in the programming API can be individually specified. Accuracy means that the truename of the font is exactly the list of all properties specified by -the font. Thus, the anomolies that occur with XLFDs on many servers +the font. Thus, the anomalies that occur with XLFDs on many servers (including modern Linux distributions with XFree86 or X.org servers) cannot occur. Convenience is subjective, of course. However, @file{fontconfig} provides a configuration system which (1) explicitly @@ -31300,7 +31300,7 @@ vs. local vs. heap, we could do so easily with bit flags in the object pointed to -- we have space for lots of them. -code reliablity and maintainability would likely substantially +code reliability and maintainability would likely substantially increase due to the ability to express most things in a natural C++ way instead of lots of weird hackish hard-to-understand C stuff implementing stuff the language wasn't really designed for.
--- a/man/lispref/customize.texi Thu Mar 17 23:42:59 2011 +0100 +++ b/man/lispref/customize.texi Tue Mar 29 00:02:47 2011 +0200 @@ -15,6 +15,7 @@ * Common Keywords:: * Group Definitions:: * Variable Definitions:: +* Face Definitions:: * Customization Types:: * Enabling Behavior:: @end menu @@ -163,6 +164,7 @@ @section Defining Customization Variables Use @code{defcustom} to declare user-editable variables. +For face declarations, use @code{defface} instead. @xref{Face Definitions}. @tindex defcustom @defmac defcustom option default doc [keyword value]... @@ -288,7 +290,67 @@ customization buffer. The @code{saved-value} property is actually a list whose car is an expression which evaluates to the value. -@node Customization Types, Enabling Behavior, Variable Definitions, Customization +@node Face Definitions, Customization Types, Variable Definitions, Customization +@section Face Definitions + +Use @code{defface} to declare a new face. Conventions used in +specifying properties are similar to those for general customizable +variables. @xref{Variable Definitions}. + +@defun defface face spec doc &rest args + +Declare @var{face} as a customizable face that defaults to @var{spec}. +@var{face} does not need to be quoted. + +Third argument @var{doc} is the face documentation. + +If @var{face} has been set with `custom-set-face', set the face attributes +as specified by that function, otherwise set the face attributes +according to @var{spec}. + +The remaining arguments @var{args} are a property list, which has the +form + + @var{keyword} @var{value}... + +The following @var{keyword}s are defined: + +@table @code +@item :group +@var{value} is a customization group. Add @var{face} to that group. +@end table + +@var{spec} is an alist of the form ((@var{display} @var{atts})...). + +@var{atts} is a list of face attributes and their values. The possible +attributes are defined in the variable `custom-face-attributes'. + +The @var{atts} of the first entry in @var{spec} where the +@var{display} matches the frame take effect in that frame. +@var{display} can either be the symbol t, which will match all frames, +or an alist of the form \((@var{req} @var{item}...)...) + +For @var{display} to match a frame, the @var{req} property of the +frame must match one of the @var{item}. The following @var{req} are +defined: + +@table @code +@item @code{type} (the value of @code{window-system}) + Should be one of @code{x}, @code{mswindows}, or @code{tty}. + +@code{class} (the frame's color support) + Should be one of @code{color}, @code{grayscale}, or @code{mono}. + +@code{min-colors} (the minimum number of colors the frame supports) + Should be in integer which is compared to @code{display-color-cells} + +@code{background} (what color is used for the background text) + Should be one of @code{light} or @code{dark}. +@end table +@end defun + + +@node Customization Types, Enabling Behavior, Face Definitions, Customization @section Customization Types When you define a user option with @code{defcustom}, you must specify
--- a/man/lispref/faces.texi Thu Mar 17 23:42:59 2011 +0100 +++ b/man/lispref/faces.texi Tue Mar 29 00:02:47 2011 +0200 @@ -26,10 +26,13 @@ Each built-in property of a face is controlled using a specifier, which allows it to have separate values in particular buffers, frames, -windows, and devices and to further vary according to device type -(X or TTY), device class (color, mono, or grayscale) and number of -displayable colors (min-colors). -@xref{Specifiers}, for more information. +windows, and devices. These properties are computed when the face is +instantiated, allowing them to vary according to properties of the +display device, such as type (X or TTY), visual class (color, mono, or +grayscale), and number of colors displayable on the device. +@xref{Specifiers}, for more information on specifiers. +@xref{Face Definitions}, for defining faces whose properties vary +according to their runtime environments. The face named @code{default} is used for ordinary text. The face named @code{modeline} is used for displaying the modeline. The face named
--- a/man/lispref/mule.texi Thu Mar 17 23:42:59 2011 +0100 +++ b/man/lispref/mule.texi Tue Mar 29 00:02:47 2011 +0200 @@ -3118,7 +3118,7 @@ possible to use a single Latin coded character set before saving the buffer. -Because the problem is rarely noticable in editing a buffer, but tends +Because the problem is rarely noticeable in editing a buffer, but tends to manifest when that buffer is exported to a file or process, the Unification package uses the strategy of examining the buffer prior to export. If use of multiple Latin coded character sets is detected,
--- a/man/lispref/strings.texi Thu Mar 17 23:42:59 2011 +0100 +++ b/man/lispref/strings.texi Tue Mar 29 00:02:47 2011 +0200 @@ -272,7 +272,7 @@ @end defun The function @code{split-string}, in @ref{Regexp Search}, generates a -list of strings by splitting a string on occurances of a regular +list of strings by splitting a string on occurrences of a regular expression. @node Predicates for Characters
--- a/man/xemacs-faq.texi Thu Mar 17 23:42:59 2011 +0100 +++ b/man/xemacs-faq.texi Tue Mar 29 00:02:47 2011 +0200 @@ -739,7 +739,7 @@ @node Q1.0.3, Q1.0.4, Q1.0.2, Introduction @unnumberedsubsec Q1.0.3: How do you pronounce XEmacs? -The most common pronounciation is @samp{Eks eemax}, @samp{Eks'im&ks} in +The most common pronunciation is @samp{Eks eemax}, @samp{Eks'im&ks} in Kirshenbaum IPA. (See @uref{http://www.kirshenbaum.net/IPA/ascii-ipa.pdf} if you know the IPA already and want to know how to map from Kirshenbaum to it.) @@ -2445,7 +2445,7 @@ ERC is an Emacs InternetRelayChat client. @item escreen -Multiple editing sessions withing a single frame (like screen). +Multiple editing sessions within a single frame (like screen). @item eshell Command shell implemented entirely in Emacs Lisp. @@ -4032,7 +4032,7 @@ the top-level source directory) to read what it says about your platform. -If you compiled XEmacs 21.4 or ealier using @samp{--use-union-type}, or +If you compiled XEmacs 21.4 or earlier using @samp{--use-union-type}, or 21.5 or later using @samp{--enable-union-type} (or in either case used the option @samp{USE_UNION_TYPE} in @file{config.inc} under Windows), try recompiling again without it. The union type has been known to @@ -9001,10 +9001,10 @@ This is usually due to using @code{hg diff} on a @dfn{merge commit}. That means the commit has multiple parents, and joins together two lines -of development that occured concurrently. +of development that occurred concurrently. You're diffing against the "wrong" one; try the other one. You get the -relevent revision number or ID from @code{hg log}. In more detail: +relevant revision number or ID from @code{hg log}. In more detail: When there is a merge in Mercurial, it will often be the case that one of the parents is the immediate predecessor of the merge @@ -9054,7 +9054,7 @@ > GAAAAK! What's the best way to restore ChangeLog and its history? -He had just inadvertantly pushed a commit which deleted +He had just inadvertently pushed a commit which deleted @file{src/ChangeLog}! The history is still there, not to worry. (In this case, another developer had restored src/ChangeLog already.) The best way depends on a number of things. First, let's look at the log
--- a/src/ChangeLog Thu Mar 17 23:42:59 2011 +0100 +++ b/src/ChangeLog Tue Mar 29 00:02:47 2011 +0200 @@ -1,3 +1,53 @@ +2011-03-24 Jerry James <james@xemacs.org> + + * README.kkcc: "occured" -> "occurred". + * alloc.c (malloced_storage_size): "supress" -> "suppress". + * buffer.c: "intial" -> "initial". + * elhash.c (Fdefine_hash_table_test): "analagous" -> "analogous". + * emacs.c: "targetting" -> "targeting". + (shut_down_emacs): "recurrance" -> "reoccurrence". + * event-stream.c: "accidentaly" -> "accidentally", and fix grammar. + * extents.c: "occuring" -> "occurring". + * faces.c (update_face_cachel_data): "appart" -> "apart", "begining" + -> "beginning". + * file-coding.c (Vkeyboard_coding_system): "interpet" -> "interpret". + * fileio.c (Fmake_temp_name): "analagous" -> "analogous". + * fontcolor-gtk.c: "sucess" -> "success". + * frame-gtk.c (gtk_init_frame_2): "carefull" -> "careful", fix + whitespace. + * frame.c: "negotation" -> "negotiation". + * glyphs-msw.c (mswindows_map_subwindow): "everytime" -> "every time". + * glyphs-widget.c: "accomodate" -> "accommodate". + (logical_unit_height): Ditto. + (Fwidget_logical_to_character_height): Ditto. + * gtk-xemacs.c (__nuke_background_items): "noticable" -> "noticeable". + * menubar-gtk.c: "inital" -> "initial". + * mule-ccl.c: "refered" -> "referred to". + * nt.c (mswindows_stat): "noticable" -> "noticeable". + * ntheap.c (recreate_heap): "commited" -> "committed". + * s/cygwin32.h: "konw" -> "know". + * sysdll.c: "dependant" -> "dependent". + * syswindows.h: "targetting" -> "targeting". + * text.c: "reversable" -> "reversible". + * unexcw.c (copy_executable_and_dump_data_section): "addres" -> + "address". + * unicode.c (Funicode_precedence_list): "occurrance" -> "occurrence". + * window.c (struct window_mirror_stats): "Ancilliary" -> "Ancillary". + +2011-03-20 Mats Lidell <matsl@xemacs.org> + + * alloca.c (find_stack_direction): + * alloca.c (xemacs_c_alloca): + Remove use of auto keyword. It is default and will be illegal in + C++0X. + +2011-03-17 Didier Verna <didier@xemacs.org> + + * data.c (init_errors_once_early): Define Qextent_read_only error. + * lisp.h: Declare it. + * extents.c (verify_extent_mapper): Signal an extent-read-only + error instead of a buffer-read-only one. + 2011-03-15 Aidan Kehoe <kehoea@parhasard.net> * config.h.in (SUPPORT_CONFOUNDING_FUNCTIONS): New #define,
--- a/src/README.kkcc Thu Mar 17 23:42:59 2011 +0100 +++ b/src/README.kkcc Tue Mar 29 00:02:47 2011 +0200 @@ -53,7 +53,7 @@ - Stack optimization (have one stack during runtime instead of malloc/free it for every garbage collect) - There are a few Lisp_Objects, where there occured differences and + There are a few Lisp_Objects, where there occurred differences and inexactness between the mark-method and the pdump description. All these Lisp_Objects get dumped (except image instances), so their descriptions have been written, before we started our work:
--- a/src/alloc.c Thu Mar 17 23:42:59 2011 +0100 +++ b/src/alloc.c Tue Mar 29 00:02:47 2011 +0200 @@ -3603,7 +3603,7 @@ # endif if (claimed_size < 4096) { - /* fxg: rename log->log2 to supress gcc3 shadow warning */ + /* fxg: rename log->log2 to suppress gcc3 shadow warning */ int log2 = 1; /* compute the log base two, more or less, then use it to compute
--- a/src/alloca.c Thu Mar 17 23:42:59 2011 +0100 +++ b/src/alloca.c Tue Mar 29 00:02:47 2011 +0200 @@ -78,7 +78,7 @@ find_stack_direction (void) { static char *addr = NULL; /* Address of first `dummy', once known. */ - auto char dummy; /* To get stack address. */ + char dummy; /* To get stack address. */ if (addr == NULL) { /* Initial entry. */ @@ -131,7 +131,7 @@ pointer xemacs_c_alloca (unsigned int size) { - auto char probe; /* Probes stack depth: */ + char probe; /* Probes stack depth: */ register char *depth = ADDRESS_FUNCTION (probe); #if STACK_DIRECTION == 0
--- a/src/buffer.c Thu Mar 17 23:42:59 2011 +0100 +++ b/src/buffer.c Tue Mar 29 00:02:47 2011 +0200 @@ -28,7 +28,7 @@ A few changes for buffer-local vars by Richard Mlynarik for 19.8 or 19.9, c. 1993. Many changes by Ben Wing: changes and cleanups for Mule, esp. the - macros in buffer.h and the intial version of the coding-system + macros in buffer.h and the initial version of the coding-system conversion macros (in buffer.h) and associated fns. (in this file), 19.12 (c. 1995); synch. to FSF 19.30 c. 1994; memory usage stats c. 1996; generated-modeline-string c. 1996 for mousable modeline in
--- a/src/data.c Thu Mar 17 23:42:59 2011 +0100 +++ b/src/data.c Tue Mar 29 00:02:47 2011 +0200 @@ -48,7 +48,8 @@ Lisp_Object Qinvalid_operation, Qinvalid_change, Qprinting_unreadable_object; Lisp_Object Qsetting_constant; Lisp_Object Qediting_error; -Lisp_Object Qbeginning_of_buffer, Qend_of_buffer, Qbuffer_read_only; +Lisp_Object Qbeginning_of_buffer, Qend_of_buffer; +Lisp_Object Qbuffer_read_only, Qextent_read_only; Lisp_Object Qio_error, Qfile_error, Qconversion_error, Qend_of_file; Lisp_Object Qtext_conversion_error; Lisp_Object Qarith_error, Qrange_error, Qdomain_error; @@ -3491,6 +3492,7 @@ DEFERROR_STANDARD (Qbeginning_of_buffer, Qediting_error); DEFERROR_STANDARD (Qend_of_buffer, Qediting_error); DEFERROR (Qbuffer_read_only, "Buffer is read-only", Qediting_error); + DEFERROR (Qextent_read_only, "Extent is read-only", Qediting_error); DEFERROR (Qio_error, "IO Error", Qinvalid_operation); DEFERROR_STANDARD (Qfile_error, Qio_error);
--- a/src/elhash.c Thu Mar 17 23:42:59 2011 +0100 +++ b/src/elhash.c Tue Mar 29 00:02:47 2011 +0200 @@ -2092,7 +2092,7 @@ Computation should use the whole value range of the underlying machine long type. In XEmacs this will necessitate bignums for values above `most-positive-fixnum' but below (1+ (* most-positive-fixnum 2)) and -analagous values below `most-negative-fixnum'. Relatively poor hashing +analogous values below `most-negative-fixnum'. Relatively poor hashing performance is guaranteed in a build without bignums. This function returns t if successful, and errors if NAME
--- a/src/emacs.c Thu Mar 17 23:42:59 2011 +0100 +++ b/src/emacs.c Tue Mar 29 00:02:47 2011 +0200 @@ -3385,7 +3385,7 @@ go. The two conditions sound somewhat redundant (maybe we could just use the second?) but they aren't completely: Theoretically (maybe with MinGW?) we could imagine compiling under native Windows as the OS - but e.g. targetting only X Windows as the window system. --ben */ + but e.g. targeting only X Windows as the window system. --ben */ #if defined (HAVE_MS_WINDOWS) && defined (WIN32_NATIVE) # define NEED_WINDOWS_MESSAGE_PAUSE @@ -3680,7 +3680,7 @@ "then type `where' at the debugger prompt. No GDB on your system? You may\n" "have DBX, or XDB, or SDB. (Ask your system administrator if you need help.)\n" "If no core file was produced, enable them (often with `ulimit -c unlimited')\n" -"in case of future recurrance of the crash.\n"); +"in case of future reoccurrence of the crash.\n"); #endif /* _MSC_VER */ }
--- a/src/event-stream.c Thu Mar 17 23:42:59 2011 +0100 +++ b/src/event-stream.c Tue Mar 29 00:02:47 2011 +0200 @@ -5375,8 +5375,8 @@ ;(let ((inhibit-quit t)) (setq x (list (read-char) quit-flag)))^J^G ;for BOTH, x should get set to (7 t), but no result should be printed. ;; #### According to the doc of quit-flag, second test should return -;; (?\^G nil). Accidentaly XEmacs returns correct value. However, -;; XEmacs 21.1.12 and 21.2.36 both fails on first test. +;; (?\^G nil). XEmacs accidentally returns the correct value. However, +;; XEmacs 21.1.12 and 21.2.36 both fail on the first test. ;also do this: make two frames, one viewing "*scratch*", the other "foo". ;in *scratch*, type (sit-for 20)^J
--- a/src/extents.c Thu Mar 17 23:42:59 2011 +0100 +++ b/src/extents.c Tue Mar 29 00:02:47 2011 +0200 @@ -4409,7 +4409,7 @@ /* ------------------------------- */ /* verify_extent_modification() is called when a buffer or string is - modified to check whether the modification is occuring inside a + modified to check whether the modification is occurring inside a read-only extent. */ @@ -4448,7 +4448,7 @@ #endif while (1) - Fsignal (Qbuffer_read_only, (list1 (closure->object))); + Fsignal (Qextent_read_only, (list1 (wrap_extent (extent)))); RETURN_NOT_REACHED(0); }
--- a/src/faces.c Thu Mar 17 23:42:59 2011 +0100 +++ b/src/faces.c Tue Mar 29 00:02:47 2011 +0200 @@ -1416,7 +1416,7 @@ - BARF !!!!! To sum up, this means that it is in general unsafe to instantiate - images before face cache updating is complete (appart from image + images before face cache updating is complete (apart from image related face attributes). The solution we use below is to actually detect whether we're building the window's face_cachels for the first time, and simply NOT frob the background pixmap in that case. If @@ -1425,7 +1425,7 @@ One note: * See comment in `default_face_font_info' in face.c. Who wrote it ? - Maybe we have the begining of an answer here ? + Maybe we have the beginning of an answer here ? Footnotes: [1] See comment at the top of `allocate_window' in window.c.
--- a/src/file-coding.c Thu Mar 17 23:42:59 2011 +0100 +++ b/src/file-coding.c Tue Mar 29 00:02:47 2011 +0200 @@ -4741,7 +4741,7 @@ DEFVAR_LISP ("keyboard-coding-system", &Vkeyboard_coding_system /* Default coding system used for TTY and X11 keyboard input. -Under X11, used only to interpet the character for a key event when that +Under X11, used only to interpret the character for a key event when that event has a KeySym of NoSymbol but does have an associated string keysym, something that's seen with input methods.
--- a/src/fileio.c Thu Mar 17 23:42:59 2011 +0100 +++ b/src/fileio.c Tue Mar 29 00:02:47 2011 +0200 @@ -609,7 +609,7 @@ does not specify an existing file. To make this work, PREFIX should be an absolute file name. -This function is analagous to mktemp(3) under POSIX, and as with it, there +This function is analogous to mktemp(3) under POSIX, and as with it, there exists a race condition between the test for the existence of the new file and its creation. See `make-temp-file' for a function which avoids this race condition by specifying the appropriate flags to `write-region'.
--- a/src/fontcolor-gtk.c Thu Mar 17 23:42:59 2011 +0100 +++ b/src/fontcolor-gtk.c Tue Mar 29 00:02:47 2011 +0200 @@ -63,7 +63,7 @@ worry about it. Return value is 1 for normal success, 2 for nearest color success, - 3 for Non-deallocable sucess. */ + 3 for Non-deallocable success. */ int allocate_nearest_color (GdkColormap *colormap, GdkVisual *UNUSED (visual), GdkColor *color_def)
--- a/src/frame-gtk.c Thu Mar 17 23:42:59 2011 +0100 +++ b/src/frame-gtk.c Tue Mar 29 00:02:47 2011 +0200 @@ -1061,7 +1061,7 @@ * will update the frame title anyway, so nothing is lost. * JV: * It turns out it gives problems with FVWMs name based mapping. - * We'll just need to be carefull in the modeline specs. + * We'll just need to be careful in the modeline specs. */ update_frame_title (f); }
--- a/src/frame.c Thu Mar 17 23:42:59 2011 +0100 +++ b/src/frame.c Tue Mar 29 00:02:47 2011 +0200 @@ -131,7 +131,7 @@ which in turn contains a menubar widget and an EmacsFrame widget, inside of which is the client area. (The division into EmacsShell and EmacsManager is due to the complex and screwy geometry-management system - in Xt [and X more generally]. The EmacsShell handles negotation with + in Xt [and X more generally]. The EmacsShell handles negotiation with the window manager; the place of the EmacsManager widget is normally assumed by a widget that manages the geometry of its child widgets, but the EmacsManager widget just lets the XEmacs redisplay mechanism do the
--- a/src/glyphs-msw.c Thu Mar 17 23:42:59 2011 +0100 +++ b/src/glyphs-msw.c Tue Mar 29 00:02:47 2011 +0200 @@ -1960,7 +1960,7 @@ /* Doing this once does not seem to be enough, for instance when mapping the search dialog this gets called four times. If we only set on the first time through then the subwindow never - gets focus as intended. However, doing this everytime doesn't + gets focus as intended. However, doing this every time doesn't seem so bad, after all we only need to redo this after the focus changes - and if that happens resetting the initial focus doesn't seem so bad. */
--- a/src/glyphs-widget.c Thu Mar 17 23:42:59 2011 +0100 +++ b/src/glyphs-widget.c Tue Mar 29 00:02:47 2011 +0200 @@ -279,7 +279,7 @@ widget_query_string_geometry (text, face, 0, &charheight, domain); /* For the returned value to be useful it needs to be big enough to - accomodate the largest single-height widget. This is currently + accommodate the largest single-height widget. This is currently the edit-field. */ return charheight + 2 * widget_spacing (domain) + 4 * widget_border_width (domain); @@ -1301,7 +1301,7 @@ size of individual widgets will affect where they get placed. The same is true for several rows of widgets. To solve this problem we introduce the notion of `logical_unit_height'. This is a size - quantity that is designed to be big enough to accomodate the + quantity that is designed to be big enough to accommodate the largest `single height unit'. The function widget_logical_unit_height() determines the value of this in pixels. It is dependent on the widget face and some combination of @@ -1671,7 +1671,7 @@ If the components of a widget layout are justified to the top or the bottom then they are aligned in terms of `logical units'. This is a -size quantity that is designed to be big enough to accomodate the +size quantity that is designed to be big enough to accommodate the largest `single height' widget. It is dependent on the widget face and some combination of spacing and border-width. Thus if you specify top or bottom justification in a vertical layout the subcontrols are laid
--- a/src/gtk-xemacs.c Thu Mar 17 23:42:59 2011 +0100 +++ b/src/gtk-xemacs.c Tue Mar 29 00:02:47 2011 +0200 @@ -129,7 +129,7 @@ frame. Well, wait, we do... otherwise there sre weird 'seethru' areas - even when XEmacs does a full redisplay. Most noticable in some + even when XEmacs does a full redisplay. Most noticeable in some areas of the modeline, or in the right-hand-side of the window between the scrollbar ad n the edge of the window. */
--- a/src/lisp.h Thu Mar 17 23:42:59 2011 +0100 +++ b/src/lisp.h Tue Mar 29 00:02:47 2011 +0200 @@ -4530,7 +4530,8 @@ extern MODULE_API Lisp_Object Qintegerp; extern Lisp_Object Qargs_out_of_range, Qarith_error, Qbeginning_of_buffer, - Qbuffer_read_only, Qcircular_list, Qcircular_property_list, + Qbuffer_read_only, Qextent_read_only, + Qcircular_list, Qcircular_property_list, Qconversion_error, Qcyclic_variable_indirection, Qdomain_error, Qediting_error, Qend_of_buffer, Qend_of_file, Qerror, Qfile_error, Qinternal_error, Qinvalid_change, Qinvalid_constant, Qinvalid_function,
--- a/src/menubar-gtk.c Thu Mar 17 23:42:59 2011 +0100 +++ b/src/menubar-gtk.c Tue Mar 29 00:02:47 2011 +0200 @@ -1297,7 +1297,7 @@ return (menubar_visible); } -/* Called from gtk_create_widgets() to create the inital menubar of a frame +/* Called from gtk_create_widgets() to create the initial menubar of a frame before it is mapped, so that the window is mapped with the menubar already there instead of us tacking it on later and thrashing the window after it is visible. */
--- a/src/mule-ccl.c Thu Mar 17 23:42:59 2011 +0100 +++ b/src/mule-ccl.c Tue Mar 29 00:02:47 2011 +0200 @@ -564,7 +564,7 @@ If VALn is lambda, move to the next map set like reaching to the end of the current map set. - If VALn is a symbol, call the CCL program refered by it. + If VALn is a symbol, call the CCL program referred to by it. Then, use reg[rrr] as a mapped value except for -1, -2 and -3. Such special values are regarded as nil, t, and lambda respectively.
--- a/src/nt.c Thu Mar 17 23:42:59 2011 +0100 +++ b/src/nt.c Tue Mar 29 00:02:47 2011 +0200 @@ -1636,7 +1636,7 @@ != INVALID_HANDLE_VALUE) { /* This is more accurate in terms of getting the correct number - of links, but is quite slow (it is noticable when Emacs is + of links, but is quite slow (it is noticeable when Emacs is making a list of file name completions). */ BY_HANDLE_FILE_INFORMATION info;
--- a/src/ntheap.c Thu Mar 17 23:42:59 2011 +0100 +++ b/src/ntheap.c Tue Mar 29 00:02:47 2011 +0200 @@ -242,7 +242,7 @@ VirtualQuery (base, &info, sizeof (info)); if (info.State != MEM_FREE) { - /* Oops, something has already reserved or commited it, nothing + /* Oops, something has already reserved or committed it, nothing we can do but exit */ Extbyte buf[256]; sprintf (buf, @@ -251,7 +251,7 @@ "(BaseAddress = 0x%lx, AllocationBase = 0x%lx, " "Size = 0x%lx, State = %s, Type = %s)", info.BaseAddress, info.AllocationBase, info.RegionSize, - info.State == MEM_COMMIT ? "COMMITED" : "RESERVED", + info.State == MEM_COMMIT ? "COMMITTED" : "RESERVED", info.Type == MEM_IMAGE ? "IMAGE" : info.Type == MEM_MAPPED ? "MAPPED" : "PRIVATE"); MessageBoxA (NULL, buf, "XEmacs", MB_OK | MB_ICONSTOP);
--- a/src/s/cygwin32.h Thu Mar 17 23:42:59 2011 +0100 +++ b/src/s/cygwin32.h Tue Mar 29 00:02:47 2011 +0200 @@ -34,7 +34,7 @@ * once you have done this, configure and make. * * windows '95 - I haven't tested this under '95, it will probably - * build but I konw there are some limitations with cygwin under 95 so + * build but I know there are some limitations with cygwin under 95 so * YMMV. I build with NT4 SP3. * * Andy Piper <andy@xemacs.org> 8/1/98
--- a/src/sysdll.c Thu Mar 17 23:42:59 2011 +0100 +++ b/src/sysdll.c Tue Mar 29 00:02:47 2011 +0200 @@ -343,7 +343,7 @@ } /* - * dyld adds libraries by first adding the directly dependant libraries in + * dyld adds libraries by first adding the directly dependent libraries in * link order, and then adding the dependencies for those libraries, so we * should do the same... but we don't bother adding the extra dependencies, if * the symbols are neither in the loaded image nor any of it's direct
--- a/src/syswindows.h Thu Mar 17 23:42:59 2011 +0100 +++ b/src/syswindows.h Tue Mar 29 00:02:47 2011 +0200 @@ -72,7 +72,7 @@ Corresponding s/ file: s/mingw32.h (none) There's no flag to indicate that you are specifically - targetting native Windows and not doing this with MINGW. + targeting native Windows and not doing this with MINGW. Presumably this means you're using Visual C++. Corresponding s/ file: s/windowsnt.h
--- a/src/text.c Thu Mar 17 23:42:59 2011 +0100 +++ b/src/text.c Tue Mar 29 00:02:47 2011 +0200 @@ -548,7 +548,7 @@ Well yes, this was the whole point of my "no lossage" proposal of being able to undo any coding-system transformation on a buffer. The idea was -to figure out which transformations were definitely reversable, and for +to figure out which transformations were definitely reversible, and for all the others, cache the original text in a text property. This way, you could probably still do a fairly good job at constructing a good reversal even after you've gone into the text and added, deleted, and rearranged @@ -587,7 +587,7 @@ Well yes, this was the whole point of my "no lossage" proposal of being able to undo any coding-system transformation on a buffer. The idea was -to figure out which transformations were definitely reversable, and for +to figure out which transformations were definitely reversible, and for all the others, cache the original text in a text property. This way, you could probably still do a fairly good job at constructing a good reversal even after you've gone into the text and added, deleted, and rearranged
--- a/src/unexcw.c Thu Mar 17 23:42:59 2011 +0100 +++ b/src/unexcw.c Tue Mar 29 00:02:47 2011 +0200 @@ -240,7 +240,7 @@ f_ohdr.dsize is the total initialized data size on disk which is f_data.s_size + f_idata.s_size. - f_ohdr.data_start is the base addres of all data and so should + f_ohdr.data_start is the base address of all data and so should not be changed. *.s_vaddr is the virtual address of the start of the section
--- a/src/unicode.c Thu Mar 17 23:42:59 2011 +0100 +++ b/src/unicode.c Tue Mar 29 00:02:47 2011 +0200 @@ -1251,7 +1251,7 @@ charsets, defined by `set-language-unicode-precedence-list'. These are followed by charsets in the default precedence list, defined by `set-default-unicode-precedence-list'. Charsets occurring multiple times are -given precedence according to their first occurrance in either list. These +given precedence according to their first occurrence in either list. These are followed by the remaining charsets, in some arbitrary order. The language-specific precedence list is meant to be set as part of the
--- a/src/window.c Thu Mar 17 23:42:59 2011 +0100 +++ b/src/window.c Tue Mar 29 00:02:47 2011 +0200 @@ -5168,10 +5168,10 @@ struct window_mirror_stats { struct usage_stats u; - /* Ancilliary non-lisp */ + /* Ancillary non-lisp */ Bytecount redisplay_structs; #ifdef HAVE_SCROLLBARS - /* Ancilliary Lisp */ + /* Ancillary Lisp */ Bytecount scrollbar; #endif };
--- a/tests/ChangeLog Thu Mar 17 23:42:59 2011 +0100 +++ b/tests/ChangeLog Tue Mar 29 00:02:47 2011 +0200 @@ -1,3 +1,8 @@ +2011-03-24 Jerry James <james@xemacs.org> + + * automated/query-coding-tests.el: "Compatiblity" -> "Compatibility". + * gtk/event-stream-tests.el: "proccess" -> "process". + 2011-03-17 Aidan Kehoe <kehoea@parhasard.net> * automated/lisp-tests.el:
--- a/tests/automated/query-coding-tests.el Thu Mar 17 23:42:59 2011 +0100 +++ b/tests/automated/query-coding-tests.el Tue Mar 29 00:02:47 2011 +0200 @@ -387,7 +387,7 @@ (equal '(257) (unencodable-char-position (point-min) (point-max) 'iso-8859-1 1)) "check #'unencodable-char-position doesn't think latin-1 encodes U+20AC") - ;; Compatiblity, sigh: + ;; Compatibility, sigh: (Assert (equal '(257) (unencodable-char-position (point-min) (point-max) 'iso-8859-1 0))
--- a/tests/gtk/event-stream-tests.el Thu Mar 17 23:42:59 2011 +0100 +++ b/tests/gtk/event-stream-tests.el Tue Mar 29 00:02:47 2011 +0200 @@ -41,7 +41,7 @@ (tst)^Jabc^G ==> ((quit) 97) with no signal, and "bc" inserted in buffer ; with sit-for only do the 2nd test. -; Do all 3 tests with (accept-proccess-output nil 20) +; Do all 3 tests with (accept-process-output nil 20) /* Additional test cases for accept-process-output, sleep-for, sit-for.