Commit b36b0121 authored by Juri Linkov's avatar Juri Linkov
Browse files

(normal-splash-screen): Add argument `concise'.

Remove unused binding `prev-buffer'. Let-bind `splash-buffer'
to the created buffer.  If `concise' is non-nil, call
`display-buffer', otherwise `switch-to-buffer'.  Doc fix.
(display-startup-screen): Add argument `concise' to the call to
`normal-splash-screen'.
parent 61ce9226
2008-02-28 Juri Linkov <juri@jurta.org>
* startup.el (normal-splash-screen): Add argument `concise'.
Remove unused binding `prev-buffer'. Let-bind `splash-buffer'
to the created buffer. If `concise' is non-nil, call
`display-buffer', otherwise `switch-to-buffer'. Doc fix.
(display-startup-screen): Add argument `concise' to the call to
`normal-splash-screen'.
2008-02-28 Kim F. Storm <storm@cua.dk> 2008-02-28 Kim F. Storm <storm@cua.dk>
   
* startup.el (startup-echo-area-message): Check for about-emacs. * startup.el (startup-echo-area-message): Check for about-emacs.
...@@ -1544,12 +1544,14 @@ we put it on this frame." ...@@ -1544,12 +1544,14 @@ we put it on this frame."
(> frame-height (+ image-height 19))))))) (> frame-height (+ image-height 19)))))))
(defun normal-splash-screen (&optional startup) (defun normal-splash-screen (&optional startup concise)
"Display non-graphic splash screen. "Display non-graphic splash screen.
If optional argument STARTUP is non-nil, display the startup screen If optional argument STARTUP is non-nil, display the startup screen
after Emacs starts. If STARTUP is nil, display the About screen." after Emacs starts. If STARTUP is nil, display the About screen.
(let ((prev-buffer (current-buffer))) If CONCISE is non-nil, display a concise version of the
(with-current-buffer (get-buffer-create "*About GNU Emacs*") splash screen in another window."
(let ((splash-buffer (get-buffer-create "*About GNU Emacs*")))
(with-current-buffer splash-buffer
(setq buffer-read-only nil) (setq buffer-read-only nil)
(erase-buffer) (erase-buffer)
(setq default-directory command-line-default-directory) (setq default-directory command-line-default-directory)
...@@ -1610,9 +1612,11 @@ after Emacs starts. If STARTUP is nil, display the About screen." ...@@ -1610,9 +1612,11 @@ after Emacs starts. If STARTUP is nil, display the About screen."
(setq buffer-read-only t) (setq buffer-read-only t)
(if (and view-read-only (not view-mode)) (if (and view-read-only (not view-mode))
(view-mode-enter nil 'kill-buffer)) (view-mode-enter nil 'kill-buffer))
(switch-to-buffer "*About GNU Emacs*")
(if startup (rename-buffer "*GNU Emacs*" t)) (if startup (rename-buffer "*GNU Emacs*" t))
(goto-char (point-min))))) (goto-char (point-min)))
(if concise
(display-buffer splash-buffer)
(switch-to-buffer splash-buffer))))
(defun normal-mouse-startup-screen () (defun normal-mouse-startup-screen ()
;; The user can use the mouse to activate menus ;; The user can use the mouse to activate menus
...@@ -1884,7 +1888,7 @@ screen." ...@@ -1884,7 +1888,7 @@ screen."
(if (not (get-buffer "*GNU Emacs*")) (if (not (get-buffer "*GNU Emacs*"))
(if (use-fancy-splash-screens-p) (if (use-fancy-splash-screens-p)
(fancy-startup-screen concise) (fancy-startup-screen concise)
(normal-splash-screen t)))) (normal-splash-screen t concise))))
(defun display-about-screen () (defun display-about-screen ()
"Display the *About GNU Emacs* buffer. "Display the *About GNU Emacs* buffer.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment