Subject: Re: bug#47881: 28.0.50; `ediff-merge-files' copies diff hunks into clipboard

From: Philipp Stephani <[email-masked]>
Date: Mon, 19 Apr 2021 13:19:37 +0200

Am So., 18. Apr. 2021 um 22:15 Uhr schrieb Philipp Stephani
<[email-masked]>:
>
>
> Create two similar text files that, when merging, will create a merge
> conflict, such as:
>
> $ cat /tmp/aa.txt
> a
> b
> c
> d
> $ cat /tmp/bb.txt
> a
> x
> c
> d
>
> Clear the clipboard:
>
> $ xsel -b -c
>
> Now run `ediff-merge-files':
>
> $ emacs -Q -l ediff -eval '(ediff-merge-files "/tmp/aa.txt" "/tmp/bb.txt")'
>
> No need to do anything else.  Now, one of the hunks has been copied to
> the system clipboard:
>
> $ xsel -b -o
> b
>
> This shouldn't happen; the clipboard should only be modified if the user
> requests it.

It looks like the problem is that ediff-copy-diff calls kill-region.