[Emacs-diffs] emacs/lisp ChangeLog mouse.el

[Chong Yidong]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Chong Yidong <cyd>      09/07/17 23:24:57

Modified files:
        lisp           : ChangeLog mouse.el 

Log message:
        * mouse.el (mouse-yank-primary): If select-active-regions is non-nil,
        deactivate the mark before insertion.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15820&r2=1.15821
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mouse.el?cvsroot=emacs&r1=1.355&r2=1.356

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15820
retrieving revision 1.15821
diff -u -b -r1.15820 -r1.15821
--- ChangeLog   17 Jul 2009 19:43:49 -0000      1.15820
+++ ChangeLog   17 Jul 2009 23:24:54 -0000      1.15821
@@ -9,8 +9,9 @@
        * 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.
+       (mouse-yank-at-click, mouse-yank-primary): 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.

Index: mouse.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mouse.el,v
retrieving revision 1.355
retrieving revision 1.356
diff -u -b -r1.355 -r1.356
--- mouse.el    17 Jul 2009 15:45:14 -0000      1.355
+++ mouse.el    17 Jul 2009 23:24:57 -0000      1.356
@@ -1387,6 +1387,10 @@
   (interactive "e")
   ;; 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))
   (let ((primary (x-get-selection 'PRIMARY)))
     (if primary