comparison lisp/startup.el @ 371:cc15677e0335 r21-2b1

Import from CVS: tag r21-2b1
author cvs
date Mon, 13 Aug 2007 11:03:08 +0200
parents a4f53d9b3154
children 6240c7796c7a
comparison
equal deleted inserted replaced
370:bd866891f083 371:cc15677e0335
197 "Print the XEmacs usage message and exit." 197 "Print the XEmacs usage message and exit."
198 (let ((standard-output 'external-debugging-output)) 198 (let ((standard-output 'external-debugging-output))
199 (princ (concat "\n" (emacs-version) "\n\n")) 199 (princ (concat "\n" (emacs-version) "\n\n"))
200 (princ 200 (princ
201 (if (featurep 'x) 201 (if (featurep 'x)
202 (concat "When creating a window on an X display, " 202 (concat (emacs-name)
203 (emacs-name) 203 " accepts all standard X Toolkit command line options.\n"
204 " accepts all standard X Toolkit 204 "In addition, the")
205 command line options plus the following:
206 -iconname <title> Use title as the icon name.
207 -mc <color> Use color as the mouse color.
208 -cr <color> Use color as the text-cursor foregound color.
209 -private Install a private colormap.
210
211 In addition, the")
212 "The")) 205 "The"))
213 (princ " following options are accepted: 206 (princ " following options are accepted:
207
214 -t <device> Use TTY <device> instead of the terminal for input 208 -t <device> Use TTY <device> instead of the terminal for input
215 and output. This implies the -nw option. 209 and output. This implies the -nw option.
216 -nw Inhibit the use of any window-system-specific 210 -nw Inhibit the use of any window-system-specific
217 display code: use the current tty. 211 display code: use the current tty.
218 -batch Execute noninteractively (messages go to stderr). 212 -batch Execute noninteractively (messages go to stderr).
406 (load (expand-file-name (file-name-sans-extension autoload-file-name) 400 (load (expand-file-name (file-name-sans-extension autoload-file-name)
407 lisp-directory) nil t)) 401 lisp-directory) nil t))
408 402
409 (if (not inhibit-autoloads) 403 (if (not inhibit-autoloads)
410 (progn 404 (progn
405 (packages-load-package-auto-autoloads last-package-load-path)
406 (packages-load-package-auto-autoloads late-package-load-path)
411 (if (not inhibit-early-packages) 407 (if (not inhibit-early-packages)
412 (packages-load-package-auto-autoloads early-package-load-path)) 408 (packages-load-package-auto-autoloads early-package-load-path))))
413 (packages-load-package-auto-autoloads late-package-load-path)
414 (packages-load-package-auto-autoloads last-package-load-path)))
415 409
416 (unwind-protect 410 (unwind-protect
417 (command-line) 411 (command-line)
418 ;; Do this again, in case .emacs defined more abbreviations. 412 ;; Do this again, in case .emacs defined more abbreviations.
419 (setq default-directory (abbreviate-file-name default-directory)) 413 (setq default-directory (abbreviate-file-name default-directory))
420 ;; Specify the file for recording all the auto save files of 414 ;; Specify the file for recording all the auto save files of
421 ;; this session. This is used by recover-session. 415 ;; this session. This is used by recover-session.
422 (if auto-save-list-file-prefix 416 (setq auto-save-list-file-name
423 (setq auto-save-list-file-name 417 (expand-file-name
424 (expand-file-name 418 (format "%s%d-%s"
425 (format "%s%d-%s" 419 auto-save-list-file-prefix
426 auto-save-list-file-prefix 420 (emacs-pid)
427 (emacs-pid) 421 (system-name))))
428 (system-name)))))
429 (run-hooks 'emacs-startup-hook) 422 (run-hooks 'emacs-startup-hook)
430 (and term-setup-hook 423 (and term-setup-hook
431 (run-hooks 'term-setup-hook)) 424 (run-hooks 'term-setup-hook))
432 (setq term-setup-hook nil) 425 (setq term-setup-hook nil)
433 ;; ;; Modify the initial frame based on what .emacs puts into 426 ;; ;; Modify the initial frame based on what .emacs puts into
685 (setq init-file-had-error nil)) 678 (setq init-file-had-error nil))
686 (error 679 (error
687 (message "Error in init file: %s" (error-message-string error)) 680 (message "Error in init file: %s" (error-message-string error))
688 (display-warning 'initialization 681 (display-warning 'initialization
689 (format "\ 682 (format "\
690 An error has occurred while loading %s: 683 An error has occured while loading %s:
691 684
692 %s 685 %s
693 686
694 To ensure normal operation, you should investigate the cause of the error 687 To ensure normal operation, you should investigate the cause of the error
695 in your initialization file and remove it. Use the `-debug-init' option 688 in your initialization file and remove it. Use the `-debug-init' option
940 `( (face (bold blue) ( "This is an Experimental version of XEmacs. " 933 `( (face (bold blue) ( "This is an Experimental version of XEmacs. "
941 " Type " (key describe-beta) 934 " Type " (key describe-beta)
942 " to see what this means.\n"))) 935 " to see what this means.\n")))
943 `( "\n")) 936 `( "\n"))
944 (face bold-italic "\ 937 (face bold-italic "\
945 Copyright (C) 1985-1998 Free Software Foundation, Inc. 938 Copyright (C) 1985-1997 Free Software Foundation, Inc.
946 Copyright (C) 1990-1994 Lucid, Inc. 939 Copyright (C) 1990-1994 Lucid, Inc.
947 Copyright (C) 1993-1997 Sun Microsystems, Inc. All Rights Reserved. 940 Copyright (C) 1993-1997 Sun Microsystems, Inc. All Rights Reserved.
948 Copyright (C) 1994-1996 Board of Trustees, University of Illinois 941 Copyright (C) 1994-1996 Board of Trustees, University of Illinois
949 Copyright (C) 1995-1996 Ben Wing\n\n") 942 Copyright (C) 1995-1996 Ben Wing\n\n")
950 943