Mercurial > emacs

diff lisp/emulation/cua-base.el @ 83676:27d11c1d4e46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Patches applied: * emacs--devo--0 (patch 857-862) - Update from CVS - Merge from emacs--rel--22 - Update from CVS: lisp/emacs-lisp/avl-tree.el: New file. * emacs--rel--22 (patch 97-100) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 246-247) - Update from CVS Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-38
author Miles Bader <miles@gnu.org>
date Mon, 27 Aug 2007 09:21:49 +0000
parents 2a69b973fae2 0c55974f55f5
children 16efb39cdb2e
line wrap: on
line diff
--- a/lisp/emulation/cua-base.el	Mon Aug 27 08:16:42 2007 +0000
+++ b/lisp/emulation/cua-base.el	Mon Aug 27 09:21:49 2007 +0000
@@ -907,14 +907,11 @@
 		    (setq paste-lines nil))) ;; paste all
 	    ;; Before a yank command, make sure we don't yank the
 	    ;; head of the kill-ring that really comes from the
-	    ;; currently active region we are going to delete
-	    ;; (when last-command is one that uses copy-region-as-kill
-	    ;; or kill-new).  That would make yank a no-op.
+	    ;; currently active region we are going to delete.
+	    ;; That would make yank a no-op.
 	    (if (and (string= (filter-buffer-substring (point) (mark))
 			      (car kill-ring))
-		     (memq last-command
-			   '(mouse-set-region mouse-drag-region
-			     mouse-save-then-kill mouse-secondary-save-then-kill)))
+		     (mouse-region-match))
 		(current-kill 1))
 	    (cua-delete-region)))
       (cond