[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108090: Backport mouse.el fix (r108702/108703) from trunk

[Chong Yidong]

------------------------------------------------------------
revno: 108090 [merge]
committer: Chong Yidong <address@hidden>
branch nick: emacs-24
timestamp: Tue 2012-08-07 11:26:09 +0800
message:
  Backport mouse.el fix (r108702/108703) from trunk
modified:
  lisp/ChangeLog
  lisp/mouse.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-08-06 17:41:32 +0000
+++ b/lisp/ChangeLog    2012-08-07 03:24:35 +0000
@@ -1,3 +1,7 @@
+2012-08-07  Chong Yidong  <address@hidden>
+
+       * mouse.el (mouse-drag-track): Deactivate the mark before popping.
+
 2012-08-06  Stefan Monnier  <address@hidden>
 
        * progmodes/cperl-mode.el (cperl-mode): Yet another fix for

=== modified file 'lisp/mouse.el'
--- a/lisp/mouse.el     2012-07-25 06:14:30 +0000
+++ b/lisp/mouse.el     2012-08-07 03:24:52 +0000
@@ -885,10 +885,12 @@
                     (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)))
+         (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