From: yamaoka <yamaoka>
Date: Mon, 11 Dec 2006 06:48:54 +0000 (+0000)
Subject: Synch with semi-1_14 branch.
X-Git-Tag: emiko-1_14-epg-branchpoint~6
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=ef39c7836b0b34e1f80e72e3fa2918218b40c659;p=elisp%2Fsemi.git

Synch with semi-1_14 branch.
---

diff --git a/ChangeLog b/ChangeLog
index 1821941..c3b5fe7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-12-11  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* 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  <lapis-lazuli@pop06.odn.ne.jp>
 
 	* mime-edit.el (mime-edit-process-multipart-1): Don't insert a
diff --git a/SEMI-CFG b/SEMI-CFG
index 7485f10..509b635 100644
--- a/SEMI-CFG
+++ b/SEMI-CFG
@@ -154,17 +154,27 @@
 	"tmdecode"))
 
 (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))
 
 ;;; SEMI-CFG ends here