Mercurial > hg > xemacs-beta
diff lisp/startup.el @ 1227:5636ae1c0234
[xemacs-hg @ 2003-01-22 20:31:52 by michaels]
2003-01-19 Mike Sperber <mike@xemacs.org>
* startup.el (normal-top-level): Compute `emacs-data-roots.' Call
`startup-setup-paths' with data-roots argument.
(emacs-data-roots): Add.
* dump-paths.el: Call `startup-setup-paths' with
data-roots argument.
(startup-setup-paths): Use `data-roots' instead of `roots' to find
packages.
Call `paths-find-emacs-roots' with `root-p' argument.
* make-docfile.el: Call `paths-find-emacs-roots' with `root-p' argument.
* find-paths.el (paths-emacs-data-root-p): Add.
(paths-find-emacs-roots): Parmeterize over `root-p.'
| author | michaels |
|---|---|
| date | Wed, 22 Jan 2003 20:31:52 +0000 |
| parents | 37bdd24225ef |
| children | c08a6fa181d1 |
line wrap: on
line diff
--- a/lisp/startup.el Tue Jan 21 22:52:39 2003 +0000 +++ b/lisp/startup.el Wed Jan 22 20:31:52 2003 +0000 @@ -133,6 +133,9 @@ (defvar emacs-roots nil "List of plausible roots of the XEmacs hierarchy.") +(defvar emacs-data-roots nil + "List of plausible data roots of the XEmacs hierarchy.") + (defvar user-init-directory-base ".xemacs" "Base of directory where user-installed init files may go.") @@ -517,7 +520,11 @@ t)))) (setq emacs-roots (paths-find-emacs-roots invocation-directory - invocation-name)) + invocation-name + #'paths-emacs-root-p)) + (setq emacs-data-roots (paths-find-emacs-roots invocation-directory + invocation-name + #'paths-emacs-data-root-p)) (if debug-paths (princ (format "emacs-roots:\n%S\n" emacs-roots) @@ -525,7 +532,7 @@ (if (null emacs-roots) (startup-find-roots-warning)) - (startup-setup-paths emacs-roots + (startup-setup-paths emacs-roots emacs-data-roots user-init-directory (cond (inhibit-all-packages t) (inhibit-early-packages '(early))