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: 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 Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="8623"; 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 Sun Apr 18 22:15:13 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 1lYDp3-00029g-6K for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 18 Apr 2021 22:15:13 +0200 Original-Received: from localhost ([::1]:50078 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYDp2-0007yG-3y for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 18 Apr 2021 16:15:12 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:49238) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYDos-0007xw-8c for bug-gnu-emacs@gnu.org; Sun, 18 Apr 2021 16:15:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:36385) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lYDos-0005xz-0k for bug-gnu-emacs@gnu.org; Sun, 18 Apr 2021 16:15:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lYDor-0002Xb-Rz for bug-gnu-emacs@gnu.org; Sun, 18 Apr 2021 16:15: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: 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-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.16187768429671 (code B ref -1); Sun, 18 Apr 2021 20:15:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 18 Apr 2021 20:14:02 +0000 Original-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 Original-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 Original-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 Original-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 Original-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) Original-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) 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-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:204408 Archived-At: 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.