mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-22 18:35:09 +00:00
Code Issues Releases Activity

select.el (xselect--encode-string): If a coding is specified for selection, and that is compatible with COMPOUND_TEXT, use it.

Browse Source
This commit is contained in:
Kenichi Handa 2012-10-10 23:45:26 +09:00
parent 9d7f027b56
commit 4ef4a10d1c
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2012-10-10 Kenichi Handa <handa@gnu.org>
* select.el (xselect--encode-string): If a coding is specified for
selection, and that is compatible with COMPOUND_TEXT, use it.
2012-10-10 Martin Rudalics <rudalics@gmx.at>
* window.el (switch-to-buffer-preserve-window-point): New option.

12
lisp/select.el
View File

@ -248,7 +248,17 @@ two markers or an overlay. Otherwise, it is nil."
(setq non-unicode t)
(setq eight-bit t)))))
str)
(setq type (if non-unicode 'COMPOUND_TEXT
(setq type (if (or non-unicode
(and
non-latin-1
;; If a coding is specified for
;; selection, and that is
;; compatible with COMPOUND_TEXT,
;; use it.
coding
(eq (coding-system-get coding :mime-charset)
'x-ctext)))
'COMPOUND_TEXT
(if non-latin-1 'UTF8_STRING
(if eight-bit 'C_STRING
'STRING))))))))