aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorGlenn Morris2012-02-11 19:13:13 -0800
committerGlenn Morris2012-02-11 19:13:13 -0800
commitbd7da63eec720259e9c45216d3db169a610c9726 (patch)
tree6754caa92bae3c69903f7ced080e71a82f3db672 /lisp
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 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/term/pc-win.el29
2 files changed, 25 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5b3cf699cb5..3dabef53ebb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12012-02-12 Glenn Morris <rgm@gnu.org> 12012-02-12 Glenn Morris <rgm@gnu.org>
2 2
3 * term/pc-win.el (x-selection-owner-p, x-own-selection-internal)
4 (x-disown-selection-internal, x-get-selection-internal):
5 Sync docs with the xselect.c versions.
6
3 * allout-widgets.el: Add missing license notice. 7 * allout-widgets.el: Add missing license notice.
4 8
52012-02-11 Glenn Morris <rgm@gnu.org> 92012-02-11 Glenn Morris <rgm@gnu.org>
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index 9bd772be9a8..fc86d4179b6 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -259,7 +259,9 @@ and t is the same as `SECONDARY'.
259 259
260TERMINAL should be a terminal object or a frame specifying the X 260TERMINAL should be a terminal object or a frame specifying the X
261server to query. If omitted or nil, that stands for the selected 261server to query. If omitted or nil, that stands for the selected
262frame's display, or the first available X display." 262frame's display, or the first available X display.
263
264On Nextstep, TERMINAL is unused."
263 (if x-select-enable-clipboard 265 (if x-select-enable-clipboard
264 (let (text) 266 (let (text)
265 ;; Don't die if w16-get-clipboard-data signals an error. 267 ;; Don't die if w16-get-clipboard-data signals an error.
@@ -285,7 +287,9 @@ VALUE is typically a string, or a cons of two markers, but may be
285anything that the functions on `selection-converter-alist' know about. 287anything that the functions on `selection-converter-alist' know about.
286 288
287FRAME should be a frame that should own the selection. If omitted or 289FRAME should be a frame that should own the selection. If omitted or
288nil, it defaults to the selected frame." 290nil, it defaults to the selected frame.
291
292On Nextstep, FRAME is unused."
289 (ignore-errors 293 (ignore-errors
290 (x-select-text value)) 294 (x-select-text value))
291 value) 295 value)
@@ -294,24 +298,33 @@ nil, it defaults to the selected frame."
294 "If we own the selection SELECTION, disown it. 298 "If we own the selection SELECTION, disown it.
295Disowning it means there is no such selection. 299Disowning it means there is no such selection.
296 300
301Sets the last-change time for the selection to TIME-OBJECT (by default
302the time of the last event).
303
297TERMINAL should be a terminal object or a frame specifying the X 304TERMINAL should be a terminal object or a frame specifying the X
298server to query. If omitted or nil, that stands for the selected 305server to query. If omitted or nil, that stands for the selected
299frame's display, or the first available X display." 306frame's display, or the first available X display.
307
308On Nextstep, the TIME-OBJECT and TERMINAL arguments are unused.
309On MS-DOS, all this does is return non-nil if we own the selection."
300 (if (x-selection-owner-p selection) 310 (if (x-selection-owner-p selection)
301 t)) 311 t))
302 312
303;; x-get-selection-internal is used in select.el 313;; x-get-selection-internal is used in select.el
304(defun x-get-selection-internal (selection-symbol target-type &optional time_stamp terminal) 314(defun x-get-selection-internal (selection-symbol target-type &optional time-stamp terminal)
305 "Return text selected from some X window. 315 "Return text selected from some X window.
306SELECTION is a symbol, typically `PRIMARY', `SECONDARY', or `CLIPBOARD'. 316SELECTION-SYMBOL is typically `PRIMARY', `SECONDARY', or `CLIPBOARD'.
307\(Those are literal upper-case symbol names, since that's what X expects.) 317\(Those are literal upper-case symbol names, since that's what X expects.)
308TYPE is the type of data desired, typically `STRING'. 318TARGET-TYPE is the type of data desired, typically `STRING'.
309TIME_STAMP is the time to use in the XConvertSelection call for foreign 319
320TIME-STAMP is the time to use in the XConvertSelection call for foreign
310selections. If omitted, defaults to the time for the last event. 321selections. If omitted, defaults to the time for the last event.
311 322
312TERMINAL should be a terminal object or a frame specifying the X 323TERMINAL should be a terminal object or a frame specifying the X
313server to query. If omitted or nil, that stands for the selected 324server to query. If omitted or nil, that stands for the selected
314frame's display, or the first available X display." 325frame's display, or the first available X display.
326
327On Nextstep, TIME-STAMP and TERMINAL are unused."
315 (x-get-selection-value)) 328 (x-get-selection-value))
316 329
317;; From src/fontset.c: 330;; From src/fontset.c: