diff options
| author | Chong Yidong | 2012-06-23 20:48:24 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-06-23 20:48:24 +0800 |
| commit | 05e89feafd8f09eb3d8efe2b92aff2d2c243b6fb (patch) | |
| tree | 18fa5f8b6b09259841fbb4bc13a61bddb8ad1f1a /lisp/mouse.el | |
| parent | 965125550937ce450c74effa9c13262db3adf48b (diff) | |
| download | emacs-05e89feafd8f09eb3d8efe2b92aff2d2c243b6fb.tar.gz emacs-05e89feafd8f09eb3d8efe2b92aff2d2c243b6fb.zip | |
* mouse.el (mouse-drag-track): Deactivate the mark before popping.
Diffstat (limited to 'lisp/mouse.el')
| -rw-r--r-- | lisp/mouse.el | 13 |
1 files changed, 9 insertions, 4 deletions
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 | |||
| 884 | (copy-region-as-kill (mark) (point))))) | 884 | (copy-region-as-kill (mark) (point))))) |
| 885 | 885 | ||
| 886 | ;; Otherwise, run binding of terminating up-event. | 886 | ;; Otherwise, run binding of terminating up-event. |
| 887 | (cond | 887 | (setq foo (list (window-buffer (selected-window)) |
| 888 | (do-multi-click (goto-char start-point)) | 888 | (current-buffer))) |
| 889 | (moved-off-start (deactivate-mark)) | 889 | |
| 890 | (t (pop-mark))) | 890 | (if do-multi-click |
| 891 | (goto-char start-point) | ||
| 892 | (deactivate-mark) | ||
| 893 | (unless moved-off-start | ||
| 894 | (pop-mark))) | ||
| 895 | |||
| 891 | (when (and (functionp fun) | 896 | (when (and (functionp fun) |
| 892 | (= start-hscroll (window-hscroll start-window)) | 897 | (= start-hscroll (window-hscroll start-window)) |
| 893 | ;; Don't run the up-event handler if the window | 898 | ;; Don't run the up-event handler if the window |