Mercurial > emacs
changeset 99390:0c8f4221f839
(server-process-filter): Don't call server-create-tty-frame when no
tty name is specified.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Tue, 04 Nov 2008 18:42:04 +0000 |
| parents | 6f533d3d2a12 |
| children | d33ec2dc14a6 |
| files | lisp/server.el |
| diffstat | 1 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/server.el Tue Nov 04 18:41:56 2008 +0000 +++ b/lisp/server.el Tue Nov 04 18:42:04 2008 +0000 @@ -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-type ;string. - (files nil) - (filepos nil) + tty-name ;nil, `window-system', or the tty name. + tty-type ;string. + 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