From eeed04ce7a69d784ef36f51058403fdf8950af4b Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 18 Sep 2001 23:08:35 +0000 Subject: [PATCH] * dgnushack.el: If W3DIR is identical to URLDIR, don't add it to `load-path'. --- ChangeLog | 5 +++++ lisp/dgnushack.el | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 06c41ec..9954667 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-09-18 Katsumi Yamaoka + + * lisp/dgnushack.el: If W3DIR is identical to URLDIR, don't add it + to `load-path'. + 2001-09-17 Katsumi Yamaoka * lisp/gnus-diary.el: Don't use `easy-menu-add-item' if it is not diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el index 3496035..2c00894 100644 --- a/lisp/dgnushack.el +++ b/lisp/dgnushack.el @@ -55,15 +55,17 @@ (defvar srcdir (or (getenv "srcdir") ".")) -(let ((urldir (getenv "URLDIR"))) - (unless (zerop (length urldir)) - (push (file-name-as-directory urldir) load-path))) - (defvar dgnushack-w3-directory (let ((w3dir (getenv "W3DIR"))) (unless (zerop (length w3dir)) (file-name-as-directory w3dir)))) -(when dgnushack-w3-directory - (push dgnushack-w3-directory load-path)) + +(let ((urldir (getenv "URLDIR"))) + (unless (zerop (length urldir)) + (setq urldir (file-name-as-directory urldir)) + (push (file-name-as-directory urldir) load-path)) + (when (and dgnushack-w3-directory + (not (string-equal urldir dgnushack-w3-directory))) + (push dgnushack-w3-directory load-path))) ;; If we are building w3 in a different directory than the source ;; directory, we must read *.el from source directory and write *.elc -- 1.7.10.4