Mercurial > emacs
changeset 83439:6359ac574acf
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
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Fri, 30 Dec 2005 06:38:50 +0000 |
| parents | dc3a189e9e3a |
| children | 6cb6e02413a8 |
| files | lisp/server.el |
| diffstat | 1 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/server.el Fri Dec 30 06:15:47 2005 +0000 +++ b/lisp/server.el Fri Dec 30 06:38:50 2005 +0000 @@ -752,12 +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)) + (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