(isearch-mode-map): Bind frame events to nil.

1 files changed, 8 insertions, 3 deletions

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 015399cffb5..300bc52296c 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -278,9 +278,14 @@ Default value, nil, means edit the string instead.")
 
       (define-key map "\M-\t" 'isearch-complete)
 
-      ;; Switching frames should terminate isearch-mode
-      (define-key map [switch-frame] 'isearch-switch-frame-handler)
-      
+      ;; Pass frame events transparently so they won't exit the search.
+      ;; In particular, if we have more than one display open, then a
+      ;; switch-frame might be generated by someone typing at another keyboard.
+      (define-key map [switch-frame] nil)
+      (define-key map [delete-frame] nil)
+      (define-key map [iconify-frame] nil)
+      (define-key map [make-frame-visible] nil)
+
       (setq isearch-mode-map map)
       ))