From d9bf544c71f035dde7522bcc355c63974cd9f5c0 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Wed, 5 Nov 2008 21:16:17 +0000 Subject: [PATCH] (server-process-filter): Only default to emacsclient's terminal in daemon mode. --- lisp/server.el | 5 +++-- 1 file 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)) -- 2.39.2