diff options
Diffstat (limited to 'lisp/startup.el')
| -rw-r--r-- | lisp/startup.el | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 432335ee9aa..a4197a85502 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -48,7 +48,9 @@ The value is nil if the selected frame is on a text-only-terminal.") :group 'internal) (defcustom inhibit-splash-screen nil - "*Non-nil inhibits the startup screen. + "Non-nil inhibits the startup screen. +It also inhibits display of the initial message in the *scratch* buffer. + This is for use in your personal init file, once you are familiar with the contents of the startup screen." :type 'boolean @@ -1071,7 +1073,9 @@ opening the first frame (e.g. open a connection to an X server).") ") "Initial message displayed in *scratch* buffer at startup. -If this is nil, no message will be displayed." +If this is nil, no message will be displayed. +If `inhibit-splash-screen' is non-nil, then no message is displayed, +regardless of the value of this variable." :type '(choice (text :tag "Message") (const :tag "none" nil)) :group 'initialization) @@ -1630,7 +1634,7 @@ normal otherwise." (longopts (append '(("--funcall") ("--load") ("--insert") ("--kill") ("--directory") ("--eval") ("--execute") ("--no-splash") - ("--find-file") ("--visit") ("--file")) + ("--find-file") ("--visit") ("--file") ("--no-desktop")) (mapcar (lambda (elt) (list (concat "-" (car elt)))) command-switch-alist))) @@ -1730,6 +1734,13 @@ normal otherwise." ((equal argi "-kill") (kill-emacs t)) + ;; This is for when they use --no-desktop with -q, or + ;; don't load Desktop in their .emacs. If desktop.el + ;; _is_ loaded, it will handle this switch, and we + ;; won't see it by the time we get here. + ((equal argi "-no-desktop") + (message "\"--no-desktop\" ignored because the Desktop package is not loaded")) + ((string-match "^\\+[0-9]+\\'" argi) (setq line (string-to-number argi))) |