mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-04-25 07:40:40 -07:00
Code Issues Projects Releases Wiki Activity

Always add initial message to *scratch* buffer if

Browse source 
`initial-scratch-message' is non-nil regardless of the value of
`inhibit-startup-screen'.
(inhibit-startup-screen, initial-scratch-message): Doc fix.
(command-line-1): Move code that inserts `initial-scratch-message'
up before the if-form that checks for `inhibit-startup-screen'.
Suggested by Jonathan Rockway <jon@jrock.us>.
This commit is contained in:
Juri Linkov 2008-02-28 22:50:26 +00:00
parent 5c842d76fa
commit 8d86c6da46
2 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lisp/ChangeLog
View file

@ -1,3 +1,13 @@
2008-02-28 Juri Linkov <juri@jurta.org>
* startup.el: Always add initial message to *scratch* buffer if
`initial-scratch-message' is non-nil regardless of the value of
`inhibit-startup-screen'.
(inhibit-startup-screen, initial-scratch-message): Doc fix.
(command-line-1): Move code that inserts `initial-scratch-message'
up before the if-form that checks for `inhibit-startup-screen'.
Suggested by Jonathan Rockway <jon@jrock.us>.
2008-02-28 Juri Linkov <juri@jurta.org>
* cus-edit.el (custom-mode-map, custom-mode-link-map):

21
lisp/startup.el
View file

@ -56,7 +56,6 @@ 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."
@ -1155,9 +1154,7 @@ 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 `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)
@ -2185,6 +2182,14 @@ A fancy display is used on graphic displays, normal otherwise."
((stringp initial-buffer-choice)
(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
noninteractive
@ -2230,14 +2235,6 @@ 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)))))