[Emacs-diffs] emacs doc/lispref/ChangeLog doc/lispref/frames....

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   09/01/22 06:58:14

Modified files:
        doc/lispref    : ChangeLog frames.texi 
        lisp           : ChangeLog frame.el server.el 

Log message:
        * 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.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/lispref/ChangeLog?cvsroot=emacs&r1=1.202&r2=1.203
http://cvs.savannah.gnu.org/viewcvs/emacs/doc/lispref/frames.texi?cvsroot=emacs&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15142&r2=1.15143
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/frame.el?cvsroot=emacs&r1=1.294&r2=1.295
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/server.el?cvsroot=emacs&r1=1.184&r2=1.185

Patches:
Index: doc/lispref/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/doc/lispref/ChangeLog,v
retrieving revision 1.202
retrieving revision 1.203
diff -u -b -r1.202 -r1.203
--- doc/lispref/ChangeLog       22 Jan 2009 04:53:32 -0000      1.202
+++ doc/lispref/ChangeLog       22 Jan 2009 06:58:10 -0000      1.203
@@ -1,3 +1,8 @@
+2009-01-22  Dan Nicolaescu  <address@hidden>
+
+       * frames.texi (Multiple Displays): Remove documentation for
+       removed function make-frame-on-tty.
+
 2009-01-22  Chong Yidong  <address@hidden>
 
        * files.texi (Format Conversion Piecemeal): Clarify behavior of

Index: doc/lispref/frames.texi
===================================================================
RCS file: /cvsroot/emacs/emacs/doc/lispref/frames.texi,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- doc/lispref/frames.texi     17 Jan 2009 18:43:24 -0000      1.22
+++ doc/lispref/frames.texi     22 Jan 2009 06:58:10 -0000      1.23
@@ -205,16 +205,6 @@
 Frames}).
 @end deffn
 
address@hidden 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.
address@hidden 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

Index: lisp/ChangeLog
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15142
retrieving revision 1.15143
diff -u -b -r1.15142 -r1.15143
--- lisp/ChangeLog      22 Jan 2009 04:43:47 -0000      1.15142
+++ lisp/ChangeLog      22 Jan 2009 06:58:11 -0000      1.15143
@@ -1,3 +1,10 @@
+2009-01-22  Dan Nicolaescu  <address@hidden>
+
+       * 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  <address@hidden>
 
        * format.el (format-annotate-function): Set

Index: lisp/frame.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/frame.el,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -b -r1.294 -r1.295
--- lisp/frame.el       14 Jan 2009 10:12:04 -0000      1.294
+++ lisp/frame.el       22 Jan 2009 06:58:13 -0000      1.295
@@ -654,23 +654,6 @@
         (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)

Index: lisp/server.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/server.el,v
retrieving revision 1.184
retrieving revision 1.185
diff -u -b -r1.184 -r1.185
--- lisp/server.el      21 Jan 2009 20:33:17 -0000      1.184
+++ lisp/server.el      22 Jan 2009 06:58:14 -0000      1.185
@@ -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,10 +635,12 @@
                "TERMINFO_DIRS" "TERMPATH"
                ;; rxvt wants these
                "COLORFGBG" "COLORTERM")
-           (make-frame-on-tty tty type
+            (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)
+                          (client . ,proc)
                                 ;; This is a leftover from an earlier
                                 ;; attempt at making it possible for process
                                 ;; run in the server process to use the