[Emacs-diffs] /srv/bzr/emacs/trunk r101027: Fix 2010-07-03 change to mouse-drag-track.

[Chong Yidong]

------------------------------------------------------------
revno: 101027
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2010-08-08 17:57:34 -0400
message:
  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).
modified:
  lisp/ChangeLog
  lisp/mouse.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-08-08 21:12:29 +0000
+++ b/lisp/ChangeLog    2010-08-08 21:57:34 +0000
@@ -1,3 +1,8 @@
+2010-08-08  Chong Yidong  <address@hidden>
+
+       * 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  <address@hidden>
 
        * replace.el (replace-highlight): Bind isearch-forward and

=== modified file 'lisp/mouse.el'
--- a/lisp/mouse.el     2010-08-07 19:39:04 +0000
+++ b/lisp/mouse.el     2010-08-08 21:57:34 +0000
@@ -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).