summaryrefslogtreecommitdiff
path: root/src/macselect.c
diff options
context:
space:
mode:
authorYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>2005-07-23 07:48:43 +0000
committerYAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>2005-07-23 07:48:43 +0000
commit7a11b872f8825ba3f7ce84dbd4f59aacbbd2d767 (patch)
treefffe8c06d6f1a64277acc891e9ce9d8b88038566 /src/macselect.c
parenta8e6b881a7ea15e3b6365aa663b3aa7313050e75 (diff)
downloademacs-7a11b872f8825ba3f7ce84dbd4f59aacbbd2d767.tar.gz
(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.c12
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. */)
{
check_mac ();
CHECK_SYMBOL (selection_name);
- if (NILP (selection_value)) error ("selection-value may not be nil");
+ if (NILP (selection_value)) error ("SELECTION-VALUE may not be nil");
x_own_selection (selection_name, selection_value);
return selection_value;
}
@@ -724,11 +724,11 @@ anything that the functions on `selection-converter-alist' know about. */)
DEFUN ("x-get-selection-internal", Fx_get_selection_internal,
Sx_get_selection_internal, 2, 3, 0,
- doc: /* Return text selected from some Mac window.
+ doc: /* Return text selected from some Mac application.
SELECTION is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'.
TYPE is the type of data desired, typically `STRING'.
TIME_STAMP is ignored on Mac. */)
- (selection_symbol, target_type, time_stamp)
+ (selection_symbol, target_type, time_stamp)
Lisp_Object selection_symbol, target_type, time_stamp;
{
Lisp_Object val = Qnil;
@@ -821,7 +821,7 @@ Disowning it means there is no such selection. */)
DEFUN ("x-selection-owner-p", Fx_selection_owner_p, Sx_selection_owner_p,
0, 1, 0,
- doc: /* Whether the current Emacs process owns the given Selection.
+ doc: /* Whether the current Emacs process owns the given SELECTION.
The arg should be the name of the selection in question, typically one of
the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'.
For convenience, the symbol nil is the same as `PRIMARY',
@@ -866,7 +866,7 @@ and t is the same as `SECONDARY'. */)
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 Selection.
+ doc: /* Whether there is an owner for the given SELECTION.
The arg should be the name of the selection in question, typically one of
the symbols `PRIMARY', `SECONDARY', or `CLIPBOARD'.
For convenience, the symbol nil is the same as `PRIMARY',
@@ -1077,7 +1077,7 @@ a desired type to which the selection should be converted;
and the local selection value (whatever was given to `x-own-selection').
The function should return the value to send to the Scrap Manager
-\(a string). A return value of nil
+\(must be a string). A return value of nil
means that the conversion could not be done.
A return value which is the symbol `NULL'
means that a side-effect was executed,