Mercurial > emacs
changeset 57765:77c93cbb1721
(Fx_server_vendor, Fx_server_version): Doc fixes.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Thu, 28 Oct 2004 06:37:48 +0000 |
| parents | b4f2fd007dda |
| children | 49c3962f983c |
| files | src/w32fns.c src/xfns.c |
| diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/w32fns.c Thu Oct 28 06:09:55 2004 +0000 +++ b/src/w32fns.c Thu Oct 28 06:37:48 2004 +0000 @@ -6398,7 +6398,7 @@ } DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0, - doc: /* Returns the vendor ID string of the W32 system (Microsoft). + doc: /* Returns the "vendor ID" string of the W32 system (Microsoft). The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) @@ -6411,7 +6411,7 @@ DEFUN ("x-server-version", Fx_server_version, Sx_server_version, 0, 1, 0, doc: /* Returns the version numbers of the server of DISPLAY. The value is a list of three integers: the major and minor -version numbers, and the vendor-specific release +version numbers of the X Protocol in use, and the distributor-specific release number. See also the function `x-server-vendor'. The optional argument DISPLAY specifies which display to ask about.
--- a/src/xfns.c Thu Oct 28 06:09:55 2004 +0000 +++ b/src/xfns.c Thu Oct 28 06:37:48 2004 +0000 @@ -3499,7 +3499,9 @@ } DEFUN ("x-server-vendor", Fx_server_vendor, Sx_server_vendor, 0, 1, 0, - doc: /* Returns the vendor ID string of the X server of display DISPLAY. + doc: /* Returns the "vendor ID" string of the X server of display DISPLAY. +\(Labelling every distributor as a "vendor" embodies the false assumption +that operating systems cannot be developed and distributed noncommercially.) The optional argument DISPLAY specifies which display to ask about. DISPLAY should be either a frame or a display name (a string). If omitted or nil, that stands for the selected frame's display. */) @@ -3516,7 +3518,7 @@ DEFUN ("x-server-version", Fx_server_version, Sx_server_version, 0, 1, 0, doc: /* Returns the version numbers of the X server of display DISPLAY. The value is a list of three integers: the major and minor -version numbers of the X Protocol in use, and the vendor-specific release +version numbers of the X Protocol in use, and the distributor-specific release number. See also the function `x-server-vendor'. The optional argument DISPLAY specifies which display to ask about.