2 files changed, 29 insertions, 14 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bc1bcac7191..dfe19e994ce 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,12 @@
 2010-08-15  Chong Yidong  <cyd@stupidchicken.com>
 
+        * mouse.el (mouse--drag-set-mark-and-point): New function.
+        (mouse-drag-track): Use LOCATION arg to push-mark.  Use
+        mouse--drag-set-mark-and-point to take click-count into
+        consideration when updating point and mark (Bug#6840).
+
+2010-08-15  Chong Yidong  <cyd@stupidchicken.com>
+
         * progmodes/compile.el (compilation-error-regexp-alist-alist):
         Give the Ruby rule a lower priority than Gnu (Bug#6778).
 
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 89a136434d9..f404de98ce3 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -954,8 +954,7 @@ DO-MOUSE-DRAG-REGION-POST-PROCESS should only be used by
               '(only)
             (cons 'only transient-mark-mode)))
     (let ((range (mouse-start-end start-point start-point click-count)))
-      (goto-char (nth 0 range))
-      (push-mark nil t t)
+      (push-mark (nth 0 range) t t)
       (goto-char (nth 1 range)))
 
     ;; Track the mouse until we get a non-movement event.
@@ -974,14 +973,8 @@ DO-MOUSE-DRAG-REGION-POST-PROCESS should only be used by
                 end-point (posn-point end))
           (if (and (eq (posn-window end) start-window)
                    (integer-or-marker-p end-point))
-              ;; If moving in the original window, move point by going
-              ;; to start first, so that if end is in intangible text,
-              ;; point jumps away from start.  Don't do it if
-              ;; start=end, or a single click would select a region if
-              ;; it's on intangible text.
-              (unless (= start-point end-point)
-                (goto-char start-point)
-                (goto-char end-point))
+              (mouse--drag-set-mark-and-point start-point
+                                              end-point click-count)
             (let ((mouse-row (cdr (cdr (mouse-position)))))
               (cond
                ((null mouse-row))
@@ -999,8 +992,9 @@ DO-MOUSE-DRAG-REGION-POST-PROCESS should only be used by
                  (eq (posn-window end) start-window)
                  (integer-or-marker-p end-point)
                  (/= start-point end-point))
-        (goto-char start-point)
-        (goto-char end-point))
+        (mouse--drag-set-mark-and-point start-point
+                                        end-point click-count))
+
       ;; Find its binding.
       (let* ((fun (key-binding (vector (car event))))
              (do-multi-click (and (> (event-click-count event) 0)
@@ -1051,6 +1045,21 @@ DO-MOUSE-DRAG-REGION-POST-PROCESS should only be used by
                 (put 'mouse-2 'event-kind 'mouse-click)))
             (push event unread-command-events)))))))
 
+(defun mouse--drag-set-mark-and-point (start click click-count)
+  (let* ((range (mouse-start-end start click click-count))
+         (beg (nth 0 range))
+         (end (nth 1 range)))
+    (cond ((eq (mark) beg)
+           (goto-char end))
+          ((eq (mark) end)
+           (goto-char beg))
+          ((< click (mark))
+           (set-mark end)
+           (goto-char beg))
+          (t
+           (set-mark beg)
+           (goto-char end)))))
+
 (defun mouse--remap-link-click-p (start-event end-event)
   (or (and (eq mouse-1-click-follows-link 'double)
            (= (event-click-count start-event) 2))
@@ -1166,8 +1175,7 @@ If MODE is 2 then do the same for lines."
         ((= mode 2)
          (list (save-excursion
                  (goto-char start)
-                 (beginning-of-line 1)
-                 (point))
+                 (line-beginning-position 1))
                (save-excursion
                  (goto-char end)
                  (forward-line 1)