Always add initial message to *scratch* buffer if

`initial-scratch-message' is non-nil regardless of the value of
`inhibit-startup-screen'.
(inhibit-startup-screen, initial-scratch-message): Doc fix.
(command-line-1): Move code that inserts `initial-scratch-message'
up before the if-form that checks for `inhibit-startup-screen'.
Suggested by Jonathan Rockway <jon@jrock.us>.

1 files changed, 10 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 528f817a01f..4b99bd30c06 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2008-02-28  Juri Linkov  <juri@jurta.org>
+
+        * startup.el: Always add initial message to *scratch* buffer if
+        `initial-scratch-message' is non-nil regardless of the value of
+        `inhibit-startup-screen'.
+        (inhibit-startup-screen, initial-scratch-message): Doc fix.
+        (command-line-1): Move code that inserts `initial-scratch-message'
+        up before the if-form that checks for `inhibit-startup-screen'.
+        Suggested by Jonathan Rockway <jon@jrock.us>.
+
 2008-02-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * textmodes/fill.el (fill-comment-paragraph): Don't try to do