diff options
| author | Chong Yidong <cyd@gnu.org> | 2012-06-23 20:48:24 +0800 |
|---|---|---|
| committer | Chong Yidong <cyd@gnu.org> | 2012-06-23 20:48:24 +0800 |
| commit | 05e89feafd8f09eb3d8efe2b92aff2d2c243b6fb (patch) | |
| tree | 18fa5f8b6b09259841fbb4bc13a61bddb8ad1f1a /lisp | |
| parent | 965125550937ce450c74effa9c13262db3adf48b (diff) | |
| download | emacs-05e89feafd8f09eb3d8efe2b92aff2d2c243b6fb.tar.gz | |
* mouse.el (mouse-drag-track): Deactivate the mark before popping.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/mouse.el | 13 |
2 files changed, 11 insertions, 4 deletions
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 |