diff options
Diffstat (limited to 'lisp/startup.el')
| -rw-r--r-- | lisp/startup.el | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/lisp/startup.el b/lisp/startup.el index 8ab56eee180..1f0cff2ccec 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -56,6 +56,7 @@ directory using `find-file'. If t, open the `*scratch*' buffer." (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 @@ opening the first frame (e.g. open a connection to an X server).") ") "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 @@ A fancy display is used on graphic displays, normal otherwise." ;; (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))))) |