diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2009-01-10 13:04:37 +0000 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2009-01-10 13:04:37 +0000 |
| commit | 6c1ec5a0505cce365e272bce948258b276b29142 (patch) | |
| tree | 815273c44e4452785d618af626c3bb6fa5b7b0b8 /lisp/server.el | |
| parent | 53ed745ab7978c8ece696a78807cbdda72fc5dd2 (diff) | |
| download | emacs-6c1ec5a0505cce365e272bce948258b276b29142.tar.gz | |
* gs.el: File removed.
Diffstat (limited to 'lisp/server.el')
| -rw-r--r-- | lisp/server.el | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/lisp/server.el b/lisp/server.el index 6dc84be0e76..69137c6a60e 100644 --- a/lisp/server.el +++ b/lisp/server.el @@ -615,6 +615,8 @@ 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" @@ -625,22 +627,24 @@ Server mode runs a process that accepts commands from the "TERMINFO_DIRS" "TERMPATH" ;; rxvt wants these "COLORFGBG" "COLORTERM") - (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))))))) - + (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)))))) ;; ttys don't use the `display' parameter, but callproc.c does to set ;; the DISPLAY environment on subprocesses. (set-frame-parameter frame 'display |