Mercurial > emacs
changeset 103947:37177e1f2fcb
* w32-fns.el (x-selection-owner-p): New function.
* mouse.el (mouse-drag-track): Call deactivate-mark earlier.
(mouse-yank-at-click): If select-active-regions is non-nil,
deactivate the mark before insertion.
* simple.el (deactivate-mark, set-mark): Only save selection if we
own it.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Fri, 17 Jul 2009 15:45:08 +0000 |
| parents | 774187433685 |
| children | 53e13148fb68 |
| files | lisp/ChangeLog lisp/mouse.el lisp/simple.el lisp/w32-fns.el |
| diffstat | 4 files changed, 37 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Fri Jul 17 12:27:15 2009 +0000 +++ b/lisp/ChangeLog Fri Jul 17 15:45:08 2009 +0000 @@ -1,3 +1,14 @@ +2009-07-17 David De La Harpe Golden <david@harpegolden.net> + + * w32-fns.el (x-selection-owner-p): New function. + + * mouse.el (mouse-drag-track): Call deactivate-mark earlier. + (mouse-yank-at-click): If select-active-regions is non-nil, + deactivate the mark before insertion. + + * simple.el (deactivate-mark, set-mark): Only save selection if we + own it. + 2009-07-17 Kenichi Handa <handa@m17n.org> * case-table.el (describe-buffer-case-table): Fix for the case
--- a/lisp/mouse.el Fri Jul 17 12:27:15 2009 +0000 +++ b/lisp/mouse.el Fri Jul 17 15:45:08 2009 +0000 @@ -927,6 +927,11 @@ should only be used by mouse-drag-region." (mouse-minibuffer-check start-event) (setq mouse-selection-click-count-buffer (current-buffer)) + ;; We must call deactivate-mark before repositioning point. + ;; Otherwise, for select-active-regions non-nil, we get the wrong + ;; selection if the user drags a region, clicks elsewhere to + ;; reposition point, then middle-clicks to paste the selection. + (deactivate-mark) (let* ((original-window (selected-window)) ;; We've recorded what we needed from the current buffer and ;; window, now let's jump to the place of the event, where things @@ -971,7 +976,6 @@ (mouse-move-drag-overlay mouse-drag-overlay start-point start-point click-count) (overlay-put mouse-drag-overlay 'window start-window) - (deactivate-mark) (let (event end end-point last-end-point) (track-mouse (while (progn @@ -1360,10 +1364,16 @@ and set mark at the beginning. Prefix arguments are interpreted as with \\[yank]. If `mouse-yank-at-point' is non-nil, insert at point -regardless of where you click." +regardless of where you click. +If `select-active-regions' is non-nil, the mark is deactivated +before inserting the text." (interactive "e\nP") ;; Give temporary modes such as isearch a chance to turn off. (run-hooks 'mouse-leave-buffer-hook) + (when select-active-regions + ;; Without this, confusing things happen upon e.g. inserting into + ;; the middle of an active region. + (deactivate-mark t)) (or mouse-yank-at-point (mouse-set-point click)) (setq this-command 'yank) (setq mouse-selection-click-count 0)
--- a/lisp/simple.el Fri Jul 17 12:27:15 2009 +0000 +++ b/lisp/simple.el Fri Jul 17 15:45:08 2009 +0000 @@ -3489,6 +3489,7 @@ ;; Copy the latest region into the primary selection, if desired. (and select-active-regions mark-active + (x-selection-owner-p 'PRIMARY) (x-set-selection 'PRIMARY (buffer-substring-no-properties (region-beginning) (region-end)))) (if (and (null force) @@ -3533,8 +3534,12 @@ (progn (setq mark-active t) (run-hooks 'activate-mark-hook) - (when select-active-regions - (x-set-selection 'PRIMARY (current-buffer))) + (and select-active-regions + ;; Only set the selection if we already own PRIMARY. The + ;; initial selection grab happens in `activate-mark', but + ;; it is necessary to update it here. + (x-selection-owner-p 'PRIMARY) + (x-set-selection 'PRIMARY (current-buffer))) (set-marker (mark-marker) pos (current-buffer))) ;; Normally we never clear mark-active except in Transient Mark mode. ;; But when we actually clear out the mark value too, we must
--- a/lisp/w32-fns.el Fri Jul 17 12:27:15 2009 +0000 +++ b/lisp/w32-fns.el Fri Jul 17 15:45:08 2009 +0000 @@ -294,12 +294,15 @@ ;;; Fix interface to (X-specific) mouse.el (defun x-set-selection (type data) - (or type (setq type 'PRIMARY)) - (put 'x-selections type data)) + (put 'x-selections (or type 'PRIMARY) data)) (defun x-get-selection (&optional type data-type) - (or type (setq type 'PRIMARY)) - (get 'x-selections type)) + (get 'x-selections (or type 'PRIMARY))) + +;; x-selection-owner-p is used in simple.el +(defun x-selection-owner-p (&optional type) + (and (memq type '(nil PRIMARY SECONDARY)) + (get 'x-selections (or type 'PRIMARY)))) (defun set-w32-system-coding-system (coding-system) "Set the coding system used by the Windows system to CODING-SYSTEM.