From 1c0ca0b7213b944d25fc55249b7ed0253d8961aa Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Sat, 11 Feb 2012 11:50:27 +0200 Subject: [PATCH] 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. --- src/ChangeLog | 7 +++++-- src/w32select.c | 19 +++++++++++-------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index a3fc046ddb5..30e81707642 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,7 +1,10 @@ 2012-02-11 Eli Zaretskii - * 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 diff --git a/src/w32select.c b/src/w32select.c index c60376b3a91..699c72b71a8 100644 --- a/src/w32select.c +++ b/src/w32select.c @@ -1009,14 +1009,17 @@ DEFUN ("w32-get-clipboard-data", Fw32_get_clipboard_data, /* 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); -- 2.39.2