(isearch-other-meta-char): Don't switch to the

buffer of a window clicked on, when the current buffer is
in Isearch mode.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2819ebcba553861a04a274e69a14ac4d54c38808..d23ed6ab2d215c1eb6ecd165c173b91155470a12 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2001-08-10  Gerd Moellmann  <gerd@gnu.org>
 
+       * isearch.el (isearch-other-meta-char): Don't switch to the
+       buffer of a window clicked on, when the current buffer is
+       in Isearch mode.
+
        * image.el (image-jpeg-p): Test for APPn markers in the range
        #xe0..#xef.
 

diff --git a/lisp/isearch.el b/lisp/isearch.el
index ef69ff23cb6b6d5ffe0c17e384c72b2cd4913d75..1de8fce8e3bfa855c275d204f104c7720e014066 100644 (file)
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1243,10 +1243,25 @@ and the meta character is unread so that it applies to editing the string."
               (pop unread-command-events)
               (setq main-event (car unread-command-events)))
 
-            ;; If we got a mouse click, maybe it was read with the buffer
+            ;; If we got a mouse click event, that event contains the
+            ;; window clicked on. maybe it was read with the buffer
             ;; it was clicked on.  If so, that buffer, not the current one,
             ;; is in isearch mode.  So end the search in that buffer.
-            (if (and (listp main-event)
+
+            ;; ??? I have no idea what this if checks for, but it's
+            ;; obviously wrong for the case that a down-mouse event
+            ;; on another window invokes this function.  The event
+            ;; will contain the window clicked on and that window's
+            ;; buffer is certainaly not always in Isearch mode.
+            ;;
+            ;; Leave the code in, but check for current buffer not
+            ;; being in Isearch mode for now, until someone tells
+            ;; what it's really supposed to do.
+            ;;
+            ;; --gerd 2001-08-10.
+
+            (if (and (not isearch-mode)
+                     (listp main-event)
                      (setq window (posn-window (event-start main-event)))
                      (windowp window)
                      (or (> (minibuffer-depth) 0)