comparison lisp/prim/startup.el @ 197:acd284d43ca1 r20-3b25

Import from CVS: tag r20-3b25
author cvs
date Mon, 13 Aug 2007 10:00:02 +0200
parents b405438285a2
children 850242ba4a81
comparison
equal deleted inserted replaced
196:58e0786448ca 197:acd284d43ca1
343 (princ "\n\n" stream))) 343 (princ "\n\n" stream)))
344 (when (not suppress-early-error-handler-backtrace) 344 (when (not suppress-early-error-handler-backtrace)
345 (backtrace stream t))) 345 (backtrace stream t)))
346 (kill-emacs -1)) 346 (kill-emacs -1))
347 347
348 (defvar lock-directory)
349 (defvar superlock-file)
350
348 (defun normal-top-level () 351 (defun normal-top-level ()
349 (if command-line-processed 352 (if command-line-processed
350 (message "Back to top level.") 353 (message "Back to top level.")
351 (setq command-line-processed t) 354 (setq command-line-processed t)
352 ;; Canonicalize HOME (PWD is canonicalized by init_buffer in buffer.c) 355 ;; Canonicalize HOME (PWD is canonicalized by init_buffer in buffer.c)
493 (setq command-line-args-left (command-line-early command-line-args-left)) 496 (setq command-line-args-left (command-line-early command-line-args-left))
494 497
495 ;; Setup the toolbar icon directory 498 ;; Setup the toolbar icon directory
496 (when (featurep 'toolbar) 499 (when (featurep 'toolbar)
497 (init-toolbar-location)) 500 (init-toolbar-location))
498
499 ;; Initialize the built-in glyphs and default specifier lists
500 (when (not noninteractive)
501 (init-glyphs))
502 501
503 ;; Run the window system's init function. tty is considered to be 502 ;; Run the window system's init function. tty is considered to be
504 ;; a type of window system for this purpose. This creates the 503 ;; a type of window system for this purpose. This creates the
505 ;; initial (non stdio) device. 504 ;; initial (non stdio) device.
506 (when (and initial-window-system (not noninteractive)) 505 (when (and initial-window-system (not noninteractive))
807 (when (search-forward "." nil t) 806 (when (search-forward "." nil t)
808 (delete-region (1- (point)) (point-max)))))) 807 (delete-region (1- (point)) (point-max))))))
809 808
810 (defun splash-frame-present (l) 809 (defun splash-frame-present (l)
811 (cond ((stringp l) 810 (cond ((stringp l)
812 (insert l) 811 (insert l))
813 (splash-hack-version-string))
814 ((eq (car-safe l) 'face) 812 ((eq (car-safe l) 'face)
815 ;; (face name string) 813 ;; (face name string)
816 (let ((p (point))) 814 (let ((p (point)))
817 (splash-frame-present (elt l 2)) 815 (splash-frame-present (elt l 2))
818 (if (fboundp 'set-extent-face) 816 (if (fboundp 'set-extent-face)
928 (splash-frame-present-hack (make-extent p (point)) 'about-xemacs)) 926 (splash-frame-present-hack (make-extent p (point)) 'about-xemacs))
929 927
930 (let ((after-change-functions nil)) ; no font-lock, thank you 928 (let ((after-change-functions nil)) ; no font-lock, thank you
931 (dolist (l (startup-splash-frame-body)) 929 (dolist (l (startup-splash-frame-body))
932 (splash-frame-present l))) 930 (splash-frame-present l)))
931 (splash-hack-version-string)
933 (set-buffer-modified-p nil)) 932 (set-buffer-modified-p nil))
934 933
935 ;; (let ((present-file 934 ;; (let ((present-file
936 ;; #'(lambda (f) 935 ;; #'(lambda (f)
937 ;; (splash-frame-present 936 ;; (splash-frame-present