From: Richard M. Stallman <rms@gnu.org>
Date: Mon, 4 Aug 1997 05:09:49 +0000 (+0000)
Subject: (isearch-other-meta-char): Don't switch windows to exit
X-Git-Tag: emacs-20.1~819
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4fd017e78e2509b93f282c4a577a2a950ab954eb;p=emacs.git

(isearch-other-meta-char): Don't switch windows to exit
if that would switch to an inactive minibuffer.
---

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 7053e637865..a0b269678bc 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1149,7 +1149,9 @@ and the meta character is unread so that it applies to editing the string."
 	     ;; is in isearch mode.  So end the search in that buffer.
 	     (if (and (listp main-event)
 		      (setq window (posn-window (event-start main-event)))
-		      (windowp window))
+		      (windowp window)
+		      (or (> (minibuffer-depth) 0)
+			  (not (window-minibuffer-p window))))
 		 (save-excursion
 		   (set-buffer (window-buffer window))
 		   (isearch-done)