Mercurial > emacs
changeset 83433:072e54344b8d
Show the splash screen on Emacsclient frames. Show *scratch* by default.
* lisp/server.el (server-process-filter): Show the Emacs splash screen
and startup echo area message. Display the *scratch* buffer by
default.
* lisp/startup.el (fancy-splash-screens): Restore previous buffer, even
if it's *scratch*.
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-473
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Thu, 29 Dec 2005 21:10:33 +0000 |
| parents | 33e433ac0b1b |
| children | 944e6b68a0de |
| files | lisp/server.el lisp/startup.el |
| diffstat | 2 files changed, 9 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/server.el Thu Dec 29 18:26:00 2005 +0000 +++ b/lisp/server.el Thu Dec 29 21:10:33 2005 +0000 @@ -752,6 +752,13 @@ (setq buffers (server-visit-files files client nowait)) (run-hooks 'post-command-hook)) + (with-selected-frame frame + (switch-to-buffer (or (car buffers) + (get-buffer-create "*scratch*"))) + (unless inhibit-splash-screen + (display-splash-screen)) + (display-startup-echo-area-message)) + ;; Delete the client if necessary. (cond (nowait
--- a/lisp/startup.el Thu Dec 29 18:26:00 2005 +0000 +++ b/lisp/startup.el Thu Dec 29 21:10:33 2005 +0000 @@ -1344,7 +1344,8 @@ (cancel-timer timer) (setq display-hourglass old-hourglass minor-mode-map-alist old-minor-mode-map-alist) - (kill-buffer splash-buffer)))))) + (kill-buffer splash-buffer) + (switch-to-buffer fancy-splash-outer-buffer)))))) (defun fancy-splash-frame () "Return the frame to use for the fancy splash screen.