Index: lisp/startup.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/startup.el,v
retrieving revision 1.477
diff -C 2 -r1.477 startup.el
*** lisp/startup.el	12 Feb 2008 23:41:08 -0000	1.477
--- lisp/startup.el	14 Feb 2008 04:08:15 -0000
***************
*** 57,61 ****
  (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
--- 57,60 ----
***************
*** 1151,1157 ****
  ")
    "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."
    :type '(choice (text :tag "Message")
  		 (const :tag "none" nil))
--- 1150,1154 ----
  ")
    "Initial message displayed in *scratch* buffer at startup.
! If this is nil, no message will be displayed."
    :type '(choice (text :tag "Message")
  		 (const :tag "none" nil))
***************
*** 2181,2184 ****
--- 2178,2189 ----
  	     (find-file initial-buffer-choice))))
  
+     ;; 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
  	    initial-buffer-choice
***************
*** 2226,2237 ****
        ;; 	(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)
--- 2231,2234 ----