From 337875ccdbe674bdc777bee68f293a3ac5e84d68 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 11 Dec 2006 07:26:28 +0000 Subject: [PATCH] Revert. --- ChangeLog | 6 ------ SEMI-CFG | 34 ++++++++++++---------------------- 2 files changed, 12 insertions(+), 28 deletions(-) diff --git a/ChangeLog b/ChangeLog index 93aeada..70c1e21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,3 @@ -2006-12-11 Katsumi Yamaoka - - * SEMI-CFG (PACKAGEDIR): Check for - (early|late|last)-package-hierarchies and configure-package-path - as well as (early|late|last)-packages. - 2006-12-02 Hiroya Murata * mime-edit.el (mime-edit-process-multipart-1): Don't insert a diff --git a/SEMI-CFG b/SEMI-CFG index 509b635..7485f10 100644 --- a/SEMI-CFG +++ b/SEMI-CFG @@ -154,27 +154,17 @@ "tmdecode")) (defvar PACKAGEDIR - (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)) + (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))) ;;; SEMI-CFG ends here -- 1.7.10.4