mirror of
git://git.sv.gnu.org/emacs.git
synced 2026-01-31 04:41:23 -08:00
(isearch-other-meta-char): Don't switch to the
buffer of a window clicked on, when the current buffer is in Isearch mode.
This commit is contained in:
parent
4a9bf8a43f
commit
346f18dcd4
2 changed files with 21 additions and 2 deletions
|
|
@ -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.
|
||||
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue