[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108702: * mouse.el (mouse-drag-track): Deactivate the mark before popping.

[Chong Yidong]

------------------------------------------------------------
revno: 108702
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sat 2012-06-23 20:48:24 +0800
message:
  * mouse.el (mouse-drag-track): Deactivate the mark before popping.
modified:
  lisp/ChangeLog
  lisp/mouse.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-06-23 09:28:10 +0000
+++ b/lisp/ChangeLog    2012-06-23 12:48:24 +0000
@@ -1,5 +1,7 @@
 2012-06-23  Chong Yidong  <address@hidden>
 
+       * mouse.el (mouse-drag-track): Deactivate the mark before popping.
+
        * progmodes/python.el (python-skeleton-define): Mark abbrevs as
        system abbrevs.
 

=== modified file 'lisp/mouse.el'
--- a/lisp/mouse.el     2012-06-13 15:28:10 +0000
+++ b/lisp/mouse.el     2012-06-23 12:48:24 +0000
@@ -884,10 +884,15 @@
                     (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