comparison lisp/startup.el @ 444:576fb035e263 r21-2-37

Import from CVS: tag r21-2-37
author cvs
date Mon, 13 Aug 2007 11:36:19 +0200
parents abe6d1db359e
children 1ccc32a20af4
comparison
equal deleted inserted replaced
443:a8296e22da4e 444:576fb035e263
134 (defvar load-user-init-file-p t 134 (defvar load-user-init-file-p t
135 "Non-nil if XEmacs should load the user's init file.") 135 "Non-nil if XEmacs should load the user's init file.")
136 136
137 ;; #### called `site-run-file' in FSFmacs 137 ;; #### called `site-run-file' in FSFmacs
138 138
139 (defvar site-start-file (purecopy "site-start") 139 (defvar site-start-file "site-start"
140 "File containing site-wide run-time initializations. 140 "File containing site-wide run-time initializations.
141 This file is loaded at run-time before `.emacs'. It 141 This file is loaded at run-time before `.emacs'. It
142 contains inits that need to be in place for the entire site, but 142 contains inits that need to be in place for the entire site, but
143 which, due to their higher incidence of change, don't make sense to 143 which, due to their higher incidence of change, don't make sense to
144 load into XEmacs' dumped image. Thus, the run-time load order is: 144 load into XEmacs' dumped image. Thus, the run-time load order is:
169 This is initialized based on `mail-host-address', 169 This is initialized based on `mail-host-address',
170 after your init file is read, in case it sets `mail-host-address'." 170 after your init file is read, in case it sets `mail-host-address'."
171 :type 'string 171 :type 'string
172 :group 'mail) 172 :group 'mail)
173 173
174 (defvar auto-save-list-file-prefix "~/.saves-"
175 "Prefix for generating auto-save-list-file-name.
176 Emacs's pid and the system name will be appended to
177 this prefix to create a unique file name.")
178
179 (defvar init-file-debug nil) 174 (defvar init-file-debug nil)
180 175
181 (defvar init-file-had-error nil) 176 (defvar init-file-had-error nil)
182 177
183 (defvar init-file-loaded nil 178 (defvar init-file-loaded nil
188 (defvar initial-frame-unmapped-p nil) 183 (defvar initial-frame-unmapped-p nil)
189 184
190 185
191 186
192 (defvar command-switch-alist 187 (defvar command-switch-alist
193 (purecopy 188 '(("-help" . command-line-do-help)
194 '(("-help" . command-line-do-help) 189 ("-version". command-line-do-version)
195 ("-version". command-line-do-version) 190 ("-V" . command-line-do-version)
196 ("-V" . command-line-do-version) 191 ("-funcall". command-line-do-funcall)
197 ("-funcall". command-line-do-funcall) 192 ("-f" . command-line-do-funcall)
198 ("-f" . command-line-do-funcall) 193 ("-e" . command-line-do-funcall-1)
199 ("-e" . command-line-do-funcall-1) 194 ("-eval" . command-line-do-eval)
200 ("-eval" . command-line-do-eval) 195 ("-load" . command-line-do-load)
201 ("-load" . command-line-do-load) 196 ("-l" . command-line-do-load)
202 ("-l" . command-line-do-load) 197 ("-insert" . command-line-do-insert)
203 ("-insert" . command-line-do-insert) 198 ("-i" . command-line-do-insert)
204 ("-i" . command-line-do-insert) 199 ("-kill" . command-line-do-kill)
205 ("-kill" . command-line-do-kill) 200 ;; Options like +35 are handled specially.
206 ;; Options like +35 are handled specially. 201 ;; Window-system, site, or package-specific code might add to this.
207 ;; Window-system, site, or package-specific code might add to this. 202 ;; X11 handles its options by letting Xt remove args from this list.
208 ;; X11 handles its options by letting Xt remove args from this list. 203 )
209 ))
210 "Alist of command-line switches. 204 "Alist of command-line switches.
211 Elements look like (SWITCH-STRING . HANDLER-FUNCTION). 205 Elements look like (SWITCH-STRING . HANDLER-FUNCTION).
212 HANDLER-FUNCTION receives switch name as sole arg; 206 HANDLER-FUNCTION receives switch name as sole arg;
213 remaining command-line args are in the variable `command-line-args-left'.") 207 remaining command-line args are in the variable `command-line-args-left'.")
214 208
442 (command-line) 436 (command-line)
443 ;; Do this again, in case .emacs defined more abbreviations. 437 ;; Do this again, in case .emacs defined more abbreviations.
444 (setq default-directory (abbreviate-file-name default-directory)) 438 (setq default-directory (abbreviate-file-name default-directory))
445 ;; Specify the file for recording all the auto save files of 439 ;; Specify the file for recording all the auto save files of
446 ;; this session. This is used by recover-session. 440 ;; this session. This is used by recover-session.
447 (setq auto-save-list-file-name 441 (if auto-save-list-file-prefix
448 (expand-file-name 442 (setq auto-save-list-file-name
449 (format "%s%d-%s" 443 (expand-file-name
450 auto-save-list-file-prefix 444 (format "%s%d-%s"
451 (emacs-pid) 445 auto-save-list-file-prefix
452 (system-name)))) 446 (emacs-pid)
447 (system-name)))))
453 (run-hooks 'emacs-startup-hook) 448 (run-hooks 'emacs-startup-hook)
454 (and term-setup-hook 449 (and term-setup-hook
455 (run-hooks 'term-setup-hook)) 450 (run-hooks 'term-setup-hook))
456 (setq term-setup-hook nil) 451 (setq term-setup-hook nil)
457 ;; ;; Modify the initial frame based on what .emacs puts into 452 ;; ;; Modify the initial frame based on what .emacs puts into