summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2009-07-24 16:33:24 +0000
committerEli Zaretskii <eliz@gnu.org>2009-07-24 16:33:24 +0000
commit7b58b32dda8578bc1ead527963ebd385a3bf4867 (patch)
tree43a654b63768e3bc5544dacf70a172292b402d0d
parent446b78fbf4c85420e68532bb02143033ef2092e1 (diff)
downloademacs-7b58b32dda8578bc1ead527963ebd385a3bf4867.tar.gz
(x-select-text): Add a doc string.
-rw-r--r--lisp/ChangeLog16
-rw-r--r--lisp/term/pc-win.el13
2 files changed, 29 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 50f1d503ac8..43a62f824b7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2009-07-24 Eli Zaretskii <eliz@gnu.org>
+
+ * term/pc-win.el (x-select-text): Add a doc string.
+
+ * select.el (x-set-selection): Doc fix.
+
+ * w32-fns.el (x-get-selection, x-set-selection): Add doc strings.
+
+ * term/ns-win.el (x-colors): Doc fix.
+
+ * term/common-win.el (x-colors): Doc fix.
+
+ * term/x-win.el (x-select-enable-clipboard): Doc fix.
+
+ * term/pc-win.el (x-select-enable-clipboard, x-colors): Doc fix.
+
2009-07-24 Kenichi Handa <handa@m17n.org>
* international/characters.el: Fix setting of category ?C, ?|, ?K,
diff --git a/lisp/term/pc-win.el b/lisp/term/pc-win.el
index 39bf5f17254..6e295c63d4a 100644
--- a/lisp/term/pc-win.el
+++ b/lisp/term/pc-win.el
@@ -210,6 +210,19 @@ set by Emacs is not accessible to other programs on Windows.\)"
:group 'killing)
(defun x-select-text (text &optional push)
+ "Select TEXT, a string, according to the window system.
+
+On X, put TEXT in the primary X selection. For backward
+compatibility with older X applications, set the value of X cut
+buffer 0 as well, and if the optional argument PUSH is non-nil,
+rotate the cut buffers. If `x-select-enable-clipboard' is
+non-nil, copy the text to the X clipboard as well.
+
+On Windows, make TEXT the current selection. If
+`x-select-enable-clipboard' is non-nil, copy the text to the
+clipboard as well. The argument PUSH is ignored.
+
+On Nextstep, put TEXT in the pasteboard; PUSH is ignored."
(if x-select-enable-clipboard
(w16-set-clipboard-data text))
(setq x-last-selected-text text))