diff lisp/packages.el @ 2481:505a24c07ba9

[xemacs-hg @ 2005-01-15 15:17:32 by michaels] 2005-01-08 Mike Sperber <mike@xemacs.org> * packages.el (packages-find-installation-package-directories): Add. * find-paths.el (paths-for-each-emacs-directory): Abstract FUNC parameter out of `paths-find-emacs-directory'. (paths-find-emacs-directories): Add. (paths-find-emacs-directory): Redefine in terms of `paths-for-each-emacs-directory'. (paths-for-each-site-directory): Add. (paths-find-site-directory): Redefine in terms of `paths-for-each-site-directory'. (paths-find-site-directories): Add. (paths-for-each-version-directory): Add. (paths-find-version-directory): Redefine in terms of `paths-for-each-version-directory'. (paths-find-version-directories): Add.
author michaels
date Sat, 15 Jan 2005 15:17:36 +0000
parents f4e405a9d18d
children 8dc793d1d990
line wrap: on
line diff
--- a/lisp/packages.el	Fri Jan 14 22:51:48 2005 +0000
+++ b/lisp/packages.el	Sat Jan 15 15:17:36 2005 +0000
@@ -376,11 +376,8 @@
 (defun packages-find-installation-package-directories (roots)
   "Find the package directories in the XEmacs installation.
 ROOTS is a list of installation roots."
-  (let ((version-directory (paths-find-version-directory roots "" nil nil t))
-	(site-directory (paths-find-site-directory roots "")))
-    (paths-uniq-append
-     (and version-directory (list version-directory))
-     (and site-directory (list site-directory)))))
+  (paths-uniq-append (paths-find-version-directories roots "" nil nil t)
+		     (paths-find-site-directories roots "")))
 
 (defun packages-find-package-hierarchies (package-directories &optional default)
   "Find package hierarchies in a list of package directories.