[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 973f0aa 1/3: Fix nul-terminated text/* strings from some programs
From: |
Lars Ingebrigtsen |
Subject: |
master 973f0aa 1/3: Fix nul-terminated text/* strings from some programs |
Date: |
Sat, 6 Nov 2021 17:45:15 -0400 (EDT) |
branch: master
commit 973f0aa5595de878f5c01b0b9365dfb57e54f7f4
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
Fix nul-terminated text/* strings from some programs
* lisp/yank-media.el (yank-media--get-selection): Some programs
nul-terminate text/* strings. Fix that.
---
lisp/yank-media.el | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/lisp/yank-media.el b/lisp/yank-media.el
index 5cc5e36..bc104a3 100644
--- a/lisp/yank-media.el
+++ b/lisp/yank-media.el
@@ -76,9 +76,14 @@ the `register-yank-media-handler' mechanism."
(defun yank-media--get-selection (type)
(when-let ((data (gui-get-selection 'CLIPBOARD type)))
- (if-let ((charset (get-text-property 0 'charset data)))
- (encode-coding-string data charset)
- data)))
+ (when-let ((charset (get-text-property 0 'charset data)))
+ (setq date (encode-coding-string data charset)))
+ ;; Some programs add a nul character at the end of text/*
+ ;; selections. Remove that.
+ (when (and (string-match-p "\\`text/" (symbol-name type))
+ (zerop (elt data (1- (length data)))))
+ (setq data (substring data 0 (1- (length data)))))
+ data))
;;;###autoload
(defun register-yank-media-handler (types handler)