aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2012-02-11 11:38:41 +0200
committerEli Zaretskii2012-02-11 11:38:41 +0200
commit90b671e27414c98e98258e127098922481c1c061 (patch)
tree0d1a158bcde6c490572c1ad0a4fa4ef49e565340 /src
parent355cabc6c7c568a89a464c89c3110db4194ec08a (diff)
downloademacs-90b671e27414c98e98258e127098922481c1c061.tar.gz
emacs-90b671e27414c98e98258e127098922481c1c061.zip
Sync MS-DOS selection-related doc strings with X doc strings.
lisp/term/pc-win.el (x-select-text, x-selection-owner-p) (x-own-selection-internal, x-disown-selection-internal) (x-get-selection-internal): Sync doc strings and argument lists with xselect.c, common-win.el and x-win.el. (Bug#10783) src/w16select.c (Fx_selection_exists_p): Sync doc string with xselect.c. (Bug#10783)
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/w16select.c19
2 files changed, 16 insertions, 8 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 61828474d5e..a3fc046ddb5 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12012-02-11 Eli Zaretskii <eliz@gnu.org>
2
3 * w16select.c (Fx_selection_exists_p): Sync doc string with
4 xselect.c. (Bug#10783)
5
12012-02-10 Glenn Morris <rgm@gnu.org> 62012-02-10 Glenn Morris <rgm@gnu.org>
2 7
3 * fns.c (Fsecure_hash): Doc fix. 8 * fns.c (Fsecure_hash): Doc fix.
diff --git a/src/w16select.c b/src/w16select.c
index 185bf252895..03f63bedf0d 100644
--- a/src/w16select.c
+++ b/src/w16select.c
@@ -637,14 +637,17 @@ DEFUN ("w16-get-clipboard-data", Fw16_get_clipboard_data, Sw16_get_clipboard_dat
637/* Support checking for a clipboard selection. */ 637/* Support checking for a clipboard selection. */
638 638
639DEFUN ("x-selection-exists-p", Fx_selection_exists_p, Sx_selection_exists_p, 639DEFUN ("x-selection-exists-p", Fx_selection_exists_p, Sx_selection_exists_p,
640 0, 1, 0, 640 0, 2, 0,
641 doc: /* Whether there is an owner for the given X Selection. 641 doc: /* Whether there is an owner for the given X selection.
642The arg should be the name of the selection in question, typically one of 642SELECTION should be the name of the selection in question, typically
643the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'. 643one of the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'. (X expects
644\(Those are literal upper-case symbol names, since that's what X expects.) 644these literal upper-case names.) The symbol nil is the same as
645For convenience, the symbol nil is the same as `PRIMARY', 645`PRIMARY', and t is the same as `SECONDARY'.
646and t is the same as `SECONDARY'. */) 646
647 (Lisp_Object selection) 647TERMINAL should be a terminal object or a frame specifying the X
648server to query. If omitted or nil, that stands for the selected
649frame's display, or the first available X display. */)
650 (Lisp_Object selection, Lisp_Object terminal)
648{ 651{
649 CHECK_SYMBOL (selection); 652 CHECK_SYMBOL (selection);
650 653