aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2009-08-02 23:22:03 +0000
committerChong Yidong2009-08-02 23:22:03 +0000
commitd977a092436b905a15f22ad75a98cda63fc0f22f (patch)
tree332801b1b6c50f8a6f63ffd1aefaf5e87eb42ba5
parentb6ce92f1c49b105bd7d13acd817a793a807d1e21 (diff)
downloademacs-d977a092436b905a15f22ad75a98cda63fc0f22f.tar.gz
emacs-d977a092436b905a15f22ad75a98cda63fc0f22f.zip
* select.el (x-set-selection): Doc fix (Bug#4021).
* w32-fns.el (x-set-selection): Doc fix (Bug#4021).
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/select.el2
-rw-r--r--lisp/w32-fns.el2
3 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2f3ea144e7d..7bdf311297b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
12009-08-02 Chong Yidong <cyd@stupidchicken.com> 12009-08-02 Chong Yidong <cyd@stupidchicken.com>
2 2
3 * select.el (x-set-selection): Doc fix (Bug#4021).
4
5 * w32-fns.el (x-set-selection): Doc fix (Bug#4021).
6
3 * help-fns.el (describe-variable): Treat list return values from 7 * help-fns.el (describe-variable): Treat list return values from
4 dir-locals-find-file properly (Bug#4005). 8 dir-locals-find-file properly (Bug#4005).
5 9
diff --git a/lisp/select.el b/lisp/select.el
index 52c31a8ca20..4473c47982f 100644
--- a/lisp/select.el
+++ b/lisp/select.el
@@ -115,7 +115,7 @@ in `selection-converter-alist', which see."
115 (selection &optional time)) 115 (selection &optional time))
116 116
117(defun x-set-selection (type data) 117(defun x-set-selection (type data)
118 "Make an X Windows selection of type TYPE and value DATA. 118 "Make an X selection of type TYPE and value DATA.
119The argument TYPE (nil means `PRIMARY') says which selection, and 119The argument TYPE (nil means `PRIMARY') says which selection, and
120DATA specifies the contents. TYPE must be a symbol. \(It can also 120DATA specifies the contents. TYPE must be a symbol. \(It can also
121be a string, which stands for the symbol with that name, but this 121be a string, which stands for the symbol with that name, but this
diff --git a/lisp/w32-fns.el b/lisp/w32-fns.el
index 033333918f9..6303287dee2 100644
--- a/lisp/w32-fns.el
+++ b/lisp/w32-fns.el
@@ -294,7 +294,7 @@ shell requires it (see `w32-shell-dos-semantics')."
294 294
295;;; Fix interface to (X-specific) mouse.el 295;;; Fix interface to (X-specific) mouse.el
296(defun x-set-selection (type data) 296(defun x-set-selection (type data)
297 "Make an X Windows selection of type TYPE and value DATA. 297 "Make an X selection of type TYPE and value DATA.
298The argument TYPE (nil means `PRIMARY') says which selection, and 298The argument TYPE (nil means `PRIMARY') says which selection, and
299DATA specifies the contents. TYPE must be a symbol. \(It can also 299DATA specifies the contents. TYPE must be a symbol. \(It can also
300be a string, which stands for the symbol with that name, but this 300be a string, which stands for the symbol with that name, but this