From: Chong Yidong <cyd@gnu.org>
Date: Sat, 23 Jun 2012 12:48:24 +0000 (+0800)
Subject: * mouse.el (mouse-drag-track): Deactivate the mark before popping.
X-Git-Tag: emacs-24.2.90~1199^2~385
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=05e89feafd8f09eb3d8efe2b92aff2d2c243b6fb;p=emacs.git

* mouse.el (mouse-drag-track): Deactivate the mark before popping.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cbc7b493b21..8b17b543315 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2012-06-23  Chong Yidong  <cyd@gnu.org>
 
+	* mouse.el (mouse-drag-track): Deactivate the mark before popping.
+
 	* progmodes/python.el (python-skeleton-define): Mark abbrevs as
 	system abbrevs.
 
diff --git a/lisp/mouse.el b/lisp/mouse.el
index fb2e67408bd..c8862454e39 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -884,10 +884,15 @@ DO-MOUSE-DRAG-REGION-POST-PROCESS should only be used by
 		     (copy-region-as-kill (mark) (point)))))
 
 	  ;; Otherwise, run binding of terminating up-event.
-	  (cond
-	   (do-multi-click (goto-char start-point))
-	   (moved-off-start (deactivate-mark))
-	   (t (pop-mark)))
+	  (setq foo (list (window-buffer (selected-window))
+			  (current-buffer)))
+
+	  (if do-multi-click
+	      (goto-char start-point)
+	    (deactivate-mark)
+	    (unless moved-off-start
+	      (pop-mark)))
+
 	  (when (and (functionp fun)
 		     (= start-hscroll (window-hscroll start-window))
 		     ;; Don't run the up-event handler if the window