aboutsummaryrefslogtreecommitdiffstats
path: root/src/xselect.c
diff options
context:
space:
mode:
authorGlenn Morris2012-02-11 19:13:13 -0800
committerGlenn Morris2012-02-11 19:13:13 -0800
commitbd7da63eec720259e9c45216d3db169a610c9726 (patch)
tree6754caa92bae3c69903f7ced080e71a82f3db672 /src/xselect.c
parent27463e3eae155f5021ebfc1ca55396f3682975c8 (diff)
downloademacs-bd7da63eec720259e9c45216d3db169a610c9726.tar.gz
emacs-bd7da63eec720259e9c45216d3db169a610c9726.zip
Yet more syncing of xselect docs and argument specs
* src/xselect.c (Fx_own_selection_internal) (Fx_get_selection_internal, Fx_disown_selection_internal) (Fx_selection_owner_p, Fx_selection_exists_p): Doc fixes. * src/nsselect.m (Fx_own_selection_internal) (Fx_disown_selection_internal, Fx_selection_exists_p) (Fx_selection_owner_p, Fx_get_selection_internal): Sync docs and argument specs with the xselect.c versions. * lisp/term/pc-win.el (x-selection-owner-p, x-own-selection-internal) (x-disown-selection-internal, x-get-selection-internal): Sync docs with the xselect.c versions.
Diffstat (limited to 'src/xselect.c')
-rw-r--r--src/xselect.c31
1 files changed, 23 insertions, 8 deletions
diff --git a/src/xselect.c b/src/xselect.c
index 85c9c40cc34..49955f03fd0 100644
--- a/src/xselect.c
+++ b/src/xselect.c
@@ -1982,7 +1982,9 @@ VALUE is typically a string, or a cons of two markers, but may be
1982anything that the functions on `selection-converter-alist' know about. 1982anything that the functions on `selection-converter-alist' know about.
1983 1983
1984FRAME should be a frame that should own the selection. If omitted or 1984FRAME should be a frame that should own the selection. If omitted or
1985nil, it defaults to the selected frame. */) 1985nil, it defaults to the selected frame.
1986
1987On Nextstep, FRAME is unused. */)
1986 (Lisp_Object selection, Lisp_Object value, Lisp_Object frame) 1988 (Lisp_Object selection, Lisp_Object value, Lisp_Object frame)
1987{ 1989{
1988 if (NILP (frame)) frame = selected_frame; 1990 if (NILP (frame)) frame = selected_frame;
@@ -2003,15 +2005,18 @@ nil, it defaults to the selected frame. */)
2003DEFUN ("x-get-selection-internal", Fx_get_selection_internal, 2005DEFUN ("x-get-selection-internal", Fx_get_selection_internal,
2004 Sx_get_selection_internal, 2, 4, 0, 2006 Sx_get_selection_internal, 2, 4, 0,
2005 doc: /* Return text selected from some X window. 2007 doc: /* Return text selected from some X window.
2006SELECTION is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'. 2008SELECTION-SYMBOL is typically `PRIMARY', `SECONDARY', or `CLIPBOARD'.
2007\(Those are literal upper-case symbol names, since that's what X expects.) 2009\(Those are literal upper-case symbol names, since that's what X expects.)
2008TYPE is the type of data desired, typically `STRING'. 2010TARGET-TYPE is the type of data desired, typically `STRING'.
2009TIME_STAMP is the time to use in the XConvertSelection call for foreign 2011
2012TIME-STAMP is the time to use in the XConvertSelection call for foreign
2010selections. If omitted, defaults to the time for the last event. 2013selections. If omitted, defaults to the time for the last event.
2011 2014
2012TERMINAL should be a terminal object or a frame specifying the X 2015TERMINAL should be a terminal object or a frame specifying the X
2013server to query. If omitted or nil, that stands for the selected 2016server to query. If omitted or nil, that stands for the selected
2014frame's display, or the first available X display. */) 2017frame's display, or the first available X display.
2018
2019On Nextstep, TIME-STAMP and TERMINAL are unused. */)
2015 (Lisp_Object selection_symbol, Lisp_Object target_type, 2020 (Lisp_Object selection_symbol, Lisp_Object target_type,
2016 Lisp_Object time_stamp, Lisp_Object terminal) 2021 Lisp_Object time_stamp, Lisp_Object terminal)
2017{ 2022{
@@ -2052,9 +2057,15 @@ DEFUN ("x-disown-selection-internal", Fx_disown_selection_internal,
2052 doc: /* If we own the selection SELECTION, disown it. 2057 doc: /* If we own the selection SELECTION, disown it.
2053Disowning it means there is no such selection. 2058Disowning it means there is no such selection.
2054 2059
2060Sets the last-change time for the selection to TIME-OBJECT (by default
2061the time of the last event).
2062
2055TERMINAL should be a terminal object or a frame specifying the X 2063TERMINAL should be a terminal object or a frame specifying the X
2056server to query. If omitted or nil, that stands for the selected 2064server to query. If omitted or nil, that stands for the selected
2057frame's display, or the first available X display. */) 2065frame's display, or the first available X display.
2066
2067On Nextstep, the TIME-OBJECT and TERMINAL arguments are unused.
2068On MS-DOS, all this does is return non-nil if we own the selection. */)
2058 (Lisp_Object selection, Lisp_Object time_object, Lisp_Object terminal) 2069 (Lisp_Object selection, Lisp_Object time_object, Lisp_Object terminal)
2059{ 2070{
2060 Time timestamp; 2071 Time timestamp;
@@ -2110,7 +2121,9 @@ and t is the same as `SECONDARY'.
2110 2121
2111TERMINAL should be a terminal object or a frame specifying the X 2122TERMINAL should be a terminal object or a frame specifying the X
2112server to query. If omitted or nil, that stands for the selected 2123server to query. If omitted or nil, that stands for the selected
2113frame's display, or the first available X display. */) 2124frame's display, or the first available X display.
2125
2126On Nextstep, TERMINAL is unused. */)
2114 (Lisp_Object selection, Lisp_Object terminal) 2127 (Lisp_Object selection, Lisp_Object terminal)
2115{ 2128{
2116 struct frame *f = frame_for_x_selection (terminal); 2129 struct frame *f = frame_for_x_selection (terminal);
@@ -2135,7 +2148,9 @@ these literal upper-case names.) The symbol nil is the same as
2135 2148
2136TERMINAL should be a terminal object or a frame specifying the X 2149TERMINAL should be a terminal object or a frame specifying the X
2137server to query. If omitted or nil, that stands for the selected 2150server to query. If omitted or nil, that stands for the selected
2138frame's display, or the first available X display. */) 2151frame's display, or the first available X display.
2152
2153On Nextstep, TERMINAL is unused. */)
2139 (Lisp_Object selection, Lisp_Object terminal) 2154 (Lisp_Object selection, Lisp_Object terminal)
2140{ 2155{
2141 Window owner; 2156 Window owner;