From: Eli Zaretskii Date: Mon, 10 Feb 2014 17:05:52 +0000 (+0200) Subject: Fix bug #15109 with confusing mis-documentation of selection-converter-alist. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~34 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=02328db965d8ffdaa67b0577a0763fc51092717c;p=emacs.git 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 6395bb1aa20..95d81345548 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2014-02-10 Eli Zaretskii + * 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 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 `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 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 `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