Mercurial > emacs
changeset 92786:f85ca7d27ab2
(inhibit-startup-screen): Revert incomplete
2008-03-10 merge from emacs--rel--22 that partly reverted
2008-02-28 change that added initial message to *scratch* buffer
regardless of the value of `inhibit-startup-screen'.
Now keep this change in the trunk, but not in the 22 branch.
| author | Juri Linkov <juri@jurta.org> |
|---|---|
| date | Wed, 12 Mar 2008 21:54:36 +0000 |
| parents | ca94bdbd0b62 |
| children | da7c30c567ef |
| files | lisp/startup.el |
| diffstat | 1 files changed, 1 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/startup.el Wed Mar 12 21:01:35 2008 +0000 +++ b/lisp/startup.el Wed Mar 12 21:54:36 2008 +0000 @@ -56,7 +56,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." @@ -1155,9 +1154,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) @@ -2242,14 +2239,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)))))