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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6395bb1aa203558fa3d8c36aa73ce8395e31921f..95d813455480e49c7f274ba078b73e8b485d4034 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2014-02-10  Eli Zaretskii  <eliz@gnu.org>
 
+       * w32-common-fns.el (x-get-selection): Doc fix.
+       * select.el (x-get-selection): Doc fix.  (Bug#15109)
+
        * face-remap.el (face-remap-add-relative)
        (face-remap-remove-relative, face-remap-reset-base)
        (face-remap-set-base): Call force-mode-line-update to redisplay

diff --git a/lisp/select.el b/lisp/select.el
index fe302c988d77851b5a7482d29cd6d2a3ef69af4e..c4d020343af89197d6553f2e5024ce5a4ddfd4bd 100644 (file)
--- a/lisp/select.el
+++ b/lisp/select.el
@@ -89,7 +89,8 @@ all upper-case names.  The most often used ones, in addition to
 `PRIMARY', are `SECONDARY' and `CLIPBOARD'.
 
 DATA-TYPE is usually `STRING', but can also be one of the symbols
-in `selection-converter-alist', which see."
+in `selection-converter-alist', which see.  This argument is
+ignored on MS-Windows and MS-DOS."
   (let ((data (x-get-selection-internal (or type 'PRIMARY)
                                        (or data-type 'STRING)))
        coding)

diff --git a/lisp/w32-common-fns.el b/lisp/w32-common-fns.el
index df3818668f1b5b0e9b90162b6c7215888b8ea7cc..72946f9bb96d8ff49691814f55c721327c46ccbd 100644 (file)
--- 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
 `PRIMARY', are `SECONDARY' and `CLIPBOARD'.
 
 DATA-TYPE is usually `STRING', but can also be one of the symbols
-in `selection-converter-alist', which see."
+in `selection-converter-alist', which see.  This argument is
+ignored on MS-Windows and MS-DOS."
   (get 'x-selections (or type 'PRIMARY)))
 
 ;; x-selection-owner-p is used in simple.el