[xemacs-hg @ 2004-12-27 12:25:14 by michaels] 2004-12-18 Mike Sperber <mike@xemacs.org> * package-admin.el: * startup.el: Reflect the changes made in packages.el. * packages.el: * loadup.el: * make-docfile.el: * package-admin.el: * startup.el: * update-elc.el (early-package-hierarchies) (late-package-hierarchies) (last-package-hierarchies): Renamed these from `early-packages', `late-packages' and `last-packages'. * packages.el: Rewrote package-finding logic to separate the concepts of "package directories" and "package hierarchies". Added explanation of these concepts. * setup-paths.el: * find-paths.el: Added parameter descriptions to some of the docstrings. * packages.el, setup-paths.el: Make terminology more explicit about "package hierarchies" * startup.el (emacs-roots, emacs-data-roots) (user-init-directory-base, user-init-directory) (user-init-file-base, user-init-file-base-list) (user-home-init-file-base-list) (load-home-init-file, load-user-init-file-p) (startup-find-load-path, startup-setup-paths) (startup-find-load-path-for-packages): Moved these back from setup-paths.el where they belong---setup-paths.el now again, as documented, contains no code that sets global variables. (They were moved from startup.el to setup-paths.el on 2003-02-28.) Clarify that in the comment at the top. * setup-paths.el (paths-find-emacs-roots): Restored `invocation-directory' 'invocation-name' parameters removed on 2003-02-28; they're useful for debugging.

--- a/lisp/package-admin.el	Sun Dec 26 22:52:34 2004 +0000
+++ b/lisp/package-admin.el	Mon Dec 27 12:27:05 2004 +0000
@@ -197,9 +197,8 @@
 			      (expand-file-name "mule-packages" user-init-directory))))))
     ;; Finally check the normal places
     (if (not top-dir)
-	(let ((path-list (nth 1 (packages-find-packages
-				 emacs-data-roots
-				 (packages-compute-package-locations user-init-directory)))))
+	(let ((path-list (nth 1 (packages-find-all-package-hierarchies
+				 emacs-data-roots))))
 	  (cond ((eq type 'std)
 		 (while path-list
 		   (if (equal (substring (car path-list) -16) 
@@ -226,7 +225,7 @@
 see if the PACKAGE is already installed and return that location, if
 it is writable.  Finally, fall back to the `user-init-directory' if
 all else fails.  As a side effect of installing packages under
-`user-init-directory' these packages become part of `early-packages'."
+`user-init-directory' these packages become part of `early-package-hierarchies'."
   ;; If pkg-dir specified, return that if writable.
   (if (and pkg-dir
 	   (file-writable-p (directory-file-name pkg-dir)))
@@ -255,7 +254,7 @@
 		  (car-safe (member-if (lambda (h)
 					 (string-match (concat "^" (regexp-quote h))
 						       autoload-dir))
-				       (append (cdr early-packages) late-packages)))))
+				       (append (cdr early-package-hierarchies) late-package-hierarchies)))))
 	  (if (and pkg-dir
 		   (file-writable-p (directory-file-name pkg-dir)))
 	      pkg-dir