Commit fe74bf60 authored by Karoly Lorentey's avatar Karoly Lorentey

Don't display the splash screen when no frame was created. (Fixes tty resume.)

* lisp/server.el (server-process-filter): Don't display the splash screen
  when no frame was created.

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-479
parent d290c554
......@@ -752,12 +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))
(when frame
(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
......
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