aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2014-02-10 19:05:52 +0200
committerEli Zaretskii2014-02-10 19:05:52 +0200
commit02328db965d8ffdaa67b0577a0763fc51092717c (patch)
tree7e7d449994abbff9cc4f80dc1dd17f47a98f0bed
parent881329dcf739c835479ff188ce2937679ce987d7 (diff)
downloademacs-02328db965d8ffdaa67b0577a0763fc51092717c.tar.gz
emacs-02328db965d8ffdaa67b0577a0763fc51092717c.zip
Fix bug #15109 with confusing mis-documentation of selection-converter-alist.
lisp/w32-common-fns.el (x-get-selection): Doc fix. lisp/select.el (x-get-selection): Doc fix.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/select.el3
-rw-r--r--lisp/w32-common-fns.el3
3 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6395bb1aa20..95d81345548 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12014-02-10 Eli Zaretskii <eliz@gnu.org> 12014-02-10 Eli Zaretskii <eliz@gnu.org>
2 2
3 * w32-common-fns.el (x-get-selection): Doc fix.
4 * select.el (x-get-selection): Doc fix. (Bug#15109)
5
3 * face-remap.el (face-remap-add-relative) 6 * face-remap.el (face-remap-add-relative)
4 (face-remap-remove-relative, face-remap-reset-base) 7 (face-remap-remove-relative, face-remap-reset-base)
5 (face-remap-set-base): Call force-mode-line-update to redisplay 8 (face-remap-set-base): Call force-mode-line-update to redisplay
diff --git a/lisp/select.el b/lisp/select.el
index fe302c988d7..c4d020343af 100644
--- a/lisp/select.el
+++ b/lisp/select.el
@@ -89,7 +89,8 @@ all upper-case names. The most often used ones, in addition to
89`PRIMARY', are `SECONDARY' and `CLIPBOARD'. 89`PRIMARY', are `SECONDARY' and `CLIPBOARD'.
90 90
91DATA-TYPE is usually `STRING', but can also be one of the symbols 91DATA-TYPE is usually `STRING', but can also be one of the symbols
92in `selection-converter-alist', which see." 92in `selection-converter-alist', which see. This argument is
93ignored on MS-Windows and MS-DOS."
93 (let ((data (x-get-selection-internal (or type 'PRIMARY) 94 (let ((data (x-get-selection-internal (or type 'PRIMARY)
94 (or data-type 'STRING))) 95 (or data-type 'STRING)))
95 coding) 96 coding)
diff --git a/lisp/w32-common-fns.el b/lisp/w32-common-fns.el
index df3818668f1..72946f9bb96 100644
--- a/lisp/w32-common-fns.el
+++ b/lisp/w32-common-fns.el
@@ -79,7 +79,8 @@ all upper-case names. The most often used ones, in addition to
79`PRIMARY', are `SECONDARY' and `CLIPBOARD'. 79`PRIMARY', are `SECONDARY' and `CLIPBOARD'.
80 80
81DATA-TYPE is usually `STRING', but can also be one of the symbols 81DATA-TYPE is usually `STRING', but can also be one of the symbols
82in `selection-converter-alist', which see." 82in `selection-converter-alist', which see. This argument is
83ignored on MS-Windows and MS-DOS."
83 (get 'x-selections (or type 'PRIMARY))) 84 (get 'x-selections (or type 'PRIMARY)))
84 85
85;; x-selection-owner-p is used in simple.el 86;; x-selection-owner-p is used in simple.el