* 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.

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 3c838da443045d37f33e6549182ec20e8845aa4a..964377b8e7bccae7d1196127f8c487ca884a075d 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-22  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * frames.texi (Multiple Displays): Remove documentation for
+       removed function make-frame-on-tty.
+
 2009-01-22  Chong Yidong  <cyd@stupidchicken.com>
 
        * files.texi (Format Conversion Piecemeal): Clarify behavior of

diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi
index c953f10f81d7395aedca8e7d7a5906a490502bff..3e0367f02686da400ba0622df977a380837e065c 100644 (file)
--- a/doc/lispref/frames.texi
+++ b/doc/lispref/frames.texi
@@ -205,16 +205,6 @@ the other frame parameters from @var{parameters}.  Aside from the
 Frames}).
 @end deffn
 
-@deffn Command make-frame-on-tty tty type &optional parameters
-This command creates a text-only frame on another text terminal.  The
-argument @var{tty} identifies the terminal device by its file name,
-e.g., @file{/dev/ttys2}, and @var{type} gives the device type as a
-string, e.g., @code{"vt100"}, to use for searching the
-termcap/terminfo database for the entry describing capabilities of the
-device.  Optional argument @var{parameters} specifies additional
-parameters for the frame.
-@end deffn
-
 @defun x-display-list
 This returns a list that indicates which X displays Emacs has a
 connection to.  The elements of the list are strings, and each one is

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 33c40d24eb7152885c2e39e467383d2cd654b182..1ef1263d62b5efe14eee3680c1d39b78e5a966ae 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2009-01-22  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * frame.el (make-frame-on-tty): Remove function, inline contents
+       in the only user ...
+
+       * server.el (server-create-tty-frame): ... here.
+
 2009-01-22  Chong Yidong  <cyd@stupidchicken.com>
 
        * format.el (format-annotate-function): Set

diff --git a/lisp/frame.el b/lisp/frame.el
index 1adda6c494e4bbe7a905b7aeb14b651d60096adb..1576ae7e4c2892080cf3aae957c6143b2534eeee 100644 (file)
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -654,23 +654,6 @@ The optional argument PARAMETERS specifies additional frame parameters."
         (make-frame `((window-system . x)
                       (display . ,display) . ,parameters)))))
 
-(defun make-frame-on-tty (tty type &optional parameters)
-  "Make a frame on terminal device TTY.
-TTY should be the file name of the tty device to use.  TYPE
-should be the terminal type string of TTY, for example \"xterm\"
-or \"vt100\".  The optional third argument PARAMETERS specifies
-additional frame parameters."
-  ;; Use "F" rather than "f", in case the device does not exist, as
-  ;; far as the filesystem is concerned.
-  (interactive "FOpen frame on tty device: \nsTerminal type of %s: ")
-  (unless tty
-    (error "Invalid terminal device"))
-  (unless type
-    (error "Invalid terminal type"))
-  (if (eq window-system 'pc)
-      (make-frame `((window-system . pc) (tty . ,tty) (tty-type . ,type) . ,parameters))
-    (make-frame `((window-system . nil) (tty . ,tty) (tty-type . ,type) . ,parameters))))
-
 (declare-function x-close-connection "xfns.c" (terminal))
 
 (defun close-display-connection (display)

diff --git a/lisp/server.el b/lisp/server.el
index 20b9ff57ffe423d986c2b146aa024667b029e1da..d58eb20e5e7d45254ff0754eddc8e1daeff16887 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -620,6 +620,10 @@ Server mode runs a process that accepts commands from the
                           (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 @@ 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)))))))
+            (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.