From d85c80f876a6de1db60456db70cf1098ddf6da00 Mon Sep 17 00:00:00 2001 From: ShengHuo ZHU Date: Wed, 12 Jul 2000 12:43:05 +0000 Subject: [PATCH] Commit Katsumi Yamaoka's patch. --- ChangeLog | 4 ++++ aclocal.m4 | 2 +- lisp/ChangeLog | 4 ++++ lisp/dgnushack.el | 4 ++-- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d34159106..ab45dca75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2000-07-13 10:09:52 Katsumi Yamaoka + + * aclocal.m4 (AC_CHECK_W3): Fix typo. + 2000-07-12 15:47:06 ShengHuo ZHU * aclocal.m4: Stolen macros from w3. diff --git a/aclocal.m4 b/aclocal.m4 index a7df500ed..2a7b8d046 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -134,7 +134,7 @@ fi if test "${EMACS_cv_ACCEPTABLE_W3}" = "yes"; then AC_EMACS_LISP(w3_dir,(file-name-directory (locate-library \"w3-forms\")),"noecho") - EMACS_cv_ACCEPTABLE_W3=$EMACS_cv_SYS_w3_forms + EMACS_cv_ACCEPTABLE_W3=$EMACS_cv_SYS_w3_dir 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` ]) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d8fbe9e77..cc6e33869 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2000-07-13 07:40:39 Katsumi Yamaoka + + * dgnushack.el (srcdir): Define it before use it. + 2000-07-12 19:37:50 ShengHuo ZHU * gnus-sum.el: `W t' is toggle-header in info. diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el index 2005ee2c2..f20cdf827 100644 --- a/lisp/dgnushack.el +++ b/lisp/dgnushack.el @@ -31,6 +31,8 @@ (require 'cl) +(defvar srcdir (or (getenv "srcdir") ".")) + (push (or (getenv "lispdir") "/usr/share/emacs/site-lisp") load-path) @@ -132,8 +134,6 @@ (require 'bytecomp) -(defvar srcdir (or (getenv "srcdir") ".")) - (push srcdir load-path) ;(push "/usr/share/emacs/site-lisp" load-path) (load (expand-file-name "lpath.el" srcdir) nil t) -- 2.34.1