diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2014-02-10 19:05:52 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2014-02-10 19:05:52 +0200 |
| commit | 02328db965d8ffdaa67b0577a0763fc51092717c (patch) | |
| tree | 7e7d449994abbff9cc4f80dc1dd17f47a98f0bed /lisp | |
| parent | 881329dcf739c835479ff188ce2937679ce987d7 (diff) | |
| download | emacs-02328db965d8ffdaa67b0577a0763fc51092717c.tar.gz emacs-02328db965d8ffdaa67b0577a0763fc51092717c.tar.bz2 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.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/select.el | 3 | ||||
| -rw-r--r-- | lisp/w32-common-fns.el | 3 |
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 @@ 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 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 |