procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* frame.el (make-frame-on-tty): Remove function, inline contents

Browse source 
in the only user ...

* server.el (server-create-tty-frame): ... here.

* frames.texi (Multiple Displays): Remove documentation for
removed function make-frame-on-tty.
This commit is contained in:
Dan Nicolaescu 2009-01-22 06:58:10 +00:00
parent a078d6e54a
commit f79b43b27b
5 changed files with 33 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
doc/lispref/ChangeLog
View file

@ -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

10
doc/lispref/frames.texi
View file

@ -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

7
lisp/ChangeLog
View file

@ -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

17
lisp/frame.el
View file

@ -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)

36
lisp/server.el
View file

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