mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

(gui-get-selection): Avoid using `string-to-multibyte'

Browse source 
* lisp/select.el (gui-get-selection): Avoid using
`string-to-multibyte' -- instead encode as `eight-bit' if the
string is unibyte.
This commit is contained in:
Lars Ingebrigtsen 2019-05-17 05:42:12 +02:00
parent 54f5d678dc
commit ab263a7980
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lisp/select.el
View file

@ -308,8 +308,15 @@ the formats available in the clipboard if TYPE is `CLIPBOARD'."
('STRING 'iso-8859-1)
(_ (error "Unknown selection data type: %S"
type))))))
(setq data (if coding (decode-coding-string data coding)
(string-to-multibyte data))))
(setq data (cond
(coding
(decode-coding-string data coding))
;; The last two cases are only possible in the
;; C_STRING case.
((multibyte-string-p data)
data)
(t
(encode-coding-string data 'eight-bit)))))
(setq next-selection-coding-system nil)
(put-text-property 0 (length data) 'foreign-selection data-type data))
data))