diff lisp/startup.el @ 274:ca9a9ec9c1c1 r21-0b35

Import from CVS: tag r21-0b35
author cvs
date Mon, 13 Aug 2007 10:29:42 +0200
parents c5d627a313b1
children 6330739388db
line wrap: on
line diff
--- a/lisp/startup.el	Mon Aug 13 10:28:54 2007 +0200
+++ b/lisp/startup.el	Mon Aug 13 10:29:42 2007 +0200
@@ -345,6 +345,7 @@
 		 stream))
 	(princ (format "\nexec-directory is %S" exec-directory) stream)
 	(princ (format "\ndata-directory is %S" data-directory) stream)
+	(princ (format "\ndata-directory-list is %S" data-directory-list) stream)
 	(princ (format "\ndoc-directory is %S" doc-directory) stream)
 	(princ (format "\nload-path is %S" load-path) stream)
 	(princ "\n\n" stream)))
@@ -1016,13 +1017,11 @@
 If INHIBIT-SITE-LISP is non-NIL, don't do site-lisp.
 It's idempotent, so call this as often as you like!"
 
-  (setq package-path (packages-find-package-path roots))
-
   (apply #'(lambda (early late last)
 	     (setq early-packages early)
 	     (setq late-packages late)
 	     (setq last-packages last))
-	 (packages-find-packages package-path inhibit-packages))
+	 (packages-find-packages roots inhibit-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))