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

daemon mode.

(server-process-filter): Only default to emacsclient's terminal in
daemon mode.
d9bf544c · Chong Yidong · 610a5df3 · d9bf544c
Commit d9bf544c authored Nov 05, 2008 by Chong Yidong
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

lisp/server.el lisp/server.el +3 -2

No files found.
--- 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))