Commit 1b207153 authored by Colin Walters's avatar Colin Walters
Browse files

(command-line): Use `when', `unless'.

(command-line-1): New argument "--nosplash".  Handle it.

(inhibit-splash-screen): New variable alias for
`inhibit-startup-message'.
parent 588c915a
...@@ -70,6 +70,9 @@ ...@@ -70,6 +70,9 @@
;; -no-site-file Do not load "site-start.el". (This is the ONLY ;; -no-site-file Do not load "site-start.el". (This is the ONLY
;; --no-site-file way to prevent loading that file.) ;; --no-site-file way to prevent loading that file.)
;; ------------------------- ;; -------------------------
;; -nosplash Don't display a splash screen on startup.
;; --nosplash
;; -------------------------
;; -u USER Load USER's init file instead of the init ;; -u USER Load USER's init file instead of the init
;; -user USER file belonging to the user starting Emacs. ;; -user USER file belonging to the user starting Emacs.
;; --user USER ;; --user USER
...@@ -136,6 +139,8 @@ with the contents of the startup message." ...@@ -136,6 +139,8 @@ with the contents of the startup message."
:type 'boolean :type 'boolean
:group 'initialization) :group 'initialization)
(defvaralias 'inhibit-splash-screen 'inhibit-startup-message)
(defcustom inhibit-startup-echo-area-message nil (defcustom inhibit-startup-echo-area-message nil
"*Non-nil inhibits the initial startup echo area message. "*Non-nil inhibits the initial startup echo area message.
Setting this variable takes effect Setting this variable takes effect
...@@ -753,11 +758,11 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'." ...@@ -753,11 +758,11 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
(argi (pop args)) (argi (pop args))
(argval nil)) (argval nil))
;; Handle --OPTION=VALUE format. ;; Handle --OPTION=VALUE format.
(if (and (string-match "\\`--" argi) (when (and (string-match "\\`--" argi)
(string-match "=" argi)) (string-match "=" argi))
(setq argval (substring argi (match-end 0)) (setq argval (substring argi (match-end 0))
argi (substring argi 0 (match-beginning 0)))) argi (substring argi 0 (match-beginning 0))))
(or (equal argi "--") (unless (equal argi "--")
(let ((completion (try-completion argi longopts))) (let ((completion (try-completion argi longopts)))
(if (eq completion t) (if (eq completion t)
(setq argi (substring argi 1)) (setq argi (substring argi 1))
...@@ -1503,7 +1508,7 @@ normal otherwise." ...@@ -1503,7 +1508,7 @@ normal otherwise."
;; and long versions of what's on command-switch-alist. ;; and long versions of what's on command-switch-alist.
(longopts (longopts
(append '(("--funcall") ("--load") ("--insert") ("--kill") (append '(("--funcall") ("--load") ("--insert") ("--kill")
("--directory") ("--eval") ("--execute") ("--directory") ("--eval") ("--execute") ("--nosplash")
("--find-file") ("--visit") ("--file")) ("--find-file") ("--visit") ("--file"))
(mapcar (lambda (elt) (mapcar (lambda (elt)
(list (concat "-" (car elt)))) (list (concat "-" (car elt))))
...@@ -1556,6 +1561,9 @@ normal otherwise." ...@@ -1556,6 +1561,9 @@ normal otherwise."
(funcall (cdr tem) argi)) (funcall (cdr tem) argi))
(funcall (cdr tem) argi))) (funcall (cdr tem) argi)))
((string-equal argi "-nosplash")
(setq inhibit-startup-message t))
((member argi '("-f" ;what the manual claims ((member argi '("-f" ;what the manual claims
"-funcall" "-funcall"
"-e")) ; what the source used to say "-e")) ; what the source used to say
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment