comparison lisp/loadup.el @ 308:33bdb3d4b97f r21-0b52

Import from CVS: tag r21-0b52
author cvs
date Mon, 13 Aug 2007 10:42:44 +0200
parents c6de09ad3017
children d1b52dcaa789
comparison
equal deleted inserted replaced
307:42d630fd9bd8 308:33bdb3d4b97f
181 (when (fboundp 'really-free) 181 (when (fboundp 'really-free)
182 (really-free)) 182 (really-free))
183 (dump-emacs (if (featurep 'infodock) "infodock" "xemacs") "temacs") 183 (dump-emacs (if (featurep 'infodock) "infodock" "xemacs") "temacs")
184 (kill-emacs)) 184 (kill-emacs))
185 185
186 ;; Avoid error if user loads some more libraries now.
187 (setq purify-flag nil)
188
186 (when (member "run-temacs" command-line-args) 189 (when (member "run-temacs" command-line-args)
187 (message "\nBootstrapping from temacs...") 190 (message "\nBootstrapping from temacs...")
188 (setq purify-flag nil)
189 (setq inhibit-early-packages t)
190 (setq inhibit-autoloads t)
191 ;; Remove all args up to and including "run-temacs" 191 ;; Remove all args up to and including "run-temacs"
192 (apply #'run-emacs-from-temacs (cdr (member "run-temacs" command-line-args))) 192 (apply #'run-emacs-from-temacs (cdr (member "run-temacs" command-line-args)))
193 ;; run-emacs-from-temacs doesn't actually return anyway. 193 ;; run-emacs-from-temacs doesn't actually return anyway.
194 (kill-emacs)) 194 (kill-emacs))
195
196 ;; Avoid error if user loads some more libraries now.
197 (setq purify-flag nil)
198 195
199 ;; XEmacs change 196 ;; XEmacs change
200 ;; If you are using 'recompile', then you should have used -l loadup-el.el 197 ;; If you are using 'recompile', then you should have used -l loadup-el.el
201 ;; so that the .el files always get loaded (the .elc files may be out-of- 198 ;; so that the .el files always get loaded (the .elc files may be out-of-
202 ;; date or bad). 199 ;; date or bad).