Mercurial > hg > xemacs-beta

comparison lisp/startup.el @ 1227:5636ae1c0234

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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
comparison
equal deleted inserted replaced
1226:440b3dcb60ed 1227:5636ae1c0234
130 (defconst initial-major-mode 'lisp-interaction-mode 130 (defconst initial-major-mode 'lisp-interaction-mode
131 "Major mode command symbol to use for the initial *scratch* buffer.") 131 "Major mode command symbol to use for the initial *scratch* buffer.")
132 132
133 (defvar emacs-roots nil 133 (defvar emacs-roots nil
134 "List of plausible roots of the XEmacs hierarchy.") 134 "List of plausible roots of the XEmacs hierarchy.")
135
136 (defvar emacs-data-roots nil
137 "List of plausible data roots of the XEmacs hierarchy.")
135 138
136 (defvar user-init-directory-base ".xemacs" 139 (defvar user-init-directory-base ".xemacs"
137 "Base of directory where user-installed init files may go.") 140 "Base of directory where user-installed init files may go.")
138 141
139 (defvar user-init-directory 142 (defvar user-init-directory
515 (let ((debug-paths (or debug-paths 518 (let ((debug-paths (or debug-paths
516 (and (getenv "EMACSDEBUGPATHS") 519 (and (getenv "EMACSDEBUGPATHS")
517 t)))) 520 t))))
518 521
519 (setq emacs-roots (paths-find-emacs-roots invocation-directory 522 (setq emacs-roots (paths-find-emacs-roots invocation-directory
520 invocation-name)) 523 invocation-name
524 #'paths-emacs-root-p))
525 (setq emacs-data-roots (paths-find-emacs-roots invocation-directory
526 invocation-name
527 #'paths-emacs-data-root-p))
521 528
522 (if debug-paths 529 (if debug-paths
523 (princ (format "emacs-roots:\n%S\n" emacs-roots) 530 (princ (format "emacs-roots:\n%S\n" emacs-roots)
524 'external-debugging-output)) 531 'external-debugging-output))
525 532
526 (if (null emacs-roots) 533 (if (null emacs-roots)
527 (startup-find-roots-warning)) 534 (startup-find-roots-warning))
528 (startup-setup-paths emacs-roots 535 (startup-setup-paths emacs-roots emacs-data-roots
529 user-init-directory 536 user-init-directory
530 (cond (inhibit-all-packages t) 537 (cond (inhibit-all-packages t)
531 (inhibit-early-packages '(early)) 538 (inhibit-early-packages '(early))
532 (t nil)) 539 (t nil))
533 inhibit-site-lisp 540 inhibit-site-lisp