From: Luc Teirlinck <teirllm@auburn.edu>
Date: Sun, 22 Jan 2006 23:14:25 +0000 (+0000)
Subject: (inhibit-splash-screen, initial-scratch-message): Doc fixes.
X-Git-Tag: emacs-pretest-22.0.90~4630
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=249d9683b3177d8d4419a58e5f2e5b9666934b12;p=emacs.git

(inhibit-splash-screen, initial-scratch-message): Doc fixes.
---

diff --git a/lisp/startup.el b/lisp/startup.el
index 4db086fa7a7..28a501e68a9 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -41,7 +41,9 @@
   :group 'internal)
 
 (defcustom inhibit-splash-screen nil
-  "*Non-nil inhibits the startup screen.
+  "Non-nil inhibits the startup screen.
+It also inhibits display of the initial message in the *scratch* buffer.
+
 This is for use in your personal init file, once you are familiar
 with the contents of the startup screen."
   :type 'boolean
@@ -1087,7 +1089,9 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'."
 
 ")
   "Initial message displayed in *scratch* buffer at startup.
-If this is nil, no message will be displayed."
+If this is nil, no message will be displayed.
+If `inhibit-splash-screen' is non-nil, then no message is displayed,
+regardless of the value of this variable."
   :type '(choice (text :tag "Message")
 		 (const :tag "none" nil))
   :group 'initialization)