# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1281304654 14400
# Node ID 472b3dda3de7c4a782c72fcb4203bf02804a0d3c
# Parent  77fb60d4233b9fe8566975cb4f7a360c6aaf46d5
Fix 2010-07-03 change to mouse-drag-track.
* mouse.el (mouse-drag-track): Remove accidentally-removed check
for `double' value of mouse-1-click-follows-link (Bug#6807).

diff -r 77fb60d4233b -r 472b3dda3de7 lisp/ChangeLog
--- a/lisp/ChangeLog	Sun Aug 08 17:15:44 2010 -0400
+++ b/lisp/ChangeLog	Sun Aug 08 17:57:34 2010 -0400
@@ -1,3 +1,8 @@
+2010-08-08  Chong Yidong  <cyd@stupidchicken.com>
+
+	* mouse.el (mouse-drag-track): Remove accidentally-removed check
+	for `double' value of mouse-1-click-follows-link (Bug#6807).
+
 2010-08-08  Johan Bockgård  <bojohan@gnu.org>
 
 	* replace.el (replace-highlight): Bind isearch-forward and
diff -r 77fb60d4233b -r 472b3dda3de7 lisp/mouse.el
--- a/lisp/mouse.el	Sun Aug 08 17:15:44 2010 -0400
+++ b/lisp/mouse.el	Sun Aug 08 17:57:34 2010 -0400
@@ -929,6 +929,9 @@
                        ;; intangible text.
                        (mouse-on-link-p start-posn)))
 	 (click-count (1- (event-click-count start-event)))
+	 (remap-double-click (and on-link
+				  (eq mouse-1-click-follows-link 'double)
+				  (= click-count 1)))
 	 ;; Suppress automatic hscrolling, because that is a nuisance
 	 ;; when setting point near the right fringe (but see below).
 	 (automatic-hscrolling-saved automatic-hscrolling)
@@ -941,6 +944,8 @@
     (if (< (point) start-point)
 	(goto-char start-point))
     (setq start-point (point))
+    (if remap-double-click
+	(setq click-count 0))
 
     ;; Activate the region, using `mouse-start-end' to determine where
     ;; to put point and mark (e.g., double-click will select a word).