aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/terminal.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/terminal.c b/src/terminal.c
index dcde8e9f557..d366e9d2438 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -402,7 +402,7 @@ but if the second argument FORCE is non-nil, you may do so. */)
402 402
403DEFUN ("frame-terminal", Fframe_terminal, Sframe_terminal, 0, 1, 0, 403DEFUN ("frame-terminal", Fframe_terminal, Sframe_terminal, 0, 1, 0,
404 doc: /* Return the terminal that FRAME is displayed on. 404 doc: /* Return the terminal that FRAME is displayed on.
405If FRAME is nil, the selected frame is used. 405If FRAME is nil, use the selected frame.
406 406
407The terminal device is represented by its integer identifier. */) 407The terminal device is represented by its integer identifier. */)
408 (Lisp_Object frame) 408 (Lisp_Object frame)
@@ -421,10 +421,12 @@ The terminal device is represented by its integer identifier. */)
421 421
422DEFUN ("terminal-live-p", Fterminal_live_p, Sterminal_live_p, 1, 1, 0, 422DEFUN ("terminal-live-p", Fterminal_live_p, Sterminal_live_p, 1, 1, 0,
423 doc: /* Return non-nil if OBJECT is a terminal which has not been deleted. 423 doc: /* Return non-nil if OBJECT is a terminal which has not been deleted.
424Value is nil if OBJECT is not a live display terminal. 424Return nil if OBJECT is not a live display terminal.
425If object is a live display terminal, the return value indicates what 425OBJECT may be a terminal object, a frame, or nil (meaning the
426sort of output terminal it uses. See the documentation of `framep' for 426selected frame's terminal).
427possible return values. */) 427If OBJECT is a live display terminal, return what sort of output
428terminal it uses. See the documentation of `framep' for possible
429return values. */)
428 (Lisp_Object object) 430 (Lisp_Object object)
429{ 431{
430 struct terminal *t = decode_terminal (object); 432 struct terminal *t = decode_terminal (object);