(server-process-filter): Only default to emacsclient's terminal in

daemon mode.

1 files changed, 3 insertions, 2 deletions

diff --git a/lisp/server.el b/lisp/server.el
index 5b3cd9b82a0..2df1f9cedb3 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -936,10 +936,11 @@ The following commands are accepted by the client:
                          (or (eq use-current-frame 'always)
                              ;; We can't use the Emacs daemon's
                              ;; terminal frame.
-                             (not (and (= (length (frame-list)) 1)
+                             (not (and (daemonp)
+                                       (= (length (frame-list)) 1)
                                        (eq (selected-frame)
                                            terminal-frame)))))
-                    (setq tty-name nil)
+                    (setq tty-name nil tty-type nil)
                     (if display (server-select-display display)))
                    ((eq tty-name 'window-system)
                     (server-create-window-system-frame display nowait proc))