From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Fri, 1 Feb 2013 23:40:55 +0000 (-0500)
Subject: * lisp/mouse.el (mouse-drag-track): Always deactivate the mark before
X-Git-Tag: emacs-24.2.93~14
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=13841bfcc20881a268e3c853f65312390c589700;p=emacs.git

* lisp/mouse.el (mouse-drag-track): Always deactivate the mark before
running the final event's command since that command is in charge of
activating the mark if needed.

Fixes: debbugs:13523
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a1d85b55c25..344a8d772da 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-02-01  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* mouse.el (mouse-drag-track): Always deactivate the mark before
+	running the final event's command since that command is in charge of
+	activating the mark if needed (bug#13523).
+
 2013-02-01  Juri Linkov  <juri@jurta.org>
 
 	* replace.el (perform-replace): Move let-bindings of isearch-*
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 9c7bf6f9c36..a1aa104495a 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -880,9 +880,9 @@ DO-MOUSE-DRAG-REGION-POST-PROCESS should only be used by
 		     (copy-region-as-kill (mark) (point)))))
 
 	  ;; Otherwise, run binding of terminating up-event.
+          (deactivate-mark)
 	  (if do-multi-click
 	      (goto-char start-point)
-	    (deactivate-mark)
 	    (unless moved-off-start
 	      (pop-mark)))