From ca79f19887f96b8ffd4abea5bbdc3dcec3d923be Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 9 Nov 2000 08:59:27 +0000 Subject: [PATCH] * configure: Regenerate. * aclocal.m4 (AC_CHECK_W3): Substitute `W3' with empty string instead of "no" if it is not acceptable. * lisp/dgnushack.el: Load ~/.lpath.el just before `srcdir' is added to `load-path'. * lisp/lpath.el: Move out `load-path' modification for APEL, FLIM and SEMI to dgnushack.el. * lisp/dgnushack.el: Move here. * lisp/lpath.el (md5): Don't bind. (url-insert-file-contents): Fbind for FSF Emacsen. --- ChangeLog | 17 +++++++++++++++++ aclocal.m4 | 10 +++++++--- configure | 18 +++++++++++------- lisp/dgnushack.el | 19 ++++++++++++------- lisp/lpath.el | 10 ++-------- 5 files changed, 49 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9551e9f..0d56a44 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,20 @@ +2000-11-09 Katsumi Yamaoka + + * configure: Regenerate. + + * aclocal.m4 (AC_CHECK_W3): Substitute `W3' with empty string + instead of "no" if it is not acceptable. + + * lisp/dgnushack.el: Load ~/.lpath.el just before `srcdir' is added + to `load-path'. + + * lisp/lpath.el: Move out `load-path' modification for APEL, FLIM + and SEMI to dgnushack.el. + * lisp/dgnushack.el: Move here. + + * lisp/lpath.el (md5): Don't bind. + (url-insert-file-contents): Fbind for FSF Emacsen. + 2000-11-08 Katsumi Yamaoka * texi/Makefile.in (install-ja-info): Specify `EMACS' and diff --git a/aclocal.m4 b/aclocal.m4 index cf0b64b..f3b6f3a 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -138,10 +138,10 @@ AC_EMACS_CHECK_LIB(w3_forms, w3-form-encode-xwfu,"noecho") if test "${HAVE_w3_forms}" = "yes"; then EMACS_cv_ACCEPTABLE_W3=yes else - EMACS_cv_ACCEPTABLE_W3=no + EMACS_cv_ACCEPTABLE_W3= fi -if test "${EMACS_cv_ACCEPTABLE_W3}" = "yes"; then +if test "x${EMACS_cv_ACCEPTABLE_W3}" = "xyes"; then AC_EMACS_LISP(w3_dir,(file-name-directory (locate-library \"w3-forms\")),"noecho") EMACS_cv_ACCEPTABLE_W3=$EMACS_cv_SYS_w3_dir fi @@ -149,7 +149,11 @@ fi AC_ARG_WITH(w3,[ --with-w3=DIR Specify where to find the w3 package], [ EMACS_cv_ACCEPTABLE_W3=`( cd $withval && pwd || echo "$withval" ) 2> /dev/null` ]) W3=${EMACS_cv_ACCEPTABLE_W3} AC_SUBST(W3) - AC_MSG_RESULT("${W3}") + if test "x${EMACS_cv_ACCEPTABLE_W3}" = "xyes"; then + AC_MSG_RESULT("${W3}") + else + AC_MSG_RESULT("not found") + fi ]) AC_DEFUN(AC_EXAMINE_PACKAGEDIR, diff --git a/configure b/configure index ca89cb3..4b76074 100755 --- a/configure +++ b/configure @@ -1019,10 +1019,10 @@ fi if test "${HAVE_w3_forms}" = "yes"; then EMACS_cv_ACCEPTABLE_W3=yes else - EMACS_cv_ACCEPTABLE_W3=no + EMACS_cv_ACCEPTABLE_W3= fi -if test "${EMACS_cv_ACCEPTABLE_W3}" = "yes"; then +if test "x${EMACS_cv_ACCEPTABLE_W3}" = "xyes"; then elisp="(file-name-directory (locate-library \"w3-forms\"))" if test -z ""noecho""; then @@ -1061,11 +1061,15 @@ fi W3=${EMACS_cv_ACCEPTABLE_W3} - echo "$ac_t"""${W3}"" 1>&6 + if test "x${EMACS_cv_ACCEPTABLE_W3}" = "xyes"; then + echo "$ac_t"""${W3}"" 1>&6 + else + echo "$ac_t"""not found"" 1>&6 + fi if test ${EMACS_FLAVOR} = xemacs; then echo $ac_n "checking where the XEmacs package is""... $ac_c" 1>&6 -echo "configure:1069: checking where the XEmacs package is" >&5 +echo "configure:1073: checking where the XEmacs package is" >&5 # Check whether --with-packagedir or --without-packagedir was given. if test "${with_packagedir+set}" = set; then withval="$with_packagedir" @@ -1088,7 +1092,7 @@ elisp="(let (package-dir)\ (or package-dir \"\"))" if test -z ""noecho""; then echo $ac_n "checking for PACKAGEDIR""... $ac_c" 1>&6 -echo "configure:1092: checking for PACKAGEDIR" >&5 +echo "configure:1096: checking for PACKAGEDIR" >&5 fi if eval "test \"\${EMACS_cv_SYS_PACKAGEDIR+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1127,7 +1131,7 @@ elisp="(let (package-dir)\ (or package-dir \"\"))" if test -z ""noecho""; then echo $ac_n "checking for PACKAGEDIR""... $ac_c" 1>&6 -echo "configure:1131: checking for PACKAGEDIR" >&5 +echo "configure:1135: checking for PACKAGEDIR" >&5 fi if eval "test \"\${EMACS_cv_SYS_PACKAGEDIR+set}\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -1164,7 +1168,7 @@ if test "${with_addpath+set}" = set; then withval="$with_addpath" if test x$withval != xyes -a x$withval != x; then echo $ac_n "checking where to find the additional elisp libraries""... $ac_c" 1>&6 -echo "configure:1168: checking where to find the additional elisp libraries" >&5 +echo "configure:1172: checking where to find the additional elisp libraries" >&5 ADDITIONAL_LOAD_PATH=$withval echo "$ac_t""$ADDITIONAL_LOAD_PATH" 1>&6 fi diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el index 9111cf6..202c66b 100644 --- a/lisp/dgnushack.el +++ b/lisp/dgnushack.el @@ -107,10 +107,6 @@ (load (expand-file-name "gnus-clfns.el" srcdir) nil t t) -(condition-case err - (load "~/.lpath.el" t nil t) - (error (message "Error in \"~/.lpath.el\" file: %s" err))) - (condition-case nil (char-after) (wrong-number-of-arguments @@ -131,10 +127,19 @@ '(char-before (point)) form)))) -(push srcdir load-path) +;; Don't load path-util until `char-after' and `char-before' have been +;; optimized because it requires `poe' and then modify the functions. +(or (featurep 'path-util) + (load "apel/path-util")) +(add-path "apel") +(add-path "flim") +(add-path "semi") -;; `char-after' and `char-before' must be well-behaved before lpath.el -;; is loaded. Because it requires `poe' via `path-util'. +(condition-case err + (load "~/.lpath.el" t nil t) + (error (message "Error in \"~/.lpath.el\" file: %s" err))) + +(push srcdir load-path) (load (expand-file-name "lpath.el" srcdir) nil t t) (unless (fboundp 'byte-compile-file-form-custom-declare-variable) diff --git a/lisp/lpath.el b/lisp/lpath.el index 7b7de93..6df58f5 100644 --- a/lisp/lpath.el +++ b/lisp/lpath.el @@ -2,12 +2,6 @@ (defvar byte-compile-default-warnings) -(or (featurep 'path-util) - (load "apel/path-util")) -(add-path "apel") -(add-path "flim") -(add-path "semi") - (defun maybe-fbind (args) (while args (or (fboundp (car args)) @@ -93,14 +87,14 @@ window-pixel-height window-pixel-width))) ;; T-gnus. -(maybe-fbind '(md5)) (if (featurep 'xemacs) (progn (maybe-fbind '(propertize)) (maybe-bind '(mh-lib-progs))) ;; FSFmacs (maybe-fbind '(charsetp - function-max-args propertize smiley-encode-buffer)) + function-max-args propertize smiley-encode-buffer + url-insert-file-contents)) (if (boundp 'MULE) (progn (maybe-fbind '(coding-system-get -- 1.7.10.4