# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1225919777 0
# Node ID 6620e11a4f76f916f4978b726a4a2fce3ec00fcd
# Parent  77bd063654c65aac349b3c2b6c46be742f02ae1d
(server-process-filter): Only default to emacsclient's terminal in
daemon mode.

diff -r 77bd063654c6 -r 6620e11a4f76 lisp/server.el
--- a/lisp/server.el	Wed Nov 05 21:15:37 2008 +0000
+++ b/lisp/server.el	Wed Nov 05 21:16:17 2008 +0000
@@ -936,10 +936,11 @@
 			 (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))