Fix previous change.

diff --git a/lisp/startup.el b/lisp/startup.el
index 4a2e6707a7871e4bc7820d546924f955ce7e3deb..3d6217f8505bf192146a4ee2782bf53dbd029059 100644 (file)
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -70,8 +70,8 @@
 ;; -no-site-file             Do not load "site-start.el".  (This is the ONLY
 ;; --no-site-file            way to prevent loading that file.)
 ;; -------------------------
-;; -nosplash                 Don't display a splash screen on startup.
-;; --nosplash
+;; -no-splash                 Don't display a splash screen on startup.
+;; --no-splash
 ;; -------------------------
 ;; -u USER                   Load USER's init file instead of the init
 ;; -user USER                file belonging to the user starting Emacs.
@@ -1508,7 +1508,7 @@ normal otherwise."
            ;; and long versions of what's on command-switch-alist.
            (longopts
             (append '(("--funcall") ("--load") ("--insert") ("--kill")
-                      ("--directory") ("--eval") ("--execute") ("--nosplash")
+                      ("--directory") ("--eval") ("--execute") ("--no-splash")
                       ("--find-file") ("--visit") ("--file"))
                     (mapcar (lambda (elt)
                               (list (concat "-" (car elt))))
@@ -1561,7 +1561,7 @@ normal otherwise."
                         (funcall (cdr tem) argi))
                     (funcall (cdr tem) argi)))
 
-                 ((string-equal argi "-nosplash")
+                 ((string-equal argi "-no-splash")
                   (setq inhibit-startup-message t))
 
                  ((member argi '("-f"  ;what the manual claims

diff --git a/man/cmdargs.texi b/man/cmdargs.texi
index e223ab05257e49a83689da3d4190ddfc3b18b5ba..45a162ae03ab34a6a240bc96b0316e3fcef26bcc 100644 (file)
--- a/man/cmdargs.texi
+++ b/man/cmdargs.texi
@@ -215,8 +215,8 @@ Do not load @file{site-start.el}.  The options @samp{-q}, @samp{-u}
 and @samp{-batch} have no effect on the loading of this file---this is
 the only option that blocks it.
 
-@item --nosplash
-@opindex --nosplash
+@item --no-splash
+@opindex --no-splash
 @vindex inhibit-startup-message
 Do not display a splash screen on startup; this is equivlaent to
 setting the variable @code{inhibit-startup-message} to non-nil.