procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix file name encoding of Motif drop protocol file selections

Browse source 
* lisp/select.el (xselect-convert-to-filename):
(xselect-convert-to-dt-netfile): Encode in the file name coding
system instead of `raw-text-unix'.
This commit is contained in:
Po Lu 2022-06-05 21:16:09 +08:00
parent d8924e179e
commit fcb4d836f0
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lisp/select.el
View file

@ -633,7 +633,8 @@ two markers or an overlay. Otherwise, it is nil."
;; Motif expects this to be STRING, but it treats the data as
;; a sequence of bytes instead of a Latin-1 string.
(cons 'STRING (encode-coding-string (expand-file-name value)
'raw-text-unix))
(or file-name-coding-system
default-file-name-coding-system)))
(when (vectorp value)
(with-temp-buffer
(cl-loop for file across value
@ -643,7 +644,8 @@ two markers or an overlay. Otherwise, it is nil."
(delete-char -1))
;; Motif wants STRING.
(cons 'STRING (encode-coding-string (buffer-string)
'raw-text-unix)))))))
(or file-name-coding-system
default-file-name-coding-system))))))))
(defun xselect-convert-to-charpos (_selection _type value)
(when (setq value (xselect--selection-bounds value))
@ -771,8 +773,11 @@ VALUE should be SELECTION's local value."
(stringp value)
(file-exists-p value)
(not (file-remote-p value)))
(encode-coding-string (xselect-tt-net-file value)
'raw-text-unix t)))
(cons 'STRING
(encode-coding-string (xselect-tt-net-file value)
(or file-name-coding-system
default-file-name-coding-system)
t))))
(setq selection-converter-alist
'((TEXT . xselect-convert-to-string)