Commit 1dafab89 authored by Lars Ingebrigtsen's avatar Lars Ingebrigtsen
Browse files

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

* lisp/vc/ediff-util.el (ediff-copy-diff, ediff-pop-diff): Don't
alter the kill ring (bug#47881).
parent 1fa1f318
Pipeline #10612 failed with stages
in 15 minutes and 42 seconds
......@@ -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)
))
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment