aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard M. Stallman1997-08-04 05:09:49 +0000
committerRichard M. Stallman1997-08-04 05:09:49 +0000
commit4fd017e78e2509b93f282c4a577a2a950ab954eb (patch)
tree2cd9c92a742e24a413a34d84c3f003140fd420dc
parent8e710301e0063ed124cc5e589ab33729ae53fb84 (diff)
downloademacs-4fd017e78e2509b93f282c4a577a2a950ab954eb.tar.gz
emacs-4fd017e78e2509b93f282c4a577a2a950ab954eb.zip
(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."
1149 ;; is in isearch mode. So end the search in that buffer. 1149 ;; is in isearch mode. So end the search in that buffer.
1150 (if (and (listp main-event) 1150 (if (and (listp main-event)
1151 (setq window (posn-window (event-start main-event))) 1151 (setq window (posn-window (event-start main-event)))
1152 (windowp window)) 1152 (windowp window)
1153 (or (> (minibuffer-depth) 0)
1154 (not (window-minibuffer-p window))))
1153 (save-excursion 1155 (save-excursion
1154 (set-buffer (window-buffer window)) 1156 (set-buffer (window-buffer window))
1155 (isearch-done) 1157 (isearch-done)