comparison lisp/setup-paths.el @ 452:3d3049ae1304 r21-2-41

Import from CVS: tag r21-2-41
author cvs
date Mon, 13 Aug 2007 11:40:21 +0200
parents abe6d1db359e
children 223736d75acb
comparison
equal deleted inserted replaced
451:8ad70c5cd5d7 452:3d3049ae1304
36 36
37 ;; It requires find-paths.el and packages.el. 37 ;; It requires find-paths.el and packages.el.
38 38
39 ;;; Code: 39 ;;; Code:
40 40
41 (defvar paths-load-path-depth 1 41 (defvar paths-core-load-path-depth 1
42 "Depth of load-path searches in core Lisp paths.") 42 "Depth of load-path searches in core Lisp paths.")
43
44 (defvar paths-site-load-path-depth 1
45 "Depth of load-path searches in site Lisp paths.")
43 46
44 (defvar paths-default-info-directories 47 (defvar paths-default-info-directories
45 (mapcar (function 48 (mapcar (function
46 (lambda (dirlist) 49 (lambda (dirlist)
47 (paths-construct-path 50 (paths-construct-path
85 (and envvar-value 88 (and envvar-value
86 (paths-decode-directory-path envvar-value 'drop-empties))) 89 (paths-decode-directory-path envvar-value 'drop-empties)))
87 (site-lisp-load-path 90 (site-lisp-load-path
88 (and site-lisp-directory 91 (and site-lisp-directory
89 (paths-find-recursive-load-path (list site-lisp-directory) 92 (paths-find-recursive-load-path (list site-lisp-directory)
90 paths-load-path-depth))) 93 paths-site-load-path-depth)))
91 (lisp-load-path 94 (lisp-load-path
92 (and lisp-directory 95 (and lisp-directory
93 (paths-find-recursive-load-path (list lisp-directory) 96 (paths-find-recursive-load-path (list lisp-directory)
94 paths-load-path-depth)))) 97 paths-core-load-path-depth))))
95 (append env-load-path 98 (append env-load-path
96 early-package-load-path 99 early-package-load-path
97 site-lisp-load-path 100 site-lisp-load-path
98 late-package-load-path 101 late-package-load-path
99 lisp-load-path 102 lisp-load-path
107 (and envvar-value 110 (and envvar-value
108 (paths-decode-directory-path envvar-value 'drop-empties))) 111 (paths-decode-directory-path envvar-value 'drop-empties)))
109 (site-module-load-path 112 (site-module-load-path
110 (and site-module-directory 113 (and site-module-directory
111 (paths-find-recursive-load-path (list site-module-directory) 114 (paths-find-recursive-load-path (list site-module-directory)
112 paths-load-path-depth))) 115 paths-site-load-path-depth)))
113 (module-load-path 116 (module-load-path
114 (and module-directory 117 (and module-directory
115 (paths-find-recursive-load-path (list module-directory) 118 (paths-find-recursive-load-path (list module-directory)
116 paths-load-path-depth)))) 119 paths-core-load-path-depth))))
117 (append env-module-path 120 (append env-module-path
118 site-module-load-path 121 site-module-load-path
119 module-load-path))) 122 module-load-path)))
120 123
121 (defun paths-construct-info-path (roots early-packages late-packages last-packages) 124 (defun paths-construct-info-path (roots early-packages late-packages last-packages)