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

2 files changed, 9 insertions, 1 deletions

diff --git a/lisp/server.el b/lisp/server.el
index 9de88d55896..68c267047fc 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -752,6 +752,13 @@ The following commands are accepted by the client:
                 (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
diff --git a/lisp/startup.el b/lisp/startup.el
index cef38411dc9..651bbb4d33d 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -1344,7 +1344,8 @@ mouse."
           (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.