comparison lisp/setup-paths.el @ 308:33bdb3d4b97f r21-0b52

Import from CVS: tag r21-0b52
author cvs
date Mon, 13 Aug 2007 10:42:44 +0200
parents 558f606b08ae
children 182f72e8cd0d
comparison
equal deleted inserted replaced
307:42d630fd9bd8 308:33bdb3d4b97f
135 (let ((path-envval (getenv "PATH"))) 135 (let ((path-envval (getenv "PATH")))
136 (if path-envval 136 (if path-envval
137 (paths-decode-directory-path path-envval 'drop-empties))) 137 (paths-decode-directory-path path-envval 'drop-empties)))
138 (packages-find-package-exec-path early-packages) 138 (packages-find-package-exec-path early-packages)
139 (packages-find-package-exec-path late-packages) 139 (packages-find-package-exec-path late-packages)
140 (packages-find-package-exec-path last-packages)
141 (let ((emacspath-envval (getenv "EMACSPATH"))) 140 (let ((emacspath-envval (getenv "EMACSPATH")))
142 (and emacspath-envval 141 (and emacspath-envval
143 (split-path emacspath-envval))) 142 (split-path emacspath-envval)))
144 (and exec-directory 143 (and exec-directory
145 (list exec-directory)))) 144 (list exec-directory))
145 (packages-find-package-exec-path last-packages)))
146 146
147 (defun paths-find-data-directory (roots) 147 (defun paths-find-data-directory (roots)
148 "Find the data directory." 148 "Find the data directory."
149 (paths-find-version-directory roots "etc" "EMACSDATA" configure-data-directory)) 149 (paths-find-version-directory roots "etc" "EMACSDATA" configure-data-directory))
150 150
152 early-packages late-packages last-packages) 152 early-packages late-packages last-packages)
153 "Find the data path." 153 "Find the data path."
154 (append 154 (append
155 (packages-find-package-data-path early-packages) 155 (packages-find-package-data-path early-packages)
156 (packages-find-package-data-path late-packages) 156 (packages-find-package-data-path late-packages)
157 (packages-find-package-data-path last-packages) 157 (list data-directory)
158 (list data-directory))) 158 (packages-find-package-data-path last-packages)))
159 159
160 ;;; setup-paths.el ends here 160 ;;; setup-paths.el ends here