Mercurial > emacs
changeset 99399:6620e11a4f76
(server-process-filter): Only default to emacsclient's terminal in
daemon mode.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Wed, 05 Nov 2008 21:16:17 +0000 |
| parents | 77bd063654c6 |
| children | b0dc8618a597 |
| files | lisp/server.el |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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))