Commit 708e05dc authored by Chong Yidong's avatar Chong Yidong

* keyboard.c (Fset_input_meta_mode): Doc fix.

* dispnew.c (Fsend_string_to_terminal): Doc fix.

* data.c (Fterminal_local_value, Fset_terminal_local_value): Doc
fixes.

* coding.c (Fterminal_coding_system): Doc fix.

* xfns.c (Fx_display_grayscale_p, Fx_display_pixel_width)
(Fx_display_pixel_height, Fx_display_planes)
(Fx_display_color_cells, Fx_server_max_request_size)
(Fx_server_vendor, Fx_server_version, Fx_display_screens)
(Fx_display_mm_height, Fx_display_mm_width)
(Fx_display_backing_store, Fx_display_visual_class)
(Fx_display_save_under, Fx_close_connection, Fx_synchronize): Doc
fixes, replacing "terminal id" with "terminal object".
(check_x_display_info): Handle terminal objects instead of
terminal ids.
parent d8da5385
2009-04-22 Chong Yidong <cyd@stupidchicken.com> 2009-04-22 Chong Yidong <cyd@stupidchicken.com>
* keyboard.c (Fset_input_meta_mode): Doc fix.
* dispnew.c (Fsend_string_to_terminal): Doc fix.
* data.c (Fterminal_local_value, Fset_terminal_local_value): Doc
fixes.
* coding.c (Fterminal_coding_system): Doc fix.
* xfns.c (Fx_display_grayscale_p, Fx_display_pixel_width)
(Fx_display_pixel_height, Fx_display_planes)
(Fx_display_color_cells, Fx_server_max_request_size)
(Fx_server_vendor, Fx_server_version, Fx_display_screens)
(Fx_display_mm_height, Fx_display_mm_width)
(Fx_display_backing_store, Fx_display_visual_class)
(Fx_display_save_under, Fx_close_connection, Fx_synchronize): Doc
fixes, replacing "terminal id" with "terminal object".
(check_x_display_info): Handle terminal objects instead of
terminal ids.
* term.c (Ftty_display_color_p, Ftty_display_color_cells) * term.c (Ftty_display_color_p, Ftty_display_color_cells)
(Ftty_type, Fcontrolling_tty_p, Ftty_no_underline, Fsuspend_tty) (Ftty_type, Fcontrolling_tty_p, Ftty_no_underline, Fsuspend_tty)
(Fresume_tty, Vsuspend_tty_functions, Vresume_tty_functions): Doc (Fresume_tty, Vsuspend_tty_functions, Vresume_tty_functions): Doc
......
...@@ -9349,7 +9349,7 @@ DEFUN ("set-safe-terminal-coding-system-internal", ...@@ -9349,7 +9349,7 @@ DEFUN ("set-safe-terminal-coding-system-internal",
DEFUN ("terminal-coding-system", Fterminal_coding_system, DEFUN ("terminal-coding-system", Fterminal_coding_system,
Sterminal_coding_system, 0, 1, 0, Sterminal_coding_system, 0, 1, 0,
doc: /* Return coding system specified for terminal output on the given terminal. doc: /* Return coding system specified for terminal output on the given terminal.
TERMINAL may be a terminal id, a frame, or nil for the selected TERMINAL may be a terminal object, a frame, or nil for the selected
frame's terminal device. */) frame's terminal device. */)
(terminal) (terminal)
Lisp_Object terminal; Lisp_Object terminal;
......
...@@ -1880,7 +1880,7 @@ DEFUN ("terminal-local-value", Fterminal_local_value, Sterminal_local_value, 2, ...@@ -1880,7 +1880,7 @@ DEFUN ("terminal-local-value", Fterminal_local_value, Sterminal_local_value, 2,
If SYMBOL is not a terminal-local variable, then return its normal If SYMBOL is not a terminal-local variable, then return its normal
value, like `symbol-value'. value, like `symbol-value'.
TERMINAL may be a terminal id, a frame, or nil (meaning the TERMINAL may be a terminal object, a frame, or nil (meaning the
selected frame's terminal device). */) selected frame's terminal device). */)
(symbol, terminal) (symbol, terminal)
Lisp_Object symbol; Lisp_Object symbol;
...@@ -1899,7 +1899,7 @@ DEFUN ("set-terminal-local-value", Fset_terminal_local_value, Sset_terminal_loca ...@@ -1899,7 +1899,7 @@ DEFUN ("set-terminal-local-value", Fset_terminal_local_value, Sset_terminal_loca
If VARIABLE is not a terminal-local variable, then set its normal If VARIABLE is not a terminal-local variable, then set its normal
binding, like `set'. binding, like `set'.
TERMINAL may be a terminal id, a frame, or nil (meaning the TERMINAL may be a terminal object, a frame, or nil (meaning the
selected frame's terminal device). */) selected frame's terminal device). */)
(symbol, terminal, value) (symbol, terminal, value)
Lisp_Object symbol; Lisp_Object symbol;
......
...@@ -6469,7 +6469,7 @@ DEFUN ("send-string-to-terminal", Fsend_string_to_terminal, ...@@ -6469,7 +6469,7 @@ DEFUN ("send-string-to-terminal", Fsend_string_to_terminal,
Control characters in STRING will have terminal-dependent effects. Control characters in STRING will have terminal-dependent effects.
Optional parameter TERMINAL specifies the tty terminal device to use. Optional parameter TERMINAL specifies the tty terminal device to use.
It may be a terminal id, a frame, or nil for the terminal used by the It may be a terminal object, a frame, or nil for the terminal used by the
currently selected frame. */) currently selected frame. */)
(string, terminal) (string, terminal)
Lisp_Object string; Lisp_Object string;
......
...@@ -11326,8 +11326,8 @@ specially interpreting the top bit. ...@@ -11326,8 +11326,8 @@ specially interpreting the top bit.
This setting only has an effect on tty terminal devices. This setting only has an effect on tty terminal devices.
Optional parameter TERMINAL specifies the tty terminal device to use. Optional parameter TERMINAL specifies the tty terminal device to use.
It may be a terminal id, a frame, or nil for the terminal used by the It may be a terminal object, a frame, or nil for the terminal used by
currently selected frame. the currently selected frame.
See also `current-input-mode'. */) See also `current-input-mode'. */)
(meta, terminal) (meta, terminal)
......
...@@ -247,7 +247,7 @@ check_x_frame (frame) ...@@ -247,7 +247,7 @@ check_x_frame (frame)
} }
/* Let the user specify an X display with a Lisp object. /* Let the user specify an X display with a Lisp object.
OBJECT may be nil, a frame or a terminal id. OBJECT may be nil, a frame or a terminal object.
nil stands for the selected frame--or, if that is not an X frame, nil stands for the selected frame--or, if that is not an X frame,
the first X display on the list. */ the first X display on the list. */
...@@ -268,7 +268,7 @@ check_x_display_info (object) ...@@ -268,7 +268,7 @@ check_x_display_info (object)
else else
error ("X windows are not in use or not initialized"); error ("X windows are not in use or not initialized");
} }
else if (INTEGERP (object)) else if (TERMINALP (object))
{ {
struct terminal *t = get_terminal (object, 1); struct terminal *t = get_terminal (object, 1);
...@@ -3639,7 +3639,7 @@ DEFUN ("x-display-grayscale-p", Fx_display_grayscale_p, Sx_display_grayscale_p, ...@@ -3639,7 +3639,7 @@ DEFUN ("x-display-grayscale-p", Fx_display_grayscale_p, Sx_display_grayscale_p,
doc: /* Return t if the X display supports shades of gray. doc: /* Return t if the X display supports shades of gray.
Note that color displays do support shades of gray. Note that color displays do support shades of gray.
The optional argument TERMINAL specifies which display to ask about. The optional argument TERMINAL specifies which display to ask about.
TERMINAL should be a terminal id, a frame or a display name (a string). TERMINAL should be a terminal object, a frame or a display name (a string).
If omitted or nil, that stands for the selected frame's display. */) If omitted or nil, that stands for the selected frame's display. */)
(terminal) (terminal)
Lisp_Object terminal; Lisp_Object terminal;
...@@ -3668,7 +3668,7 @@ DEFUN ("x-display-pixel-width", Fx_display_pixel_width, Sx_display_pixel_width, ...@@ -3668,7 +3668,7 @@ DEFUN ("x-display-pixel-width", Fx_display_pixel_width, Sx_display_pixel_width,
0, 1, 0, 0, 1, 0,
doc: /* Return the width in pixels of the X display TERMINAL. doc: /* Return the width in pixels of the X display TERMINAL.
The optional argument TERMINAL specifies which display to ask about. The optional argument TERMINAL specifies which display to ask about.
TERMINAL should be a terminal id, a frame or a display name (a string). TERMINAL should be a terminal object, a frame or a display name (a string).
If omitted or nil, that stands for the selected frame's display. */) If omitted or nil, that stands for the selected frame's display. */)
(terminal) (terminal)
Lisp_Object terminal; Lisp_Object terminal;
...@@ -3682,7 +3682,7 @@ DEFUN ("x-display-pixel-height", Fx_display_pixel_height, ...@@ -3682,7 +3682,7 @@ DEFUN ("x-display-pixel-height", Fx_display_pixel_height,
Sx_display_pixel_height, 0, 1, 0, Sx_display_pixel_height, 0, 1, 0,
doc: /* Return the height in pixels of the X display TERMINAL. doc: /* Return the height in pixels of the X display TERMINAL.
The optional argument TERMINAL specifies which display to ask about. The optional argument TERMINAL specifies which display to ask about.
TERMINAL should be a terminal id, a frame or a display name (a string). TERMINAL should be a terminal object, a frame or a display name (a string).
If omitted or nil, that stands for the selected frame's display. */) If omitted or nil, that stands for the selected frame's display. */)
(terminal) (terminal)
Lisp_Object terminal; Lisp_Object terminal;
...@@ -3696,7 +3696,7 @@ DEFUN ("x-display-planes", Fx_display_planes, Sx_display_planes, ...@@ -3696,7 +3696,7 @@ DEFUN ("x-display-planes", Fx_display_planes, Sx_display_planes,
0, 1, 0, 0, 1, 0,
doc: /* Return the number of bitplanes of the X display TERMINAL. doc: /* Return the number of bitplanes of the X display TERMINAL.
The optional argument TERMINAL specifies which display to ask about. The optional argument TERMINAL specifies which display to ask about.
TERMINAL should be a terminal id, a frame or a display name (a string). TERMINAL should be a terminal object, a frame or a display name (a string).
If omitted or nil, that stands for the selected frame's display. */) If omitted or nil, that stands for the selected frame's display. */)
(terminal) (terminal)
Lisp_Object terminal; Lisp_Object terminal;
...@@ -3710,7 +3710,7 @@ DEFUN ("x-display-color-cells", Fx_display_color_cells, Sx_display_color_cells, ...@@ -3710,7 +3710,7 @@ DEFUN ("x-display-color-cells", Fx_display_color_cells, Sx_display_color_cells,
0, 1, 0, 0, 1, 0,
doc: /* Return the number of color cells of the X display TERMINAL. doc: /* Return the number of color cells of the X display TERMINAL.
The optional argument TERMINAL specifies which display to ask about. The optional argument TERMINAL specifies which display to ask about.
TERMINAL should be a terminal id, a frame or a display name (a string). TERMINAL should be a terminal object, a frame or a display name (a string).
If omitted or nil, that stands for the selected frame's display. */) If omitted or nil, that stands for the selected frame's display. */)
(terminal) (terminal)
Lisp_Object terminal; Lisp_Object terminal;
...@@ -3735,7 +3735,7 @@ DEFUN ("x-server-max-request-size", Fx_server_max_request_size, ...@@ -3735,7 +3735,7 @@ DEFUN ("x-server-max-request-size", Fx_server_max_request_size,
0, 1, 0, 0, 1, 0,
doc: /* Return the maximum request size of the X server of display TERMINAL. doc: /* Return the maximum request size of the X server of display TERMINAL.
The optional argument TERMINAL specifies which display to ask about. The optional argument TERMINAL specifies which display to ask about.
TERMINAL should be a terminal id, a frame or a display name (a string). TERMINAL should be a terminal object, a frame or a display name (a string).
If omitted or nil, that stands for the selected frame's display. */) If omitted or nil, that stands for the selected frame's display. */)
(terminal) (terminal)
Lisp_Object terminal; Lisp_Object terminal;
...@@ -3750,7 +3750,7 @@ DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0, ...@@ -3750,7 +3750,7 @@ DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0,
\(Labelling every distributor as a "vendor" embodies the false assumption \(Labelling every distributor as a "vendor" embodies the false assumption
that operating systems cannot be developed and distributed noncommercially.) that operating systems cannot be developed and distributed noncommercially.)
The optional argument TERMINAL specifies which display to ask about. The optional argument TERMINAL specifies which display to ask about.
TERMINAL should be a terminal id, a frame or a display name (a string). TERMINAL should be a terminal object, a frame or a display name (a string).
If omitted or nil, that stands for the selected frame's display. */) If omitted or nil, that stands for the selected frame's display. */)
(terminal) (terminal)
Lisp_Object terminal; Lisp_Object terminal;
...@@ -3769,7 +3769,7 @@ version numbers of the X Protocol in use, and the distributor-specific release ...@@ -3769,7 +3769,7 @@ version numbers of the X Protocol in use, and the distributor-specific release
number. See also the function `x-server-vendor'. number. See also the function `x-server-vendor'.
The optional argument TERMINAL specifies which display to ask about. The optional argument TERMINAL specifies which display to ask about.
TERMINAL should be a terminal id, a frame or a display name (a string). TERMINAL should be a terminal object, a frame or a display name (a string).
If omitted or nil, that stands for the selected frame's display. */) If omitted or nil, that stands for the selected frame's display. */)
(terminal) (terminal)
Lisp_Object terminal; Lisp_Object terminal;
...@@ -3785,7 +3785,7 @@ If omitted or nil, that stands for the selected frame's display. */) ...@@ -3785,7 +3785,7 @@ If omitted or nil, that stands for the selected frame's display. */)
DEFUN ("x-display-screens", Fx_display_screens, Sx_display_screens, 0, 1, 0, DEFUN ("x-display-screens", Fx_display_screens, Sx_display_screens, 0, 1, 0,
doc: /* Return the number of screens on the X server of display TERMINAL. doc: /* Return the number of screens on the X server of display TERMINAL.
The optional argument TERMINAL specifies which display to ask about. The optional argument TERMINAL specifies which display to ask about.
TERMINAL should be a terminal id, a frame or a display name (a string). TERMINAL should be a terminal object, a frame or a display name (a string).
If omitted or nil, that stands for the selected frame's display. */) If omitted or nil, that stands for the selected frame's display. */)
(terminal) (terminal)
Lisp_Object terminal; Lisp_Object terminal;
...@@ -3798,7 +3798,7 @@ If omitted or nil, that stands for the selected frame's display. */) ...@@ -3798,7 +3798,7 @@ If omitted or nil, that stands for the selected frame's display. */)
DEFUN ("x-display-mm-height", Fx_display_mm_height, Sx_display_mm_height, 0, 1, 0, DEFUN ("x-display-mm-height", Fx_display_mm_height, Sx_display_mm_height, 0, 1, 0,
doc: /* Return the height in millimeters of the X display TERMINAL. doc: /* Return the height in millimeters of the X display TERMINAL.
The optional argument TERMINAL specifies which display to ask about. The optional argument TERMINAL specifies which display to ask about.
TERMINAL should be a terminal id, a frame or a display name (a string). TERMINAL should be a terminal object, a frame or a display name (a string).
If omitted or nil, that stands for the selected frame's display. */) If omitted or nil, that stands for the selected frame's display. */)
(terminal) (terminal)
Lisp_Object terminal; Lisp_Object terminal;
...@@ -3811,7 +3811,7 @@ If omitted or nil, that stands for the selected frame's display. */) ...@@ -3811,7 +3811,7 @@ If omitted or nil, that stands for the selected frame's display. */)
DEFUN ("x-display-mm-width", Fx_display_mm_width, Sx_display_mm_width, 0, 1, 0, DEFUN ("x-display-mm-width", Fx_display_mm_width, Sx_display_mm_width, 0, 1, 0,
doc: /* Return the width in millimeters of the X display TERMINAL. doc: /* Return the width in millimeters of the X display TERMINAL.
The optional argument TERMINAL specifies which display to ask about. The optional argument TERMINAL specifies which display to ask about.
TERMINAL should be a terminal id, a frame or a display name (a string). TERMINAL should be a terminal object, a frame or a display name (a string).
If omitted or nil, that stands for the selected frame's display. */) If omitted or nil, that stands for the selected frame's display. */)
(terminal) (terminal)
Lisp_Object terminal; Lisp_Object terminal;
...@@ -3826,7 +3826,7 @@ DEFUN ("x-display-backing-store", Fx_display_backing_store, ...@@ -3826,7 +3826,7 @@ DEFUN ("x-display-backing-store", Fx_display_backing_store,
doc: /* Return an indication of whether X display TERMINAL does backing store. doc: /* Return an indication of whether X display TERMINAL does backing store.
The value may be `always', `when-mapped', or `not-useful'. The value may be `always', `when-mapped', or `not-useful'.
The optional argument TERMINAL specifies which display to ask about. The optional argument TERMINAL specifies which display to ask about.
TERMINAL should be a terminal id, a frame or a display name (a string). TERMINAL should be a terminal object, a frame or a display name (a string).
If omitted or nil, that stands for the selected frame's display. */) If omitted or nil, that stands for the selected frame's display. */)
(terminal) (terminal)
Lisp_Object terminal; Lisp_Object terminal;
...@@ -3863,7 +3863,7 @@ The value is one of the symbols `static-gray', `gray-scale', ...@@ -3863,7 +3863,7 @@ The value is one of the symbols `static-gray', `gray-scale',
`static-color', `pseudo-color', `true-color', or `direct-color'. `static-color', `pseudo-color', `true-color', or `direct-color'.
The optional argument TERMINAL specifies which display to ask about. The optional argument TERMINAL specifies which display to ask about.
TERMINAL should a terminal id, a frame or a display name (a string). TERMINAL should a terminal object, a frame or a display name (a string).
If omitted or nil, that stands for the selected frame's display. */) If omitted or nil, that stands for the selected frame's display. */)
(terminal) (terminal)
Lisp_Object terminal; Lisp_Object terminal;
...@@ -3903,7 +3903,7 @@ DEFUN ("x-display-save-under", Fx_display_save_under, ...@@ -3903,7 +3903,7 @@ DEFUN ("x-display-save-under", Fx_display_save_under,
Sx_display_save_under, 0, 1, 0, Sx_display_save_under, 0, 1, 0,
doc: /* Return t if the X display TERMINAL supports the save-under feature. doc: /* Return t if the X display TERMINAL supports the save-under feature.
The optional argument TERMINAL specifies which display to ask about. The optional argument TERMINAL specifies which display to ask about.
TERMINAL should be a terminal id, a frame or a display name (a string). TERMINAL should be a terminal object, a frame or a display name (a string).
If omitted or nil, that stands for the selected frame's display. */) If omitted or nil, that stands for the selected frame's display. */)
(terminal) (terminal)
Lisp_Object terminal; Lisp_Object terminal;
...@@ -4174,7 +4174,7 @@ An insecure way to solve the problem may be to use `xhost'.\n", ...@@ -4174,7 +4174,7 @@ An insecure way to solve the problem may be to use `xhost'.\n",
DEFUN ("x-close-connection", Fx_close_connection, DEFUN ("x-close-connection", Fx_close_connection,
Sx_close_connection, 1, 1, 0, Sx_close_connection, 1, 1, 0,
doc: /* Close the connection to TERMINAL's X server. doc: /* Close the connection to TERMINAL's X server.
For TERMINAL, specify a terminal id, a frame or a display name (a For TERMINAL, specify a terminal object, a frame or a display name (a
string). If TERMINAL is nil, that stands for the selected frame's string). If TERMINAL is nil, that stands for the selected frame's
terminal. */) terminal. */)
(terminal) (terminal)
...@@ -4210,7 +4210,7 @@ Turning on synchronization prohibits the Xlib routines from buffering ...@@ -4210,7 +4210,7 @@ Turning on synchronization prohibits the Xlib routines from buffering
requests and seriously degrades performance, but makes debugging much requests and seriously degrades performance, but makes debugging much
easier. easier.
The optional second argument TERMINAL specifies which display to act on. The optional second argument TERMINAL specifies which display to act on.
TERMINAL should be a terminal id, a frame or a display name (a string). TERMINAL should be a terminal object, a frame or a display name (a string).
If TERMINAL is omitted or nil, that stands for the selected frame's display. */) If TERMINAL is omitted or nil, that stands for the selected frame's display. */)
(on, terminal) (on, terminal)
Lisp_Object terminal, on; Lisp_Object terminal, on;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment