--- a/lisp/loadup.el	Mon Aug 13 11:01:58 2007 +0200
+++ b/lisp/loadup.el	Mon Aug 13 11:03:08 2007 +0200
@@ -64,6 +64,7 @@
 	;; the package path.
 	;; #### This code is duplicated in two other places.
 	(let ((temp-path (expand-file-name "." (car load-path))))
+	  (setq source-directory temp-path)
 	  (setq load-path (nconc (mapcar
 				  #'(lambda (i) (concat i "/"))
 				  (directory-files temp-path t "^[^-.]"
@@ -182,16 +183,19 @@
     (dump-emacs (if (featurep 'infodock) "infodock" "xemacs") "temacs")
     (kill-emacs))
 
-;; Avoid error if user loads some more libraries now.
-(setq purify-flag nil)
-
 (when (member "run-temacs" command-line-args)
   (message "\nBootstrapping from temacs...")
+  (setq purify-flag nil)
+  (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.
   (kill-emacs))
 
+;; Avoid error if user loads some more libraries now.
+(setq purify-flag nil)
+
 ;; XEmacs change
 ;; If you are using 'recompile', then you should have used -l loadup-el.el
 ;; so that the .el files always get loaded (the .elc files may be out-of-