2 files changed, 10 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index aebe6b5951e..6a7c7c7ed09 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/mouse.el b/lisp/mouse.el
index a0491b0e5fb..3bc3fcefa80 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -929,6 +929,9 @@ DO-MOUSE-DRAG-REGION-POST-PROCESS should only be used by
                        ;; 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 @@ DO-MOUSE-DRAG-REGION-POST-PROCESS should only be used by
     (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).