[Emacs-diffs] Changes to emacs/lisp/server.el,v

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/11/05 21:16:20

Index: server.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/server.el,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -b -r1.172 -r1.173
--- server.el   4 Nov 2008 18:42:04 -0000       1.172
+++ server.el   5 Nov 2008 21:16:17 -0000       1.173
@@ -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))