comparison lisp/startup.el @ 239:41f2f0e326e9 r20-5b18

Import from CVS: tag r20-5b18
author cvs
date Mon, 13 Aug 2007 10:15:48 +0200
parents 85a06df23a9a
children 51092a27c943
comparison
equal deleted inserted replaced
238:b5f2e56b938d 239:41f2f0e326e9
210 -debug-init Enter the debugger if an error in the init file occurs. 210 -debug-init Enter the debugger if an error in the init file occurs.
211 -unmapped Do not map the initial frame. 211 -unmapped Do not map the initial frame.
212 -no-site-file Do not load the site-specific init file (site-start.el). 212 -no-site-file Do not load the site-specific init file (site-start.el).
213 -no-init-file Do not load the user-specific init file (~/.emacs). 213 -no-init-file Do not load the user-specific init file (~/.emacs).
214 -no-packages Do not process the package path. 214 -no-packages Do not process the package path.
215 -no-autoloads Do not load global symbol files (auto-autoloads) at
216 startup. Also implies `-vanilla'.
215 -vanilla Equivalent to -q -no-site-file -no-packages. 217 -vanilla Equivalent to -q -no-site-file -no-packages.
216 -q Same as -no-init-file. 218 -q Same as -no-init-file.
217 -user <user> Load user's init file instead of your own. 219 -user <user> Load user's init file instead of your own.
218 -u <user> Same as -user.\n") 220 -u <user> Same as -user.\n")
219 (let ((l command-switch-alist) 221 (let ((l command-switch-alist)
465 (setq site-start-file nil)) 467 (setq site-start-file nil))
466 ((or (string= arg "-no-packages") 468 ((or (string= arg "-no-packages")
467 (string= arg "--no-packages")) 469 (string= arg "--no-packages"))
468 (setq inhibit-package-init t)) 470 (setq inhibit-package-init t))
469 ((or (string= arg "-vanilla") 471 ((or (string= arg "-vanilla")
470 (string= arg "--vanilla")) 472 (string= arg "--vanilla")
473 ;; Some work on this one already done in emacs.c.
474 (string= arg "-no-autoloads")
475 (string= arg "--no-autoloads"))
471 (setq init-file-user nil 476 (setq init-file-user nil
472 site-start-file nil 477 site-start-file nil
473 inhibit-package-init t)) 478 inhibit-package-init t))
474 ((or (string= arg "-u") 479 ((or (string= arg "-u")
475 (string= arg "-user")) 480 (string= arg "-user"))
605 ;; Don't you dare turn this off for anyone except yourself. 610 ;; Don't you dare turn this off for anyone except yourself.
606 (load "default" t t))))) 611 (load "default" t t)))))
607 612
608 ;;; Load user's init file and default ones. 613 ;;; Load user's init file and default ones.
609 (defun load-init-file () 614 (defun load-init-file ()
615 ;; Disabled for now
616 (unless inhibit-update-dumped-lisp
617 (packages-reload-dumped-lisp))
618
619 ;; (unless inhibit-update-autoloads
620 ;; (packages-reload-autoloads))
621 (unless inhibit-update-autoloads
622 (let ((dir load-path))
623 (while dir
624 (condition-case nil
625 (load (expand-file-name "auto-autoloads" (car dir)) nil t)
626 (t nil))
627 (pop dir))))
628
610 (run-hooks 'before-init-hook) 629 (run-hooks 'before-init-hook)
611 630
612 ;; Run the site-start library if it exists. The point of this file is 631 ;; Run the site-start library if it exists. The point of this file is
613 ;; that it is run before .emacs. There is no point in doing this after 632 ;; that it is run before .emacs. There is no point in doing this after
614 ;; .emacs; that is useless. 633 ;; .emacs; that is useless.
615 (when site-start-file 634 (when site-start-file
616 (load site-start-file t t)) 635 (load site-start-file t t))
617
618 ;; Disabled for now
619 (unless inhibit-update-dumped-lisp
620 (packages-reload-dumped-lisp))
621
622 (unless inhibit-update-autoloads
623 (packages-reload-autoloads))
624 636
625 ;; Sites should not disable this. Only individuals should disable 637 ;; Sites should not disable this. Only individuals should disable
626 ;; the startup message. 638 ;; the startup message.
627 (setq inhibit-startup-message nil) 639 (setq inhibit-startup-message nil)
628 640
938 For tips and answers to frequently asked questions, see the XEmacs FAQ. 950 For tips and answers to frequently asked questions, see the XEmacs FAQ.
939 \(It's on the Help menu, or type " (key xemacs-local-faq) " [a capital F!].\)")))) 951 \(It's on the Help menu, or type " (key xemacs-local-faq) " [a capital F!].\)"))))
940 952
941 (defun startup-splash-frame () 953 (defun startup-splash-frame ()
942 (let ((p (point)) 954 (let ((p (point))
955 (logo (cond ((featurep 'infodock)
956 (make-glyph (locate-data-file "altrasoft-logo.xpm")))
957 (t xemacs-logo)))
943 (cramped-p (eq 'tty (console-type)))) 958 (cramped-p (eq 'tty (console-type))))
944 (unless cramped-p (insert "\n")) 959 (unless cramped-p (insert "\n"))
945 (indent-to (startup-center-spaces xemacs-logo)) 960 (indent-to (startup-center-spaces logo))
946 (set-extent-begin-glyph (make-extent (point) (point)) xemacs-logo) 961 (set-extent-begin-glyph (make-extent (point) (point)) logo)
947 (insert (if cramped-p "\n" "\n\n")) 962 (insert (if cramped-p "\n" "\n\n"))
948 (splash-frame-present-hack (make-extent p (point)) 'about-xemacs)) 963 (splash-frame-present-hack (make-extent p (point)) 'about-xemacs))
949 964
950 (let ((after-change-functions nil)) ; no font-lock, thank you 965 (let ((after-change-functions nil)) ; no font-lock, thank you
951 (dolist (l (startup-splash-frame-body)) 966 (dolist (l (startup-splash-frame-body))