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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index aebe6b5951e753491cd4dd31ba70190eba148996..6a7c7c7ed098130976acee8c6f2dbc6e2ad75bcb 100644 (file)
--- 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 a0491b0e5fb26b5407f5ae711a253617c20fadf3..3bc3fcefa80c7abe31fbcfb675ce3e45602ebf02 100644 (file)
--- 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).