changeset 82508:0c55974f55f5

(cua-paste): Use `mouse-region-match' instead of checking last-command.
author Juri Linkov <juri@jurta.org>
date Tue, 21 Aug 2007 20:05:04 +0000
parents 9c9e50cbdf1e
children a63d32c6172b
files lisp/emulation/cua-base.el
diffstat 1 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/emulation/cua-base.el	Tue Aug 21 20:04:51 2007 +0000
+++ b/lisp/emulation/cua-base.el	Tue Aug 21 20:05:04 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