comparison lisp/packages.el @ 5020:eadd99984bfb

merge
author Ben Wing <ben@xemacs.org>
date Tue, 09 Feb 2010 03:53:52 -0600
parents 6b6b0f8ab749
children 5efbd1253905
comparison
equal deleted inserted replaced
5019:d7cc9553d3eb 5020:eadd99984bfb
383 (apply consumer list)) 383 (apply consumer list))
384 384
385 (defun packages-find-installation-package-directories (roots) 385 (defun packages-find-installation-package-directories (roots)
386 "Find the package directories in the XEmacs installation. 386 "Find the package directories in the XEmacs installation.
387 ROOTS is a list of installation roots." 387 ROOTS is a list of installation roots."
388 (union (paths-find-version-directories roots (list "") nil nil nil t) 388 (delete-duplicates
389 (paths-find-site-directories roots (list "") nil) :test #'equal)) 389 (nconc (paths-find-version-directories roots (list "") nil nil nil t)
390 (paths-find-site-directories roots (list "") nil))
391 :test #'equal))
390 392
391 (defun packages-find-package-hierarchies (package-directories &optional envvar default) 393 (defun packages-find-package-hierarchies (package-directories &optional envvar default)
392 "Find package hierarchies in a list of package directories. 394 "Find package hierarchies in a list of package directories.
393 PACKAGE-DIRECTORIES is a list of package directories. 395 PACKAGE-DIRECTORIES is a list of package directories.
394 DEFAULT is a default list of package hierarchies. 396 DEFAULT is a default list of package hierarchies.