# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1139431644 0
# Node ID 43f8bbedb5ee851f5319b18d1873c256447f7cca
# Parent  194be2b25aed97fee988c631a0e7e283313a5a21
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 -r 194be2b25aed -r 43f8bbedb5ee lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Feb 08 18:05:51 2006 +0000
+++ b/lisp/ChangeLog	Wed Feb 08 20:47:24 2006 +0000
@@ -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 -r 194be2b25aed -r 43f8bbedb5ee lisp/mouse.el
--- a/lisp/mouse.el	Wed Feb 08 18:05:51 2006 +0000
+++ b/lisp/mouse.el	Wed Feb 08 20:47:24 2006 +0000
@@ -1036,13 +1036,13 @@
 					   (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