aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong <[email protected]>2006-02-08 20:47:24 +0000
committerChong Yidong <[email protected]>2006-02-08 20:47:24 +0000
commit745cfc57058bf80726961f8e4775b290e308bf7c (patch)
tree3fdba4940fd8244e51426811f2fdf1f616633dc4
parente499d09261b28174761e0f642c3579448fbe24a5 (diff)
2006-02-08 Chong Yidong <[email protected]>
* mouse.el (mouse-drag-track): Don't change window if we rebind to some other event.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/mouse.el4
2 files changed, 7 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c03d0171f0..65cbcacd4f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2006-02-08 Chong Yidong <[email protected]>
+
+ * mouse.el (mouse-drag-track): Don't change window if we rebind to
+ some other event.
+
2006-02-08 Ryan Yeske <[email protected]>
* net/rcirc.el (rcirc-startup-channels-alist): Add
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 4b3b098543..9922b0f9ae 100644
--- 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 [email protected] 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