From 9f986d957d689c4289584176bc782c82f05a545d Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 14 Mar 2025 14:00:16 +0200 Subject: [PATCH] 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) --- lisp/isearch.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lisp/isearch.el b/lisp/isearch.el index e9cbc8ea31b..4403da16024 100644 --- 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))) -- 2.39.5