# HG changeset patch
# User Juri Linkov <juri@jurta.org>
# Date 1204238469 0
# Node ID 962e043b10b50e04473fe8c9946b6a77ed7a8a59
# Parent  d2d9530e9b454d666eb63d17c891c664140bacfc
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>.

diff -r d2d9530e9b45 -r 962e043b10b5 lisp/startup.el
--- a/lisp/startup.el	Thu Feb 28 22:29:03 2008 +0000
+++ b/lisp/startup.el	Thu Feb 28 22:41:09 2008 +0000
@@ -42,7 +42,6 @@
 
 (defcustom inhibit-startup-screen nil
   "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 (but NOT site-start.el), once
 you are familiar with the contents of the startup screen."
@@ -1123,9 +1122,7 @@
 
 ")
   "Initial message displayed in *scratch* buffer at startup.
-If this is nil, no message will be displayed.
-If `inhibit-startup-screen' is non-nil, then no message is displayed,
-regardless of the value of this variable."
+If this is nil, no message will be displayed."
   :type '(choice (text :tag "Message")
 		 (const :tag "none" nil))
   :group 'initialization)
@@ -2120,6 +2117,14 @@
 	    ;; abort later.
 	    (unless (frame-live-p (selected-frame)) (kill-emacs nil))))))
 
+    ;; If *scratch* exists and is empty, insert initial-scratch-message.
+    (and initial-scratch-message
+	 (get-buffer "*scratch*")
+	 (with-current-buffer "*scratch*"
+	   (when (zerop (buffer-size))
+	     (insert initial-scratch-message)
+	     (set-buffer-modified-p nil))))
+
     (if (or inhibit-startup-screen
 	    noninteractive
 	    emacs-quick-startup)
@@ -2164,14 +2169,6 @@
       ;; (with-no-warnings
       ;; 	(setq menubar-bindings-done t))
 
-      ;; If *scratch* exists and is empty, insert initial-scratch-message.
-      (and initial-scratch-message
-	   (get-buffer "*scratch*")
-	   (with-current-buffer "*scratch*"
-	     (when (zerop (buffer-size))
-	       (insert initial-scratch-message)
-	       (set-buffer-modified-p nil))))
-
       (if (> file-count 0)
 	  (display-startup-screen t)
 	(display-startup-screen nil)))))