Index: man/cmdargs.texi
===================================================================
RCS file: /cvsroot/emacs/emacs/man/cmdargs.texi,v
retrieving revision 1.61
diff -u -d -r1.61 cmdargs.texi
--- man/cmdargs.texi	1 Apr 2002 23:05:22 -0000	1.61
+++ man/cmdargs.texi	23 May 2002 23:32:03 -0000
@@ -215,6 +215,12 @@
 and @samp{-batch} have no effect on the loading of this file---this is
 the only option that blocks it.
 
address@hidden --nosplash
address@hidden --nosplash
address@hidden 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.
+
 @item -u @var{user}
 @opindex -u
 @itemx address@hidden
Index: lisp/startup.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/startup.el,v
retrieving revision 1.296
diff -u -d -r1.296 startup.el
--- lisp/startup.el	20 Apr 2002 22:25:55 -0000	1.296
+++ lisp/startup.el	23 May 2002 23:32:03 -0000
@@ -70,6 +70,9 @@
 ;; -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
+;; -------------------------
 ;; -u USER                   Load USER's init file instead of the init
 ;; -user USER                file belonging to the user starting Emacs.
 ;; --user USER
@@ -749,24 +752,25 @@
     ;; does things.
     (while (and (not done) args)
       (let ((longopts '(("--no-init-file") ("--no-site-file") ("--user")
-			("--debug-init") ("--iconic") ("--icon-type")))
+			("--debug-init") ("--iconic") ("--icon-type")
+			("--nosplash")))
 	    (argi (pop args))
 	    (argval nil))
 	;; Handle --OPTION=VALUE format.
-	(if (and (string-match "\\`--" argi)
-		 (string-match "=" argi))
-	    (setq argval (substring argi (match-end 0))
-		  argi (substring argi 0 (match-beginning 0))))
-	(or (equal argi "--")
-	    (let ((completion (try-completion argi longopts)))
-	      (if (eq completion t)
-		  (setq argi (substring argi 1))
-		(if (stringp completion)
-		    (let ((elt (assoc completion longopts)))
-		      (or elt
-			  (error "Option `%s' is ambiguous" argi))
-		      (setq argi (substring (car elt) 1)))
-		  (setq argval nil)))))
+	(when (and (string-match "\\`--" argi)
+		   (string-match "=" argi))
+	  (setq argval (substring argi (match-end 0))
+		argi (substring argi 0 (match-beginning 0))))
+	(unless (equal argi "--")
+	  (let ((completion (try-completion argi longopts)))
+	    (if (eq completion t)
+		(setq argi (substring argi 1))
+	      (if (stringp completion)
+		  (let ((elt (assoc completion longopts)))
+		    (or elt
+			(error "Option `%s' is ambiguous" argi))
+		    (setq argi (substring (car elt) 1)))
+		(setq argval nil)))))
 	(cond
 	 ((member argi '("-q" "-no-init-file"))
 	  (setq init-file-user nil))
@@ -1503,7 +1507,7 @@
 	    ;; and long versions of what's on command-switch-alist.
 	    (longopts
 	     (append '(("--funcall") ("--load") ("--insert") ("--kill")
-		       ("--directory") ("--eval") ("--execute")
+		       ("--directory") ("--eval") ("--execute") ("--nosplash")
 		       ("--find-file") ("--visit") ("--file"))
 		     (mapcar (lambda (elt)
 			       (list (concat "-" (car elt))))
@@ -1555,6 +1559,9 @@
 			      (cons argval command-line-args-left)))
 			 (funcall (cdr tem) argi))
 		     (funcall (cdr tem) argi)))
+
+		  ((string-equal argi "-nosplash")
+		   (setq inhibit-startup-message t))
 
 		  ((member argi '("-f"	;what the manual claims
 				  "-funcall"