[Emacs-diffs] /srv/bzr/emacs/trunk r107241: Fix bug #10783 with w32 doc string of x-selection-exists-p.

[Eli Zaretskii]

------------------------------------------------------------
revno: 107241
fixes bug(s): http://debbugs.gnu.org/10783
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Sat 2012-02-11 11:50:27 +0200
message:
  Fix bug #10783 with w32 doc string of x-selection-exists-p.
  
   src/w32select.c (Fx_selection_exists_p): Sync doc string and
   argument list with xselect.c.
modified:
  src/ChangeLog
  src/w32select.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2012-02-11 09:38:41 +0000
+++ b/src/ChangeLog     2012-02-11 09:50:27 +0000
@@ -1,7 +1,10 @@
 2012-02-11  Eli Zaretskii  <address@hidden>
 
-       * w16select.c (Fx_selection_exists_p): Sync doc string with
-       xselect.c.  (Bug#10783)
+       * w32select.c (Fx_selection_exists_p): Sync doc string and
+       argument list with xselect.c.  (Bug#10783)
+
+       * w16select.c (Fx_selection_exists_p): Sync doc string and
+       argument list with xselect.c.  (Bug#10783)
 
 2012-02-10  Glenn Morris  <address@hidden>
 

=== modified file 'src/w32select.c'
--- a/src/w32select.c   2012-01-19 07:21:25 +0000
+++ b/src/w32select.c   2012-02-11 09:50:27 +0000
@@ -1009,14 +1009,17 @@
 /* Support checking for a clipboard selection. */
 
 DEFUN ("x-selection-exists-p", Fx_selection_exists_p, Sx_selection_exists_p,
-       0, 1, 0,
-       doc: /* Whether there is an owner for the given X Selection.
-The arg should be the name of the selection in question, typically one of
-the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'.
-\(Those are literal upper-case symbol names, since that's what X expects.)
-For convenience, the symbol nil is the same as `PRIMARY',
-and t is the same as `SECONDARY'.  */)
-  (Lisp_Object selection)
+       0, 2, 0,
+       doc: /* Whether there is an owner for the given X selection.
+SELECTION should be the name of the selection in question, typically
+one of the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'.  (X expects
+these literal upper-case names.)  The symbol nil is the same as
+`PRIMARY', and t is the same as `SECONDARY'.
+
+TERMINAL should be a terminal object or a frame specifying the X
+server to query.  If omitted or nil, that stands for the selected
+frame's display, or the first available X display.  */)
+  (Lisp_Object selection, Lisp_Object terminal)
 {
   CHECK_SYMBOL (selection);