diff lisp/loadup.el @ 373:6240c7796c7a r21-2b2

Import from CVS: tag r21-2b2
author cvs
date Mon, 13 Aug 2007 11:04:06 +0200
parents cc15677e0335
children 8626e4521993
line wrap: on
line diff
--- a/lisp/loadup.el	Mon Aug 13 11:03:09 2007 +0200
+++ b/lisp/loadup.el	Mon Aug 13 11:04:06 2007 +0200
@@ -64,7 +64,6 @@
 	;; 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 "^[^-.]"
@@ -183,19 +182,16 @@
     (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-