(cua-paste): Use `mouse-region-match' instead of checking last-command.

2 files changed, 9 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9569de20af0..274533830df 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
 2007-08-21  Juri Linkov  <juri@jurta.org>
 
+        * delsel.el (delete-selection-pre-hook):
+        * emulation/cua-base.el (cua-paste): Use `mouse-region-match'
+        instead of checking last-command.
+
+2007-08-21  Juri Linkov  <juri@jurta.org>
+
         * loadup.el: Preload "button".
 
 2007-08-21  Stefan Monnier  <monnier@iro.umontreal.ca>
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 6e420b36242..98a9b4d6361 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -907,14 +907,11 @@ If global mark is active, copy from register or one character."
                     (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