unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Philipp Stephani <p.stephani2@gmail.com>
To: 47881@debbugs.gnu.org
Subject: bug#47881: 28.0.50; `ediff-merge-files' copies diff hunks into clipboard
Date: Mon, 19 Apr 2021 13:19:37 +0200	[thread overview]
Message-ID: <CAArVCkRfBmE=YW=QzDYP0ejS5B92=rqUxD11jnkACR5L_siWFA@mail.gmail.com> (raw)
In-Reply-To: <wvr4lf9fmjul.fsf@gmail.com>

Am So., 18. Apr. 2021 um 22:15 Uhr schrieb Philipp Stephani
<p.stephani2@gmail.com>:
>
>
> 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.





  reply	other threads:[~2021-04-19 11:19 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-18 20:13 bug#47881: 28.0.50; `ediff-merge-files' copies diff hunks into clipboard Philipp Stephani
2021-04-19 11:19 ` Philipp Stephani [this message]
2021-05-03 10:23   ` Lars Ingebrigtsen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAArVCkRfBmE=YW=QzDYP0ejS5B92=rqUxD11jnkACR5L_siWFA@mail.gmail.com' \
    --to=p.stephani2@gmail.com \
    --cc=47881@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).