[Emacs-diffs] Changes to emacs/lisp/startup.el

[Luc Teirlinck]

Index: emacs/lisp/startup.el
diff -u emacs/lisp/startup.el:1.396 emacs/lisp/startup.el:1.397
--- emacs/lisp/startup.el:1.396 Sat Jan 21 09:32:13 2006
+++ emacs/lisp/startup.el       Sun Jan 22 23:14:25 2006
@@ -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 @@
 
 ")
   "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)