[Emacs-diffs] Changes to emacs/lisp/isearch.el,v

[David Kastrup]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     David Kastrup <dak>     06/10/03 14:03:47

Index: isearch.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/isearch.el,v
retrieving revision 1.290
retrieving revision 1.291
diff -u -b -r1.290 -r1.291
--- isearch.el  20 Sep 2006 06:13:43 -0000      1.290
+++ isearch.el  3 Oct 2006 14:03:46 -0000       1.291
@@ -1293,23 +1293,18 @@
 (defun isearch-mouse-2 (click)
   "Handle mouse-2 in Isearch mode.
 For a click in the echo area, invoke `isearch-yank-x-selection'.
-Otherwise invoke whatever mouse-2 is bound to outside of Isearch."
+Otherwise invoke whatever the calling mouse-2 command sequence
+is bound to outside of Isearch."
   (interactive "e")
   (let* ((w (posn-window (event-start click)))
         (overriding-terminal-local-map nil)
-        (key (vector (event-basic-type click)))
-        ;; FIXME: `key-binding' should accept an event as argument
-        ;; and do all the overlay/text-properties lookup etc...
-        (binding (with-current-buffer
-                     (if (window-live-p w) (window-buffer w) (current-buffer))
-                   (key-binding key))))
+        (binding (key-binding (this-command-keys-vector) t)))
     (if (and (window-minibuffer-p w)
             (not (minibuffer-window-active-p w))) ; in echo area
        (isearch-yank-x-selection)
       (when (functionp binding)
        (call-interactively binding)))))
 
-
 (defun isearch-yank-internal (jumpform)
   "Pull the text from point to the point reached by JUMPFORM.
 JUMPFORM is a lambda expression that takes no arguments and returns a