From b36b0121583ddf8975e9af40c7c9b13d2f9ba7fb Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Thu, 28 Feb 2008 23:30:11 +0000 Subject: [PATCH] (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'. --- lisp/ChangeLog | 9 +++++++++ lisp/startup.el | 18 +++++++++++------- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index eb78b338272..499f2fd82b3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,12 @@ +2008-02-28 Juri Linkov + + * 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 * startup.el (startup-echo-area-message): Check for about-emacs. diff --git a/lisp/startup.el b/lisp/startup.el index 3e988421d3d..a5e315cbc0f 100644 --- a/lisp/startup.el +++ b/lisp/startup.el @@ -1544,12 +1544,14 @@ we put it on this frame." (> frame-height (+ image-height 19))))))) -(defun normal-splash-screen (&optional startup) +(defun normal-splash-screen (&optional startup concise) "Display non-graphic splash screen. If optional argument STARTUP is non-nil, display the startup screen -after Emacs starts. If STARTUP is nil, display the About screen." - (let ((prev-buffer (current-buffer))) - (with-current-buffer (get-buffer-create "*About GNU Emacs*") +after Emacs starts. If STARTUP is nil, display the About screen. +If CONCISE is non-nil, display a concise version of the +splash screen in another window." + (let ((splash-buffer (get-buffer-create "*About GNU Emacs*"))) + (with-current-buffer splash-buffer (setq buffer-read-only nil) (erase-buffer) (setq default-directory command-line-default-directory) @@ -1610,9 +1612,11 @@ after Emacs starts. If STARTUP is nil, display the About screen." (setq buffer-read-only t) (if (and view-read-only (not view-mode)) (view-mode-enter nil 'kill-buffer)) - (switch-to-buffer "*About GNU Emacs*") (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 () ;; The user can use the mouse to activate menus @@ -1884,7 +1888,7 @@ screen." (if (not (get-buffer "*GNU Emacs*")) (if (use-fancy-splash-screens-p) (fancy-startup-screen concise) - (normal-splash-screen t)))) + (normal-splash-screen t concise)))) (defun display-about-screen () "Display the *About GNU Emacs* buffer. -- 2.39.2