From: Juri Linkov <juri@linkov.net>
Date: Mon, 16 Dec 2019 00:18:00 +0000 (+0200)
Subject: * lisp/isearch.el (isearch-xterm-paste): Use code like in 'xterm-paste'.
X-Git-Tag: emacs-27.0.90~341
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5aab1e83f55ccbf7affc25272f6b1107aa17598c;p=emacs.git

* lisp/isearch.el (isearch-xterm-paste): Use code like in 'xterm-paste'.

Add arg 'event' and use it to get pasted text.
This allows pasting text on terminals to the
search string (bug#18727, bug#36950).
---

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 4f3342782d3..2928a96b97d 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -2508,10 +2508,12 @@ is bound to outside of Isearch."
 
 (declare-function xterm--pasted-text "term/xterm" ())
 
-(defun isearch-xterm-paste ()
+(defun isearch-xterm-paste (event)
   "Pull terminal paste into search string."
-  (interactive)
-  (isearch-yank-string (xterm--pasted-text)))
+  (interactive "e")
+  (when (eq (car-safe event) 'xterm-paste)
+    (let ((pasted-text (nth 1 event)))
+      (isearch-yank-string pasted-text))))
 
 (defun isearch-yank-internal (jumpform)
   "Pull the text from point to the point reached by JUMPFORM.