Mercurial > hg > xemacs-beta
comparison lisp/loadup.el @ 371:cc15677e0335 r21-2b1
Import from CVS: tag r21-2b1
| author | cvs |
|---|---|
| date | Mon, 13 Aug 2007 11:03:08 +0200 |
| parents | d1b52dcaa789 |
| children | 6240c7796c7a |
comparison
equal
deleted
inserted
replaced
| 370:bd866891f083 | 371:cc15677e0335 |
|---|---|
| 62 ;; initialized that we can start dumping "standard" lisp. | 62 ;; initialized that we can start dumping "standard" lisp. |
| 63 ;; Dumped lisp from external packages is added when we search | 63 ;; Dumped lisp from external packages is added when we search |
| 64 ;; the package path. | 64 ;; the package path. |
| 65 ;; #### This code is duplicated in two other places. | 65 ;; #### This code is duplicated in two other places. |
| 66 (let ((temp-path (expand-file-name "." (car load-path)))) | 66 (let ((temp-path (expand-file-name "." (car load-path)))) |
| 67 (setq source-directory temp-path) | |
| 67 (setq load-path (nconc (mapcar | 68 (setq load-path (nconc (mapcar |
| 68 #'(lambda (i) (concat i "/")) | 69 #'(lambda (i) (concat i "/")) |
| 69 (directory-files temp-path t "^[^-.]" | 70 (directory-files temp-path t "^[^-.]" |
| 70 nil 'dirs-only)) | 71 nil 'dirs-only)) |
| 71 (cons (file-name-as-directory temp-path) | 72 (cons (file-name-as-directory temp-path) |
| 180 (when (fboundp 'really-free) | 181 (when (fboundp 'really-free) |
| 181 (really-free)) | 182 (really-free)) |
| 182 (dump-emacs (if (featurep 'infodock) "infodock" "xemacs") "temacs") | 183 (dump-emacs (if (featurep 'infodock) "infodock" "xemacs") "temacs") |
| 183 (kill-emacs)) | 184 (kill-emacs)) |
| 184 | 185 |
| 185 ;; Avoid error if user loads some more libraries now. | |
| 186 (setq purify-flag nil) | |
| 187 | |
| 188 (when (member "run-temacs" command-line-args) | 186 (when (member "run-temacs" command-line-args) |
| 189 (message "\nBootstrapping from temacs...") | 187 (message "\nBootstrapping from temacs...") |
| 188 (setq purify-flag nil) | |
| 189 (setq inhibit-early-packages t) | |
| 190 (setq inhibit-autoloads t) | |
| 190 ;; Remove all args up to and including "run-temacs" | 191 ;; Remove all args up to and including "run-temacs" |
| 191 (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))) |
| 192 ;; run-emacs-from-temacs doesn't actually return anyway. | 193 ;; run-emacs-from-temacs doesn't actually return anyway. |
| 193 (kill-emacs)) | 194 (kill-emacs)) |
| 195 | |
| 196 ;; Avoid error if user loads some more libraries now. | |
| 197 (setq purify-flag nil) | |
| 194 | 198 |
| 195 ;; XEmacs change | 199 ;; XEmacs change |
| 196 ;; If you are using 'recompile', then you should have used -l loadup-el.el | 200 ;; If you are using 'recompile', then you should have used -l loadup-el.el |
| 197 ;; so that the .el files always get loaded (the .elc files may be out-of- | 201 ;; so that the .el files always get loaded (the .elc files may be out-of- |
| 198 ;; date or bad). | 202 ;; date or bad). |