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

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      08/11/04 18:42:04

Index: server.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/server.el,v
retrieving revision 1.171
retrieving revision 1.172
diff -u -b -r1.171 -r1.172
--- server.el   30 Oct 2008 15:50:01 -0000      1.171
+++ server.el   4 Nov 2008 18:42:04 -0000       1.172
@@ -808,13 +808,13 @@
                frame ; The frame that was opened for the client (if any).
                display              ; Open the frame on this display.
                dontkill       ; t if the client should not be killed.
-                (commands ())
+               commands
                dir
                use-current-frame
-                (tty-name nil)       ;nil, `window-system', or the tty name.
+               tty-name       ;nil, `window-system', or the tty name.
                 tty-type             ;string.
-               (files nil)
-                (filepos nil)
+               files
+               filepos
                command-line-args-left
                arg)
            ;; Remove this line from STRING.
@@ -943,7 +943,9 @@
                    (if display (server-select-display display)))
                   ((eq tty-name 'window-system)
                    (server-create-window-system-frame display nowait proc))
-                  (t (server-create-tty-frame tty-name tty-type proc))))
+                  ;; When resuming on a tty, tty-name is nil.
+                  (tty-name
+                   (server-create-tty-frame tty-name tty-type proc))))
 
             (process-put
              proc 'continuation