*** empty log message ***

2 files changed, 12 insertions, 0 deletions

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}