Fix a recent change in isearch.el

* lisp/isearch.el (isearch-yank-x-selection): Ignore errors
signaled by 'gui-get-primary-selection', to better emulate what
'gui-get-selection' was doing.  In particular,
'gui-get-primary-selection' can signal an error on MS-Windows.

(cherry picked from commit 5d4056c7658d9a6c64267821bd56450e82de01cb)

diff --git a/lisp/isearch.el b/lisp/isearch.el
index e9cbc8ea31b28a6d4e6baef5c473d9509b4dddbc..4403da16024da002fc7e657886ac776d85e01c9a 100644 (file)
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -2627,7 +2627,7 @@ always reads a string from the `kill-ring' using the minibuffer."
 (defun isearch-yank-x-selection ()
   "Pull current PRIMARY X selection into the search string."
   (interactive)
-  (isearch-yank-string (gui-get-primary-selection))
+  (isearch-yank-string (ignore-errors (gui-get-primary-selection)))
   ;; If `gui-get-selection' returned the text from the active region,
   ;; then it "used" the mark which we should hence deactivate.
   (when select-active-regions (deactivate-mark)))