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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cbc7b493b21f22600f84484f3d8534aa94b73841..8b17b543315007ce06a1d8956c9c53c5e25070e0 100644 (file)
--- 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 fb2e67408bd49202b7fcdfe9ad9cf1e98049bf4b..c8862454e39e2b324d903a1076ae7f4385695f73 100644 (file)
--- 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