Mercurial > hg > xemacs-beta

comparison lisp/loadup.el @ 276:6330739388db r21-0b36

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-0b36
author cvs
date Mon, 13 Aug 2007 10:30:37 +0200
parents ca9a9ec9c1c1
children 7df0dd720c89
comparison
equal deleted inserted replaced
275:a68ae4439f57 276:6330739388db
26 26
27 ;;; Synched up with: Last synched with FSF 19.30, with wild divergence since. 27 ;;; Synched up with: Last synched with FSF 19.30, with wild divergence since.
28 28
29 ;;; Commentary: 29 ;;; Commentary:
30 30
31 ;; Please do not edit this file. Use site-init.el, site-load.el, or 31 ;; Please do not edit this file. Use site-init.el or site-load.el instead.
32 ;; packaged dumped-lisp.el's instead.
33 32
34 ;; This is loaded into a bare XEmacs to make a dumpable one. 33 ;; This is loaded into a bare XEmacs to make a dumpable one.
35 34
36 ;;; Code: 35 ;;; Code:
37 36
95 ;;(print (format "guessed-roots: %S" (paths-find-emacs-roots invocation-directory invocation-name))) 94 ;;(print (format "guessed-roots: %S" (paths-find-emacs-roots invocation-directory invocation-name)))
96 nil))) 95 nil)))
97 96
98 (load (concat default-directory "../lisp/dumped-lisp.el")) 97 (load (concat default-directory "../lisp/dumped-lisp.el"))
99 98
100 (let ((dumped-lisp-packages preloaded-file-list) 99 (let ((files preloaded-file-list)
101 file) 100 file)
102 (while (setq file (car dumped-lisp-packages)) 101 (while (setq file (car files))
103 (or (pureload file) 102 (or (pureload file)
104 (progn 103 (progn
105 (external-debugging-output "Fatal error during load, aborting") 104 (external-debugging-output "Fatal error during load, aborting")
106 (kill-emacs 1))) 105 (kill-emacs 1)))
107 (setq dumped-lisp-packages (cdr dumped-lisp-packages))) 106 (setq files (cdr files)))
108 (if (not (featurep 'toolbar)) 107 (if (not (featurep 'toolbar))
109 (progn 108 (progn
110 ;; else still define a few functions. 109 ;; else still define a few functions.
111 (defun toolbar-button-p (obj) "No toolbar support." nil) 110 (defun toolbar-button-p (obj) "No toolbar support." nil)
112 (defun toolbar-specifier-p (obj) "No toolbar support." nil))) 111 (defun toolbar-specifier-p (obj) "No toolbar support." nil)))
113 (fmakunbound 'pureload)) 112 (fmakunbound 'pureload))
114 113
115 (if (null inhibit-package-init) 114 (packages-load-package-dumped-lisps late-package-load-path)
116 (packages-load-package-dumped-lisps late-package-load-path))
117 115
118 )) ;; end of call-with-condition-handler 116 )) ;; end of call-with-condition-handler
119 117
120 ;; Fix up the preloaded file list 118 ;; Fix up the preloaded file list
121 (setq preloaded-file-list (mapcar #'file-name-sans-extension 119 (setq preloaded-file-list (mapcar #'file-name-sans-extension
184 (kill-emacs)) 182 (kill-emacs))
185 183
186 (when (member "run-temacs" command-line-args) 184 (when (member "run-temacs" command-line-args)
187 (message "\nBootstrapping from temacs...") 185 (message "\nBootstrapping from temacs...")
188 (setq purify-flag nil) 186 (setq purify-flag nil)
189 (setq inhibit-package-init t) 187 (setq inhibit-early-packages t)
190 (setq inhibit-update-dumped-lisp t) 188 (setq inhibit-autoloads t)
191 (setq inhibit-update-autoloads t)
192 ;; Remove all args up to and including "run-temacs" 189 ;; Remove all args up to and including "run-temacs"
193 (apply #'run-emacs-from-temacs (cdr (member "run-temacs" command-line-args))) 190 (apply #'run-emacs-from-temacs (cdr (member "run-temacs" command-line-args)))
194 ;; run-emacs-from-temacs doesn't actually return anyway. 191 ;; run-emacs-from-temacs doesn't actually return anyway.
195 (kill-emacs)) 192 (kill-emacs))
196 193