changeset 3184:072ccc89ac3c

[xemacs-hg @ 2005-12-30 16:42:35 by michaels] 2005-12-30 Mike Sperber <mike@xemacs.org> * packages.el (packages-find-all-package-hierarchies): Interpret EMACSPACKAGEPATH as listing package direcories, not hierarchies. This fixes a regression introduced in the change on 2005-01-08.
author michaels
date Fri, 30 Dec 2005 16:42:36 +0000
parents 69ec6385a01a
children b4b66310c964
files lisp/ChangeLog lisp/packages.el
diffstat 2 files changed, 19 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/ChangeLog	Thu Dec 29 22:51:18 2005 +0000
+++ b/lisp/ChangeLog	Fri Dec 30 16:42:36 2005 +0000
@@ -1,3 +1,9 @@
+2005-12-30  Mike Sperber  <mike@xemacs.org>
+
+	* packages.el (packages-find-all-package-hierarchies): Interpret
+	EMACSPACKAGEPATH as listing package direcories, not hierarchies.
+	This fixes a regression introduced in the change on 2005-01-08.
+
 2005-11-25  Mike Sperber  <mike@xemacs.org>
 
 	* packages.el (packages-find-package-hierarchies-named): Use
--- a/lisp/packages.el	Thu Dec 29 22:51:18 2005 +0000
+++ b/lisp/packages.el	Fri Dec 30 16:42:36 2005 +0000
@@ -423,10 +423,22 @@
   (let ((envvar-value (getenv "EMACSPACKAGEPATH")))
     (cond
      (envvar-value
-      (packages-split-package-path (paths-decode-directory-path envvar-value)))
+      (packages-deconstruct
+       (packages-split-package-path (paths-decode-directory-path envvar-value))
+       ;; we get package *directories*
+       #'(lambda (early late last)
+	   (list
+	    (packages-find-package-hierarchies early
+					       "EMACSEARLYPACKAGES")
+	    (packages-find-package-hierarchies late
+					       "EMACSLATEPACKAGES")
+	    (packages-find-package-hierarchies last
+					       "EMACSLATEPACKAGES")))))
+     ;; --with-package-path is also a historical kludge
      (configure-package-path
       (packages-deconstruct
        (packages-split-package-path configure-package-path)
+       ;; we get package *hierarchies*
        #'(lambda (early late last)
 	   (list
 	    (packages-find-package-hierarchies (list user-init-directory)