diff options
| author | Alexander Gramiak | 2017-05-29 13:43:23 -0600 |
|---|---|---|
| committer | Noam Postavsky | 2017-06-01 17:56:14 -0400 |
| commit | 404273aeacba39833ae3a38ce6764cc7a636e9d9 (patch) | |
| tree | 2b8763779507d4f5db6460ea61453eff10caa605 /lisp | |
| parent | 8c0f845b34ff3fc9622fa7a433d8272d94698c44 (diff) | |
| download | emacs-404273aeacba39833ae3a38ce6764cc7a636e9d9.tar.gz emacs-404273aeacba39833ae3a38ce6764cc7a636e9d9.zip | |
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'.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/isearch.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el index c34739d6386..5f34dcadb5d 100644 --- a/lisp/isearch.el +++ b/lisp/isearch.el | |||
| @@ -2036,9 +2036,9 @@ For a click in the echo area, invoke `isearch-yank-x-selection'. | |||
| 2036 | Otherwise invoke whatever the calling mouse-2 command sequence | 2036 | Otherwise invoke whatever the calling mouse-2 command sequence |
| 2037 | is bound to outside of Isearch." | 2037 | is bound to outside of Isearch." |
| 2038 | (interactive "e") | 2038 | (interactive "e") |
| 2039 | (let* ((w (posn-window (event-start click))) | 2039 | (let ((w (posn-window (event-start click))) |
| 2040 | (overriding-terminal-local-map nil) | 2040 | (binding (let ((overriding-terminal-local-map nil)) |
| 2041 | (binding (key-binding (this-command-keys-vector) t))) | 2041 | (key-binding (this-command-keys-vector) t)))) |
| 2042 | (if (and (window-minibuffer-p w) | 2042 | (if (and (window-minibuffer-p w) |
| 2043 | (not (minibuffer-window-active-p w))) ; in echo area | 2043 | (not (minibuffer-window-active-p w))) ; in echo area |
| 2044 | (isearch-yank-x-selection) | 2044 | (isearch-yank-x-selection) |