Mercurial > hg > xemacs-beta
diff 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 |
line wrap: on
line diff
--- a/lisp/dump-paths.el Thu Oct 10 21:54:15 2002 +0000 +++ b/lisp/dump-paths.el Fri Oct 11 14:10:03 2002 +0000 @@ -119,24 +119,24 @@ site-directory mule-lisp-directory)) - (if called-early - (progn - (setq module-directory (paths-find-module-directory roots)) - (if debug-paths - (princ (format "module-directory:\n%S\n" module-directory) - 'external-debugging-output)) - (setq site-module-directory (and (null inhibit-site-modules) - (paths-find-site-module-directory - roots))) - (if (and debug-paths (null inhibit-site-modules)) - (princ (format "site-module-directory:\n%S\n" - site-module-directory) - 'external-debugging-output)) + (setq module-directory (paths-find-module-directory roots)) + (if debug-paths + (princ (format "module-directory:\n%S\n" module-directory) + 'external-debugging-output)) + (setq site-module-directory (and (null inhibit-site-modules) + (paths-find-site-module-directory + roots))) + (if (and debug-paths (null inhibit-site-modules)) + (princ (format "site-module-directory:\n%S\n" + site-module-directory) + 'external-debugging-output)) - (setq module-load-path (paths-construct-module-load-path - roots - module-directory - site-module-directory))) + (setq module-load-path (paths-construct-module-load-path + roots + module-directory + site-module-directory)) + + (unless called-early (setq Info-directory-list (paths-construct-info-path roots early-packages late-packages last-packages))