From 558f4a53de4d19ec050e717787cd6806d1d02460 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 11 Dec 2006 06:49:10 +0000 Subject: [PATCH] (PACKAGEDIR): Check for (early|late|last)-package-hierarchies and configure-package-path as well as (early|late|last)-packages. --- ChangeLog | 6 ++++++ MU-CFG | 34 ++++++++++++++++++++++------------ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 23a8392..dc8c087 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-12-11 Katsumi Yamaoka + + * MU-CFG (PACKAGEDIR): Check for + (early|late|last)-package-hierarchies and configure-package-path + as well as (early|late|last)-packages. + 2005-06-06 MORIOKA Tomohiko * mu-cite.el (mu-cite-original): Allow nil as a value of diff --git a/MU-CFG b/MU-CFG index be4e421..92d9b06 100644 --- a/MU-CFG +++ b/MU-CFG @@ -79,17 +79,27 @@ (setq MU_DIR (expand-file-name MU_PREFIX LISPDIR)) (defvar PACKAGEDIR - (if (boundp 'early-packages) - (let ((dirs (append (if early-package-load-path - early-packages) - (if late-package-load-path - late-packages) - (if last-package-load-path - last-packages))) - dir) - (while (not (file-exists-p - (setq dir (car dirs)))) - (setq dirs (cdr dirs))) - dir))) + (let ((dirs (append + (cond ((boundp 'early-package-hierarchies) + (append (if early-package-load-path + early-package-hierarchies) + (if late-package-load-path + late-package-hierarchies) + (if last-package-load-path + last-package-hierarchies))) + ((boundp 'early-packages) + (append (if early-package-load-path + early-packages) + (if late-package-load-path + late-packages) + (if last-package-load-path + last-packages)))) + (if (and (boundp 'configure-package-path) + (listp configure-package-path)) + (delete "" configure-package-path)))) + dir) + (while (not (file-exists-p (setq dir (car dirs)))) + (setq dirs (cdr dirs))) + dir)) ;;; MU-CFG ends here -- 1.7.10.4