diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2009-01-10 13:07:04 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2009-01-10 13:07:04 +0000 |
| commit | 052056a969b1418b0ba15b76d287667334957865 (patch) | |
| tree | 722118012e3515546d297b231e756e1a2bc82800 /lisp/server.el | |
| parent | 6c1ec5a0505cce365e272bce948258b276b29142 (diff) | |
| download | emacs-052056a969b1418b0ba15b76d287667334957865.tar.gz | |
Revert previous change (commit mistake).
Diffstat (limited to 'lisp/server.el')
| -rw-r--r-- | lisp/server.el | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/lisp/server.el b/lisp/server.el index 69137c6a60e..6dc84be0e76 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -615,8 +615,6 @@ Server mode runs a process that accepts commands from the (defun server-create-tty-frame (tty type proc) (add-to-list 'frame-inherited-parameters 'client) - (unless tty (error "Invalid terminal device")) - (unless type (error "Invalid terminal type")) (let ((frame (server-with-environment (process-get proc 'env) '("LANG" "LC_CTYPE" "LC_ALL" @@ -627,24 +625,22 @@ Server mode runs a process that accepts commands from the "TERMINFO_DIRS" "TERMPATH" ;; rxvt wants these "COLORFGBG" "COLORTERM") - (let ((ws (if (eq window-system 'pc) 'pc nil)) - ;; Ignore nowait here; we always need to clean up - ;; opened ttys when the client dies. - (parameters `((client . ,proc) - ;; This is left over from an earlier - ;; attempt at causing a process run in - ;; the server process to use the - ;; environment of the client process. - ;; It has no effect now and to make it - ;; work we'd need to decide how to make - ;; process-environment interact with - ;; client envvars, and then to change - ;; the C functions `child_setup' and - ;; `getenv_internal' accordingly. - (environment . ,(process-get proc 'env))))) - (make-frame `((window-system . ,ws) - (tty . ,tty) - (tty-type . ,type) . ,parameters)))))) + (make-frame-on-tty tty type + ;; Ignore nowait here; we always need to + ;; clean up opened ttys when the client dies. + `((client . ,proc) + ;; This is a leftover from an earlier + ;; attempt at making it possible for process + ;; run in the server process to use the + ;; environment of the client process. + ;; It has no effect now and to make it work + ;; we'd need to decide how to make + ;; process-environment interact with client + ;; envvars, and then to change the + ;; C functions `child_setup' and + ;; `getenv_internal' accordingly. + (environment . ,(process-get proc 'env))))))) + ;; ttys don't use the `display' parameter, but callproc.c does to set ;; the DISPLAY environment on subprocesses. (set-frame-parameter frame 'display |