# HG changeset patch # User Chong Yidong # Date 1240371786 0 # Node ID 997f1f1cac0840915b1c459f4a9ecb4934fdd1f1 # Parent 9637720d550b2315f6ab853a0f41a2c2f5ff3add * term.c (Ftty_display_color_p, Ftty_display_color_cells) (Ftty_type, Fcontrolling_tty_p, Ftty_no_underline, Fsuspend_tty) (Fresume_tty): Doc fixes, replacing "terminal id" with "terminal object". diff -r 9637720d550b -r 997f1f1cac08 src/ChangeLog --- a/src/ChangeLog Wed Apr 22 03:37:30 2009 +0000 +++ b/src/ChangeLog Wed Apr 22 03:43:06 2009 +0000 @@ -1,3 +1,10 @@ +2009-04-22 Chong Yidong + + * term.c (Ftty_display_color_p, Ftty_display_color_cells) + (Ftty_type, Fcontrolling_tty_p, Ftty_no_underline, Fsuspend_tty) + (Fresume_tty): Doc fixes, replacing "terminal id" with "terminal + object". + 2009-04-21 Kenichi Handa * font.c (font_load_for_lface): Cancel previous change (bug#2994). diff -r 9637720d550b -r 997f1f1cac08 src/term.c --- a/src/term.c Wed Apr 22 03:37:30 2009 +0000 +++ b/src/term.c Wed Apr 22 03:43:06 2009 +0000 @@ -2097,9 +2097,9 @@ 0, 1, 0, doc: /* Return non-nil if the tty device TERMINAL can display colors. -TERMINAL can be a terminal id, a frame or nil (meaning the selected -frame's terminal). This function always returns nil if TERMINAL -is not on a tty device. */) +TERMINAL can be a terminal object, a frame, or nil (meaning the +selected frame's terminal). This function always returns nil if +TERMINAL does not refer to a text-only terminal. */) (terminal) Lisp_Object terminal; { @@ -2115,9 +2115,9 @@ Stty_display_color_cells, 0, 1, 0, doc: /* Return the number of colors supported by the tty device TERMINAL. -TERMINAL can be a terminal id, a frame or nil (meaning the selected -frame's terminal). This function always returns 0 if TERMINAL -is not on a tty device. */) +TERMINAL can be a terminal object, a frame, or nil (meaning the +selected frame's terminal). This function always returns 0 if +TERMINAL does not refer to a text-only terminal. */) (terminal) Lisp_Object terminal; { @@ -2303,8 +2303,8 @@ doc: /* Return the type of the tty device that TERMINAL uses. Returns nil if TERMINAL is not on a tty device. -TERMINAL can be a terminal id, a frame or nil (meaning the selected -frame's terminal). */) +TERMINAL can be a terminal object, a frame, or nil (meaning the +selected frame's terminal). */) (terminal) Lisp_Object terminal; { @@ -2322,9 +2322,9 @@ DEFUN ("controlling-tty-p", Fcontrolling_tty_p, Scontrolling_tty_p, 0, 1, 0, doc: /* Return non-nil if TERMINAL is the controlling tty of the Emacs process. -TERMINAL can be a terminal id, a frame or nil (meaning the selected -frame's terminal). This function always returns nil if TERMINAL -is not on a tty device. */) +TERMINAL can be a terminal object, a frame, or nil (meaning the +selected frame's terminal). This function always returns nil if +TERMINAL is not on a tty device. */) (terminal) Lisp_Object terminal; { @@ -2343,9 +2343,9 @@ do not really do underlining, but say that they do. This function has no effect if used on a non-tty terminal. -TERMINAL can be a terminal id, a frame or nil (meaning the selected -frame's terminal). This function always returns nil if TERMINAL -is not on a tty device. */) +TERMINAL can be a terminal object, a frame or nil (meaning the +selected frame's terminal). This function always returns nil if +TERMINAL does not refer to a text-only terminal. */) (terminal) Lisp_Object terminal; { @@ -2366,8 +2366,8 @@ but input is not read from them and if they change, their display is not updated. -TTY may be a terminal id, a frame, or nil for the terminal device of -the currently selected frame. +TTY may be a terminal object, a frame, or nil for the terminal device +of the currently selected frame. This function runs `suspend-tty-functions' after suspending the device. The functions are run with one arg, the id of the suspended @@ -2442,8 +2442,8 @@ `resume-tty' does nothing if it is called on a device that is not suspended. -TTY may be a terminal id, a frame, or nil for the terminal device of -the currently selected frame. */) +TTY may be a terminal object, a frame, or nil (meaning the selected +frame's terminal). */) (tty) Lisp_Object tty; {