comparison lisp/packages.el @ 280:7df0dd720c89 r21-0b38

Import from CVS: tag r21-0b38
author cvs
date Mon, 13 Aug 2007 10:32:22 +0200
parents 90d73dddcdc4
children 57709be46d1b
comparison
equal deleted inserted replaced
279:c20b2fb5bb0a 280:7df0dd720c89
86 (list (paths-construct-path '("~" ".xemacs")) 86 (list (paths-construct-path '("~" ".xemacs"))
87 'early #'(lambda () t)) 87 'early #'(lambda () t))
88 (list "site-packages" 'late #'(lambda () t)) 88 (list "site-packages" 'late #'(lambda () t))
89 (list "infodock-packages" 'late #'(lambda () (featurep 'infodock))) 89 (list "infodock-packages" 'late #'(lambda () (featurep 'infodock)))
90 (list "mule-packages" 'late #'(lambda () (featurep 'mule))) 90 (list "mule-packages" 'late #'(lambda () (featurep 'mule)))
91 (list "xemacs-packages" 'late #'(lambda () t))
91 (list "packages" 'late #'(lambda () t))) 92 (list "packages" 'late #'(lambda () t)))
92 "Locations of the various package directories. 93 "Locations of the various package directories.
93 This is a list each of whose elements describes one directory. 94 This is a list each of whose elements describes one directory.
94 A directory description is a three-element list. 95 A directory description is a three-element list.
95 The first element is either an absolute path or a subdirectory 96 The first element is either an absolute path or a subdirectory
318 319
319 ;; Path setup 320 ;; Path setup
320 321
321 (defun packages-find-package-directories (roots base) 322 (defun packages-find-package-directories (roots base)
322 "Find a set of package directories." 323 "Find a set of package directories."
323 (let ((version-directory (paths-find-version-directory roots base)) 324 ;; make sure paths-find-version-directory and paths-find-site-directory
325 ;; don't both pick up version-independent directories ...
326 (let ((version-directory (paths-find-version-directory roots base nil nil t))
324 (site-directory (paths-find-site-directory roots base))) 327 (site-directory (paths-find-site-directory roots base)))
325 (paths-uniq-append 328 (paths-uniq-append
326 (and version-directory (list version-directory)) 329 (and version-directory (list version-directory))
327 (and site-directory (list site-directory))))) 330 (and site-directory (list site-directory)))))
328 331