diff lisp/server.el @ 101349:191a3121c949

* frame.el (make-frame-on-tty): Remove function, inline contents in the only user ... * server.el (server-create-tty-frame): ... here. * frames.texi (Multiple Displays): Remove documentation for removed function make-frame-on-tty.

--- a/lisp/server.el	Thu Jan 22 06:38:56 2009 +0000
+++ b/lisp/server.el	Thu Jan 22 06:58:10 2009 +0000
@@ -620,6 +620,10 @@
                           (server-quote-arg text)))))))))
 
 (defun server-create-tty-frame (tty type proc)
+  (unless tty
+    (error "Invalid terminal device"))
+  (unless type
+    (error "Invalid terminal type"))
   (add-to-list 'frame-inherited-parameters 'client)
   (let ((frame
          (server-with-environment (process-get proc 'env)
@@ -631,21 +635,23 @@
                "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)))))))
+	     (make-frame `((window-system . nil)
+			   (tty . ,tty)
+			   (tty-type . ,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.