comparison lisp/emulation/cua-base.el @ 81895:d59242324437

(cua-paste): 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.

81894:fb5c5d1a8fe2

     (buffer-read-only
      (message "Cannot paste into a read-only buffer"))
     (t
      ;; Must save register here, since delete may override reg 0.
      (if mark-active
	  ;; 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.
	  (if cua--rectangle
	      (progn
		(goto-char (min (mark) (point)))
		(setq paste-column (cua--rectangle-left))
		(setq paste-lines (cua--delete-rectangle))
		(if (= paste-lines 1)
		    (setq paste-lines nil))) ;; paste all
	    (if (string= (filter-buffer-substring (point) (mark))
			 (car kill-ring))
		(current-kill 1))
	    (cua-delete-region)))
      (cond
       (regtxt
	(cond

81895:d59242324437

     (buffer-read-only
      (message "Cannot paste into a read-only buffer"))
     (t
      ;; Must save register here, since delete may override reg 0.
      (if mark-active
	  (if cua--rectangle
	      (progn
		(goto-char (min (mark) (point)))
		(setq paste-column (cua--rectangle-left))
		(setq paste-lines (cua--delete-rectangle))
		(if (= paste-lines 1)
		    (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.
	    (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)))
		(current-kill 1))
	    (cua-delete-region)))
      (cond
       (regtxt
	(cond