[Emacs-diffs] Changes to emacs/src/xfns.c

[Richard M . Stallman]

Index: emacs/src/xfns.c
diff -c emacs/src/xfns.c:1.618 emacs/src/xfns.c:1.619
*** emacs/src/xfns.c:1.618      Tue Oct 26 19:47:36 2004
--- emacs/src/xfns.c    Thu Oct 28 06:33:10 2004
***************
*** 3499,3505 ****
  }
  
  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.
  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.  */)
--- 3499,3507 ----
  }
  
  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.
! \(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,3522 ****
  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
  number.  See also the function `x-server-vendor'.
  
  The optional argument DISPLAY specifies which display to ask about.
--- 3518,3524 ----
  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 distributor-specific release
  number.  See also the function `x-server-vendor'.
  
  The optional argument DISPLAY specifies which display to ask about.