From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philipp Stephani Newsgroups: gmane.emacs.bugs Subject: bug#47881: 28.0.50; `ediff-merge-files' copies diff hunks into clipboard Date: Mon, 19 Apr 2021 13:19:37 +0200 Message-ID: References: Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="11624"; mail-complaints-to="usenet@ciao.gmane.io" To: 47881@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Apr 19 13:20:11 2021 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lYRwp-0002vh-MI for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 19 Apr 2021 13:20:11 +0200 Original-Received: from localhost ([::1]:59566 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYRwo-0006yB-Pc for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 19 Apr 2021 07:20:10 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:45574) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYRwg-0006y3-AY for bug-gnu-emacs@gnu.org; Mon, 19 Apr 2021 07:20:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:36984) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lYRwg-0001fP-2f for bug-gnu-emacs@gnu.org; Mon, 19 Apr 2021 07:20:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lYRwf-0008Cb-Uh for bug-gnu-emacs@gnu.org; Mon, 19 Apr 2021 07:20:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Philipp Stephani Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 19 Apr 2021 11:20:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47881 X-GNU-PR-Package: emacs Original-Received: via spool by 47881-submit@debbugs.gnu.org id=B47881.161883120031517 (code B ref 47881); Mon, 19 Apr 2021 11:20:01 +0000 Original-Received: (at 47881) by debbugs.gnu.org; 19 Apr 2021 11:20:00 +0000 Original-Received: from localhost ([127.0.0.1]:48530 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYRwe-0008CH-8J for submit@debbugs.gnu.org; Mon, 19 Apr 2021 07:20:00 -0400 Original-Received: from mail-oi1-f182.google.com ([209.85.167.182]:44558) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYRwX-0008Bz-Ur for 47881@debbugs.gnu.org; Mon, 19 Apr 2021 07:19:58 -0400 Original-Received: by mail-oi1-f182.google.com with SMTP id l17so3736900oil.11 for <47881@debbugs.gnu.org>; Mon, 19 Apr 2021 04:19:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=opL2nyqLqw2Vu2T5F9DFuvQkW6EYYL+pJ4SPjn1S6eA=; b=iBhyA7eUOnaKNYsIJG4j6UYi7zHUjVppQ7fdIxfllTav25q3cDzp88w4NruhX0Z0+7 1uOIgrvli8qTKsw6dsBhp78Grc9/tcNDKznrlVuzRT4gvVMMDNsPFeK/o0/p8gkJRwQ2 f+dDhw+//vAYjSX6nIrso4dcbqHwMtR4CRnOm61NnKQL+8zW+zaagapOgWYHVcplGQYx aAunKU9dNfqUQGRFr/Adk1icfq5M+8m+as8+4dY5WsbXyUQNoaD/EcS4OgFjv7cJ8+jc DSuh/aV3xjjKc0eaHrxbCOcfE/EkV8p5eRG0XIF588l7m7BsD6EB3Fq1Y9ur3l0WCKY2 VoFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=opL2nyqLqw2Vu2T5F9DFuvQkW6EYYL+pJ4SPjn1S6eA=; b=E9k5n0fuJOOk+jT0ELR51IP9yRWB+YkqXQ6E2Hx42H662IPPUq1ahLdrfLSToyxOp1 GCYBcZhJrdCToS6baN4tvc370dmZ09uCvRG96yAxXaXxNF3iNlyDGbBqba55uJpXlquS ly19Lk5zEayJnXpjnsKl5G3x1sFilPgv2GXGip5xTfCbNClN/ZFPpzagvR+AQk3WvhRd 0Pls11uuqa0bhoGD4EMHYFIsmGgsy310pc5Bi64Q2oynkKQL49pnHc9aBacnhUvU5X5C 7PHd3AYAzuBNXdRCfk7ayHUGUEbwuaG5fWWxDfM1hInioqqkSiFAguJf7jwrSd23+ed2 rjmA== X-Gm-Message-State: AOAM530QoRewe3+DEnbNsI9EUqy0wA9xvTuFzVfqTZ+g6OXK3JDv/mqu yzuQj0sNd3CCooW1/K63BbAixk+vJoslVLXOa/0z9ZzJ8U8= X-Google-Smtp-Source: ABdhPJxpVDIcwlv1CVS7NsuP4FjQlMqYVq/SKrdj6rcakgYOaGgFquIBzI/1gLurG2CpiAT+SRTnSdCmMumiMHcxdVg= X-Received: by 2002:aca:be04:: with SMTP id o4mr15293336oif.25.1618831188088; Mon, 19 Apr 2021 04:19:48 -0700 (PDT) In-Reply-To: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:204427 Archived-At: Am So., 18. Apr. 2021 um 22:15 Uhr schrieb Philipp Stephani : > > > 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.