--- a/lisp/loadup.el	Mon Aug 13 10:29:43 2007 +0200
+++ b/lisp/loadup.el	Mon Aug 13 10:30:37 2007 +0200
@@ -28,8 +28,7 @@
 
 ;;; Commentary:
 
-;; Please do not edit this file.  Use site-init.el, site-load.el, or
-;; packaged dumped-lisp.el's instead.
+;; Please do not edit this file.  Use site-init.el or site-load.el instead.
 
 ;; This is loaded into a bare XEmacs to make a dumpable one.
 
@@ -97,14 +96,14 @@
 
 	(load (concat default-directory "../lisp/dumped-lisp.el"))
 
-	(let ((dumped-lisp-packages preloaded-file-list)
+	(let ((files preloaded-file-list)
 	      file)
-	  (while (setq file (car dumped-lisp-packages))
+	  (while (setq file (car files))
 	    (or (pureload file)
 	      (progn
 		(external-debugging-output "Fatal error during load, aborting")
 		(kill-emacs 1)))
-	    (setq dumped-lisp-packages (cdr dumped-lisp-packages)))
+	    (setq files (cdr files)))
 	  (if (not (featurep 'toolbar))
 	      (progn
 		;; else still define a few functions.
@@ -112,8 +111,7 @@
 		(defun toolbar-specifier-p (obj) "No toolbar support." nil)))
 	  (fmakunbound 'pureload))
 
-	(if (null inhibit-package-init)
-	    (packages-load-package-dumped-lisps late-package-load-path))
+	(packages-load-package-dumped-lisps late-package-load-path)
 
 	)) ;; end of call-with-condition-handler
 
@@ -186,9 +184,8 @@
 (when (member "run-temacs" command-line-args)
   (message "\nBootstrapping from temacs...")
   (setq purify-flag nil)
-  (setq inhibit-package-init t)
-  (setq inhibit-update-dumped-lisp t)
-  (setq inhibit-update-autoloads t)
+  (setq inhibit-early-packages t)
+  (setq inhibit-autoloads t)
   ;; Remove all args up to and including "run-temacs"
   (apply #'run-emacs-from-temacs (cdr (member "run-temacs" command-line-args)))
   ;; run-emacs-from-temacs doesn't actually return anyway.