summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1997-08-04 05:09:49 +0000
committerRichard M. Stallman <rms@gnu.org>1997-08-04 05:09:49 +0000
commitd36e64f91dc66ec62eb8e97072a7d55fa121eac2 (patch)
tree71549539527ba0155bc5dcc871b9cb8e0109598b
parenteb72b276ba2d84b796c8c9c66b57b6f7b06ddbb1 (diff)
downloademacs-d36e64f91dc66ec62eb8e97072a7d55fa121eac2.tar.gz
(isearch-other-meta-char): Don't switch windows to exit
if that would switch to an inactive minibuffer.
-rw-r--r--lisp/isearch.el4
1 files changed, 3 insertions, 1 deletions
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)