Mercurial > hg > xemacs-beta

comparison lisp/startup.el @ 3360:316fddbf58e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2006-04-25 14:01:52 by stephent] Repair broken commit to Xft code. <87aca9n4in.fsf@tleepslib.sk.tsukuba.ac.jp>
author stephent
date Tue, 25 Apr 2006 14:02:09 +0000
parents f441e940eed8
children 86be8d3dd45d
comparison
equal deleted inserted replaced
3359:af8dab703edc 3360:316fddbf58e2
172 Otherwise, XEmacs will offer migration to the init directory.") 172 Otherwise, XEmacs will offer migration to the init directory.")
173 173
174 (defvar load-user-init-file-p t 174 (defvar load-user-init-file-p t
175 "Non-nil if XEmacs should load the user's init file.") 175 "Non-nil if XEmacs should load the user's init file.")
176 176
177 ;; #### called `site-run-file' in FSFmacs 177 ;; #### called `site-run-file' in GNU Emacs
178 178
179 (defvar site-start-file "site-start" 179 (defvar site-start-file "site-start"
180 "File containing site-wide run-time initializations. 180 "File containing site-wide run-time initializations.
181 It is loaded at run-time before the user's init file (see `user-init-file'). 181 It is loaded at run-time before the user's init file (see `user-init-file').
182 It contains inits that need to be in place for the entire site, but 182 It contains inits that need to be in place for the entire site, but
283 created. Otherwise, an initial Windows frame will be 283 created. Otherwise, an initial Windows frame will be
284 created if Windows support exists and neither -nw nor 284 created if Windows support exists and neither -nw nor
285 -t is given. Otherwise, a TTY frame is created. 285 -t is given. Otherwise, a TTY frame is created.
286 -unmapped Do not display the initial frame. Useful to create 286 -unmapped Do not display the initial frame. Useful to create
287 a \"server\" that can accept `gnuclient' connections. 287 a \"server\" that can accept `gnuclient' connections.
288 -tty Create the initial frame on the given window system.
289 -x (Requesting an unsupported window system, or giving
290 -gtk conflicting window systems, is a fatal error.)
291 -gnome
292 -msw
288 293
289 Noninteractive options: 294 Noninteractive options:
290 295
291 {-help} 296 {-help}
292 {-version} 297 {-version}
567 (run-hooks 'term-setup-hook)) 572 (run-hooks 'term-setup-hook))
568 (setq term-setup-hook nil) 573 (setq term-setup-hook nil)
569 ;; ;; Modify the initial frame based on what the init file puts into 574 ;; ;; Modify the initial frame based on what the init file puts into
570 ;; ;; ...-frame-alist. 575 ;; ;; ...-frame-alist.
571 (frame-notice-user-settings) 576 (frame-notice-user-settings)
572 ;; ;;####FSFmacs junk 577 ;; ;;#### GNU Emacs junk
573 ;; ;; Now we know the user's default font, so add it to the menu. 578 ;; ;; Now we know the user's default font, so add it to the menu.
574 ;; (if (fboundp 'font-menu-add-default) 579 ;; (if (fboundp 'font-menu-add-default)
575 ;; (font-menu-add-default)) 580 ;; (font-menu-add-default))
576 (when window-setup-hook 581 (when window-setup-hook
577 (run-hooks 'window-setup-hook)) 582 (run-hooks 'window-setup-hook))
581 ;; wipe out the user's .emacs if she hasn't migrated yet! 586 ;; wipe out the user's .emacs if she hasn't migrated yet!
582 (signal-error (car error-data) (cdr error-data)))) 587 (signal-error (car error-data) (cdr error-data))))
583 588
584 (if load-user-init-file-p 589 (if load-user-init-file-p
585 (maybe-migrate-user-init-file)) 590 (maybe-migrate-user-init-file))
586 ;; FSF calls precompute-menubar-bindings. We don't mix menubars 591 ;; GNU calls precompute-menubar-bindings. We don't mix menubars
587 ;; and keymaps. 592 ;; and keymaps.
588 )) 593 ))
589 594
590 (defun command-line-early (args) 595 (defun command-line-early (args)
591 ;; This processes those switches which need to be processed before 596 ;; This processes those switches which need to be processed before
604 (setq version-control nil)) 609 (setq version-control nil))
605 ((or (string= vc "never") 610 ((or (string= vc "never")
606 (string= vc "simple")) 611 (string= vc "simple"))
607 (setq version-control 'never)))) 612 (setq version-control 'never))))
608 613
609 ;;####FSFmacs 614 ;;#### GNU Emacs
610 ;; (if (let ((ctype 615 ;; (if (let ((ctype
611 ;; ;; Use the first of these three envvars that has a nonempty value. 616 ;; ;; Use the first of these three envvars that has a nonempty value.
612 ;; (or (let ((string (getenv "LC_ALL"))) 617 ;; (or (let ((string (getenv "LC_ALL")))
613 ;; (and (not (equal string "")) string)) 618 ;; (and (not (equal string "")) string))
614 ;; (let ((string (getenv "LC_CTYPE"))) 619 ;; (let ((string (getenv "LC_CTYPE")))