diff options
| author | Juri Linkov <juri@jurta.org> | 2008-03-02 16:18:21 +0000 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2008-03-02 16:18:21 +0000 |
| commit | 1344a1f99e110e040d69325f27a6d2afd26a7535 (patch) | |
| tree | efa6959fd777dd507bbc034f20d200b306e86aeb | |
| parent | 59cd993bbda67978f1c25e205b9c429cd30e267f (diff) | |
| download | emacs-1344a1f99e110e040d69325f27a6d2afd26a7535.tar.gz | |
Revert 2008-02-28 change that adds initial message
to *scratch* buffer regardless of the value of `inhibit-startup-screen'.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/startup.el | 21 |
2 files changed, 17 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 1071d15b88f..76a30b75224 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-03-02 Juri Linkov <juri@jurta.org> + + * startup.el: Revert 2008-02-28 change that adds initial message + to *scratch* buffer regardless of the value of `inhibit-startup-screen'. + 2008-03-01 Dan Nicolaescu <dann@ics.uci.edu> * textmodes/css-mode.el (css-indent-offset, css-electric-keys): diff --git a/lisp/startup.el b/lisp/startup.el index a5e315cbc0f..4f66a1cf501 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -42,6 +42,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." @@ -1122,7 +1123,9 @@ or `CVS', and any subdirectory that contains a file named `.nosearch'." ") "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) @@ -2121,14 +2124,6 @@ A fancy display is used on graphic displays, normal otherwise." ;; 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) @@ -2173,6 +2168,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))))) |