diff options
| author | Eli Zaretskii | 2012-02-11 11:50:27 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2012-02-11 11:50:27 +0200 |
| commit | 1c0ca0b7213b944d25fc55249b7ed0253d8961aa (patch) | |
| tree | ebd40dae917e639903f67f28e4e00de1a2967551 /src | |
| parent | 90b671e27414c98e98258e127098922481c1c061 (diff) | |
| download | emacs-1c0ca0b7213b944d25fc55249b7ed0253d8961aa.tar.gz emacs-1c0ca0b7213b944d25fc55249b7ed0253d8961aa.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | 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 @@ | |||
| 1 | 2012-02-11 Eli Zaretskii <eliz@gnu.org> | 1 | 2012-02-11 Eli Zaretskii <eliz@gnu.org> |
| 2 | 2 | ||
| 3 | * w16select.c (Fx_selection_exists_p): Sync doc string with | 3 | * w32select.c (Fx_selection_exists_p): Sync doc string and |
| 4 | xselect.c. (Bug#10783) | 4 | argument list with xselect.c. (Bug#10783) |
| 5 | |||
| 6 | * w16select.c (Fx_selection_exists_p): Sync doc string and | ||
| 7 | argument list with xselect.c. (Bug#10783) | ||
| 5 | 8 | ||
| 6 | 2012-02-10 Glenn Morris <rgm@gnu.org> | 9 | 2012-02-10 Glenn Morris <rgm@gnu.org> |
| 7 | 10 | ||
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, | |||
| 1009 | /* Support checking for a clipboard selection. */ | 1009 | /* Support checking for a clipboard selection. */ |
| 1010 | 1010 | ||
| 1011 | DEFUN ("x-selection-exists-p", Fx_selection_exists_p, Sx_selection_exists_p, | 1011 | DEFUN ("x-selection-exists-p", Fx_selection_exists_p, Sx_selection_exists_p, |
| 1012 | 0, 1, 0, | 1012 | 0, 2, 0, |
| 1013 | doc: /* Whether there is an owner for the given X Selection. | 1013 | doc: /* Whether there is an owner for the given X selection. |
| 1014 | The arg should be the name of the selection in question, typically one of | 1014 | SELECTION should be the name of the selection in question, typically |
| 1015 | the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'. | 1015 | one of the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'. (X expects |
| 1016 | \(Those are literal upper-case symbol names, since that's what X expects.) | 1016 | these literal upper-case names.) The symbol nil is the same as |
| 1017 | For convenience, the symbol nil is the same as `PRIMARY', | 1017 | `PRIMARY', and t is the same as `SECONDARY'. |
| 1018 | and t is the same as `SECONDARY'. */) | 1018 | |
| 1019 | (Lisp_Object selection) | 1019 | TERMINAL should be a terminal object or a frame specifying the X |
| 1020 | server to query. If omitted or nil, that stands for the selected | ||
| 1021 | frame's display, or the first available X display. */) | ||
| 1022 | (Lisp_Object selection, Lisp_Object terminal) | ||
| 1020 | { | 1023 | { |
| 1021 | CHECK_SYMBOL (selection); | 1024 | CHECK_SYMBOL (selection); |
| 1022 | 1025 | ||