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

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     08/03/10 00:49:48

Index: lisp/startup.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/startup.el,v
retrieving revision 1.484
retrieving revision 1.485
diff -u -b -r1.484 -r1.485
--- lisp/startup.el     29 Feb 2008 23:38:43 -0000      1.484
+++ lisp/startup.el     10 Mar 2008 00:49:41 -0000      1.485
@@ -56,6 +56,7 @@
 
 (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."
@@ -1154,7 +1155,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-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))
   :group 'initialization)
@@ -2239,6 +2242,14 @@
       ;; (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)))))