diff options
| author | YAMAMOTO Mitsuharu | 2005-07-23 07:50:27 +0000 |
|---|---|---|
| committer | YAMAMOTO Mitsuharu | 2005-07-23 07:50:27 +0000 |
| commit | 99f963e4ea6fa3ca4498731c271d07914e86ea1d (patch) | |
| tree | 4bc9c4cc1bc6862e57f9dfd799418bc0113f9b76 /src/macselect.c | |
| parent | 50971a123a9ccca43497c008305de55cb2203fa1 (diff) | |
| download | emacs-99f963e4ea6fa3ca4498731c271d07914e86ea1d.tar.gz emacs-99f963e4ea6fa3ca4498731c271d07914e86ea1d.zip | |
(Fx_own_selection_internal): Follow error conventions.
(Fx_get_selection_internal, Fx_selection_owner_p)
(Fx_selection_exists_p): Doc fixes. (syms_of_macselect)
<selection-converter-alist>: Likewise.
Diffstat (limited to 'src/macselect.c')
| -rw-r--r-- | src/macselect.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/macselect.c b/src/macselect.c index 94fe591a206..63221ba3a90 100644 --- a/src/macselect.c +++ b/src/macselect.c | |||
| @@ -712,7 +712,7 @@ anything that the functions on `selection-converter-alist' know about. */) | |||
| 712 | { | 712 | { |
| 713 | check_mac (); | 713 | check_mac (); |
| 714 | CHECK_SYMBOL (selection_name); | 714 | CHECK_SYMBOL (selection_name); |
| 715 | if (NILP (selection_value)) error ("selection-value may not be nil"); | 715 | if (NILP (selection_value)) error ("SELECTION-VALUE may not be nil"); |
| 716 | x_own_selection (selection_name, selection_value); | 716 | x_own_selection (selection_name, selection_value); |
| 717 | return selection_value; | 717 | return selection_value; |
| 718 | } | 718 | } |
| @@ -724,11 +724,11 @@ anything that the functions on `selection-converter-alist' know about. */) | |||
| 724 | 724 | ||
| 725 | DEFUN ("x-get-selection-internal", Fx_get_selection_internal, | 725 | DEFUN ("x-get-selection-internal", Fx_get_selection_internal, |
| 726 | Sx_get_selection_internal, 2, 3, 0, | 726 | Sx_get_selection_internal, 2, 3, 0, |
| 727 | doc: /* Return text selected from some Mac window. | 727 | doc: /* Return text selected from some Mac application. |
| 728 | SELECTION is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'. | 728 | SELECTION is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'. |
| 729 | TYPE is the type of data desired, typically `STRING'. | 729 | TYPE is the type of data desired, typically `STRING'. |
| 730 | TIME_STAMP is ignored on Mac. */) | 730 | TIME_STAMP is ignored on Mac. */) |
| 731 | (selection_symbol, target_type, time_stamp) | 731 | (selection_symbol, target_type, time_stamp) |
| 732 | Lisp_Object selection_symbol, target_type, time_stamp; | 732 | Lisp_Object selection_symbol, target_type, time_stamp; |
| 733 | { | 733 | { |
| 734 | Lisp_Object val = Qnil; | 734 | Lisp_Object val = Qnil; |
| @@ -821,7 +821,7 @@ Disowning it means there is no such selection. */) | |||
| 821 | 821 | ||
| 822 | DEFUN ("x-selection-owner-p", Fx_selection_owner_p, Sx_selection_owner_p, | 822 | DEFUN ("x-selection-owner-p", Fx_selection_owner_p, Sx_selection_owner_p, |
| 823 | 0, 1, 0, | 823 | 0, 1, 0, |
| 824 | doc: /* Whether the current Emacs process owns the given Selection. | 824 | doc: /* Whether the current Emacs process owns the given SELECTION. |
| 825 | The arg should be the name of the selection in question, typically one of | 825 | The arg should be the name of the selection in question, typically one of |
| 826 | the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'. | 826 | the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'. |
| 827 | For convenience, the symbol nil is the same as `PRIMARY', | 827 | For convenience, the symbol nil is the same as `PRIMARY', |
| @@ -866,7 +866,7 @@ and t is the same as `SECONDARY'. */) | |||
| 866 | 866 | ||
| 867 | DEFUN ("x-selection-exists-p", Fx_selection_exists_p, Sx_selection_exists_p, | 867 | DEFUN ("x-selection-exists-p", Fx_selection_exists_p, Sx_selection_exists_p, |
| 868 | 0, 1, 0, | 868 | 0, 1, 0, |
| 869 | doc: /* Whether there is an owner for the given Selection. | 869 | doc: /* Whether there is an owner for the given SELECTION. |
| 870 | The arg should be the name of the selection in question, typically one of | 870 | The arg should be the name of the selection in question, typically one of |
| 871 | the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'. | 871 | the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'. |
| 872 | For convenience, the symbol nil is the same as `PRIMARY', | 872 | For convenience, the symbol nil is the same as `PRIMARY', |
| @@ -1077,7 +1077,7 @@ a desired type to which the selection should be converted; | |||
| 1077 | and the local selection value (whatever was given to `x-own-selection'). | 1077 | and the local selection value (whatever was given to `x-own-selection'). |
| 1078 | 1078 | ||
| 1079 | The function should return the value to send to the Scrap Manager | 1079 | The function should return the value to send to the Scrap Manager |
| 1080 | \(a string). A return value of nil | 1080 | \(must be a string). A return value of nil |
| 1081 | means that the conversion could not be done. | 1081 | means that the conversion could not be done. |
| 1082 | A return value which is the symbol `NULL' | 1082 | A return value which is the symbol `NULL' |
| 1083 | means that a side-effect was executed, | 1083 | means that a side-effect was executed, |