Mercurial > emacs
comparison lisp/startup.el @ 90143:146c086df160
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-37
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 241-257)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 59-65)
- Update from CVS
- Merge from emacs--cvs-trunk--0
- (mm-string-to-multibyte): Use Gnus trunk definition.
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 14 Apr 2005 05:03:52 +0000 |
parents | 02f1dbc4a199 e70ec34c978b |
children | e1fbb019c538 |
comparison
equal
deleted
inserted
replaced
90142:627771f44771 | 90143:146c086df160 |
---|---|
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)) |
708 | 712 |
709 ;; Re-attach the program name to the front of the arg list. | 713 ;; Re-attach the program name to the front of the arg list. |
710 (and command-line-args | 714 (and command-line-args |
711 (setcdr command-line-args args))) | 715 (setcdr command-line-args args))) |
712 | 716 |
713 ;; Under X Windows, this creates the X frame and deletes the terminal frame. | 717 ;; Under X Window, this creates the X frame and deletes the terminal frame. |
714 (when (fboundp 'frame-initialize) | 718 (when (fboundp 'frame-initialize) |
715 (frame-initialize)) | 719 (frame-initialize)) |
716 | 720 |
721 ;; Turn off blinking cursor if so specified in X resources. This is here | |
722 ;; only because all other settings of no-blinking-cursor is here. | |
723 (unless (or noninteractive | |
724 emacs-basic-display | |
725 (and (memq window-system '(x w32 mac)) | |
726 (not (member (x-get-resource "cursorBlink" "CursorBlink") | |
727 '("off" "false"))))) | |
728 (setq no-blinking-cursor t)) | |
729 | |
717 ;; If frame was created with a menu bar, set menu-bar-mode on. | 730 ;; If frame was created with a menu bar, set menu-bar-mode on. |
718 (unless (or noninteractive | 731 (unless (or noninteractive |
719 emacs-quick-startup | 732 emacs-basic-display |
720 (and (memq window-system '(x w32)) | 733 (and (memq window-system '(x w32)) |
721 (<= (frame-parameter nil 'menu-bar-lines) 0))) | 734 (<= (frame-parameter nil 'menu-bar-lines) 0))) |
722 (menu-bar-mode 1)) | 735 (menu-bar-mode 1)) |
723 | 736 |
724 ;; If frame was created with a tool bar, switch tool-bar-mode on. | 737 ;; If frame was created with a tool bar, switch tool-bar-mode on. |
725 (unless (or noninteractive | 738 (unless (or noninteractive |
726 emacs-quick-startup | 739 emacs-basic-display |
727 (not (display-graphic-p)) | 740 (not (display-graphic-p)) |
728 (<= (frame-parameter nil 'tool-bar-lines) 0)) | 741 (<= (frame-parameter nil 'tool-bar-lines) 0)) |
729 (tool-bar-mode 1)) | 742 (tool-bar-mode 1)) |
730 | 743 |
731 ;; Can't do this init in defcustom because the relevant variables | 744 ;; Can't do this init in defcustom because the relevant variables |
732 ;; are not set. | 745 ;; are not set. |
733 (custom-reevaluate-setting 'blink-cursor-mode) | 746 (custom-reevaluate-setting 'blink-cursor-mode) |
734 (custom-reevaluate-setting 'normal-erase-is-backspace) | 747 (custom-reevaluate-setting 'normal-erase-is-backspace) |
735 | 748 |
736 (unless (or noninteractive | 749 (unless (or noninteractive |
737 emacs-quick-startup | 750 emacs-basic-display |
738 (not (display-graphic-p)) | 751 (not (display-graphic-p)) |
739 (not (fboundp 'x-show-tip))) | 752 (not (fboundp 'x-show-tip))) |
740 (tooltip-mode 1)) | 753 (tooltip-mode 1)) |
754 | |
755 ;; If you change the code below, you need to also change the | |
756 ;; corresponding code in the xterm-mouse-mode defcustom. The two need | |
757 ;; to be equivalent under all conditions, or Custom will get confused. | |
758 (unless (or noninteractive | |
759 window-system) | |
760 (let ((term (getenv "TERM"))) | |
761 (and term | |
762 (string-match "^\\(xterm\\|rxvt\\|dtterm\\|eterm\\)" term) | |
763 (xterm-mouse-mode 1)))) | |
741 | 764 |
742 ;; Register default TTY colors for the case the terminal hasn't a | 765 ;; Register default TTY colors for the case the terminal hasn't a |
743 ;; terminal init file. | 766 ;; terminal init file. |
744 (unless (memq window-system '(x w32)) | 767 (unless (memq window-system '(x w32)) |
745 ;; We do this regardles of whether the terminal supports colors | 768 ;; We do this regardles of whether the terminal supports colors |
1039 using the mouse.\n\n" | 1062 using the mouse.\n\n" |
1040 :face (variable-pitch :weight bold) | 1063 :face (variable-pitch :weight bold) |
1041 "Useful File menu items:\n" | 1064 "Useful File menu items:\n" |
1042 :face variable-pitch "\ | 1065 :face variable-pitch "\ |
1043 Exit Emacs\t(Or type Control-x followed by Control-c) | 1066 Exit Emacs\t(Or type Control-x followed by Control-c) |
1044 Recover Session\tRecover files you were editing before a crash | 1067 Recover Crashed Session\tRecover files you were editing before a crash |
1045 | 1068 |
1046 | 1069 |
1047 | 1070 |
1048 | 1071 |
1049 " | 1072 " |
1166 (fancy-splash-insert :face `(variable-pitch :foreground ,fg) | 1189 (fancy-splash-insert :face `(variable-pitch :foreground ,fg) |
1167 "\nThis is " | 1190 "\nThis is " |
1168 (emacs-version) | 1191 (emacs-version) |
1169 "\n" | 1192 "\n" |
1170 :face '(variable-pitch :height 0.5) | 1193 :face '(variable-pitch :height 0.5) |
1171 "Copyright (C) 2004 Free Software Foundation, Inc.") | 1194 "Copyright (C) 2005 Free Software Foundation, Inc.") |
1172 (and auto-save-list-file-prefix | 1195 (and auto-save-list-file-prefix |
1173 ;; Don't signal an error if the | 1196 ;; Don't signal an error if the |
1174 ;; directory for auto-save-list files | 1197 ;; directory for auto-save-list files |
1175 ;; does not yet exist. | 1198 ;; does not yet exist. |
1176 (file-directory-p (file-name-directory | 1199 (file-directory-p (file-name-directory |