mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

ediff shouldn't alter the kill ring when copying a diff

Browse source 
* lisp/vc/ediff-util.el (ediff-copy-diff, ediff-pop-diff): Don't
alter the kill ring (bug#47881).
This commit is contained in:
Lars Ingebrigtsen 2021-05-03 12:21:11 +02:00
parent 1fa1f3184a
commit 1dafab8936
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lisp/vc/ediff-util.el
View file

@ -2002,9 +2002,8 @@ ARG is a prefix argument. If nil, copy the current difference region."
(goto-char reg-to-delete-end)
(insert reg-to-copy)
(if (> reg-to-delete-end reg-to-delete-beg)
(kill-region reg-to-delete-beg reg-to-delete-end))
))
(when (> reg-to-delete-end reg-to-delete-beg)
(delete-region reg-to-delete-beg reg-to-delete-end))))
(or batch-invocation
(setq
messg
@ -2105,8 +2104,8 @@ ARG is a prefix argument. If nil, copy the current difference region."
(goto-char reg-end)
(insert saved-diff)
(if (> reg-end reg-beg)
(kill-region reg-beg reg-end))
(when (> reg-end reg-beg)
(delete-region reg-beg reg-end))
(setq recovered t)
))