From: Juri Linkov <juri@jurta.org>
Date: Sun, 15 Jul 2007 19:55:32 +0000 (+0000)
Subject: (delete-selection-pre-hook): Before a yank command,
X-Git-Tag: emacs-pretest-23.0.90~11895
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=195d88f474f26dee7db29e240a5546262c97ff43;p=emacs.git

(delete-selection-pre-hook): Before a yank command,
check also whether last-command is one of mouse-save-then-kill,
mouse-secondary-save-then-kill, mouse-set-region, mouse-drag-region.
---

diff --git a/lisp/delsel.el b/lisp/delsel.el
index 7028bad9ad4..09b30d3e874 100644
--- a/lisp/delsel.el
+++ b/lisp/delsel.el
@@ -87,12 +87,16 @@ any selection."
 	  (cond ((eq type 'kill)
 		 (delete-active-region t))
 		((eq type 'yank)
-		 ;; Before a yank command,
-		 ;; make sure we don't yank the same region
-		 ;; that we are going to delete.
-		 ;; That would make yank a no-op.
-		 (when (string= (buffer-substring-no-properties (point) (mark))
-				(car kill-ring))
+		 ;; 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.
+		 (when (and (string= (buffer-substring-no-properties (point) (mark))
+				     (car kill-ring))
+			    (memq last-command
+				  '(mouse-set-region mouse-drag-region
+				    mouse-save-then-kill mouse-secondary-save-then-kill)))
 		   (current-kill 1))
 		 (delete-active-region))
 		((eq type 'supersede)