Mercurial > emacs
comparison lisp/startup.el @ 90286:5b7d410e31f9
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-7
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 4-14)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (base, patch 1-7)
- tag of miles@gnu.org--gnu-2005/gnus--rel--5.10--patch-187
- Update from CVS
- Merge from emacs--devo--0
* miles@gnu.org--gnu-2005/gnus--rel--5.10 (patch 187)
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Wed, 25 Jan 2006 07:10:04 +0000 |
parents | 7beb78bc1f8e a3986bd22732 |
children | 716899c45974 |
comparison
equal
deleted
inserted
replaced
90285:5251b70632c4 | 90286:5b7d410e31f9 |
---|---|
39 (defgroup initialization nil | 39 (defgroup initialization nil |
40 "Emacs start-up procedure." | 40 "Emacs start-up procedure." |
41 :group 'internal) | 41 :group 'internal) |
42 | 42 |
43 (defcustom inhibit-splash-screen nil | 43 (defcustom inhibit-splash-screen nil |
44 "*Non-nil inhibits the startup screen. | 44 "Non-nil inhibits the startup screen. |
45 It also inhibits display of the initial message in the *scratch* buffer. | |
46 | |
45 This is for use in your personal init file, once you are familiar | 47 This is for use in your personal init file, once you are familiar |
46 with the contents of the startup screen." | 48 with the contents of the startup screen." |
47 :type 'boolean | 49 :type 'boolean |
48 :group 'initialization) | 50 :group 'initialization) |
49 | 51 |
1085 ;; If you want to create a file, visit that file with C-x C-f, | 1087 ;; If you want to create a file, visit that file with C-x C-f, |
1086 ;; then enter the text in that file's own buffer. | 1088 ;; then enter the text in that file's own buffer. |
1087 | 1089 |
1088 ") | 1090 ") |
1089 "Initial message displayed in *scratch* buffer at startup. | 1091 "Initial message displayed in *scratch* buffer at startup. |
1090 If this is nil, no message will be displayed." | 1092 If this is nil, no message will be displayed. |
1093 If `inhibit-splash-screen' is non-nil, then no message is displayed, | |
1094 regardless of the value of this variable." | |
1091 :type '(choice (text :tag "Message") | 1095 :type '(choice (text :tag "Message") |
1092 (const :tag "none" nil)) | 1096 (const :tag "none" nil)) |
1093 :group 'initialization) | 1097 :group 'initialization) |
1094 | 1098 |
1095 | 1099 |
1629 ;; This includes our standard options' long versions | 1633 ;; This includes our standard options' long versions |
1630 ;; and long versions of what's on command-switch-alist. | 1634 ;; and long versions of what's on command-switch-alist. |
1631 (longopts | 1635 (longopts |
1632 (append '(("--funcall") ("--load") ("--insert") ("--kill") | 1636 (append '(("--funcall") ("--load") ("--insert") ("--kill") |
1633 ("--directory") ("--eval") ("--execute") ("--no-splash") | 1637 ("--directory") ("--eval") ("--execute") ("--no-splash") |
1634 ("--find-file") ("--visit") ("--file")) | 1638 ("--find-file") ("--visit") ("--file") ("--no-desktop")) |
1635 (mapcar (lambda (elt) | 1639 (mapcar (lambda (elt) |
1636 (list (concat "-" (car elt)))) | 1640 (list (concat "-" (car elt)))) |
1637 command-switch-alist))) | 1641 command-switch-alist))) |
1638 (line 0) | 1642 (line 0) |
1639 (column 0)) | 1643 (column 0)) |
1728 (error "File name omitted from `-insert' option")) | 1732 (error "File name omitted from `-insert' option")) |
1729 (insert-file-contents (command-line-normalize-file-name tem))) | 1733 (insert-file-contents (command-line-normalize-file-name tem))) |
1730 | 1734 |
1731 ((equal argi "-kill") | 1735 ((equal argi "-kill") |
1732 (kill-emacs t)) | 1736 (kill-emacs t)) |
1737 | |
1738 ;; This is for when they use --no-desktop with -q, or | |
1739 ;; don't load Desktop in their .emacs. If desktop.el | |
1740 ;; _is_ loaded, it will handle this switch, and we | |
1741 ;; won't see it by the time we get here. | |
1742 ((equal argi "-no-desktop") | |
1743 (message "\"--no-desktop\" ignored because the Desktop package is not loaded")) | |
1733 | 1744 |
1734 ((string-match "^\\+[0-9]+\\'" argi) | 1745 ((string-match "^\\+[0-9]+\\'" argi) |
1735 (setq line (string-to-number argi))) | 1746 (setq line (string-to-number argi))) |
1736 | 1747 |
1737 ((string-match "^\\+\\([0-9]+\\):\\([0-9]+\\)\\'" argi) | 1748 ((string-match "^\\+\\([0-9]+\\):\\([0-9]+\\)\\'" argi) |