Mercurial > hg > xemacs-beta

comparison lisp/setup-paths.el @ 269:b2472a1930f2 r20-5b33

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-5b33
author cvs
date Mon, 13 Aug 2007 10:27:19 +0200
parents 966663fcf606
children c5d627a313b1
comparison
equal deleted inserted replaced
268:6ced69ccd85f 269:b2472a1930f2
52 52
53 (defun paths-construct-load-path 53 (defun paths-construct-load-path
54 (roots early-package-load-path late-package-load-path 54 (roots early-package-load-path late-package-load-path
55 &optional inhibit-site-lisp) 55 &optional inhibit-site-lisp)
56 "Construct the load path." 56 "Construct the load path."
57 (let ((envvar-value (getenv "EMACSLOADPATH"))) 57 (let* ((envvar-value (getenv "EMACSLOADPATH"))
58 (if envvar-value 58 (env-load-path (and envvar-value
59 (decode-path-internal envvar-value) 59 (decode-path-internal envvar-value)))
60 (let* ((site-lisp-directory 60 (site-lisp-directory
61 (and (null inhibit-site-lisp) 61 (and (null inhibit-site-lisp)
62 (paths-find-site-lisp-directory roots))) 62 (paths-find-site-lisp-directory roots)))
63 (site-lisp-load-path 63 (site-lisp-load-path
64 (and site-lisp-directory 64 (and site-lisp-directory
65 (paths-find-recursive-load-path (list site-lisp-directory)))) 65 (paths-find-recursive-load-path (list site-lisp-directory))))
66 (lisp-directory (paths-find-lisp-directory roots)) 66 (lisp-directory (paths-find-lisp-directory roots))
67 (lisp-load-path 67 (lisp-load-path
68 (paths-find-recursive-load-path (list lisp-directory)))) 68 (paths-find-recursive-load-path (list lisp-directory))))
69 (append early-package-load-path 69 (append env-load-path
70 site-lisp-load-path 70 early-package-load-path
71 late-package-load-path 71 site-lisp-load-path
72 lisp-load-path))))) 72 late-package-load-path
73 lisp-load-path)))
73 74
74 (defun paths-construct-info-path (roots early-packages late-packages) 75 (defun paths-construct-info-path (roots early-packages late-packages)
75 "Construct the info path." 76 "Construct the info path."
76 (append 77 (append
77 (packages-find-package-info-path early-packages) 78 (packages-find-package-info-path early-packages)
78 (packages-find-package-info-path late-packages) 79 (packages-find-package-info-path late-packages)
79 (let ((info-directory 80 (let ((info-directory
80 (paths-find-version-directory roots "info" 81 (paths-find-version-directory roots "info"
81 nil 82 nil
82 (append 83 configure-info-directory)))
83 (and configure-info-directory
84 (list configure-info-directory))
85 configure-info-path))))
86 (and info-directory 84 (and info-directory
87 (list info-directory))) 85 (list info-directory)))
88 (let ((info-path-envval (getenv "INFOPATH"))) 86 (let ((info-path-envval (getenv "INFOPATH")))
89 (if info-path-envval 87 (if info-path-envval
90 (decode-path-internal info-path-envval))))) 88 (decode-path-internal info-path-envval)
89 (paths-directories-which-exist configure-info-path)))))
91 90
92 (defun paths-find-doc-directory (roots) 91 (defun paths-find-doc-directory (roots)
93 "Find the documentation directory." 92 "Find the documentation directory."
94 (paths-find-architecture-directory roots "lib-src")) 93 (paths-find-architecture-directory roots "lib-src"))
95 94