[Emacs-diffs] trunk r116402: Fix bug #15109 with confusing mis-documentation of selection-converter-alist.

[Eli Zaretskii]

------------------------------------------------------------
revno: 116402
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/15109
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Mon 2014-02-10 19:05:52 +0200
message:
  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.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/select.el                 select.el-20091113204419-o5vbwnq5f7feedwu-550
  lisp/w32-common-fns.el         
w32commonfns.el-20120917115700-3at3xhn4to67xnca-4

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-02-10 16:08:37 +0000
+++ b/lisp/ChangeLog    2014-02-10 17:05:52 +0000
@@ -1,5 +1,8 @@
 2014-02-10  Eli Zaretskii  <address@hidden>
 
+       * 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

=== modified file 'lisp/select.el'
--- a/lisp/select.el    2014-02-10 01:34:22 +0000
+++ b/lisp/select.el    2014-02-10 17:05:52 +0000
@@ -89,7 +89,8 @@
 `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)

=== modified file 'lisp/w32-common-fns.el'
--- a/lisp/w32-common-fns.el    2014-01-01 07:43:34 +0000
+++ b/lisp/w32-common-fns.el    2014-02-10 17:05:52 +0000
@@ -79,7 +79,8 @@
 `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