From unknown Tue Jun 17 01:36:24 2025 X-Loop: help-debbugs@gnu.org Subject: bug#47881: 28.0.50; `ediff-merge-files' copies diff hunks into clipboard Resent-From: Philipp Stephani Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 18 Apr 2021 20:15:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47881 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: 47881@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16187768429671 (code B ref -1); Sun, 18 Apr 2021 20:15:01 +0000 Received: (at submit) by debbugs.gnu.org; 18 Apr 2021 20:14:02 +0000 Received: from localhost ([127.0.0.1]:47929 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYDnu-0002Vj-AQ for submit@debbugs.gnu.org; Sun, 18 Apr 2021 16:14:02 -0400 Received: from lists.gnu.org ([209.51.188.17]:51680) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYDns-0002VO-Sq for submit@debbugs.gnu.org; Sun, 18 Apr 2021 16:14:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49174) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYDns-0007un-NM for bug-gnu-emacs@gnu.org; Sun, 18 Apr 2021 16:14:00 -0400 Received: from mail-ej1-x62f.google.com ([2a00:1450:4864:20::62f]:44616) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lYDnq-0005IF-PU for bug-gnu-emacs@gnu.org; Sun, 18 Apr 2021 16:14:00 -0400 Received: by mail-ej1-x62f.google.com with SMTP id e14so49682857ejz.11 for ; Sun, 18 Apr 2021 13:13:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=NOUHM43fRqretOkp6WDv15iYBf8RBGHLAIYLWbi8trg=; b=OLYY2sBRBVFNV2Pp28dwZ3DO0Ims+EZXP/fA8KYO513hxWLC6AigjUt/B2TGLKuTfc 35I3AvItqGs5/RxZzXPW7xJQC2ZlAIlt6BvsOwu0PY+v9R1yFVRTm6T8+bKQyY7IbZcA GlHJ29zVrhazo0ZgQd2QjiWBYcj2vM3NoT1zogQAVmVu4x0H2p1WKqBBBrfvpfyZnpyW wKUo4yDVCtPOCWK6KyMwRcSyUiZOT+OIs6dH69zde7K4EG9htQCwdSJb+TAS0ZWNuh/m XTul5J24Y43u80ZtmMllbuyEQO2t7XWgUrMmI18jBk7fZmzbDu+eIRV/jNpNIVR+BrlO dU1Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=NOUHM43fRqretOkp6WDv15iYBf8RBGHLAIYLWbi8trg=; b=faAB2ydsqem8QVYakahFIeaYX9CJo2OZ+nM+3+y32r9y23e/yMv+3AURSCJY2AwkPC f/b1pQXJE0IEsQxMDNHAfLXS1lrZbq1aNq7xLYiHFFCY5E/g90ihNgtFNk7TLi0HaVO0 1gYrDHEQBhIGcmiMEgd/btPD+CVs/ZxMvZi9T7XfAVqWBk7jb25liu5AlaxBfzop6cIk vAeHvkybojuaQYd1uwExHYtMzy7auhwCUIT6CEhaQYPUycne34iZDrbJ15vVONF++Jm1 cTNgFK2/cku+vWiNqzcNCcZ0BEdWD1G4Y1rGQySrUTDkJJz45MnDJfn/OwOGtYf8aMFo Sukg== X-Gm-Message-State: AOAM531y2TXNO3FLDS58vO2Art7Qnm/Dkxwyj8oNkQPku89j24Xa2Ch3 JBr637339m9aPgdElOG5OMMBFu5ghRB2yw== X-Google-Smtp-Source: ABdhPJw/AhgieeKQSNLWgF6ZUDXeltqJOWXE6gASL4Wb4VpY7E1QDRkw1ciro2ac2qLT4aJW26i7Sw== X-Received: by 2002:a17:906:cb1:: with SMTP id k17mr18513987ejh.307.1618776836390; Sun, 18 Apr 2021 13:13:56 -0700 (PDT) Received: from phst (p5b13f7f9.dip0.t-ipconnect.de. [91.19.247.249]) by smtp.gmail.com with ESMTPSA id s11sm11217866edt.27.2021.04.18.13.13.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Apr 2021 13:13:56 -0700 (PDT) From: Philipp Stephani Date: Sun, 18 Apr 2021 22:13:54 +0200 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Received-SPF: pass client-ip=2a00:1450:4864:20::62f; envelope-from=p.stephani2@gmail.com; helo=mail-ej1-x62f.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.1 (-) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.1 (--) 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. In GNU Emacs 28.0.50 (build 81, x86_64-pc-linux-gnu, GTK+ Version 3.24.24, = cairo version 1.16.0) of 2021-04-18 Repository revision: 652b0f4c7453e6d440fec767336ca85aec13e33d Repository branch: master Windowing system distributor 'The X.Org Foundation', version 11.0.12010000 System Description: Debian GNU/Linux rodete Configured using: 'configure --enable-gcc-warnings=3Dwarn-only --enable-gtk-deprecation-warnings --without-pop --with-mailutils --enable-checking=3Dall --enable-check-lisp-object-type --with-modules 'CFLAGS=3D-O0 -ggdb3'' Configured features: CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GSETTINGS HARFBUZZ JPEG JSON LIBSELINUX LIBSYSTEMD MODULES NOTIFY INOTIFY PDUMPER PNG SECCOMP SOUND THREADS TIFF TOOLKIT_SCROLL_BARS X11 XDBE XIM XPM GTK3 ZLIB Important settings: value of $LC_TIME: en_DK.utf8 value of $LANG: en_US.utf8 value of $XMODIFIERS: @im=3Dibus locale-coding-system: utf-8-unix Major mode: Lisp Interaction Minor modes in effect: tooltip-mode: t global-eldoc-mode: t eldoc-mode: t electric-indent-mode: t mouse-wheel-mode: t tool-bar-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t line-number-mode: t transient-mark-mode: t Load-path shadows: None found. Features: (shadow sort mail-extr emacsbug message rmc dired dired-loaddefs rfc822 mml mml-sec epa epg epg-config gnus-util rmail rmail-loaddefs time-date mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader sendmail rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils phst skeleton derived edmacro kmacro pcase ffap thingatpt url url-proxy url-privacy url-expand url-methods url-history url-cookie url-domsuf url-util url-parse auth-source cl-seq eieio eieio-core cl-macs eieio-loaddefs password-cache json map url-vars mailcap rx gnutls puny dbus xml subr-x seq byte-opt gv bytecomp byte-compile cconv compile text-property-search comint ansi-color ring cl-loaddefs cl-lib iso-transl tooltip eldoc electric uniquify ediff-hook vc-hooks lisp-float-type mwheel term/x-win x-win term/common-win x-dnd tool-bar dnd fontset image regexp-opt fringe tabulated-list replace newcomment text-mode elisp-mode lisp-mode prog-mode register page tab-bar menu-bar rfn-eshadow isearch easymenu timer select scroll-bar mouse jit-lock font-lock syntax font-core term/tty-colors frame minibuffer cl-generic cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese composite charscript charprop case-table epa-hook jka-cmpr-hook help simple abbrev obarray cl-preloaded nadvice button loaddefs faces cus-face macroexp files window text-properties overlay sha1 md5 base64 format env code-pages mule custom widget hashtable-print-readable backquote threads dbusbind inotify dynamic-setting system-font-setting font-render-setting cairo move-toolbar gtk x-toolkit x multi-tty make-network-process emacs) Memory information: ((conses 16 68417 8436) (symbols 48 8316 1) (strings 32 24272 1892) (string-bytes 1 785968) (vectors 16 14970) (vector-slots 8 194986 4588) (floats 8 27 31) (intervals 56 224 0) (buffers 992 11)) --=20 Google Germany GmbH Erika-Mann-Stra=C3=9Fe 33 80636 M=C3=BCnchen Gesch=C3=A4ftsf=C3=BChrer: Paul Manicle, Halimah DeLaine Prado Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Diese E-Mail ist vertraulich. Falls Sie diese f=C3=A4lschlicherweise erhal= ten haben sollten, leiten Sie diese bitte nicht an jemand anderes weiter, l=C3=B6sche= n Sie alle Kopien und Anh=C3=A4nge davon und lassen Sie mich bitte wissen, dass d= ie E-Mail an die falsche Person gesendet wurde. This e-mail is confidential. If you received this communication by mistake, please don=E2=80=99t forward it to anyone else, please erase all copies and attachments, and please let me know that it has gone to the wrong person. From debbugs-submit-bounces@debbugs.gnu.org Mon Apr 19 03:38:58 2021 Received: (at control) by debbugs.gnu.org; 19 Apr 2021 07:38:58 +0000 Received: from localhost ([127.0.0.1]:48285 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYOUk-0004Wy-0U for submit@debbugs.gnu.org; Mon, 19 Apr 2021 03:38:58 -0400 Received: from mail-pj1-f45.google.com ([209.85.216.45]:35563) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lYOUi-0004Wl-Qu for control@debbugs.gnu.org; Mon, 19 Apr 2021 03:38:57 -0400 Received: by mail-pj1-f45.google.com with SMTP id j21-20020a17090ae615b02901505b998b45so4526220pjy.0 for ; Mon, 19 Apr 2021 00:38:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:mime-version:date:message-id:subject:to; bh=DnwK8I3ocyl36/gLv7WB9jea+b6W6fkhEouWl1GCObY=; b=cGv8qNe8cZPPf1PduAk71Y0MlFpveSBlt1ABLOIWv4I5zo8bJ0kmb+3XYolp48R5be wsfO4rb1m+WR0YqVsd/MyY0R2FGVwIxcduDXkcGe3gsaGsx0flt524NyOpWBd6nXJGwS 4brNhS2xxDFNAQq2JOclnVCZJk0sS598i6ZZ+2UqY5rw4dhkD3bSOJp/EXgeLf8a59Lv PgfI+SxT4sR9ngDoO4Z7LSeAq76lXdRNa5xeodw2LnritbuCYBIxMMtSvIGeOlpO6rmn wO+lnLIulyd+oz7sCzAX8fwwJKQO4lwXDoKNc9dta811HWzklgcSar/xDLTi4O1m5AX/ Cm4g== X-Gm-Message-State: AOAM531sJu6k7KZUHPd0LAULAh9GZZyFKvWLWrwe7GZ8HdQI0bUH+/pq jfPgoGmdlwZTIdVrTzAzEMp7wwpAJ368d4pU1Srpj8Eg X-Google-Smtp-Source: ABdhPJwUodEfqqhfLK98bVlSm5dHX5uof0H8SEkWJLzhGBgpu9+kfnnW/hFLumvM28LkljxJi0XB81L/ex6OuOMTRtM= X-Received: by 2002:a17:90b:19ca:: with SMTP id nm10mr23890059pjb.175.1618817931266; Mon, 19 Apr 2021 00:38:51 -0700 (PDT) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Mon, 19 Apr 2021 07:38:50 +0000 From: Stefan Kangas MIME-Version: 1.0 Date: Mon, 19 Apr 2021 07:38:50 +0000 Message-ID: Subject: To: control@debbugs.gnu.org Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 2.5 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: severity 47881 minor severity 47878 wishlist severity 47876 wishlist severity 47862 minor severity 47785 minor severity 47738 minor severity 47686 wishlist severity 47677 wishlist thanks Content analysis details: (2.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (stefankangas[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.216.45 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.216.45 listed in list.dnswl.org] 0.2 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different 2.0 BLANK_SUBJECT Subject is present but empty -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.5 (+) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: severity 47881 minor severity 47878 wishlist severity 47876 wishlist severity 47862 minor severity 47785 minor severity 47738 minor severity 47686 wishlist severity 47677 wishlist thanks Content analysis details: (1.5 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.216.45 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.216.45 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (stefankangas[at]gmail.com) 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different -0.0 SPF_PASS SPF: sender matches SPF record 0.2 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different 2.0 BLANK_SUBJECT Subject is present but empty -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders -1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list manager 0.0 UNPARSEABLE_RELAY Informational: message has unparseable relay lines severity 47881 minor severity 47878 wishlist severity 47876 wishlist severity 47862 minor severity 47785 minor severity 47738 minor severity 47686 wishlist severity 47677 wishlist thanks From unknown Tue Jun 17 01:36:24 2025 X-Loop: help-debbugs@gnu.org Subject: bug#47881: 28.0.50; `ediff-merge-files' copies diff hunks into clipboard 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 X-GNU-PR-Keywords: To: 47881@debbugs.gnu.org Received: via spool by 47881-submit@debbugs.gnu.org id=B47881.161883120031517 (code B ref 47881); Mon, 19 Apr 2021 11:20:01 +0000 Received: (at 47881) by debbugs.gnu.org; 19 Apr 2021 11:20:00 +0000 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 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 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) MIME-Version: 1.0 References: In-Reply-To: From: Philipp Stephani Date: Mon, 19 Apr 2021 13:19:37 +0200 Message-ID: Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.2 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.8 (/) 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. From unknown Tue Jun 17 01:36:24 2025 X-Loop: help-debbugs@gnu.org Subject: bug#47881: 28.0.50; `ediff-merge-files' copies diff hunks into clipboard Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 03 May 2021 10:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47881 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: To: Philipp Stephani Cc: 47881@debbugs.gnu.org Received: via spool by 47881-submit@debbugs.gnu.org id=B47881.162003740224929 (code B ref 47881); Mon, 03 May 2021 10:24:01 +0000 Received: (at 47881) by debbugs.gnu.org; 3 May 2021 10:23:22 +0000 Received: from localhost ([127.0.0.1]:46274 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ldVjW-0006U1-33 for submit@debbugs.gnu.org; Mon, 03 May 2021 06:23:22 -0400 Received: from quimby.gnus.org ([95.216.78.240]:40388) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ldVjT-0006To-CK for 47881@debbugs.gnu.org; Mon, 03 May 2021 06:23:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Gk/9LkZgIADDLWeA1BYfblKdHw+r4AtUzOrUDolr9ks=; b=Wi5hlXo8KKFl7WSnHh5+/vear3 d3nT41L/o7uk9J82tXl2+MPP3P7+99Lo4VAmVNY1bRzQbD5R5ty6XAcXS8RTomhVqg08Sdx1VjZn+ 5/ihUoEg0fLonpC2iWAbH/MAgi1wY+TUTgkwZAYI0uW8segSPmIhYvSPEJbkY3cmkJQU=; Received: from cm-84.212.220.105.getinternet.no ([84.212.220.105] helo=xo) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ldVjK-0003ol-Vm; Mon, 03 May 2021 12:23:13 +0200 From: Lars Ingebrigtsen References: X-Now-Playing: Sector 27's _Sector 27 Complete_: "Christopher Calling (bonus track)" Date: Mon, 03 May 2021 12:23:10 +0200 In-Reply-To: (Philipp Stephani's message of "Mon, 19 Apr 2021 13:19:37 +0200") Message-ID: <875z00ce0h.fsf@gnus.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: Philipp Stephani writes: > It looks like the problem is that ediff-copy-diff calls kill-region. Yup. I wondered first whether it did so on purpose, as far as I can see, the things it puts on the kill ring aren't useful? So I've just changed it to delete-region instead. If people are depending on [...] Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) Philipp Stephani writes: > It looks like the problem is that ediff-copy-diff calls kill-region. Yup. I wondered first whether it did so on purpose, as far as I can see, the things it puts on the kill ring aren't useful? So I've just changed it to delete-region instead. If people are depending on that value being in the kill ring, the patch should be reverted, and a comment should be added to say what the point of the kill-region is. -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no From debbugs-submit-bounces@debbugs.gnu.org Mon May 03 06:23:25 2021 Received: (at control) by debbugs.gnu.org; 3 May 2021 10:23:25 +0000 Received: from localhost ([127.0.0.1]:46277 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ldVjZ-0006UD-9o for submit@debbugs.gnu.org; Mon, 03 May 2021 06:23:25 -0400 Received: from quimby.gnus.org ([95.216.78.240]:40402) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ldVjX-0006Tt-Nb for control@debbugs.gnu.org; Mon, 03 May 2021 06:23:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Subject:From:To:Message-Id:Date:Sender:Reply-To:Cc: MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:In-Reply-To:References:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=uCMSVjXQYXY73pgyPQB7j7elOcmujRgIeZ633etjW7s=; b=N9TQj14UeVy1L4Kx/3c9GqvxvR ZkD4oNqNhQMrX8/kADjSUL1Rc0wTdFJMh9aLNQCIszoqM9aeWz7BK6+7fHHMaeZ46WFfsqsspDWEg ENop1wkhF3hIT9lYnaKH9XL571PrxtAfdF4YKZgR4amwpltXEGbO5LrxZLfjxz9H8yg0=; Received: from cm-84.212.220.105.getinternet.no ([84.212.220.105] helo=xo) by quimby.gnus.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1ldVjQ-0003or-7C for control@debbugs.gnu.org; Mon, 03 May 2021 12:23:18 +0200 Date: Mon, 03 May 2021 12:23:15 +0200 Message-Id: <874kfkce0c.fsf@gnus.org> To: control@debbugs.gnu.org From: Lars Ingebrigtsen Subject: control message for bug #47881 X-Spam-Report: Spam detection software, running on the system "quimby.gnus.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see @@CONTACT_ADDRESS@@ for details. Content preview: tags 47881 fixed close 47881 28.1 quit Content analysis details: (-2.9 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -1.0 ALL_TRUSTED Passed through trusted hosts only via SMTP -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) tags 47881 fixed close 47881 28.1 quit