Mercurial > emacs
changeset 103052:e68707cf48a5
* 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.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Wed, 22 Apr 2009 04:32:21 +0000 |
| parents | ccf9a356f1a1 |
| children | 384db4f6fc8a |
| files | src/ChangeLog src/coding.c src/data.c src/dispnew.c src/keyboard.c src/xfns.c |
| diffstat | 6 files changed, 44 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Apr 22 04:23:09 2009 +0000 +++ b/src/ChangeLog Wed Apr 22 04:32:21 2009 +0000 @@ -1,5 +1,25 @@ 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) (Ftty_type, Fcontrolling_tty_p, Ftty_no_underline, Fsuspend_tty) (Fresume_tty, Vsuspend_tty_functions, Vresume_tty_functions): Doc
--- a/src/coding.c Wed Apr 22 04:23:09 2009 +0000 +++ b/src/coding.c Wed Apr 22 04:32:21 2009 +0000 @@ -9349,7 +9349,7 @@ DEFUN ("terminal-coding-system", Fterminal_coding_system, Sterminal_coding_system, 0, 1, 0, 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. */) (terminal) Lisp_Object terminal;
--- a/src/data.c Wed Apr 22 04:23:09 2009 +0000 +++ b/src/data.c Wed Apr 22 04:32:21 2009 +0000 @@ -1880,7 +1880,7 @@ If SYMBOL is not a terminal-local variable, then return its normal 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). */) (symbol, terminal) Lisp_Object symbol; @@ -1899,7 +1899,7 @@ If VARIABLE is not a terminal-local variable, then set its normal 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). */) (symbol, terminal, value) Lisp_Object symbol;
--- a/src/dispnew.c Wed Apr 22 04:23:09 2009 +0000 +++ b/src/dispnew.c Wed Apr 22 04:32:21 2009 +0000 @@ -6469,7 +6469,7 @@ Control characters in STRING will have terminal-dependent effects. 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. */) (string, terminal) Lisp_Object string;
--- a/src/keyboard.c Wed Apr 22 04:23:09 2009 +0000 +++ b/src/keyboard.c Wed Apr 22 04:32:21 2009 +0000 @@ -11326,8 +11326,8 @@ This setting only has an effect on tty terminal devices. 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 -currently selected frame. +It may be a terminal object, a frame, or nil for the terminal used by +the currently selected frame. See also `current-input-mode'. */) (meta, terminal)
--- a/src/xfns.c Wed Apr 22 04:23:09 2009 +0000 +++ b/src/xfns.c Wed Apr 22 04:32:21 2009 +0000 @@ -247,7 +247,7 @@ } /* 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, the first X display on the list. */ @@ -268,7 +268,7 @@ else 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); @@ -3639,7 +3639,7 @@ doc: /* Return t if the X display supports shades of gray. Note that color displays do support shades of gray. 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. */) (terminal) Lisp_Object terminal; @@ -3668,7 +3668,7 @@ 0, 1, 0, doc: /* Return the width in pixels of the X display TERMINAL. 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. */) (terminal) Lisp_Object terminal; @@ -3682,7 +3682,7 @@ Sx_display_pixel_height, 0, 1, 0, doc: /* Return the height in pixels of the X display TERMINAL. 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. */) (terminal) Lisp_Object terminal; @@ -3696,7 +3696,7 @@ 0, 1, 0, doc: /* Return the number of bitplanes of the X display TERMINAL. 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. */) (terminal) Lisp_Object terminal; @@ -3710,7 +3710,7 @@ 0, 1, 0, doc: /* Return the number of color cells of the X display TERMINAL. 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. */) (terminal) Lisp_Object terminal; @@ -3735,7 +3735,7 @@ 0, 1, 0, doc: /* Return the maximum request size of the X server of display TERMINAL. 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. */) (terminal) Lisp_Object terminal; @@ -3750,7 +3750,7 @@ \(Labelling every distributor as a "vendor" embodies the false assumption that operating systems cannot be developed and distributed noncommercially.) 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. */) (terminal) Lisp_Object terminal; @@ -3769,7 +3769,7 @@ number. See also the function `x-server-vendor'. 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. */) (terminal) Lisp_Object terminal; @@ -3785,7 +3785,7 @@ 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. 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. */) (terminal) Lisp_Object terminal; @@ -3798,7 +3798,7 @@ 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. 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. */) (terminal) Lisp_Object terminal; @@ -3811,7 +3811,7 @@ 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. 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. */) (terminal) Lisp_Object terminal; @@ -3826,7 +3826,7 @@ doc: /* Return an indication of whether X display TERMINAL does backing store. The value may be `always', `when-mapped', or `not-useful'. 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. */) (terminal) Lisp_Object terminal; @@ -3863,7 +3863,7 @@ `static-color', `pseudo-color', `true-color', or `direct-color'. 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. */) (terminal) Lisp_Object terminal; @@ -3903,7 +3903,7 @@ Sx_display_save_under, 0, 1, 0, doc: /* Return t if the X display TERMINAL supports the save-under feature. 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. */) (terminal) Lisp_Object terminal; @@ -4174,7 +4174,7 @@ DEFUN ("x-close-connection", Fx_close_connection, Sx_close_connection, 1, 1, 0, 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 terminal. */) (terminal) @@ -4210,7 +4210,7 @@ requests and seriously degrades performance, but makes debugging much easier. 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. */) (on, terminal) Lisp_Object terminal, on;