From: Colin Walters <walters@gnu.org>
Date: Sun, 26 May 2002 20:58:40 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: ttn-vms-21-2-B4~14863
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=908abdfd40fcb056451480f6adaf806f2b07cb42;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f79c288abad..bed3498fe02 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2002-05-26  Colin Walters  <walters@verbum.org>
 
+	* startup.el (command-line): Use `when', `unless'.
+	(command-line-1): New argument "--nosplash".  Handle it.
+
+	* startup.el (inhibit-splash-screen): New variable alias for
+	`inhibit-startup-message'.
+
 	* replace.el (perform-replace): Document return value.  Use `pop'.
 
 2002-05-26  Glenn Morris  <gmorris@ast.cam.ac.uk>
diff --git a/man/cmdargs.texi b/man/cmdargs.texi
index 5d5497499c0..e223ab05257 100644
--- a/man/cmdargs.texi
+++ b/man/cmdargs.texi
@@ -215,6 +215,12 @@ 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
+@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.
+
 @item -u @var{user}
 @opindex -u
 @itemx --user=@var{user}