From: Chong Yidong <cyd@stupidchicken.com>
Date: Sun, 8 Aug 2010 21:57:34 +0000 (-0400)
Subject: Fix 2010-07-03 change to mouse-drag-track.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~438^2~49^2~12
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=7adf5fdcb806eacfe9a2b2fcdbea6f7907e1af50;p=emacs.git

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 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).