2006-02-08 Chong Yidong <cyd@stupidchicken.com>

	* mouse.el (mouse-drag-track): Don't change window if we rebind to
	some other event.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c03d0171f06f57aeeaced55a4ce4fbe94a35501d..65cbcacd4f7923c5b05e2a8382b9c9248a757754 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-08  Chong Yidong  <cyd@stupidchicken.com>
+
+       * mouse.el (mouse-drag-track): Don't change window if we rebind to
+       some other event.
+
 2006-02-08  Ryan Yeske  <rcyeske@gmail.com>
 
        * net/rcirc.el (rcirc-startup-channels-alist): Add

diff --git a/lisp/mouse.el b/lisp/mouse.el
index 4b3b098543c2f7f60a19daaac08859b2acedbc29..9922b0f9aed4499ff8902ef69bda822e20c1c650 100644 (file)
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -1036,13 +1036,13 @@ should only be used by mouse-drag-region."
                                           (if (> mouse-1-click-follows-link 0)
                                               (<= (- t1 t0) mouse-1-click-follows-link)
                                             (< (- t0 t1) mouse-1-click-follows-link))))))))
-                 ;; Reselect previous selected window,
+                 ;; If we rebind to mouse-2, reselect previous selected window,
                  ;; so that the mouse-2 event runs in the same
                  ;; situation as if user had clicked it directly.
                  ;; Fixes the bug reported by juri@jurta.org on 2005-12-27.
-                 (select-window original-window)
                  (if (or (vectorp on-link) (stringp on-link))
                      (setq event (aref on-link 0))
+                   (select-window original-window)
                    (setcar event 'mouse-2)
                    ;; If this mouse click has never been done by
                    ;; the user, it doesn't have the necessary