diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-08-24 11:48:14 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-08-24 11:48:14 -0400 |
| commit | 1c409d0b963ebdb1f48b90ddce85c56d989bee5f (patch) | |
| tree | db1bf3baea9d24a20e325d76c52699c64daef7b7 /lisp/mouse.el | |
| parent | 372214322c37ded1631741b55cb125a99ff6bdbd (diff) | |
| download | emacs-1c409d0b963ebdb1f48b90ddce85c56d989bee5f.tar.gz | |
Avoid clobbering primary selection when switching frames (Bug#6872).
* lisp/mouse.el (mouse-yank-primary): Avoid setting primary when
deactivating the mark (Bug#6872).
* src/keyboard.c (command_loop_1): Don't set primary selection during
handle-switch-frame (Bug#6872).
Diffstat (limited to 'lisp/mouse.el')
| -rw-r--r-- | lisp/mouse.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/mouse.el b/lisp/mouse.el index c9b190f1c79..a2a0191ce79 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -1268,10 +1268,11 @@ regardless of where you click." (interactive "e") ;; Give temporary modes such as isearch a chance to turn off. (run-hooks 'mouse-leave-buffer-hook) + ;; Without this, confusing things happen upon e.g. inserting into + ;; the middle of an active region. (when select-active-regions - ;; Without this, confusing things happen upon e.g. inserting into - ;; the middle of an active region. - (deactivate-mark)) + (let (select-active-regions) + (deactivate-mark))) (or mouse-yank-at-point (mouse-set-point click)) (let ((primary (cond |