Limit scope of local overriding-terminal-local-map

The function `binding' may call isearch-done, which globally sets
overriding-terminal-local-map to nil (Bug#23007).
* lisp/isearch.el (isearch-mouse-2): Don't bind
overriding-terminal-local-map around the call to `binding'.

diff --git a/lisp/isearch.el b/lisp/isearch.el
index c34739d6386c37316ab3a93f0a453de3064cbbb1..5f34dcadb5d7181025fd07da51a6f99ce6543f81 100644 (file)
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -2036,9 +2036,9 @@ For a click in the echo area, invoke `isearch-yank-x-selection'.
 Otherwise invoke whatever the calling mouse-2 command sequence
 is bound to outside of Isearch."
   (interactive "e")
-  (let* ((w (posn-window (event-start click)))
-        (overriding-terminal-local-map nil)
-        (binding (key-binding (this-command-keys-vector) t)))
+  (let ((w (posn-window (event-start click)))
+        (binding (let ((overriding-terminal-local-map nil))
+                   (key-binding (this-command-keys-vector) t))))
     (if (and (window-minibuffer-p w)
             (not (minibuffer-window-active-p w))) ; in echo area
        (isearch-yank-x-selection)