Mercurial > emacs
comparison lisp/startup.el @ 61452:b9d559315c0a
(fancy-splash-tail): Update copyright year.
(command-line): Split part of -Q into -D.
(emacs-basic-display): New defvar.
(fancy-splash-text): Correct name of menu item.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Sun, 10 Apr 2005 23:36:22 +0000 |
| parents | 35306ccf2422 |
| children | c8cf56d85000 9deb6323655c |
comparison
equal
deleted
inserted
replaced
| 61451:25fbe49d4631 | 61452:b9d559315c0a |
|---|---|
| 274 :type '(choice (const :tag "Don't record a session's auto save list" nil) | 274 :type '(choice (const :tag "Don't record a session's auto save list" nil) |
| 275 string) | 275 string) |
| 276 :group 'auto-save) | 276 :group 'auto-save) |
| 277 | 277 |
| 278 (defvar emacs-quick-startup nil) | 278 (defvar emacs-quick-startup nil) |
| 279 | |
| 280 (defvar emacs-basic-display nil) | |
| 279 | 281 |
| 280 (defvar init-file-debug nil) | 282 (defvar init-file-debug nil) |
| 281 | 283 |
| 282 (defvar init-file-had-error nil) | 284 (defvar init-file-had-error nil) |
| 283 | 285 |
| 675 (error "Option `%s' is ambiguous" argi)) | 677 (error "Option `%s' is ambiguous" argi)) |
| 676 (setq argi (substring (car elt) 1))) | 678 (setq argi (substring (car elt) 1))) |
| 677 (setq argval nil | 679 (setq argval nil |
| 678 argi orig-argi))))) | 680 argi orig-argi))))) |
| 679 (cond | 681 (cond |
| 680 ((member argi '("-Q" "-bare-bones")) | 682 ((member argi '("-Q" "-quick")) |
| 681 (setq init-file-user nil | 683 (setq init-file-user nil |
| 682 site-run-file nil | 684 site-run-file nil |
| 683 no-blinking-cursor t | 685 emacs-quick-startup t)) |
| 684 emacs-quick-startup t) | 686 ((member argi '("-D" "-basic-display")) |
| 687 (setq no-blinking-cursor t | |
| 688 emacs-basic-display t) | |
| 685 (push '(vertical-scroll-bars . nil) initial-frame-alist)) | 689 (push '(vertical-scroll-bars . nil) initial-frame-alist)) |
| 686 ((member argi '("-q" "-no-init-file")) | 690 ((member argi '("-q" "-no-init-file")) |
| 687 (setq init-file-user nil)) | 691 (setq init-file-user nil)) |
| 688 ((member argi '("-u" "-user")) | 692 ((member argi '("-u" "-user")) |
| 689 (setq init-file-user (or argval (pop args)) | 693 (setq init-file-user (or argval (pop args)) |
| 714 (when (fboundp 'frame-initialize) | 718 (when (fboundp 'frame-initialize) |
| 715 (frame-initialize)) | 719 (frame-initialize)) |
| 716 | 720 |
| 717 ;; If frame was created with a menu bar, set menu-bar-mode on. | 721 ;; If frame was created with a menu bar, set menu-bar-mode on. |
| 718 (unless (or noninteractive | 722 (unless (or noninteractive |
| 719 emacs-quick-startup | 723 emacs-basic-display |
| 720 (and (memq window-system '(x w32)) | 724 (and (memq window-system '(x w32)) |
| 721 (<= (frame-parameter nil 'menu-bar-lines) 0))) | 725 (<= (frame-parameter nil 'menu-bar-lines) 0))) |
| 722 (menu-bar-mode 1)) | 726 (menu-bar-mode 1)) |
| 723 | 727 |
| 724 ;; If frame was created with a tool bar, switch tool-bar-mode on. | 728 ;; If frame was created with a tool bar, switch tool-bar-mode on. |
| 725 (unless (or noninteractive | 729 (unless (or noninteractive |
| 726 emacs-quick-startup | 730 emacs-basic-display |
| 727 (not (display-graphic-p)) | 731 (not (display-graphic-p)) |
| 728 (<= (frame-parameter nil 'tool-bar-lines) 0)) | 732 (<= (frame-parameter nil 'tool-bar-lines) 0)) |
| 729 (tool-bar-mode 1)) | 733 (tool-bar-mode 1)) |
| 730 | 734 |
| 731 ;; Can't do this init in defcustom because the relevant variables | 735 ;; Can't do this init in defcustom because the relevant variables |
| 732 ;; are not set. | 736 ;; are not set. |
| 733 (custom-reevaluate-setting 'blink-cursor-mode) | 737 (custom-reevaluate-setting 'blink-cursor-mode) |
| 734 (custom-reevaluate-setting 'normal-erase-is-backspace) | 738 (custom-reevaluate-setting 'normal-erase-is-backspace) |
| 735 | 739 |
| 736 (unless (or noninteractive | 740 (unless (or noninteractive |
| 737 emacs-quick-startup | 741 emacs-basic-display |
| 738 (not (display-graphic-p)) | 742 (not (display-graphic-p)) |
| 739 (not (fboundp 'x-show-tip))) | 743 (not (fboundp 'x-show-tip))) |
| 740 (tooltip-mode 1)) | 744 (tooltip-mode 1)) |
| 741 | 745 |
| 742 ;; Register default TTY colors for the case the terminal hasn't a | 746 ;; Register default TTY colors for the case the terminal hasn't a |
| 1039 using the mouse.\n\n" | 1043 using the mouse.\n\n" |
| 1040 :face (variable-pitch :weight bold) | 1044 :face (variable-pitch :weight bold) |
| 1041 "Useful File menu items:\n" | 1045 "Useful File menu items:\n" |
| 1042 :face variable-pitch "\ | 1046 :face variable-pitch "\ |
| 1043 Exit Emacs\t(Or type Control-x followed by Control-c) | 1047 Exit Emacs\t(Or type Control-x followed by Control-c) |
| 1044 Recover Session\tRecover files you were editing before a crash | 1048 Recover Crashed Session\tRecover files you were editing before a crash |
| 1045 | 1049 |
| 1046 | 1050 |
| 1047 | 1051 |
| 1048 | 1052 |
| 1049 " | 1053 " |
| 1163 (fancy-splash-insert :face `(variable-pitch :foreground ,fg) | 1167 (fancy-splash-insert :face `(variable-pitch :foreground ,fg) |
| 1164 "\nThis is " | 1168 "\nThis is " |
| 1165 (emacs-version) | 1169 (emacs-version) |
| 1166 "\n" | 1170 "\n" |
| 1167 :face '(variable-pitch :height 0.5) | 1171 :face '(variable-pitch :height 0.5) |
| 1168 "Copyright (C) 2004 Free Software Foundation, Inc.") | 1172 "Copyright (C) 2005 Free Software Foundation, Inc.") |
| 1169 (and auto-save-list-file-prefix | 1173 (and auto-save-list-file-prefix |
| 1170 ;; Don't signal an error if the | 1174 ;; Don't signal an error if the |
| 1171 ;; directory for auto-save-list files | 1175 ;; directory for auto-save-list files |
| 1172 ;; does not yet exist. | 1176 ;; does not yet exist. |
| 1173 (file-directory-p (file-name-directory | 1177 (file-directory-p (file-name-directory |