Mercurial > emacs
changeset 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.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Thu, 22 Jan 2009 06:58:10 +0000 |
| parents | b809ab4a474e |
| children | b8bf70ca95b2 |
| files | doc/lispref/ChangeLog doc/lispref/frames.texi lisp/ChangeLog lisp/frame.el lisp/server.el |
| diffstat | 5 files changed, 33 insertions(+), 42 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/lispref/ChangeLog Thu Jan 22 06:38:56 2009 +0000 +++ b/doc/lispref/ChangeLog Thu Jan 22 06:58:10 2009 +0000 @@ -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
--- a/doc/lispref/frames.texi Thu Jan 22 06:38:56 2009 +0000 +++ b/doc/lispref/frames.texi Thu Jan 22 06:58:10 2009 +0000 @@ -205,16 +205,6 @@ 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
--- a/lisp/ChangeLog Thu Jan 22 06:38:56 2009 +0000 +++ b/lisp/ChangeLog Thu Jan 22 06:58:10 2009 +0000 @@ -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
--- a/lisp/frame.el Thu Jan 22 06:38:56 2009 +0000 +++ b/lisp/frame.el Thu Jan 22 06:58:10 2009 +0000 @@ -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)
--- 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.