Mercurial > hg > xemacs-beta
comparison lisp/dump-paths.el @ 1048:edc95b5fe4cb
[xemacs-hg @ 2002-10-11 14:09:46 by james]
Make modules autoload only if the module exists. Fix a paths bug that caused
module-directory, site-module-directory, and module-load-path to be wrong.
author | james |
---|---|
date | Fri, 11 Oct 2002 14:10:03 +0000 |
parents | 79940b592197 |
children | 5636ae1c0234 |
comparison
equal
deleted
inserted
replaced
1047:c46be6682f03 | 1048:edc95b5fe4cb |
---|---|
117 last-package-load-path | 117 last-package-load-path |
118 lisp-directory | 118 lisp-directory |
119 site-directory | 119 site-directory |
120 mule-lisp-directory)) | 120 mule-lisp-directory)) |
121 | 121 |
122 (if called-early | 122 (setq module-directory (paths-find-module-directory roots)) |
123 (progn | 123 (if debug-paths |
124 (setq module-directory (paths-find-module-directory roots)) | 124 (princ (format "module-directory:\n%S\n" module-directory) |
125 (if debug-paths | 125 'external-debugging-output)) |
126 (princ (format "module-directory:\n%S\n" module-directory) | 126 (setq site-module-directory (and (null inhibit-site-modules) |
127 'external-debugging-output)) | 127 (paths-find-site-module-directory |
128 (setq site-module-directory (and (null inhibit-site-modules) | 128 roots))) |
129 (paths-find-site-module-directory | 129 (if (and debug-paths (null inhibit-site-modules)) |
130 roots))) | 130 (princ (format "site-module-directory:\n%S\n" |
131 (if (and debug-paths (null inhibit-site-modules)) | 131 site-module-directory) |
132 (princ (format "site-module-directory:\n%S\n" | 132 'external-debugging-output)) |
133 site-module-directory) | 133 |
134 'external-debugging-output)) | 134 (setq module-load-path (paths-construct-module-load-path |
135 | 135 roots |
136 (setq module-load-path (paths-construct-module-load-path | 136 module-directory |
137 roots | 137 site-module-directory)) |
138 module-directory | 138 |
139 site-module-directory))) | 139 (unless called-early |
140 (setq Info-directory-list | 140 (setq Info-directory-list |
141 (paths-construct-info-path | 141 (paths-construct-info-path |
142 roots early-packages late-packages last-packages)) | 142 roots early-packages late-packages last-packages)) |
143 | 143 |
144 (if debug-paths | 144 (if debug-paths |