Mercurial > hg > xemacs-beta

diff lisp/dump-paths.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 edc95b5fe4cb
children 4542b72c005e
line wrap: on
line diff
--- a/lisp/dump-paths.el	Tue Jan 21 22:52:39 2003 +0000
+++ b/lisp/dump-paths.el	Wed Jan 22 20:31:52 2003 +0000
@@ -31,7 +31,7 @@
 ;; This is the only file of the basic path/package files (find-paths.el,
 ;; package.el, setup-paths.el, dump-paths.el) that actually does stuff.
 
-(defun startup-setup-paths (roots user-init-directory
+(defun startup-setup-paths (roots data-roots user-init-directory
 				  &optional
 				  inhibit-packages inhibit-site-lisp
 				  debug-paths called-early)
@@ -56,18 +56,17 @@
 				       last))
 	     )
 	 (packages-find-packages
-	  roots
+	  data-roots
 	  (packages-compute-package-locations user-init-directory)))
 
-  (setq early-package-load-path (packages-find-package-load-path
-				 early-packages))
+  (setq early-package-load-path (packages-find-package-load-path early-packages))
   (setq late-package-load-path (packages-find-package-load-path late-packages))
   (setq last-package-load-path (packages-find-package-load-path last-packages))
 
   (if debug-paths
       (progn
-	(princ (format "arguments:\nroots: %S\nuser-init-directory: %S\n"
-		       roots user-init-directory)
+	(princ (format "arguments:\nroots: %S\ndata-roots: %S\nuser-init-directory: %S\n"
+		       roots data-roots user-init-directory)
 	       'external-debugging-output)
 	(princ (format "inhibit-packages: %S\ninhibit-site-lisp: %S\n"
 		       inhibit-packages inhibit-site-lisp)
@@ -185,13 +184,21 @@
 		      (and (getenv "EMACSDEBUGPATHS")
 			   t)))
       (roots (paths-find-emacs-roots invocation-directory
-				     invocation-name)))
+				     invocation-name
+				     #'paths-emacs-root-p))
+      (data-roots (paths-find-emacs-roots invocation-directory
+					  invocation-name
+					  #'paths-emacs-data-root-p)))
 
   (if debug-paths
-      (princ (format "XEmacs thinks the roots of its hierarchy are:\n%S\n"
-		     roots)
-	     'external-debugging-output))
-  (startup-setup-paths roots
+      (progn
+	(princ (format "XEmacs thinks the roots of its hierarchy are:\n%S\n"
+		       roots)
+	     'external-debugging-output)
+	(princ (format "XEmacs thinks the data roots of its hierarchy are:\n%S\n"
+		       data-roots)
+	     'external-debugging-output)))
+  (startup-setup-paths roots data-roots
 		       (paths-construct-path '("~" ".xemacs"))
 		       (if inhibit-all-packages t
 			 '(early last))