Mercurial > emacs

changeset 101060:be6cb2e93600

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revert previous change (commit mistake).
author Chong Yidong <cyd@stupidchicken.com>
date Sat, 10 Jan 2009 13:07:04 +0000
parents e75e790488a6
children d7b4cff6207d
files lisp/server.el
diffstat 1 files changed, 16 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/server.el	Sat Jan 10 13:06:23 2009 +0000
+++ b/lisp/server.el	Sat Jan 10 13:07:04 2009 +0000
@@ -615,8 +615,6 @@
 
 (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 @@
                "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