From unknown Wed Jun 25 00:26:09 2025 X-Loop: help-debbugs@gnu.org Subject: bug#72866: [PATCH] Add ediff-copy-all-X-to-Y functions Resent-From: Paul Nelson Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 29 Aug 2024 06:05:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 72866 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: 72866@debbugs.gnu.org X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.172491145410989 (code B ref -1); Thu, 29 Aug 2024 06:05:01 +0000 Received: (at submit) by debbugs.gnu.org; 29 Aug 2024 06:04:14 +0000 Received: from localhost ([127.0.0.1]:50132 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sjYGU-0002rA-7j for submit@debbugs.gnu.org; Thu, 29 Aug 2024 02:04:14 -0400 Received: from lists.gnu.org ([209.51.188.17]:59818) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sjYGS-0002r1-0T for submit@debbugs.gnu.org; Thu, 29 Aug 2024 02:04:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sjYFY-0003hx-QT for bug-gnu-emacs@gnu.org; Thu, 29 Aug 2024 02:03:16 -0400 Received: from mail-io1-xd2e.google.com ([2607:f8b0:4864:20::d2e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sjYFX-0008Rx-9s for bug-gnu-emacs@gnu.org; Thu, 29 Aug 2024 02:03:16 -0400 Received: by mail-io1-xd2e.google.com with SMTP id ca18e2360f4ac-81fd925287eso12892739f.3 for ; Wed, 28 Aug 2024 23:03:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724911393; x=1725516193; darn=gnu.org; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=eWB6HnxH9hI8HjXd87mGcQtf6gTfaUl+Hqtnl3gbai4=; b=g0EEZfMdJsOuJfcgzsVhYNaIxZxZmHbBUwUtW4lDAzvn0Ugx+NN5jHXLUKy7Mxzvx4 3aXgmFbzzd3vVIXqHHDhIhX+EOjsWFQCicDBImgzaRQ6IsUttCHA2nesC6cU3nXc3XMG p4RXG3+B5JHeF1eYGV4KW0ba7ko3TkCLePGZxkZBIfk6lfsqyZyEaW9If9KV7Hj0Vunk 3V/FJCUe2V/+VyPJhQVyZSwh+iZnoyUoJbhWdAqB7ywIxZ6zjpBwSwvE8woABpS4I/ie kEX0ZsrVdoglBcIuif+tX5DvkhQAPh9IQdw3dAr2leHyb4a+U9R70dmkQlHGpk7i4o4q EFNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724911393; x=1725516193; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=eWB6HnxH9hI8HjXd87mGcQtf6gTfaUl+Hqtnl3gbai4=; b=ZHpNtZ0XyQJnQUcTXU1NDH3gDKZdWbRupS6RcFnuj72OfRVz2/d7OCRRqtKVGlu20C FdqR/DXmCKBqfaxw3IQDzpdGO2VfDJ6UGMo+77zmaqmRs3EJ7aGU0XqPXzpgy2CipWie Jm7+0n+PJVSZcEwuTIq/txOl3busjq2Rehkdem3I1o+HMQiMSjm/GY7lELg+5OhAROCc 89jUGhWVKvPHXvDsXCsQEUg61/cw0mNkTYF6KSrR44LoWF6y7gUdw8ZbQImhTtAx0wmX 0MK6v71RjnQxeMgJ2yUOuxdJhUYalCytpjywr88GZ0wqOIKD9NTYZ8+8ufrWJN6xJ/m7 YPLA== X-Gm-Message-State: AOJu0YyFCr+H4UddKzYIpmdjG3dWLOeIJCceewuj8NrsfXphxHP0asy4 zJvltlReB1d0HeMHttTKsdrePkTdX0rmxewP3MkTO1LOzsTxwIQlHEPSIcsVmEVAg1KIB3+CA5T 5ArviNnN5hGjhPxAJ2gz5FpXIklHhIFb7tqE= X-Google-Smtp-Source: AGHT+IHAmVWGmXIBy8CCEjrpS5wAb/oTRccIWWKUsnO71xWWFImQ4bdwjBDHn/NLZKZwYY7oVyoOTc8cjssGqoAlZu4= X-Received: by 2002:a05:6602:6286:b0:805:e2bf:f303 with SMTP id ca18e2360f4ac-82a110525cbmr205376639f.8.1724911393441; Wed, 28 Aug 2024 23:03:13 -0700 (PDT) MIME-Version: 1.0 From: Paul Nelson Date: Thu, 29 Aug 2024 08:03:01 +0200 Message-ID: Content-Type: multipart/mixed; boundary="000000000000e02f020620cc3a67" Received-SPF: pass client-ip=2607:f8b0:4864:20::d2e; envelope-from=ultrono@gmail.com; helo=mail-io1-xd2e.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) 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.3 (--) --000000000000e02f020620cc3a67 Content-Type: text/plain; charset="UTF-8" This patch binds functions in Ediff that copy all changes from one buffer to another, without having to manually go through each difference. Any feedback welcome. Thanks, best, Paul --000000000000e02f020620cc3a67 Content-Type: application/octet-stream; name="0001-Add-ediff-copy-all-X-to-Y-functions.patch" Content-Disposition: attachment; filename="0001-Add-ediff-copy-all-X-to-Y-functions.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_m0evo2sp0 RnJvbSAxNTUwYWY5Yjc4NmNmZjAzZDM3NzI1YzY5YjUzYzRiNzExYTlmNDVjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIE5lbHNvbiA8dWx0cm9ub0BnbWFpbC5jb20+CkRhdGU6 IFRodSwgMjkgQXVnIDIwMjQgMDc6NTA6MjcgKzAyMDAKU3ViamVjdDogW1BBVENIXSBBZGQgZWRp ZmYtY29weS1hbGwtWC10by1ZIGZ1bmN0aW9ucwoKKiBsaXNwL3ZjL2VkaWZmLXV0aWwuZWwgKGVk aWZmLS1jb3B5LWFsbCk6CihlZGlmZi1jb3B5LWFsbC1BLXRvLUIpOgooZWRpZmYtY29weS1hbGwt Qi10by1BKToKKGVkaWZmLWNvcHktYWxsLUEtdG8tQyk6CihlZGlmZi1jb3B5LWFsbC1CLXRvLUMp OgooZWRpZmYtY29weS1hbGwtQy10by1BKToKKGVkaWZmLWNvcHktYWxsLUMtdG8tQik6IE5ldyBm dW5jdGlvbnMuCihlZGlmZi1zZXR1cC1rZXltYXApOiBCaW5kIHRoZW0uCi0tLQogbGlzcC92Yy9l ZGlmZi11dGlsLmVsIHwgNjQgKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKwogMSBmaWxlIGNoYW5nZWQsIDY0IGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9saXNw L3ZjL2VkaWZmLXV0aWwuZWwgYi9saXNwL3ZjL2VkaWZmLXV0aWwuZWwKaW5kZXggNTk3ZDhhNWU2 NDMuLmI1NzVlYWVjYTc1IDEwMDY0NAotLS0gYS9saXNwL3ZjL2VkaWZmLXV0aWwuZWwKKysrIGIv bGlzcC92Yy9lZGlmZi11dGlsLmVsCkBAIC0xNTksNiArMTU5LDggQEAgZWRpZmYtc2V0dXAta2V5 bWFwCiAJIDs7IEluIG1lcmdpbmcsIHdlIGFsbG93IG9ubHkgQS0+QyBhbmQgQi0+QyBjb3B5aW5n LgogCSAoZGVmaW5lLWtleSBlZGlmZi1tb2RlLW1hcCAiYSIgIydlZGlmZi1jb3B5LUEtdG8tQykK IAkgKGRlZmluZS1rZXkgZWRpZmYtbW9kZS1tYXAgImIiICMnZWRpZmYtY29weS1CLXRvLUMpCisJ IChkZWZpbmUta2V5IGVkaWZmLW1vZGUtbWFwICJDLWMgQy1hIiAjJ2VkaWZmLWNvcHktYWxsLUEt dG8tQykKKwkgKGRlZmluZS1rZXkgZWRpZmYtbW9kZS1tYXAgIkMtYyBDLWIiICMnZWRpZmYtY29w eS1hbGwtQi10by1DKQogCSAoZGVmaW5lLWtleSBlZGlmZi1tb2RlLW1hcCAiciIgIydlZGlmZi1y ZXN0b3JlLWRpZmYtaW4tbWVyZ2UtYnVmZmVyKQogCSAoZGVmaW5lLWtleSBlZGlmZi1tb2RlLW1h cCAicyIgIydlZGlmZi1zaHJpbmstd2luZG93LUMpCiAJIChkZWZpbmUta2V5IGVkaWZmLW1vZGUt bWFwICIrIiAjJ2VkaWZmLWNvbWJpbmUtZGlmZnMpCkBAIC0xNzQsNiArMTc2LDEyIEBAIGVkaWZm LXNldHVwLWtleW1hcAogCSAoZGVmaW5lLWtleSBlZGlmZi1tb2RlLW1hcCAiYyIgbmlsKQogCSAo ZGVmaW5lLWtleSBlZGlmZi1tb2RlLW1hcCAiY2EiICMnZWRpZmYtY29weS1DLXRvLUEpCiAJIChk ZWZpbmUta2V5IGVkaWZmLW1vZGUtbWFwICJjYiIgIydlZGlmZi1jb3B5LUMtdG8tQikKKyAgICAg ICAgIChkZWZpbmUta2V5IGVkaWZmLW1vZGUtbWFwICJDLWMgQy1hIEMtYiIgIydlZGlmZi1jb3B5 LWFsbC1BLXRvLUIpCisgICAgICAgICAoZGVmaW5lLWtleSBlZGlmZi1tb2RlLW1hcCAiQy1jIEMt YiBDLWEiICMnZWRpZmYtY29weS1hbGwtQi10by1BKQorICAgICAgICAgKGRlZmluZS1rZXkgZWRp ZmYtbW9kZS1tYXAgIkMtYyBDLWEgQy1jIiAjJ2VkaWZmLWNvcHktYWxsLUEtdG8tQykKKyAgICAg ICAgIChkZWZpbmUta2V5IGVkaWZmLW1vZGUtbWFwICJDLWMgQy1iIEMtYyIgIydlZGlmZi1jb3B5 LWFsbC1CLXRvLUMpCisgICAgICAgICAoZGVmaW5lLWtleSBlZGlmZi1tb2RlLW1hcCAiQy1jIEMt YyBDLWEiICMnZWRpZmYtY29weS1hbGwtQy10by1BKQorICAgICAgICAgKGRlZmluZS1rZXkgZWRp ZmYtbW9kZS1tYXAgIkMtYyBDLWMgQy1iIiAjJ2VkaWZmLWNvcHktYWxsLUMtdG8tQikKIAkgKGRl ZmluZS1rZXkgZWRpZmYtbW9kZS1tYXAgInJhIiAjJ2VkaWZmLXJlc3RvcmUtZGlmZikKIAkgKGRl ZmluZS1rZXkgZWRpZmYtbW9kZS1tYXAgInJiIiAjJ2VkaWZmLXJlc3RvcmUtZGlmZikKIAkgKGRl ZmluZS1rZXkgZWRpZmYtbW9kZS1tYXAgInJjIiAjJ2VkaWZmLXJlc3RvcmUtZGlmZikKQEAgLTE4 MSw2ICsxODksOCBAQCBlZGlmZi1zZXR1cC1rZXltYXAKIAkodCA7IDItd2F5IGNvbXBhcmlzb24K IAkgKGRlZmluZS1rZXkgZWRpZmYtbW9kZS1tYXAgImEiICAjJ2VkaWZmLWNvcHktQS10by1CKQog CSAoZGVmaW5lLWtleSBlZGlmZi1tb2RlLW1hcCAiYiIgICMnZWRpZmYtY29weS1CLXRvLUEpCisg ICAgICAgICAoZGVmaW5lLWtleSBlZGlmZi1tb2RlLW1hcCAiQy1jIEMtYSIgIydlZGlmZi1jb3B5 LWFsbC1BLXRvLUIpCisgICAgICAgICAoZGVmaW5lLWtleSBlZGlmZi1tb2RlLW1hcCAiQy1jIEMt YiIgIydlZGlmZi1jb3B5LWFsbC1CLXRvLUEpCiAJIChkZWZpbmUta2V5IGVkaWZmLW1vZGUtbWFw ICJyYSIgIydlZGlmZi1yZXN0b3JlLWRpZmYpCiAJIChkZWZpbmUta2V5IGVkaWZmLW1vZGUtbWFw ICJyYiIgIydlZGlmZi1yZXN0b3JlLWRpZmYpKQogCSkgOyBjb25kCkBAIC0xOTUyLDYgKzE5NjIs NjAgQEAgZWRpZmYtY29weS1DLXRvLUEKICAgKGludGVyYWN0aXZlICJQIikKICAgKGVkaWZmLWRp ZmYtdG8tZGlmZiBhcmcgImNhIikpCiAKKyhkZWZ1biBlZGlmZi0tY29weS1hbGwgKHNvdXJjZSBk ZXN0KQorICAiQ29weSBhbGwgY2hhbmdlcyBmcm9tIFNPVVJDRSB0byBERVNUIGluIEVkaWZmLgor U09VUkNFIGFuZCBERVNUIHNob3VsZCBlYWNoIGJlIG9uZSBvZiB0aGUgc3ltYm9scyBgQScsIGBC Jywgb3IgYEMnLiIKKyAgKGVkaWZmLWJhcmYtaWYtbm90LWNvbnRyb2wtYnVmZmVyKQorICAobGV0 ICgodmFsaWQtYnVmZmVycyAnKEEgQiBDKSkpCisgICAgKHVubGVzcyAoYW5kIChtZW1xIHNvdXJj ZSB2YWxpZC1idWZmZXJzKQorICAgICAgICAgICAgICAgICAobWVtcSBkZXN0IHZhbGlkLWJ1ZmZl cnMpKQorICAgICAgKGVycm9yICJCdWZmZXIgYXJndW1lbnRzIHNob3VsZCBiZSBgQScsIGBCJywg b3IgYEMnIikpKQorICAodW5sZXNzIChlcSBzb3VyY2UgZGVzdCkKKyAgICAobGV0KiAoKGNvcHkt ZnVuYy1uYW1lIChmb3JtYXQgImVkaWZmLWNvcHktJXMtdG8tJXMiCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIChzeW1ib2wtbmFtZSBzb3VyY2UpCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIChzeW1ib2wtbmFtZSBkZXN0KSkpCisgICAgICAgICAgIChjb3B5 LWZ1bmMgKGludGVybiBjb3B5LWZ1bmMtbmFtZSkpKQorICAgICAgKGNvbmRpdGlvbi1jYXNlIGVy cgorICAgICAgICAgIChsZXQgKChuIDApKQorICAgICAgICAgICAgKHdoaWxlIChlZGlmZi12YWxp ZC1kaWZmZXJlbmNlLXAgbikKKyAgICAgICAgICAgICAgKGVkaWZmLWp1bXAtdG8tZGlmZmVyZW5j ZSAoMSsgbikpCisgICAgICAgICAgICAgIChmdW5jYWxsIGNvcHktZnVuYyBuaWwpCisgICAgICAg ICAgICAgIChzZXRxIG4gKDErIG4pKSkKKyAgICAgICAgICAgIChtZXNzYWdlICJBbGwgY2hhbmdl cyBjb3BpZWQgZnJvbSBidWZmZXIgJXMgdG8gJXMiCisgICAgICAgICAgICAgICAgICAgICAoc3lt Ym9sLW5hbWUgc291cmNlKQorICAgICAgICAgICAgICAgICAgICAgKHN5bWJvbC1uYW1lIGRlc3Qp KSkKKyAgICAgICAgKGVycm9yCisgICAgICAgICAobWVzc2FnZSAiRXJyb3Igb2NjdXJyZWQgd2hp bGUgY29weWluZzogJXMiIChlcnJvci1tZXNzYWdlLXN0cmluZyBlcnIpKSkpKSkpCisKKyhkZWZ1 biBlZGlmZi1jb3B5LWFsbC1BLXRvLUIgKCkKKyAgIkNvcHkgYWxsIGNoYW5nZXMgZnJvbSBidWZm ZXIgQSB0byBidWZmZXIgQiBpbiBFZGlmZi4iCisgIChpbnRlcmFjdGl2ZSkKKyAgKGVkaWZmLS1j b3B5LWFsbCAnQSAnQikpCisKKyhkZWZ1biBlZGlmZi1jb3B5LWFsbC1CLXRvLUEgKCkKKyAgIkNv cHkgYWxsIGNoYW5nZXMgZnJvbSBidWZmZXIgQiB0byBidWZmZXIgQSBpbiBFZGlmZi4iCisgIChp bnRlcmFjdGl2ZSkKKyAgKGVkaWZmLS1jb3B5LWFsbCAnQiAnQSkpCisKKyhkZWZ1biBlZGlmZi1j b3B5LWFsbC1BLXRvLUMgKCkKKyAgIkNvcHkgYWxsIGNoYW5nZXMgZnJvbSBidWZmZXIgQSB0byBi dWZmZXIgQyBpbiBFZGlmZi4iCisgIChpbnRlcmFjdGl2ZSkKKyAgKGVkaWZmLS1jb3B5LWFsbCAn QSAnQykpCisKKyhkZWZ1biBlZGlmZi1jb3B5LWFsbC1CLXRvLUMgKCkKKyAgIkNvcHkgYWxsIGNo YW5nZXMgZnJvbSBidWZmZXIgQiB0byBidWZmZXIgQyBpbiBFZGlmZi4iCisgIChpbnRlcmFjdGl2 ZSkKKyAgKGVkaWZmLS1jb3B5LWFsbCAnQiAnQykpCisKKyhkZWZ1biBlZGlmZi1jb3B5LWFsbC1D LXRvLUEgKCkKKyAgIkNvcHkgYWxsIGNoYW5nZXMgZnJvbSBidWZmZXIgQyB0byBidWZmZXIgQSBp biBFZGlmZi4iCisgIChpbnRlcmFjdGl2ZSkKKyAgKGVkaWZmLS1jb3B5LWFsbCAnQyAnQSkpCisK KyhkZWZ1biBlZGlmZi1jb3B5LWFsbC1DLXRvLUIgKCkKKyAgIkNvcHkgYWxsIGNoYW5nZXMgZnJv bSBidWZmZXIgQyB0byBidWZmZXIgQiBpbiBFZGlmZi4iCisgIChpbnRlcmFjdGl2ZSkKKyAgKGVk aWZmLS1jb3B5LWFsbCAnQyAnQikpCiAKIAogOzsgQ29weSBkaWZmIE4gZnJvbSBGUk9NLUJVRi1U WVBFIChnaXZlbiBhcyBBLCBCIG9yIEMpIHRvIFRPLUJVRi1UWVBFLgotLSAKMi4zOS4zIChBcHBs ZSBHaXQtMTQ1KQoK --000000000000e02f020620cc3a67-- From unknown Wed Jun 25 00:26:09 2025 X-Loop: help-debbugs@gnu.org Subject: bug#72866: [PATCH] Add ediff-copy-all-X-to-Y functions Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 31 Aug 2024 10:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72866 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Paul Nelson Cc: 72866@debbugs.gnu.org Received: via spool by 72866-submit@debbugs.gnu.org id=B72866.17251004058518 (code B ref 72866); Sat, 31 Aug 2024 10:34:02 +0000 Received: (at 72866) by debbugs.gnu.org; 31 Aug 2024 10:33:25 +0000 Received: from localhost ([127.0.0.1]:54036 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1skLQ5-0002DJ-6Q for submit@debbugs.gnu.org; Sat, 31 Aug 2024 06:33:25 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48936) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1skLQ3-0002D0-Gm for 72866@debbugs.gnu.org; Sat, 31 Aug 2024 06:33:24 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1skLP2-0003fz-91; Sat, 31 Aug 2024 06:32:20 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=tMgwJFITKoVBg7hTdBdBM6iwIFJQrdtQf9mF0juqI0M=; b=gcoZEaG/aXMk jVDxvOZLQwXDs5xCLGv18tz+smvMmbHT1vCgtTaGXX9kee579pURB2SNEjMuSF6bVPzLstcTFOSrt ERJfnDRH4/vTIdN4LEge8dHlzYQME/dumDpieM58M0PC0OekYHWKYMxtz0dAJW6uCnwwl0r/gkXVC JZj+5w03ztKBUjXD6XOn1x+CW6ypbAWn7B2PwgxjCYee+YtYAXTdEV6LqWzdbYEkVvKabLqp0GUKU p2MJTp8BnmcYXINInJu6LqlGsO5VNY2xDfWj4xLzq5HQL+Lx80hXkm9HbofzxIuSxoWCjef4tO7gZ /3uBccm1FFYYHOwp9S2aew==; Date: Sat, 31 Aug 2024 13:32:18 +0300 Message-Id: <86le0dasp9.fsf@gnu.org> From: Eli Zaretskii In-Reply-To: (message from Paul Nelson on Thu, 29 Aug 2024 08:03:01 +0200) References: X-Spam-Score: -2.3 (--) 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: -3.3 (---) > From: Paul Nelson > Date: Thu, 29 Aug 2024 08:03:01 +0200 > > This patch binds functions in Ediff that copy all changes from one > buffer to another, without having to manually go through each > difference. Any feedback welcome. Can you describe situation(s) where these commands will be useful? I think all we need to install this is a suitable NEWS entry. Thanks. From unknown Wed Jun 25 00:26:09 2025 X-Loop: help-debbugs@gnu.org Subject: bug#72866: [PATCH] Add ediff-copy-all-X-to-Y functions Resent-From: Paul Nelson Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 01 Sep 2024 07:03:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72866 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Eli Zaretskii Cc: 72866@debbugs.gnu.org Received: via spool by 72866-submit@debbugs.gnu.org id=B72866.172517413519592 (code B ref 72866); Sun, 01 Sep 2024 07:03:01 +0000 Received: (at 72866) by debbugs.gnu.org; 1 Sep 2024 07:02:15 +0000 Received: from localhost ([127.0.0.1]:32970 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1skebH-00055w-7B for submit@debbugs.gnu.org; Sun, 01 Sep 2024 03:02:15 -0400 Received: from mail-io1-f52.google.com ([209.85.166.52]:50614) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1skebF-00055g-7l for 72866@debbugs.gnu.org; Sun, 01 Sep 2024 03:02:13 -0400 Received: by mail-io1-f52.google.com with SMTP id ca18e2360f4ac-82a316f8ae1so59163639f.1 for <72866@debbugs.gnu.org>; Sun, 01 Sep 2024 00:01:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725174008; x=1725778808; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=U+6SB+4OaAUOHCRuZNcBHQNC3uMMnx6Fb6I9OemIsNo=; b=aRaTEuebwZF3AX/0He6ihaMBDRda6djZT+o5VUvLGYHe5nDnapLD92UgDI3/JErJiv +i+PKaZGxEeeHPxT36XlUO/9BHD3PtCDu8fBEBMwf9hgXcxCIb3ddoFYGn8j+VvMbhZY nRePqdOK/UFyaWhDplNrPa0WkyCSkCgMnYz2uLBRgUvt3IscO8gFVUUNodfdLMEVbWmr 7BYFSjaG6VuBD04CW6rcuAkwpQIdI1dnJRGKPDSBrgRHGQx+2pfBvr7NSK4SY9Atiz2e wF6S/IwcUaG/TptJoM9zwSWB7AJVoEOdd3vJRsBMlK4g7F3cwFlrBLladT+NW8u5R7Rd fM8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725174008; x=1725778808; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=U+6SB+4OaAUOHCRuZNcBHQNC3uMMnx6Fb6I9OemIsNo=; b=ZdECvLyV6l1lGvYaH29vDrmsrtXzxX/McvSy/N5mAmZZVPUxMvP+1z+tahhbByVO7s z+YoMdFtL8ETWRggi50/WamadD80Rlyh3hYUV1UkRInSvIwGDPmdlGC163NHDArSpdFv 0n2Yc2tvQtVrKmveUrWk5Vo/O2PXAC5zxSv2ZArYWlBZ7KGv5WOBSPqUbb2dSO+ftNrT 5OLjhuilWCGRBkdc+JJTUjB2EJdIRn3dTp0+Wm46WHM1hKppxQTko5MITug4RpxDXQGI raHlef8AUhw2pEZqoA4A/pMuUWYL9OKO5M2IoH3zjWAgaxHpFgD94qb5GC5pfjn0Vakd MW+Q== X-Gm-Message-State: AOJu0YxABtlOJNX+D3SBB5V8TlaQ1BCJ45Ahav0NEXZS1pKzmk0kQbpP 7xS/qQOJyoWcvhnOWJSogTa/uJ0us//XKog1bUV/f2mqZn2iUc1Fg2ooIsr4Nl9vvIFpxLFzClV hUHmT43qnaRnsngLOHWnIS/OzchU= X-Google-Smtp-Source: AGHT+IEQGjhcWEdPaqfEvfXMMzFzFsJQaswu5Go2fasdj3PQrDrRE2Ai6cL/sI7szVjTy/CBfbcaiiwt0qsOuICkUX4= X-Received: by 2002:a05:6602:342a:b0:82a:34da:72f7 with SMTP id ca18e2360f4ac-82a34da751bmr376285339f.16.1725174008208; Sun, 01 Sep 2024 00:00:08 -0700 (PDT) MIME-Version: 1.0 References: <86le0dasp9.fsf@gnu.org> In-Reply-To: <86le0dasp9.fsf@gnu.org> From: Paul Nelson Date: Sun, 1 Sep 2024 08:59:53 +0200 Message-ID: Content-Type: multipart/mixed; boundary="000000000000ef8bf70621095fa4" 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 (-) --000000000000ef8bf70621095fa4 Content-Type: text/plain; charset="UTF-8" > > This patch binds functions in Ediff that copy all changes from one > > buffer to another, without having to manually go through each > > difference. Any feedback welcome. > > Can you describe situation(s) where these commands will be useful? I use Ediff to merge documents outside of git, like when working with someone over email or using a computer program to refactor code. Sometimes all changes go one way, say from B to A. The standard workflow then involves pressing "n" to review and "b" to apply each change. When the changes turn out to be mundane, this leads to repetitive "n b" keystrokes. The proposed patch allows a more efficient process: rapidly review with "n", then apply all at once using "C-c C-b". > > I think all we need to install this is a suitable NEWS entry. > > Thanks. I've updated the patch with a NEWS entry (formatted to the best of my ability), together with updates to the Ediff manual and the internal help system. Happy to revise further if I missed anything. Thanks, best, Paul --000000000000ef8bf70621095fa4 Content-Type: application/x-patch; name="0001-Add-ediff-copy-all-X-to-Y-functions.patch" Content-Disposition: attachment; filename="0001-Add-ediff-copy-all-X-to-Y-functions.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_m0j7zkcc0 RnJvbSA3MGNiMTA2OTQxZTEwZmVlMWUwOTQ2OTI4YjRhZGU3ZjU5OWRmZDQxIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIE5lbHNvbiA8dWx0cm9ub0BnbWFpbC5jb20+CkRhdGU6 IFRodSwgMjkgQXVnIDIwMjQgMDc6NTA6MjcgKzAyMDAKU3ViamVjdDogW1BBVENIXSBBZGQgZWRp ZmYtY29weS1hbGwtWC10by1ZIGZ1bmN0aW9ucwoKKiBsaXNwL3ZjL2VkaWZmLXV0aWwuZWwgKGVk aWZmLS1jb3B5LWFsbCk6CihlZGlmZi1jb3B5LWFsbC1BLXRvLUIpOgooZWRpZmYtY29weS1hbGwt Qi10by1BKToKKGVkaWZmLWNvcHktYWxsLUEtdG8tQyk6CihlZGlmZi1jb3B5LWFsbC1CLXRvLUMp OgooZWRpZmYtY29weS1hbGwtQy10by1BKToKKGVkaWZmLWNvcHktYWxsLUMtdG8tQik6IE5ldyBm dW5jdGlvbnMuCihlZGlmZi1zZXR1cC1rZXltYXApOiBCaW5kIHRoZW0uCgoqIGRvYy9taXNjL2Vk aWZmLnRleGkgKFF1aWNrIEhlbHAgQ29tbWFuZHMpOiBEb2N1bWVudCB0aGVtLgoKKiBsaXNwL3Zj L2VkaWZmLWhlbHAuZWwgKGVkaWZmLWxvbmctaGVscC1tZXNzYWdlLWNvbXBhcmUzKToKKGVkaWZm LWxvbmctaGVscC1tZXNzYWdlLWNvbXBhcmUyKToKKGVkaWZmLWxvbmctaGVscC1tZXNzYWdlLW5h cnJvdzIpOgooZWRpZmYtbG9uZy1oZWxwLW1lc3NhZ2Utd29yZC1tb2RlKToKKGVkaWZmLWxvbmct aGVscC1tZXNzYWdlLW1lcmdlKTogTWVudGlvbiB0aGVtLgoKKiBldGMvTkVXUyAoTGlzcCBDaGFu Z2VzIGluIEVtYWNzIDMxLjEpOiBNZW50aW9uIHRoZW0uCi0tLQogZG9jL21pc2MvZWRpZmYudGV4 aSAgIHwgMjEgKysrKysrKysrKysrKysKIGV0Yy9ORVdTICAgICAgICAgICAgICB8IDE3ICsrKysr KysrKysrCiBsaXNwL3ZjL2VkaWZmLWhlbHAuZWwgfCA2NiArKysrKysrKysrKysrKysrKysrKyst LS0tLS0tLS0tLS0tLS0tLS0tLS0tCiBsaXNwL3ZjL2VkaWZmLXV0aWwuZWwgfCA2NCArKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKwogNCBmaWxlcyBjaGFuZ2VkLCAxMzUg aW5zZXJ0aW9ucygrKSwgMzMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZG9jL21pc2MvZWRp ZmYudGV4aSBiL2RvYy9taXNjL2VkaWZmLnRleGkKaW5kZXggNzQ5MDI1Yzg3MGIuLjVjZGQ0ZTgz ODhmIDEwMDY0NAotLS0gYS9kb2MvbWlzYy9lZGlmZi50ZXhpCisrKyBiL2RvYy9taXNjL2VkaWZm LnRleGkKQEAgLTUzOSw2ICs1MzksMjcgQEAgUXVpY2sgSGVscCBDb21tYW5kcwogQ29waWVzIHRo ZSBkaWZmZXJlbmNlIHJlZ2lvbiBmcm9tIGJ1ZmZlciBDIHRvIGJ1ZmZlciBCQC4KIFRoZSBjb21t YW5kIEBrYmR7cmJ9IHVuZG9lcyB0aGlzLgogCitAaXRlbSBDLWMgQy1hCitAaXRlbXggQy1jIEMt YgorQGl0ZW14IEMtYyBDLWEgQy1iCitAaXRlbXggQy1jIEMtYSBDLWMKK0BpdGVteCBDLWMgQy1i IEMtYQorQGl0ZW14IEMtYyBDLWIgQy1jCitAaXRlbXggQy1jIEMtYyBDLWEKK0BpdGVteCBDLWMg Qy1jIEMtYgorQGtpbmRleCBDLWMgQy1hCitAa2luZGV4IEMtYyBDLWIKK0BraW5kZXggQy1jIEMt YSBDLWIKK0BraW5kZXggQy1jIEMtYSBDLWMKK0BraW5kZXggQy1jIEMtYiBDLWEKK0BraW5kZXgg Qy1jIEMtYiBDLWMKK0BraW5kZXggQy1jIEMtYyBDLWEKK0BraW5kZXggQy1jIEMtYyBDLWIKK0Jl aGF2ZXMgbGlrZSB0aGUgYWJvdmUgY29tbWFuZHMsIGJ1dCBjb3BpZXMgQGVtcGh7YWxsfSBkaWZm ZXJlbmNlCityZWdpb25zIGZyb20gb25lIGJ1ZmZlciB0byBhbm90aGVyLiAgRm9yIGluc3RhbmNl LCBAa2Jke0MtYyBDLWF9IGNvcGllcworYWxsIGNoYW5nZXMgZnJvbSBidWZmZXIgQSB0byBidWZm ZXIgQiAoaW4gYSAyLXdheSBkaWZmKSBvciB0byBidWZmZXIgQworKGluIGEgbWVyZ2UpLgorCiBA aXRlbSBwCiBAaXRlbXggQGtleXtERUx9CiBAa2luZGV4IHAKZGlmZiAtLWdpdCBhL2V0Yy9ORVdT IGIvZXRjL05FV1MKaW5kZXggZjEwZjlhZTRkNjUuLmRiZWU2NmVhOTc4IDEwMDY0NAotLS0gYS9l dGMvTkVXUworKysgYi9ldGMvTkVXUwpAQCAtMTIxLDYgKzEyMSwyMyBAQCBBIG5ldyAnOmF1dGhv cml6YWJsZSB0JyBwYXJhbWV0ZXIgaGFzIGJlZW4gYWRkZWQgdG8gJ2RidXMtY2FsbC1tZXRob2Qn CiBhbmQgJ2RidXMtY2FsbC1tZXRob2QtYXN5bmNocm9ub3VzbHknIHRvIGFsbG93IHRoZSB1c2Vy IHRvIGludGVyYWN0aXZlbHkKIGF1dGhvcml6ZSB0aGUgaW52b2tlZCBELUJ1cyBtZXRob2QgKGUu Zy4sIHZpYSBwb2xraXQpLgogCisrKysKKyoqIEVkaWZmIG5vdyBzdXBwb3J0cyBjb3B5aW5nIGFs bCBjaGFuZ2VzIGJldHdlZW4gYnVmZmVycyBhdCBvbmNlLgorTmV3IGNvbW1hbmRzIGhhdmUgYmVl biBhZGRlZCB0byBFZGlmZiB0byBjb3B5IGFsbCBjaGFuZ2VzIGZyb20gb25lIGJ1ZmZlcgordG8g YW5vdGhlciBpbiBhIHNpbmdsZSBvcGVyYXRpb246CisKKy0gJ0MtYyBDLWEnIGNvcGllcyBhbGwg Y2hhbmdlcyBmcm9tIGJ1ZmZlciBBIHRvIGJ1ZmZlciBCIChpbiAyLXdheSBkaWZmKQorICBvciB0 byBidWZmZXIgQyAoaW4gMy13YXkgZGlmZiBvciBtZXJnZSkuCistICdDLWMgQy1iJyBjb3BpZXMg YWxsIGNoYW5nZXMgZnJvbSBidWZmZXIgQiB0byBidWZmZXIgQSAoaW4gMi13YXkgZGlmZikKKyAg b3IgdG8gYnVmZmVyIEMgKGluIDMtd2F5IGRpZmYgb3IgbWVyZ2UpLgorLSAnQy1jIEMtYSBDLWIn IGNvcGllcyBhbGwgY2hhbmdlcyBmcm9tIGJ1ZmZlciBBIHRvIGJ1ZmZlciBCLgorLSAnQy1jIEMt YiBDLWEnIGNvcGllcyBhbGwgY2hhbmdlcyBmcm9tIGJ1ZmZlciBCIHRvIGJ1ZmZlciBBLgorLSAn Qy1jIEMtYSBDLWMnIGNvcGllcyBhbGwgY2hhbmdlcyBmcm9tIGJ1ZmZlciBBIHRvIGJ1ZmZlciBD LgorLSAnQy1jIEMtYiBDLWMnIGNvcGllcyBhbGwgY2hhbmdlcyBmcm9tIGJ1ZmZlciBCIHRvIGJ1 ZmZlciBDLgorLSAnQy1jIEMtYyBDLWEnIGNvcGllcyBhbGwgY2hhbmdlcyBmcm9tIGJ1ZmZlciBD IHRvIGJ1ZmZlciBBLgorLSAnQy1jIEMtYyBDLWInIGNvcGllcyBhbGwgY2hhbmdlcyBmcm9tIGJ1 ZmZlciBDIHRvIGJ1ZmZlciBCLgorCisKIAwKICogQ2hhbmdlcyBpbiBFbWFjcyAzMS4xIG9uIE5v bi1GcmVlIE9wZXJhdGluZyBTeXN0ZW1zCiAKZGlmZiAtLWdpdCBhL2xpc3AvdmMvZWRpZmYtaGVs cC5lbCBiL2xpc3AvdmMvZWRpZmYtaGVscC5lbAppbmRleCA1NmUxZWM4MGM1Yy4uMTA3ODMyMmE4 MTYgMTAwNjQ0Ci0tLSBhL2xpc3AvdmMvZWRpZmYtaGVscC5lbAorKysgYi9saXNwL3ZjL2VkaWZm LWhlbHAuZWwKQEAgLTQ2LDEzICs0NiwxMyBAQCBlZGlmZi1sb25nLWhlbHAtbWVzc2FnZS10YWls CiAoZGVmY29uc3QgZWRpZmYtbG9uZy1oZWxwLW1lc3NhZ2UtY29tcGFyZTMKICAgIgogcCxERUwg LXByZXZpb3VzIGRpZmYgfCAgICAgfCAtdmVydC9ob3JpeiBzcGxpdCAgIHwgeHkgLWNvcHkgYnVm IFgncyByZWdpb24gdG8gWQotbixTUEMgLW5leHQgZGlmZiAgICAgfCAgICAgaCAtaGlnaGxpZ2h0 aW5nICAgICAgIHwgcnggLXJlc3RvcmUgYnVmIFgncyBvbGQgZGlmZgotICAgIGogLWp1bXAgdG8g ZGlmZiAgfCAgICAgQCAtYXV0by1yZWZpbmVtZW50ICAgIHwgICogLXJlZmluZSBjdXJyZW50IHJl Z2lvbgotICAgZ3ggLWdvdG8gWCdzIHBvaW50fCAgICAjIyAtaWdub3JlIHdoaXRlc3BhY2UgIHwg ICEgLXVwZGF0ZSBkaWZmIHJlZ2lvbnMKLSAgQy1sIC1yZWNlbnRlciAgICAgIHwgICAgI2MgLWln bm9yZSBjYXNlICAgICAgICB8Ci0gIHYvViAtc2Nyb2xsIHVwL2RuICB8ICNmLyNoIC1mb2N1cy9o aWRlIHJlZ2lvbnMgfCB3eCAtc2F2ZSBidWYgWAotICA8Lz4gLXNjcm9sbCBsdC9ydCAgfCAgICAg WCAtcmVhZC1vbmx5IGluIGJ1ZiBYIHwgd2QgLXNhdmUgZGlmZiBvdXRwdXQKLSAgICB+IC1yb3Rh dGUgYnVmZmVyc3wgICAgIG0gLXdpZGUgZGlzcGxheSAgICAgICB8CituLFNQQyAtbmV4dCBkaWZm ICAgICB8ICAgICBoIC1oaWdobGlnaHRpbmcgICAgICAgfCBDLWMgQy14IEMteTogY29weSBhbGwg WC0+WQorICAgIGogLWp1bXAgdG8gZGlmZiAgfCAgICAgQCAtYXV0by1yZWZpbmVtZW50ICAgIHwg cnggLXJlc3RvcmUgYnVmIFgncyBvbGQgZGlmZgorICAgZ3ggLWdvdG8gWCdzIHBvaW50fCAgICAj IyAtaWdub3JlIHdoaXRlc3BhY2UgIHwgICogLXJlZmluZSBjdXJyZW50IHJlZ2lvbgorICBDLWwg LXJlY2VudGVyICAgICAgfCAgICAjYyAtaWdub3JlIGNhc2UgICAgICAgIHwgICEgLXVwZGF0ZSBk aWZmIHJlZ2lvbnMKKyAgdi9WIC1zY3JvbGwgdXAvZG4gIHwgI2YvI2ggLWZvY3VzL2hpZGUgcmVn aW9ucyB8CisgIDwvPiAtc2Nyb2xsIGx0L3J0ICB8ICAgICBYIC1yZWFkLW9ubHkgaW4gYnVmIFgg fCB3eCAtc2F2ZSBidWYgWAorICAgIH4gLXJvdGF0ZSBidWZmZXJzfCAgICAgbSAtd2lkZSBkaXNw bGF5ICAgICAgIHwgd2QgLXNhdmUgZGlmZiBvdXRwdXQKICIKICAgIkhlbHAgbWVzc2FnZSB1c3Vh bGx5IHVzZWQgZm9yIDMtd2F5IGNvbXBhcmlzb24uCiBOb3JtYWxseSwgbm90IGEgdXNlciBvcHRp b24uICBTZWUgYGVkaWZmLWhlbHAtbWVzc2FnZScgZm9yIGRldGFpbHMuIikKQEAgLTYwLDEzICs2 MCwxMyBAQCBlZGlmZi1sb25nLWhlbHAtbWVzc2FnZS1jb21wYXJlMwogKGRlZmNvbnN0IGVkaWZm LWxvbmctaGVscC1tZXNzYWdlLWNvbXBhcmUyCiAgICIKIHAsREVMIC1wcmV2aW91cyBkaWZmIHwg ICAgIHwgLXZlcnQvaG9yaXogc3BsaXQgICB8YS9iIC1jb3B5IEEvQidzIHJlZ2lvbiB0byBCL0EK LW4sU1BDIC1uZXh0IGRpZmYgICAgIHwgICAgIGggLWhpZ2hsaWdodGluZyAgICAgICB8IHJ4IC1y ZXN0b3JlIGJ1ZiBYJ3Mgb2xkIGRpZmYKLSAgICBqIC1qdW1wIHRvIGRpZmYgIHwgICAgIEAgLWF1 dG8tcmVmaW5lbWVudCAgICB8ICAqIC1yZWZpbmUgY3VycmVudCByZWdpb24KLSAgIGd4IC1nb3Rv IFgncyBwb2ludHwgICAgIyMgLWlnbm9yZSB3aGl0ZXNwYWNlICB8ICAhIC11cGRhdGUgZGlmZiBy ZWdpb25zCi0gIEMtbCAtcmVjZW50ZXIgICAgICB8ICAgICNjIC1pZ25vcmUgY2FzZSAgICAgICAg fAotICB2L1YgLXNjcm9sbCB1cC9kbiAgfCAjZi8jaCAtZm9jdXMvaGlkZSByZWdpb25zIHwgd3gg LXNhdmUgYnVmIFgKLSAgPC8+IC1zY3JvbGwgbHQvcnQgIHwgICAgIFggLXJlYWQtb25seSBpbiBi dWYgWCB8IHdkIC1zYXZlIGRpZmYgb3V0cHV0Ci0gICAgfiAtc3dhcCB2YXJpYW50cyB8ICAgICBt IC13aWRlIGRpc3BsYXkgICAgICAgfAorbixTUEMgLW5leHQgZGlmZiAgICAgfCAgICAgaCAtaGln aGxpZ2h0aW5nICAgICAgIHxDLWMgQy1hL2I6IGNvcHkgYWxsIEEvQi0+Qi9BCisgICAgaiAtanVt cCB0byBkaWZmICB8ICAgICBAIC1hdXRvLXJlZmluZW1lbnQgICAgfCByeCAtcmVzdG9yZSBidWYg WCdzIG9sZCBkaWZmCisgICBneCAtZ290byBYJ3MgcG9pbnR8ICAgICMjIC1pZ25vcmUgd2hpdGVz cGFjZSAgfCAgKiAtcmVmaW5lIGN1cnJlbnQgcmVnaW9uCisgIEMtbCAtcmVjZW50ZXIgICAgICB8 ICAgICNjIC1pZ25vcmUgY2FzZSAgICAgICAgfCAgISAtdXBkYXRlIGRpZmYgcmVnaW9ucworICB2 L1YgLXNjcm9sbCB1cC9kbiAgfCAjZi8jaCAtZm9jdXMvaGlkZSByZWdpb25zIHwKKyAgPC8+IC1z Y3JvbGwgbHQvcnQgIHwgICAgIFggLXJlYWQtb25seSBpbiBidWYgWCB8IHd4IC1zYXZlIGJ1ZiBY CisgICAgfiAtc3dhcCB2YXJpYW50cyB8ICAgICBtIC13aWRlIGRpc3BsYXkgICAgICAgfCB3ZCAt c2F2ZSBkaWZmIG91dHB1dAogIgogICAiSGVscCBtZXNzYWdlIHVzdWFsbHkgdXNlZCBmb3IgMi13 YXkgY29tcGFyaXNvbi4KIE5vcm1hbGx5LCBub3QgYSB1c2VyIG9wdGlvbi4gIFNlZSBgZWRpZmYt aGVscC1tZXNzYWdlJyBmb3IgZGV0YWlscy4iKQpAQCAtNzQsMTMgKzc0LDEzIEBAIGVkaWZmLWxv bmctaGVscC1tZXNzYWdlLWNvbXBhcmUyCiAoZGVmY29uc3QgZWRpZmYtbG9uZy1oZWxwLW1lc3Nh Z2UtbmFycm93MgogICAiCiBwLERFTCAtcHJldmlvdXMgZGlmZiB8ICAgICB8IC12ZXJ0L2hvcml6 IHNwbGl0ICAgfGEvYiAtY29weSBBL0IncyByZWdpb24gdG8gQi9BCi1uLFNQQyAtbmV4dCBkaWZm ICAgICB8ICAgICBoIC1oaWdobGlnaHRpbmcgICAgICAgfCByeCAtcmVzdG9yZSBidWYgWCdzIG9s ZCBkaWZmCi0gICAgaiAtanVtcCB0byBkaWZmICB8ICAgICBAIC1hdXRvLXJlZmluZW1lbnQgICAg fCAgKiAtcmVmaW5lIGN1cnJlbnQgcmVnaW9uCi0gICBneCAtZ290byBYJ3MgcG9pbnR8ICAgICMj IC1pZ25vcmUgd2hpdGVzcGFjZSAgfCAgISAtdXBkYXRlIGRpZmYgcmVnaW9ucwotICBDLWwgLXJl Y2VudGVyICAgICAgfCAgICAjYyAtaWdub3JlIGNhc2UgICAgICAgIHwgICUgLW5hcnJvdy93aWRl biBidWZmcwotICB2L1YgLXNjcm9sbCB1cC9kbiAgfCAjZi8jaCAtZm9jdXMvaGlkZSByZWdpb25z IHwgd3ggLXNhdmUgYnVmIFgKLSAgPC8+IC1zY3JvbGwgbHQvcnQgIHwgICAgIFggLXJlYWQtb25s eSBpbiBidWYgWCB8IHdkIC1zYXZlIGRpZmYgb3V0cHV0Ci0gICAgfiAtc3dhcCB2YXJpYW50cyB8 ICAgICBtIC13aWRlIGRpc3BsYXkgICAgICAgfAorbixTUEMgLW5leHQgZGlmZiAgICAgfCAgICAg aCAtaGlnaGxpZ2h0aW5nICAgICAgIHwgQy1jIEMtYS9iOiBjb3B5IGFsbCBBL0ItPkIvQQorICAg IGogLWp1bXAgdG8gZGlmZiAgfCAgICAgQCAtYXV0by1yZWZpbmVtZW50ICAgIHwgcnggLXJlc3Rv cmUgYnVmIFgncyBvbGQgZGlmZgorICAgZ3ggLWdvdG8gWCdzIHBvaW50fCAgICAjIyAtaWdub3Jl IHdoaXRlc3BhY2UgIHwgICogLXJlZmluZSBjdXJyZW50IHJlZ2lvbgorICBDLWwgLXJlY2VudGVy ICAgICAgfCAgICAjYyAtaWdub3JlIGNhc2UgICAgICAgIHwgICEgLXVwZGF0ZSBkaWZmIHJlZ2lv bnMKKyAgdi9WIC1zY3JvbGwgdXAvZG4gIHwgI2YvI2ggLWZvY3VzL2hpZGUgcmVnaW9ucyB8ICAl IC1uYXJyb3cvd2lkZW4gYnVmZnMKKyAgPC8+IC1zY3JvbGwgbHQvcnQgIHwgICAgIFggLXJlYWQt b25seSBpbiBidWYgWCB8IHd4IC1zYXZlIGJ1ZiBYCisgICAgfiAtc3dhcCB2YXJpYW50cyB8ICAg ICBtIC13aWRlIGRpc3BsYXkgICAgICAgfCB3ZCAtc2F2ZSBkaWZmIG91dHB1dAogIgogICAiSGVs cCBtZXNzYWdlIHdoZW4gY29tcGFyaW5nIHdpbmRvd3Mgb3IgcmVnaW9ucyBsaW5lLWJ5LWxpbmUu CiBOb3JtYWxseSwgbm90IGEgdXNlciBvcHRpb24uICBTZWUgYGVkaWZmLWhlbHAtbWVzc2FnZScg Zm9yIGRldGFpbHMuIikKQEAgLTg4LDEzICs4OCwxMyBAQCBlZGlmZi1sb25nLWhlbHAtbWVzc2Fn ZS1uYXJyb3cyCiAoZGVmY29uc3QgZWRpZmYtbG9uZy1oZWxwLW1lc3NhZ2Utd29yZC1tb2RlCiAg ICIKIHAsREVMIC1wcmV2aW91cyBkaWZmIHwgICAgIHwgLXZlcnQvaG9yaXogc3BsaXQgICB8IHh5 IC1jb3B5IGJ1ZiBYJ3MgcmVnaW9uIHRvIFkKLW4sU1BDIC1uZXh0IGRpZmYgICAgIHwgICAgIGgg LWhpZ2hsaWdodGluZyAgICAgICB8IHJ4IC1yZXN0b3JlIGJ1ZiBYJ3Mgb2xkIGRpZmYKLSAgICBq IC1qdW1wIHRvIGRpZmYgIHwgICAgICAgICAgICAgICAgICAgICAgICAgICB8CituLFNQQyAtbmV4 dCBkaWZmICAgICB8ICAgICBoIC1oaWdobGlnaHRpbmcgICAgICAgfCBDLWMgQy14IEMteTogY29w eSBhbGwgWC0+WQorICAgIGogLWp1bXAgdG8gZGlmZiAgfCAgICAgICAgICAgICAgICAgICAgICAg ICAgIHwgcnggLXJlc3RvcmUgYnVmIFgncyBvbGQgZGlmZgogICAgZ3ggLWdvdG8gWCdzIHBvaW50 fCAgICAlIC1uYXJyb3cvd2lkZW4gYnVmZnMgIHwgICEgLXJlY29tcHV0ZSBkaWZmcwogICBDLWwg LXJlY2VudGVyICAgICAgfCAgICAjYyAtaWdub3JlIGNhc2UgICAgICAgIHwKICAgdi9WIC1zY3Jv bGwgdXAvZG4gIHwgI2YvI2ggLWZvY3VzL2hpZGUgcmVnaW9ucyB8IHd4IC1zYXZlIGJ1ZiBYCiAg IDwvPiAtc2Nyb2xsIGx0L3J0ICB8ICAgICBYIC1yZWFkLW9ubHkgaW4gYnVmIFggfCB3ZCAtc2F2 ZSBkaWZmIG91dHB1dAotICAgIH4gLXN3YXAgdmFyaWFudHMgfCAgICAgbSAtd2lkZSBkaXNwbGF5 ICAgICAgIHwKKyAgICB+IC1zd2FwIHZhcmlhbnRzIHwgICAgIG0gLXdpZGUgZGlzcGxheSAgICAg ICB8IEMtYyBDLXggQy15OiBjb3B5IGFsbCBYLT5ZCiAiCiAgICJIZWxwIG1lc3NhZ2Ugd2hlbiBj b21wYXJpbmcgd2luZG93cyBvciByZWdpb25zIHdvcmQtYnktd29yZC4KIE5vcm1hbGx5LCBub3Qg YSB1c2VyIG9wdGlvbi4gIFNlZSBgZWRpZmYtaGVscC1tZXNzYWdlJyBmb3IgZGV0YWlscy4iKQpA QCAtMTAyLDE1ICsxMDIsMTUgQEAgZWRpZmYtbG9uZy1oZWxwLW1lc3NhZ2Utd29yZC1tb2RlCiAo ZGVmY29uc3QgZWRpZmYtbG9uZy1oZWxwLW1lc3NhZ2UtbWVyZ2UKICAgIgogcCxERUwgLXByZXZp b3VzIGRpZmYgfCAgICAgfCAtdmVydC9ob3JpeiBzcGxpdCAgIHwgIHggLWNvcHkgYnVmIFgncyBy ZWdpb24gdG8gQwotbixTUEMgLW5leHQgZGlmZiAgICAgfCAgICAgaCAtaGlnaGxpZ2h0aW5nICAg ICAgIHwgIHIgLXJlc3RvcmUgYnVmIEMncyBvbGQgZGlmZgotICAgIGogLWp1bXAgdG8gZGlmZiAg fCAgICAgQCAtYXV0by1yZWZpbmVtZW50ICAgIHwgICogLXJlZmluZSBjdXJyZW50IHJlZ2lvbgot ICAgZ3ggLWdvdG8gWCdzIHBvaW50fCAgICAjIyAtaWdub3JlIHdoaXRlc3BhY2UgIHwgICEgLXVw ZGF0ZSBkaWZmIHJlZ2lvbnMKLSAgQy1sIC1yZWNlbnRlciAgICAgIHwgI2YvI2ggLWZvY3VzL2hp ZGUgcmVnaW9ucyB8ICArIC1jb21iaW5lIGRpZmYgcmVnaW9ucwotICB2L1YgLXNjcm9sbCB1cC9k biAgfCAgICAgWCAtcmVhZC1vbmx5IGluIGJ1ZiBYIHwgd3ggLXNhdmUgYnVmIFgKLSAgPC8+IC1z Y3JvbGwgbHQvcnQgIHwgICAgIG0gLXdpZGUgZGlzcGxheSAgICAgICB8IHdkIC1zYXZlIGRpZmYg b3V0cHV0Ci0gICAgfiAtc3dhcCB2YXJpYW50cyB8ICAgICBzIC1zaHJpbmsgd2luZG93IEMgICAg fCAgLyAtc2hvdy9oaWRlIGFuY2VzdG9yIGJ1ZmYKLSAgICAgICAgICAgICAgICAgICAgIHwgICQk IC1zaG93IGNsYXNoZXMgb25seSAgICB8ICAmIC1tZXJnZSB3L25ldyBkZWZhdWx0Ci0gICAgICAg ICAgICAgICAgICAgICB8ICAkKiAtc2tpcCBjaGFuZ2VkIHJlZ2lvbnMgfAorbixTUEMgLW5leHQg ZGlmZiAgICAgfCAgICAgaCAtaGlnaGxpZ2h0aW5nICAgICAgIHwgIEMtYyBDLXg6IGNvcHkgYWxs IFgtPkMKKyAgICBqIC1qdW1wIHRvIGRpZmYgIHwgICAgIEAgLWF1dG8tcmVmaW5lbWVudCAgICB8 ICByIC1yZXN0b3JlIGJ1ZiBDJ3Mgb2xkIGRpZmYKKyAgIGd4IC1nb3RvIFgncyBwb2ludHwgICAg IyMgLWlnbm9yZSB3aGl0ZXNwYWNlICB8ICAqIC1yZWZpbmUgY3VycmVudCByZWdpb24KKyAgQy1s IC1yZWNlbnRlciAgICAgIHwgI2YvI2ggLWZvY3VzL2hpZGUgcmVnaW9ucyB8ICAhIC11cGRhdGUg ZGlmZiByZWdpb25zCisgIHYvViAtc2Nyb2xsIHVwL2RuICB8ICAgICBYIC1yZWFkLW9ubHkgaW4g YnVmIFggfCAgKyAtY29tYmluZSBkaWZmIHJlZ2lvbnMKKyAgPC8+IC1zY3JvbGwgbHQvcnQgIHwg ICAgIG0gLXdpZGUgZGlzcGxheSAgICAgICB8IHd4IC1zYXZlIGJ1ZiBYCisgICAgfiAtc3dhcCB2 YXJpYW50cyB8ICAgICBzIC1zaHJpbmsgd2luZG93IEMgICAgfCB3ZCAtc2F2ZSBkaWZmIG91dHB1 dAorICAgICAgICAgICAgICAgICAgICAgfCAgJCQgLXNob3cgY2xhc2hlcyBvbmx5ICAgIHwgIC8g LXNob3cvaGlkZSBhbmNlc3RvciBidWZmCisgICAgICAgICAgICAgICAgICAgICB8ICAkKiAtc2tp cCBjaGFuZ2VkIHJlZ2lvbnMgfCAgJiAtbWVyZ2Ugdy9uZXcgZGVmYXVsdAogIgogICAiSGVscCBt ZXNzYWdlIGZvciBtZXJnZSBzZXNzaW9ucy4KIE5vcm1hbGx5LCBub3QgYSB1c2VyIG9wdGlvbi4g IFNlZSBgZWRpZmYtaGVscC1tZXNzYWdlJyBmb3IgZGV0YWlscy4iKQpkaWZmIC0tZ2l0IGEvbGlz cC92Yy9lZGlmZi11dGlsLmVsIGIvbGlzcC92Yy9lZGlmZi11dGlsLmVsCmluZGV4IDU5N2Q4YTVl NjQzLi5iNTc1ZWFlY2E3NSAxMDA2NDQKLS0tIGEvbGlzcC92Yy9lZGlmZi11dGlsLmVsCisrKyBi L2xpc3AvdmMvZWRpZmYtdXRpbC5lbApAQCAtMTU5LDYgKzE1OSw4IEBAIGVkaWZmLXNldHVwLWtl eW1hcAogCSA7OyBJbiBtZXJnaW5nLCB3ZSBhbGxvdyBvbmx5IEEtPkMgYW5kIEItPkMgY29weWlu Zy4KIAkgKGRlZmluZS1rZXkgZWRpZmYtbW9kZS1tYXAgImEiICMnZWRpZmYtY29weS1BLXRvLUMp CiAJIChkZWZpbmUta2V5IGVkaWZmLW1vZGUtbWFwICJiIiAjJ2VkaWZmLWNvcHktQi10by1DKQor CSAoZGVmaW5lLWtleSBlZGlmZi1tb2RlLW1hcCAiQy1jIEMtYSIgIydlZGlmZi1jb3B5LWFsbC1B LXRvLUMpCisJIChkZWZpbmUta2V5IGVkaWZmLW1vZGUtbWFwICJDLWMgQy1iIiAjJ2VkaWZmLWNv cHktYWxsLUItdG8tQykKIAkgKGRlZmluZS1rZXkgZWRpZmYtbW9kZS1tYXAgInIiICMnZWRpZmYt cmVzdG9yZS1kaWZmLWluLW1lcmdlLWJ1ZmZlcikKIAkgKGRlZmluZS1rZXkgZWRpZmYtbW9kZS1t YXAgInMiICMnZWRpZmYtc2hyaW5rLXdpbmRvdy1DKQogCSAoZGVmaW5lLWtleSBlZGlmZi1tb2Rl LW1hcCAiKyIgIydlZGlmZi1jb21iaW5lLWRpZmZzKQpAQCAtMTc0LDYgKzE3NiwxMiBAQCBlZGlm Zi1zZXR1cC1rZXltYXAKIAkgKGRlZmluZS1rZXkgZWRpZmYtbW9kZS1tYXAgImMiIG5pbCkKIAkg KGRlZmluZS1rZXkgZWRpZmYtbW9kZS1tYXAgImNhIiAjJ2VkaWZmLWNvcHktQy10by1BKQogCSAo ZGVmaW5lLWtleSBlZGlmZi1tb2RlLW1hcCAiY2IiICMnZWRpZmYtY29weS1DLXRvLUIpCisgICAg ICAgICAoZGVmaW5lLWtleSBlZGlmZi1tb2RlLW1hcCAiQy1jIEMtYSBDLWIiICMnZWRpZmYtY29w eS1hbGwtQS10by1CKQorICAgICAgICAgKGRlZmluZS1rZXkgZWRpZmYtbW9kZS1tYXAgIkMtYyBD LWIgQy1hIiAjJ2VkaWZmLWNvcHktYWxsLUItdG8tQSkKKyAgICAgICAgIChkZWZpbmUta2V5IGVk aWZmLW1vZGUtbWFwICJDLWMgQy1hIEMtYyIgIydlZGlmZi1jb3B5LWFsbC1BLXRvLUMpCisgICAg ICAgICAoZGVmaW5lLWtleSBlZGlmZi1tb2RlLW1hcCAiQy1jIEMtYiBDLWMiICMnZWRpZmYtY29w eS1hbGwtQi10by1DKQorICAgICAgICAgKGRlZmluZS1rZXkgZWRpZmYtbW9kZS1tYXAgIkMtYyBD LWMgQy1hIiAjJ2VkaWZmLWNvcHktYWxsLUMtdG8tQSkKKyAgICAgICAgIChkZWZpbmUta2V5IGVk aWZmLW1vZGUtbWFwICJDLWMgQy1jIEMtYiIgIydlZGlmZi1jb3B5LWFsbC1DLXRvLUIpCiAJIChk ZWZpbmUta2V5IGVkaWZmLW1vZGUtbWFwICJyYSIgIydlZGlmZi1yZXN0b3JlLWRpZmYpCiAJIChk ZWZpbmUta2V5IGVkaWZmLW1vZGUtbWFwICJyYiIgIydlZGlmZi1yZXN0b3JlLWRpZmYpCiAJIChk ZWZpbmUta2V5IGVkaWZmLW1vZGUtbWFwICJyYyIgIydlZGlmZi1yZXN0b3JlLWRpZmYpCkBAIC0x ODEsNiArMTg5LDggQEAgZWRpZmYtc2V0dXAta2V5bWFwCiAJKHQgOyAyLXdheSBjb21wYXJpc29u CiAJIChkZWZpbmUta2V5IGVkaWZmLW1vZGUtbWFwICJhIiAgIydlZGlmZi1jb3B5LUEtdG8tQikK IAkgKGRlZmluZS1rZXkgZWRpZmYtbW9kZS1tYXAgImIiICAjJ2VkaWZmLWNvcHktQi10by1BKQor ICAgICAgICAgKGRlZmluZS1rZXkgZWRpZmYtbW9kZS1tYXAgIkMtYyBDLWEiICMnZWRpZmYtY29w eS1hbGwtQS10by1CKQorICAgICAgICAgKGRlZmluZS1rZXkgZWRpZmYtbW9kZS1tYXAgIkMtYyBD LWIiICMnZWRpZmYtY29weS1hbGwtQi10by1BKQogCSAoZGVmaW5lLWtleSBlZGlmZi1tb2RlLW1h cCAicmEiICMnZWRpZmYtcmVzdG9yZS1kaWZmKQogCSAoZGVmaW5lLWtleSBlZGlmZi1tb2RlLW1h cCAicmIiICMnZWRpZmYtcmVzdG9yZS1kaWZmKSkKIAkpIDsgY29uZApAQCAtMTk1Miw2ICsxOTYy LDYwIEBAIGVkaWZmLWNvcHktQy10by1BCiAgIChpbnRlcmFjdGl2ZSAiUCIpCiAgIChlZGlmZi1k aWZmLXRvLWRpZmYgYXJnICJjYSIpKQogCisoZGVmdW4gZWRpZmYtLWNvcHktYWxsIChzb3VyY2Ug ZGVzdCkKKyAgIkNvcHkgYWxsIGNoYW5nZXMgZnJvbSBTT1VSQ0UgdG8gREVTVCBpbiBFZGlmZi4K K1NPVVJDRSBhbmQgREVTVCBzaG91bGQgZWFjaCBiZSBvbmUgb2YgdGhlIHN5bWJvbHMgYEEnLCBg QicsIG9yIGBDJy4iCisgIChlZGlmZi1iYXJmLWlmLW5vdC1jb250cm9sLWJ1ZmZlcikKKyAgKGxl dCAoKHZhbGlkLWJ1ZmZlcnMgJyhBIEIgQykpKQorICAgICh1bmxlc3MgKGFuZCAobWVtcSBzb3Vy Y2UgdmFsaWQtYnVmZmVycykKKyAgICAgICAgICAgICAgICAgKG1lbXEgZGVzdCB2YWxpZC1idWZm ZXJzKSkKKyAgICAgIChlcnJvciAiQnVmZmVyIGFyZ3VtZW50cyBzaG91bGQgYmUgYEEnLCBgQics IG9yIGBDJyIpKSkKKyAgKHVubGVzcyAoZXEgc291cmNlIGRlc3QpCisgICAgKGxldCogKChjb3B5 LWZ1bmMtbmFtZSAoZm9ybWF0ICJlZGlmZi1jb3B5LSVzLXRvLSVzIgorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAoc3ltYm9sLW5hbWUgc291cmNlKQorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAoc3ltYm9sLW5hbWUgZGVzdCkpKQorICAgICAgICAgICAoY29w eS1mdW5jIChpbnRlcm4gY29weS1mdW5jLW5hbWUpKSkKKyAgICAgIChjb25kaXRpb24tY2FzZSBl cnIKKyAgICAgICAgICAobGV0ICgobiAwKSkKKyAgICAgICAgICAgICh3aGlsZSAoZWRpZmYtdmFs aWQtZGlmZmVyZW5jZS1wIG4pCisgICAgICAgICAgICAgIChlZGlmZi1qdW1wLXRvLWRpZmZlcmVu Y2UgKDErIG4pKQorICAgICAgICAgICAgICAoZnVuY2FsbCBjb3B5LWZ1bmMgbmlsKQorICAgICAg ICAgICAgICAoc2V0cSBuICgxKyBuKSkpCisgICAgICAgICAgICAobWVzc2FnZSAiQWxsIGNoYW5n ZXMgY29waWVkIGZyb20gYnVmZmVyICVzIHRvICVzIgorICAgICAgICAgICAgICAgICAgICAgKHN5 bWJvbC1uYW1lIHNvdXJjZSkKKyAgICAgICAgICAgICAgICAgICAgIChzeW1ib2wtbmFtZSBkZXN0 KSkpCisgICAgICAgIChlcnJvcgorICAgICAgICAgKG1lc3NhZ2UgIkVycm9yIG9jY3VycmVkIHdo aWxlIGNvcHlpbmc6ICVzIiAoZXJyb3ItbWVzc2FnZS1zdHJpbmcgZXJyKSkpKSkpKQorCisoZGVm dW4gZWRpZmYtY29weS1hbGwtQS10by1CICgpCisgICJDb3B5IGFsbCBjaGFuZ2VzIGZyb20gYnVm ZmVyIEEgdG8gYnVmZmVyIEIgaW4gRWRpZmYuIgorICAoaW50ZXJhY3RpdmUpCisgIChlZGlmZi0t Y29weS1hbGwgJ0EgJ0IpKQorCisoZGVmdW4gZWRpZmYtY29weS1hbGwtQi10by1BICgpCisgICJD b3B5IGFsbCBjaGFuZ2VzIGZyb20gYnVmZmVyIEIgdG8gYnVmZmVyIEEgaW4gRWRpZmYuIgorICAo aW50ZXJhY3RpdmUpCisgIChlZGlmZi0tY29weS1hbGwgJ0IgJ0EpKQorCisoZGVmdW4gZWRpZmYt Y29weS1hbGwtQS10by1DICgpCisgICJDb3B5IGFsbCBjaGFuZ2VzIGZyb20gYnVmZmVyIEEgdG8g YnVmZmVyIEMgaW4gRWRpZmYuIgorICAoaW50ZXJhY3RpdmUpCisgIChlZGlmZi0tY29weS1hbGwg J0EgJ0MpKQorCisoZGVmdW4gZWRpZmYtY29weS1hbGwtQi10by1DICgpCisgICJDb3B5IGFsbCBj aGFuZ2VzIGZyb20gYnVmZmVyIEIgdG8gYnVmZmVyIEMgaW4gRWRpZmYuIgorICAoaW50ZXJhY3Rp dmUpCisgIChlZGlmZi0tY29weS1hbGwgJ0IgJ0MpKQorCisoZGVmdW4gZWRpZmYtY29weS1hbGwt Qy10by1BICgpCisgICJDb3B5IGFsbCBjaGFuZ2VzIGZyb20gYnVmZmVyIEMgdG8gYnVmZmVyIEEg aW4gRWRpZmYuIgorICAoaW50ZXJhY3RpdmUpCisgIChlZGlmZi0tY29weS1hbGwgJ0MgJ0EpKQor CisoZGVmdW4gZWRpZmYtY29weS1hbGwtQy10by1CICgpCisgICJDb3B5IGFsbCBjaGFuZ2VzIGZy b20gYnVmZmVyIEMgdG8gYnVmZmVyIEIgaW4gRWRpZmYuIgorICAoaW50ZXJhY3RpdmUpCisgIChl ZGlmZi0tY29weS1hbGwgJ0MgJ0IpKQogCiAKIDs7IENvcHkgZGlmZiBOIGZyb20gRlJPTS1CVUYt VFlQRSAoZ2l2ZW4gYXMgQSwgQiBvciBDKSB0byBUTy1CVUYtVFlQRS4KLS0gCjIuMzkuMyAoQXBw bGUgR2l0LTE0NSkKCg== --000000000000ef8bf70621095fa4-- From unknown Wed Jun 25 00:26:09 2025 X-Loop: help-debbugs@gnu.org Subject: bug#72866: [PATCH] Add ediff-copy-all-X-to-Y functions Resent-From: Robert Pluim Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 02 Sep 2024 10:35:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72866 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Paul Nelson Cc: Eli Zaretskii , 72866@debbugs.gnu.org Received: via spool by 72866-submit@debbugs.gnu.org id=B72866.172527329316428 (code B ref 72866); Mon, 02 Sep 2024 10:35:01 +0000 Received: (at 72866) by debbugs.gnu.org; 2 Sep 2024 10:34:53 +0000 Received: from localhost ([127.0.0.1]:44949 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sl4Ob-0004Gu-JI for submit@debbugs.gnu.org; Mon, 02 Sep 2024 06:34:53 -0400 Received: from mail-wr1-f42.google.com ([209.85.221.42]:59737) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sl4OZ-0004GN-0J for 72866@debbugs.gnu.org; Mon, 02 Sep 2024 06:34:51 -0400 Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-374ca7a10d4so497848f8f.3 for <72866@debbugs.gnu.org>; Mon, 02 Sep 2024 03:33:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725273164; x=1725877964; darn=debbugs.gnu.org; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=h0/VFmp2eQ7GWGWK7MEdEUmnZxwCHyvM3kRu4NyeIt8=; b=KkR+xpuMEOEEI4UZJkj6lKzPP/hD+4azQFsw9OiVP3mtwc/8QNqP/L1yxxjACwM2Ua 8PJZSXZ7aA5/LdC5aCiXhBSFOdCZDrP3ZfabTFT/O3ZsuOppTN5AmcHNoSa9xol2UCpf n9044O2LEOxB9nHNQtB//V9lLKLnR9PsO+QpRFvowz4QItHKUZT+2fhKZZ2V+8E4U7XS mHA8Jcs8qnsklyedS7vik9qiu7Qxm49WeOKa+An7vIZJgbfyCKMeSgn6MOeKz+MYZNrI +MlnWzXB8lJaLXlRyqhSOQim/UMhDKyoa9+mxlbmrV8bmq5qc5Y+9rNuRtgwS9bkxMS7 Ub/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725273164; x=1725877964; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=h0/VFmp2eQ7GWGWK7MEdEUmnZxwCHyvM3kRu4NyeIt8=; b=xA8328wQelcJ7V8KDtlunWmeOoBCQZCwUnZeBhNnCP9C8uTnvHT6VHt9VHFY2loNU8 4D4tlAFkK0zJwjRbE27nWFvET8CH+gkUMySffJy3VBo7Orn8wgy++I10zyUEuQ+HhP9K zLFtZdjcXaY3svJ2w08OYvYzMJPBIeO6I7xV++UqQMStlRd/mltocXlrKlXcUjoTvoCo EHXwHPcWBlOQUrfaay5G8wGnlNxJbJgcaecuiPAq6hj1X9CJLyK3zXzwORn7VQT2NMx8 N/WD/N1TiSrLYXQjvhxPDftgtEPDF4Kjju/FF2/nsJaqlBGnED2hPiKNBT+d1RlcjtRU +3cA== X-Forwarded-Encrypted: i=1; AJvYcCULgZo/EPwO2gbB6XB0RiEdW3TzuM6I9IBFv2e7sZN7Ulf23whj9a1qBNkoZdPhMwNz4zdpng==@debbugs.gnu.org X-Gm-Message-State: AOJu0Yxlqzxj9Gf88niMwgICnRwVlK1iYM73hDRMbkRhjqxaFBwNCFEf erQqbIbRsRcIB+UdehUSVkRf64IBEOIl1WbXdsK0rMTeB46LKBELS6dGyQ== X-Google-Smtp-Source: AGHT+IHlszQECeARu7oLeeh8TbSN022InXbMQBOVC6mkL42vJVWaNSBB3/rAXTV30PMCYDwy8G+50g== X-Received: by 2002:a5d:4ec3:0:b0:374:c581:9f4f with SMTP id ffacd0b85a97d-374c581a03amr2428196f8f.55.1725273163701; Mon, 02 Sep 2024 03:32:43 -0700 (PDT) Received: from rltb ([2a01:e0a:3f3:fb51:77ce:21fc:7053:7c9d]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-374c2b29d2esm5199558f8f.107.2024.09.02.03.32.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Sep 2024 03:32:43 -0700 (PDT) From: Robert Pluim In-Reply-To: (Paul Nelson's message of "Sun, 1 Sep 2024 08:59:53 +0200") References: <86le0dasp9.fsf@gnu.org> Date: Mon, 02 Sep 2024 12:32:42 +0200 Message-ID: <8734miuz05.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain 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 (-) >>>>> On Sun, 1 Sep 2024 08:59:53 +0200, Paul Nelson said: >> > This patch binds functions in Ediff that copy all changes from one >> > buffer to another, without having to manually go through each >> > difference. Any feedback welcome. >> >> Can you describe situation(s) where these commands will be useful? Paul> I use Ediff to merge documents outside of git, like when Paul> working with someone over email or using a computer program to Paul> refactor code. Sometimes all changes go one way, say from B to A. Paul> The standard workflow then involves pressing "n" to review and "b" to Paul> apply each change. When the changes turn out to be mundane, this Paul> leads to repetitive "n b" keystrokes. The proposed patch allows a Paul> more efficient process: rapidly review with "n", then apply all at Paul> once using "C-c C-b". The functionality seems useful. I wonder if it makes more sense to have them triggered by the prefix arg, eg "C-u b", "C-u a b", etc. rather than having to keep Ctrl pressed. Robert -- From unknown Wed Jun 25 00:26:09 2025 X-Loop: help-debbugs@gnu.org Subject: bug#72866: [PATCH] Add ediff-copy-all-X-to-Y functions Resent-From: Paul Nelson Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 04 Sep 2024 07:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72866 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Robert Pluim Cc: Eli Zaretskii , 72866@debbugs.gnu.org Received: via spool by 72866-submit@debbugs.gnu.org id=B72866.172543520031963 (code B ref 72866); Wed, 04 Sep 2024 07:34:02 +0000 Received: (at 72866) by debbugs.gnu.org; 4 Sep 2024 07:33:20 +0000 Received: from localhost ([127.0.0.1]:33262 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1slkW0-0008JT-K7 for submit@debbugs.gnu.org; Wed, 04 Sep 2024 03:33:20 -0400 Received: from mail-io1-f42.google.com ([209.85.166.42]:57354) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1slkVy-0008JA-Fm for 72866@debbugs.gnu.org; Wed, 04 Sep 2024 03:33:19 -0400 Received: by mail-io1-f42.google.com with SMTP id ca18e2360f4ac-82a205810ccso305192839f.2 for <72866@debbugs.gnu.org>; Wed, 04 Sep 2024 00:32:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725435069; x=1726039869; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=XSX9AdDzzOyLpb9Qa5RH0yCUXw4eEwxCLkpmdUto9xo=; b=J3DzJINLq/OfVXs6vgercZ+vE07K6J0UD6YuHst7qWo9smTQZe5heZTPMn4J0zD3Zm Q5CI5XvXYlSOLcM8OSumMzgveH3mIXMmUuXQr6lpvNb8By8QZTXLD4L1hhMVlENl+4jb VgZvhSSF+OU642T/OexC0QmzNEBp9pd6Hs124aECBGkkD/mQsmRRiRAIcsziKrVH3Amj 1afDByE1KMmdNv3r7n+HcjYZYTBuGD0iQ+WGHgbsBQ2Fbv6DWGlPM/HmdrqF4hfTFUf2 Fipv6cB/7OKjhO4sclTPcSDrHOaMwIwkm2ZoEEk6m2wgKarF95VLDh4/Cy3gGM1bzO5h BkKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725435069; x=1726039869; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=XSX9AdDzzOyLpb9Qa5RH0yCUXw4eEwxCLkpmdUto9xo=; b=ixBzSdxH7Q7ART9Px/ZLKUwKCLDPRtTEx/IjeXmPrilb3dVASnLEdlLuNi6gYy48NO 3GAAt+keq7E4k3bo/peKQCfG3OE5GooMOcKfqEIzllGxRYZ8gtlf3jOGJjd730/a+QDx zedCFQ+tW9LyEMzouq5boF+EeFprZu37I0laSQpuSJKG8Z10ZhVfeTayUyy6ODKcQylN ciFYgwHO45+xZtMbtNDOH68/lerRK6y/PB8okx5yEXazE6Yeckla0F+3wUnN9O0FA2PG Mq1mQIgdbHw2HDTEVTSaezS8UC4pQDm+H6Q+4xXY4Fn9Oq7kGS2x3GoMwQ4YgGhmjCgG mc3Q== X-Forwarded-Encrypted: i=1; AJvYcCVCLxm/WbKqwjd06Db03r4VX3vaxwWUj5VXtFOCjM+gmXRtCHK4QPe+BoXWL/YNpg+moYp1IQ==@debbugs.gnu.org X-Gm-Message-State: AOJu0YzfYG1maapkwMoZsQy3gXDFfr7niHcd4n8jvk5pk+CISd/34JiX DYCb8k05K1NPq5/GbrA2XtYVBg4n3iv8FlQ+I2V0zRQOG+2gX5llEpLpvzEcUmCNWYjMt+KqXZ0 VnQLVGZlOPC85H9275qqFkCiGA9Q= X-Google-Smtp-Source: AGHT+IEwRwZcM0611HD41im9NIWvyl+ub9dSRbWaq9Q40sIXNUa/IGEYvGXALAeNdY6BU6zbDla6/3CaFE0Wus+BJRE= X-Received: by 2002:a05:6602:1686:b0:81f:75bf:6570 with SMTP id ca18e2360f4ac-82a36ee0e9dmr1574063639f.5.1725435069276; Wed, 04 Sep 2024 00:31:09 -0700 (PDT) MIME-Version: 1.0 References: <86le0dasp9.fsf@gnu.org> <8734miuz05.fsf@gmail.com> In-Reply-To: <8734miuz05.fsf@gmail.com> From: Paul Nelson Date: Wed, 4 Sep 2024 09:30:58 +0200 Message-ID: Content-Type: multipart/mixed; boundary="000000000000634dd60621462879" 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 (-) --000000000000634dd60621462879 Content-Type: text/plain; charset="UTF-8" Hi Robert, > The functionality seems useful. I wonder if it makes more sense to > have them triggered by the prefix arg, eg "C-u b", "C-u a b", > etc. rather than having to keep Ctrl pressed. > > Robert > -- Many thanks for your suggestion. I agree that this is a more elegant approach, which also admits a simpler implementation. I've attached my revised patch. Any further feedback welcome. Thanks, best, Paul --000000000000634dd60621462879 Content-Type: application/octet-stream; name="0001-Add-Ediff-feature-for-copying-all-differences.patch" Content-Disposition: attachment; filename="0001-Add-Ediff-feature-for-copying-all-differences.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_m0njgqwa0 RnJvbSA5MWFkZTNlZmZkYmYxOWI3ZDg3OTMwMjBhMWMzMWE0ZmY3OTFhNThkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIE5lbHNvbiA8dWx0cm9ub0BnbWFpbC5jb20+CkRhdGU6 IFdlZCwgNCBTZXAgMjAyNCAwOToyNDoyNSArMDIwMApTdWJqZWN0OiBbUEFUQ0hdIEFkZCBFZGlm ZiBmZWF0dXJlIGZvciBjb3B5aW5nIGFsbCBkaWZmZXJlbmNlcwoKKiBsaXNwL3ZjL2VkaWZmLXV0 aWwuZWwgKGVkaWZmLWRpZmYtdG8tZGlmZik6IFdpdGggdW5pdmVyc2FsCnByZWZpeCwgY29weSBh bGwgZGlmZmVyZW5jZXMuCgoqIGRvYy9taXNjL2VkaWZmLnRleGkgKFF1aWNrIEhlbHAgQ29tbWFu ZHMpOgoqIGV0Yy9ORVdTOiAoTGlzcCBDaGFuZ2VzIGluIEVtYWNzIDMxLjEpOiBEb2N1bWVudCB0 aGUgbmV3CmZlYXR1cmUuCi0tLQogZG9jL21pc2MvZWRpZmYudGV4aSAgIHwgMjYgKysrKysrKysr KysrKystLS0tLS0tLS0tLS0KIGV0Yy9ORVdTICAgICAgICAgICAgICB8IDE2ICsrKysrKysrKysr KysrKysKIGxpc3AvdmMvZWRpZmYtdXRpbC5lbCB8IDI5ICsrKysrKysrKysrKysrKysrLS0tLS0t LS0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDQ3IGluc2VydGlvbnMoKyksIDI0IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL2RvYy9taXNjL2VkaWZmLnRleGkgYi9kb2MvbWlzYy9lZGlmZi50ZXhp CmluZGV4IDc0OTAyNWM4NzBiLi42YWZiMzhlM2ZhZSAxMDA2NDQKLS0tIGEvZG9jL21pc2MvZWRp ZmYudGV4aQorKysgYi9kb2MvbWlzYy9lZGlmZi50ZXhpCkBAIC00ODksMTUgKzQ4OSwxNiBAQCBR dWljayBIZWxwIENvbW1hbmRzCiBAaXRlbSBhCiBAa2luZGV4IGEKIEBlbXBoe0luIGNvbXBhcmlz b24gc2Vzc2lvbnM6fQotQ29waWVzIHRoZSBjdXJyZW50IGRpZmZlcmVuY2UgcmVnaW9uIChvciB0 aGUgcmVnaW9uIHNwZWNpZmllZCBhcyB0aGUgcHJlZml4Ci10byB0aGlzIGNvbW1hbmQpIGZyb20g YnVmZmVyIEEgdG8gYnVmZmVyIEJALgotRWRpZmYgc2F2ZXMgdGhlIG9sZCBjb250ZW50cyBvZiBi dWZmZXIgQidzIHJlZ2lvbjsgaXQgY2FuCi1iZSByZXN0b3JlZCB2aWEgdGhlIGNvbW1hbmQgQGti ZHtyYn0sIHdoaWNoIHNlZS4KK0NvcGllcyB0aGUgY3VycmVudCBkaWZmZXJlbmNlIHJlZ2lvbiAo b3IgdGhlIHJlZ2lvbiBzcGVjaWZpZWQgYXMgdGhlCitwcmVmaXggdG8gdGhpcyBjb21tYW5kLCBv ciBAZW1waHthbGx9IHJlZ2lvbnMgd2l0aCBAa2Jke0MtdX0gcHJlZml4KQorZnJvbSBidWZmZXIg QSB0byBidWZmZXIgQkAuICBFZGlmZiBzYXZlcyB0aGUgb2xkIGNvbnRlbnRzIG9mIGJ1ZmZlciBC J3MKK3JlZ2lvbjsgaXQgY2FuIGJlIHJlc3RvcmVkIHZpYSB0aGUgY29tbWFuZCBAa2Jke3JifSwg d2hpY2ggc2VlLgogCiBAZW1waHtJbiBtZXJnZSBzZXNzaW9uczp9Ci1Db3BpZXMgdGhlIGN1cnJl bnQgZGlmZmVyZW5jZSByZWdpb24gKG9yIHRoZSByZWdpb24gc3BlY2lmaWVkIGFzIHRoZSBwcmVm aXgKLXRvIHRoaXMgY29tbWFuZCkgZnJvbSBidWZmZXIgQSB0byB0aGUgbWVyZ2UgYnVmZmVyLiAg VGhlIG9sZCBjb250ZW50cyBvZgotdGhpcyByZWdpb24gaW4gYnVmZmVyIEMgY2FuIGJlIHJlc3Rv cmVkIHZpYSB0aGUgY29tbWFuZCBAa2Jke3J9LgorQ29waWVzIHRoZSBjdXJyZW50IGRpZmZlcmVu Y2UgcmVnaW9uIChvciB0aGUgcmVnaW9uIHNwZWNpZmllZCBhcyB0aGUKK3ByZWZpeCB0byB0aGlz IGNvbW1hbmQsIG9yIEBlbXBoe2FsbH0gcmVnaW9ucyB3aXRoIEBrYmR7Qy11fSBwcmVmaXgpCitm cm9tIGJ1ZmZlciBBIHRvIHRoZSBtZXJnZSBidWZmZXIuICBUaGUgb2xkIGNvbnRlbnRzIG9mIHRo aXMgcmVnaW9uIGluCitidWZmZXIgQyBjYW4gYmUgcmVzdG9yZWQgdmlhIHRoZSBjb21tYW5kIEBr YmR7cn0uCiAKIEBpdGVtIGIKIEBraW5kZXggYgpAQCAtNTExLDExICs1MTIsMTIgQEAgUXVpY2sg SGVscCBDb21tYW5kcwogCiBAaXRlbSBhYgogQGtpbmRleCBhYgotQ29waWVzIHRoZSBjdXJyZW50 IGRpZmZlcmVuY2UgcmVnaW9uIChvciB0aGUgcmVnaW9uIHNwZWNpZmllZCBhcyB0aGUgcHJlZml4 Ci10byB0aGlzIGNvbW1hbmQpIGZyb20gYnVmZmVyIEEgdG8gYnVmZmVyIEJALiAgVGhpcyAoYW5k IHRoZSBuZXh0IGZpdmUpCi1jb21tYW5kIGlzIGVuYWJsZWQgb25seSBpbiBzZXNzaW9ucyB0aGF0 IGNvbXBhcmUgdGhyZWUgZmlsZXMKLXNpbXVsdGFuZW91c2x5LiAgVGhlIG9sZCByZWdpb24gaW4g YnVmZmVyIEIgaXMgc2F2ZWQgYW5kIGNhbiBiZSByZXN0b3JlZAotdmlhIHRoZSBjb21tYW5kIEBr YmR7cmJ9LgorQ29waWVzIHRoZSBjdXJyZW50IGRpZmZlcmVuY2UgcmVnaW9uIChvciB0aGUgcmVn aW9uIHNwZWNpZmllZCBhcyB0aGUKK3ByZWZpeCB0byB0aGlzIGNvbW1hbmQsIG9yIEBlbXBoe2Fs bH0gcmVnaW9ucyB3aXRoIEBrYmR7Qy11fSBwcmVmaXgpCitmcm9tIGJ1ZmZlciBBIHRvIGJ1ZmZl ciBCQC4gIFRoaXMgKGFuZCB0aGUgbmV4dCBmaXZlKSBjb21tYW5kIGlzIGVuYWJsZWQKK29ubHkg aW4gc2Vzc2lvbnMgdGhhdCBjb21wYXJlIHRocmVlIGZpbGVzIHNpbXVsdGFuZW91c2x5LiAgVGhl IG9sZAorcmVnaW9uIGluIGJ1ZmZlciBCIGlzIHNhdmVkIGFuZCBjYW4gYmUgcmVzdG9yZWQgdmlh IHRoZSBjb21tYW5kCitAa2Jke3JifS4KIEBpdGVtIGFjCiBAa2luZGV4IGFjCiBDb3BpZXMgdGhl IGRpZmZlcmVuY2UgcmVnaW9uIGZyb20gYnVmZmVyIEEgdG8gYnVmZmVyIENALgpkaWZmIC0tZ2l0 IGEvZXRjL05FV1MgYi9ldGMvTkVXUwppbmRleCBmMTBmOWFlNGQ2NS4uYTZkYjBjOTYyODggMTAw NjQ0Ci0tLSBhL2V0Yy9ORVdTCisrKyBiL2V0Yy9ORVdTCkBAIC0xMjEsNiArMTIxLDIyIEBAIEEg bmV3ICc6YXV0aG9yaXphYmxlIHQnIHBhcmFtZXRlciBoYXMgYmVlbiBhZGRlZCB0byAnZGJ1cy1j YWxsLW1ldGhvZCcKIGFuZCAnZGJ1cy1jYWxsLW1ldGhvZC1hc3luY2hyb25vdXNseScgdG8gYWxs b3cgdGhlIHVzZXIgdG8gaW50ZXJhY3RpdmVseQogYXV0aG9yaXplIHRoZSBpbnZva2VkIEQtQnVz IG1ldGhvZCAoZS5nLiwgdmlhIHBvbGtpdCkuCiAKKysrKworKiogRWRpZmYncyBjb3B5IGNvbW1h bmRzIG5vdyBhcHBseSB0byBhbGwgY2hhbmdlcyB3aXRoICdDLXUnIHByZWZpeC4KK1RoZSBFZGlm ZiBjb3B5IGNvbW1hbmRzLCBib3VuZCB0byAnYScsICdiJywgJ2FiJywgZXRjLiwgbm93IGNvcHkg YWxsCitjaGFuZ2VzIHdoZW4gc3VwcGxpZWQgd2l0aCBhIHVuaXZlcnNhbCBwcmVmaXggYXJndW1l bnQgdmlhICdDLXUnOgorCistICdDLXUgYScgY29waWVzIGFsbCBjaGFuZ2VzIGZyb20gYnVmZmVy IEEgdG8gYnVmZmVyIEIgKGluIDItd2F5IGRpZmYpCisgIG9yIHRvIGJ1ZmZlciBDIChpbiAzLXdh eSBkaWZmIG9yIG1lcmdlKS4KKy0gJ0MtdSBiJyBjb3BpZXMgYWxsIGNoYW5nZXMgZnJvbSBidWZm ZXIgQiB0byBidWZmZXIgQSAoaW4gMi13YXkgZGlmZikKKyAgb3IgdG8gYnVmZmVyIEMgKGluIDMt d2F5IGRpZmYgb3IgbWVyZ2UpLgorLSAnQy11IGEgYicgY29waWVzIGFsbCBjaGFuZ2VzIGZyb20g YnVmZmVyIEEgdG8gYnVmZmVyIEIuCistICdDLXUgYiBhJyBjb3BpZXMgYWxsIGNoYW5nZXMgZnJv bSBidWZmZXIgQiB0byBidWZmZXIgQS4KKy0gJ0MtdSBhIGMnIGNvcGllcyBhbGwgY2hhbmdlcyBm cm9tIGJ1ZmZlciBBIHRvIGJ1ZmZlciBDLgorLSAnQy11IGIgYycgY29waWVzIGFsbCBjaGFuZ2Vz IGZyb20gYnVmZmVyIEIgdG8gYnVmZmVyIEMuCistICdDLXUgYyBhJyBjb3BpZXMgYWxsIGNoYW5n ZXMgZnJvbSBidWZmZXIgQyB0byBidWZmZXIgQS4KKy0gJ0MtdSBjIGInIGNvcGllcyBhbGwgY2hh bmdlcyBmcm9tIGJ1ZmZlciBDIHRvIGJ1ZmZlciBCLgorCiAMCiAqIENoYW5nZXMgaW4gRW1hY3Mg MzEuMSBvbiBOb24tRnJlZSBPcGVyYXRpbmcgU3lzdGVtcwogCmRpZmYgLS1naXQgYS9saXNwL3Zj L2VkaWZmLXV0aWwuZWwgYi9saXNwL3ZjL2VkaWZmLXV0aWwuZWwKaW5kZXggNTk3ZDhhNWU2NDMu LmMyY2RmN2Q0ZTVlIDEwMDY0NAotLS0gYS9saXNwL3ZjL2VkaWZmLXV0aWwuZWwKKysrIGIvbGlz cC92Yy9lZGlmZi11dGlsLmVsCkBAIC0xODkxLDcgKzE4OTEsNyBAQCBlZGlmZi1kaWZmLWF0LXBv aW50CiAoZGVmdW4gZWRpZmYtZGlmZi10by1kaWZmIChhcmcgJm9wdGlvbmFsIGtleXMpCiAgICJD b3B5IGJ1ZmZlci1YJ3RoIGRpZmZlcmVuY2UgcmVnaW9uIHRvIGJ1ZmZlciBZIChYLFkgYXJlIEEs IEIsIG9yIEMpLgogV2l0aCBudW1lcmljYWwgcHJlZml4IGFyZ3VtZW50IEFSRywgY29weSB0aGUg ZGlmZmVyZW5jZSBzcGVjaWZpZWQKLWluIHRoZSBhcmcuCitpbiB0aGUgYXJnLiAgV2l0aCBwcmVm aXggYEMtdScsIGNvcHkgYWxsIGRpZmZlcmVuY2VzLgogT3RoZXJ3aXNlLCBjb3B5IHRoZSBkaWZm ZXJlbmNlIGdpdmVuIGJ5IGBlZGlmZi1jdXJyZW50LWRpZmZlcmVuY2UnLgogVGhpcyBjb21tYW5k IGFzc3VtZXMgaXQgaXMgYm91bmQgdG8gYSAyLWNoYXJhY3RlciBrZXkgc2VxdWVuY2UsIGBhYics IGBiYScsCiBgYWMnLCBldGMuLCB3aGljaCBpcyB1c2VkIHRvIGRldGVybWluZSB0aGUgdHlwZXMg b2YgYnVmZmVycyB0byBiZSB1c2VkIGZvcgpAQCAtMTkwNCwxNyArMTkwNCwyMiBAQCBlZGlmZi1k aWZmLXRvLWRpZmYKICAgKGludGVyYWN0aXZlICJQIikKICAgKGVkaWZmLWJhcmYtaWYtbm90LWNv bnRyb2wtYnVmZmVyKQogICAob3Iga2V5cyAoc2V0cSBrZXlzICh0aGlzLWNvbW1hbmQta2V5cykp KQotICAoaWYgKGVxIGFyZyAnLSkgKHNldHEgYXJnIC0xKSkgOyB0cmFuc2xhdGUgbmVnIGFyZyB0 byAtMQotICAoaWYgKG51bWJlcnAgYXJnKSAoZWRpZmYtanVtcC10by1kaWZmZXJlbmNlIGFyZykp Ci0KLSAgKGxldCogKChjaGFyMSAoYXJlZiBrZXlzIDApKQotCSAoY2hhcjIgKGFyZWYga2V5cyAx KSkKLQkgZWRpZmYtdmVyYm9zZS1wKQotICAgIChlZGlmZi1jb3B5LWRpZmYgZWRpZmYtY3VycmVu dC1kaWZmZXJlbmNlCi0JCSAgICAgKGVkaWZmLWNoYXItdG8tYnVmdHlwZSBjaGFyMSkKLQkJICAg ICAoZWRpZmYtY2hhci10by1idWZ0eXBlIGNoYXIyKSkKLSAgICA7OyByZWNlbnRlciB3aXRoIHJl aGlnaGxpZ2h0aW5nLCBidXQgbm8gbWVzc2FnZXMKLSAgICAoZWRpZmYtcmVjZW50ZXIpKSkKKyAg KGlmIChlcXVhbCBhcmcgJyg0KSkKKyAgICAgIDs7IGNvcHkgYWxsIGRpZmZlcmVuY2VzIHdpdGgg YEMtdScgcHJlZml4CisgICAgICAobGV0ICgobiAwKSkKKyAgICAgICAgKHdoaWxlIChlZGlmZi12 YWxpZC1kaWZmZXJlbmNlLXAgbikKKyAgICAgICAgICAoZWRpZmYtZGlmZi10by1kaWZmICgxKyBu KSBrZXlzKQorICAgICAgICAgIChzZXRxIG4gKDErIG4pKSkpCisgICAgKGlmIChlcSBhcmcgJy0p IChzZXRxIGFyZyAtMSkpICAgICAgOyB0cmFuc2xhdGUgbmVnIGFyZyB0byAtMQorICAgIChpZiAo bnVtYmVycCBhcmcpIChlZGlmZi1qdW1wLXRvLWRpZmZlcmVuY2UgYXJnKSkKKyAgICAobGV0KiAo KGNoYXIxIChhcmVmIGtleXMgMCkpCisJICAgKGNoYXIyIChhcmVmIGtleXMgMSkpCisJICAgZWRp ZmYtdmVyYm9zZS1wKQorICAgICAgKGVkaWZmLWNvcHktZGlmZiBlZGlmZi1jdXJyZW50LWRpZmZl cmVuY2UKKwkJICAgICAgIChlZGlmZi1jaGFyLXRvLWJ1ZnR5cGUgY2hhcjEpCisJCSAgICAgICAo ZWRpZmYtY2hhci10by1idWZ0eXBlIGNoYXIyKSkKKyAgICAgIDs7IHJlY2VudGVyIHdpdGggcmVo aWdobGlnaHRpbmcsIGJ1dCBubyBtZXNzYWdlcworICAgICAgKGVkaWZmLXJlY2VudGVyKSkpKQog CiAoZGVmdW4gZWRpZmYtY29weS1BLXRvLUIgKGFyZykKICAgIkNvcHkgQVJHdGggZGlmZmVyZW5j ZSByZWdpb24gZnJvbSBidWZmZXIgQSB0byBCLgotLSAKMi4zOS4zIChBcHBsZSBHaXQtMTQ1KQoK --000000000000634dd60621462879-- From unknown Wed Jun 25 00:26:09 2025 X-Loop: help-debbugs@gnu.org Subject: bug#72866: [PATCH] Add ediff-copy-all-X-to-Y functions Resent-From: Robert Pluim Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 04 Sep 2024 13:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72866 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Paul Nelson Cc: Eli Zaretskii , 72866@debbugs.gnu.org Received: via spool by 72866-submit@debbugs.gnu.org id=B72866.17254550182565 (code B ref 72866); Wed, 04 Sep 2024 13:04:02 +0000 Received: (at 72866) by debbugs.gnu.org; 4 Sep 2024 13:03:38 +0000 Received: from localhost ([127.0.0.1]:33842 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1slpfd-0000fI-Jw for submit@debbugs.gnu.org; Wed, 04 Sep 2024 09:03:38 -0400 Received: from mail-wm1-f46.google.com ([209.85.128.46]:57563) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1slpfa-0000ev-UK for 72866@debbugs.gnu.org; Wed, 04 Sep 2024 09:03:35 -0400 Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-42bbbff40bbso45569085e9.2 for <72866@debbugs.gnu.org>; Wed, 04 Sep 2024 06:02:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725454885; x=1726059685; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:from:to:cc:subject:date:message-id :reply-to; bh=slTDWSrmiThy/fIDe/Klc8CadkleY6SfbbyZdClSpSI=; b=nWGYPUDZUZxN45R02qaUrOCH9tVox9IeBPuaJYaW1c12ZEgImjpT5KXronfsGZURxC RWw88hKp6l6Y09jJ1Wbm0iC0aOzy+O3x5TW/iyo9RWoZaiiPVvQLlUgB52gV9U+3wuHD TLDHBk3nNHBMdIhRfk8i1cIud4lBgUQAnV0DbCsHLVMm05G+Edkt5dFVDTC38Z1f9aYS oyn6G5/wCKN9kQt/Ei/MTf6CYF8XisjHQrRcOzIXVA6B3sW3kdyFPLWktkxeWCIlCcGR LRqSzp3wIbISdec0fEDRxqxaaqL8Rgz0PKf4BVVFOPYARspFbUhYESUSq/9HbFRF2Jho 0NGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725454885; x=1726059685; h=content-transfer-encoding:mime-version:message-id:date:references :in-reply-to:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=slTDWSrmiThy/fIDe/Klc8CadkleY6SfbbyZdClSpSI=; b=w4L9+vLiHvvXeJbFvqCsomabhqyLicS4sV7hzVBgsNkc/fC4wUETcneIgewye41aE9 LVS9IvOOZzW+6wtJborK3SxVInopJebuhWEBH/D8C7mHqOKVmRANQKeovQ8Q57IDLOPR tS4zviY7nDPLCRM6S48DnC+x1YW/dEMOMSMGwMkbNUnuxFZnZIPpFmHUx+W6HjjhZiJ0 K7O6TpnXcOdm7VBCzE/9DzSMYhkte4IWOikovA7TGPUXZSj3OuXxfSa9+BjgW2nVBLqT JxZa92IXkUw+0Y/lqfUBZ9YcPDAawKfsGDNSZjbnN0qO58VvuKrXPRsVbkpBn/czFPUG j7VQ== X-Forwarded-Encrypted: i=1; AJvYcCUPfweAk/aFuDtdQsTE+/wsu7Ev9bJtuj8z7CrgJCey+g90g0j8Pjr18pa5zDo86hJP1wwp2w==@debbugs.gnu.org X-Gm-Message-State: AOJu0YzmO1wzBPhpl9/qMHp4u2nELyghQXRRhzFoKDsLJKPJhkeawo7j jji0a9UMvAKB6C8BcUirNq23HFMvZom0SUB627iE9ocBs/wdb0NSAAbx0g== X-Google-Smtp-Source: AGHT+IEuC5UWsoKLtT+Q6qYVUdaQFAwPAqYu9etu4hDZm43nD2d13/oxmIYoTYDKRjWgNyprQ7UFbQ== X-Received: by 2002:a05:600c:46c9:b0:42b:8a35:1acf with SMTP id 5b1f17b1804b1-42bbb436e9amr119444335e9.25.1725454884745; Wed, 04 Sep 2024 06:01:24 -0700 (PDT) Received: from rltb ([2a01:e0a:3f3:fb51:58a0:797d:5a6f:fa4f]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-42c88c624f7sm62202955e9.39.2024.09.04.06.01.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 04 Sep 2024 06:01:24 -0700 (PDT) From: Robert Pluim In-Reply-To: (Paul Nelson's message of "Wed, 4 Sep 2024 09:30:58 +0200") References: <86le0dasp9.fsf@gnu.org> <8734miuz05.fsf@gmail.com> Date: Wed, 04 Sep 2024 15:01:23 +0200 Message-ID: <87h6avtvx8.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: 1.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 (-) >>>>> On Wed, 4 Sep 2024 09:30:58 +0200, Paul Nelson sa= id: Paul> Many thanks for your suggestion. I agree that this is a more ele= gant Paul> approach, which also admits a simpler implementation. I've attac= hed Paul> my revised patch. Any further feedback welcome. Minor comments below Paul> Thanks, best, Paul> Paul Paul> From 91ade3effdbf19b7d8793020a1c31a4ff791a58d Mon Sep 17 00:00:00= 2001 Paul> From: Paul Nelson Paul> Date: Wed, 4 Sep 2024 09:24:25 +0200 Paul> Subject: [PATCH] Add Ediff feature for copying all differences Paul> * lisp/vc/ediff-util.el (ediff-diff-to-diff): With universal Paul> prefix, copy all differences. Paul> * doc/misc/ediff.texi (Quick Help Commands): Paul> * etc/NEWS: (Lisp Changes in Emacs 31.1): Document the new Paul> feature. Paul> --- Paul> doc/misc/ediff.texi | 26 ++++++++++++++------------ Paul> etc/NEWS | 16 ++++++++++++++++ Paul> lisp/vc/ediff-util.el | 29 +++++++++++++++++------------ Paul> 3 files changed, 47 insertions(+), 24 deletions(-) Paul> diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi Paul> index 749025c870b..6afb38e3fae 100644 Paul> --- a/doc/misc/ediff.texi Paul> +++ b/doc/misc/ediff.texi Paul> @@ -489,15 +489,16 @@ Quick Help Commands Paul> @item a Paul> @kindex a Paul> @emph{In comparison sessions:} Paul> -Copies the current difference region (or the region specified as= the prefix Paul> -to this command) from buffer A to buffer B@. Paul> -Ediff saves the old contents of buffer B's region; it can Paul> -be restored via the command @kbd{rb}, which see. Paul> +Copies the current difference region (or the region specified as= the Paul> +prefix to this command, or @emph{all} regions with @kbd{C-u} pre= fix) Paul> +from buffer A to buffer B@. Ediff saves the old contents of buf= fer B's Paul> +region; it can be restored via the command @kbd{rb}, which see. 'numerical prefix' maybe? Although that part of the text is not new. Paul> @emph{In merge sessions:} Paul> -Copies the current difference region (or the region specified as= the prefix Paul> -to this command) from buffer A to the merge buffer. The old con= tents of Paul> -this region in buffer C can be restored via the command @kbd{r}. Paul> +Copies the current difference region (or the region specified as= the Paul> +prefix to this command, or @emph{all} regions with @kbd{C-u} pre= fix) Paul> +from buffer A to the merge buffer. The old contents of this reg= ion in Paul> +buffer C can be restored via the command @kbd{r}. Similarly here Paul> @item b Paul> @kindex b Paul> @@ -511,11 +512,12 @@ Quick Help Commands =20 Paul> @item ab Paul> @kindex ab Paul> -Copies the current difference region (or the region specified as= the prefix Paul> -to this command) from buffer A to buffer B@. This (and the next= five) Paul> -command is enabled only in sessions that compare three files Paul> -simultaneously. The old region in buffer B is saved and can be = restored Paul> -via the command @kbd{rb}. Paul> +Copies the current difference region (or the region specified as= the Paul> +prefix to this command, or @emph{all} regions with @kbd{C-u} pre= fix) Paul> +from buffer A to buffer B@. This (and the next five) command is= enabled Paul> +only in sessions that compare three files simultaneously. The o= ld Paul> +region in buffer B is saved and can be restored via the command Paul> +@kbd{rb}. and here. Paul> @item ac Paul> @kindex ac Paul> Copies the difference region from buffer A to buffer C@. Paul> diff --git a/etc/NEWS b/etc/NEWS Paul> index f10f9ae4d65..a6db0c96288 100644 Paul> --- a/etc/NEWS Paul> +++ b/etc/NEWS Paul> @@ -121,6 +121,22 @@ A new ':authorizable t' parameter has been a= dded to 'dbus-call-method' Paul> and 'dbus-call-method-asynchronously' to allow the user to inter= actively Paul> authorize the invoked D-Bus method (e.g., via polkit). =20 Paul> ++++ Paul> +** Ediff's copy commands now apply to all changes with 'C-u' pre= fix. Paul> +The Ediff copy commands, bound to 'a', 'b', 'ab', etc., now copy= all Paul> +changes when supplied with a universal prefix argument via 'C-u': Paul> + Paul> +- 'C-u a' copies all changes from buffer A to buffer B (in 2-way= diff) Paul> + or to buffer C (in 3-way diff or merge). Paul> +- 'C-u b' copies all changes from buffer B to buffer A (in 2-way= diff) Paul> + or to buffer C (in 3-way diff or merge). Paul> +- 'C-u a b' copies all changes from buffer A to buffer B. Paul> +- 'C-u b a' copies all changes from buffer B to buffer A. Paul> +- 'C-u a c' copies all changes from buffer A to buffer C. Paul> +- 'C-u b c' copies all changes from buffer B to buffer C. Paul> +- 'C-u c a' copies all changes from buffer C to buffer A. Paul> +- 'C-u c b' copies all changes from buffer C to buffer B. Paul> + You should add an '** Ediff' section to 'Changes in Specialized Modes and Packages in Emacs 31.1' and put this change there. Paul> Paul> * Changes in Emacs 31.1 on Non-Free Operating Systems =20 Paul> diff --git a/lisp/vc/ediff-util.el b/lisp/vc/ediff-util.el Paul> index 597d8a5e643..c2cdf7d4e5e 100644 Paul> --- a/lisp/vc/ediff-util.el Paul> +++ b/lisp/vc/ediff-util.el Paul> @@ -1891,7 +1891,7 @@ ediff-diff-at-point Paul> (defun ediff-diff-to-diff (arg &optional keys) Paul> "Copy buffer-X'th difference region to buffer Y (X,Y are A, B,= or C). Paul> With numerical prefix argument ARG, copy the difference specified Paul> -in the arg. Paul> +in the arg. With prefix `C-u', copy all differences. In docstrings `C-u' is written `\\[universal-argument]' (not that I=CA=BCve ever been tempted to change it from `C-u' :-)) Eli, does this change need a copyright assigment? I don=CA=BCt see 'ultrono@gmail.com' in the git logs anywhere. Robert --=20 From unknown Wed Jun 25 00:26:09 2025 X-Loop: help-debbugs@gnu.org Subject: bug#72866: [PATCH] Add ediff-copy-all-X-to-Y functions Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 04 Sep 2024 13:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72866 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Robert Pluim Cc: 72866@debbugs.gnu.org, ultrono@gmail.com Received: via spool by 72866-submit@debbugs.gnu.org id=B72866.17254555233409 (code B ref 72866); Wed, 04 Sep 2024 13:13:02 +0000 Received: (at 72866) by debbugs.gnu.org; 4 Sep 2024 13:12:03 +0000 Received: from localhost ([127.0.0.1]:33854 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1slpnm-0000sv-MO for submit@debbugs.gnu.org; Wed, 04 Sep 2024 09:12:02 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43566) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1slpnj-0000sO-Vq for 72866@debbugs.gnu.org; Wed, 04 Sep 2024 09:12:00 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1slpmc-0001qu-Iz; Wed, 04 Sep 2024 09:10:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From: Date; bh=jBwQQkLwyc3nIQcrRJn03SaNkno8i728lo/gVwr7Tws=; b=fdoTJWohA4BywSs6oxgw bwv+BrL3NbJF8E6WT2Fau7LdLC57RvtkckKjO2hGcCRsmP3YTHMsRscwTOkjw2Wc7qNxsk1SqsHMl H3/W9C79UtN0kojlHZZU0HM3wOQj0kPWHzc1xIeCX5KQ3e7t777p7NPuu2I7zKpiWiTT4WfZi5sWd S5LJN897SnQaZ3mUIzSWYPfWa5Y9DVzoAMtfyVHPq15brhlRgYr3vJAu7JVJ7Ze+70vnqLKLKdV2D RVZwdarPjmUn+KGpitvqC4uhbPL/b+LpC+DPcO908jA9m0hKiroV5UGhQt+j/G+5xgF/wD1QbCavL c3bw0qiB7e1uZg==; Date: Wed, 04 Sep 2024 16:10:46 +0300 Message-Id: <86h6av5zu1.fsf@gnu.org> From: Eli Zaretskii In-Reply-To: <87h6avtvx8.fsf@gmail.com> (message from Robert Pluim on Wed, 04 Sep 2024 15:01:23 +0200) References: <86le0dasp9.fsf@gnu.org> <8734miuz05.fsf@gmail.com> <87h6avtvx8.fsf@gmail.com> MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 1.3 (+) 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: > From: Robert Pluim > Cc: Eli Zaretskii , 72866@debbugs.gnu.org > Date: Wed, 04 Sep 2024 15:01:23 +0200 > > Eli, does this change need a copyright assigment? I =?UTF-8?Q?don=CA=BCt?= [...] Content analysis details: (1.3 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 3.6 RCVD_IN_SBL_CSS RBL: Received via a relay in Spamhaus SBL-CSS [209.51.188.92 listed in zen.spamhaus.org] -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/, medium trust [209.51.188.92 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 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.3 (/) > From: Robert Pluim > Cc: Eli Zaretskii , 72866@debbugs.gnu.org > Date: Wed, 04 Sep 2024 15:01:23 +0200 > > Eli, does this change need a copyright assigment? I donʼt see > 'ultrono@gmail.com' in the git logs anywhere. Paul's assignment is on file, so we are okay in that department. From unknown Wed Jun 25 00:26:09 2025 X-Loop: help-debbugs@gnu.org Subject: bug#72866: [PATCH] Add ediff-copy-all-X-to-Y functions Resent-From: Paul Nelson Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 04 Sep 2024 13:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72866 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Eli Zaretskii Cc: Robert Pluim , 72866@debbugs.gnu.org Received: via spool by 72866-submit@debbugs.gnu.org id=B72866.17254561894532 (code B ref 72866); Wed, 04 Sep 2024 13:24:02 +0000 Received: (at 72866) by debbugs.gnu.org; 4 Sep 2024 13:23:09 +0000 Received: from localhost ([127.0.0.1]:33863 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1slpyX-0001B1-7G for submit@debbugs.gnu.org; Wed, 04 Sep 2024 09:23:09 -0400 Received: from mail-io1-f50.google.com ([209.85.166.50]:55408) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1slpyV-0001AZ-4W for 72866@debbugs.gnu.org; Wed, 04 Sep 2024 09:23:07 -0400 Received: by mail-io1-f50.google.com with SMTP id ca18e2360f4ac-82a20efed34so338456939f.2 for <72866@debbugs.gnu.org>; Wed, 04 Sep 2024 06:22:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1725456058; x=1726060858; darn=debbugs.gnu.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=iiiOxjwlV/NljYITmvAShYRY1SH2FdcK3YmCgX6G4+0=; b=D8HbFTZnbUeAEj+wJalcad9EZrLh7kVggSA/RbpaZUOtVVUI8KvmJLuZkThP5JfalJ vzFLXEu2DzE8vrCuDgFZ0NQZEElYF/IdoVOlwjhwbVa3/7ZqhbTN3I59q0xJ3RQYC9t5 3TtZoNUT1y6bQmqT2lehtsruKFux3tFK26YaJBPUpEpp3ybyNG3TJq14l1AnpooXVvGP K6S7cG2UKOgNtKoAi2s+d4O902HtK3QZXzN/0hv4gZcffC0T6Slur01CtC8Z5qCChsTo nTZrU66hjftWZJ7HosM0tIObEvgnIicaZuBC3BkZNefgEmKiJ1W4cPaHQiIc1gTl4l9B pwQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725456058; x=1726060858; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=iiiOxjwlV/NljYITmvAShYRY1SH2FdcK3YmCgX6G4+0=; b=aM9KOfV/oGH/yA9QH1MnfDvBzgoYU4hTyXevh9aFi5KncwEm7VChemZgwZrdfQ+K3b VxKDXZA6SvLappN6iu5Ynp0bXsf1e/XMTRCLxxhOLKkukzr0m6vLa80DxoCpXVb5Gf+k aRZR1HNf7b1sCik/05HcjCaBruIVJqr23yrut0fieh3fKxztm7QoCrw1o7EjAAStpiSK Rf9/NHL6hz/23hfTHDEt2+VGg45Ea0JLLCA5mXjIqxp4HGa0jVsB+jMTFJq2og4MmGXq y6CZY7G3Typ2JUrOj5Fl733g+y7ntxYz4nDKzrcTgpF1T5UzdPQeLReD4sFKEk1L7aV9 6qCg== X-Forwarded-Encrypted: i=1; AJvYcCX/goRcxusfDDpWX5V5Y8nIlpdSz23EyKsiQNiWw3UofQ8lt8xrUH/4c9/w8ZgeQZDcRCVScw==@debbugs.gnu.org X-Gm-Message-State: AOJu0Yy4E8jbs+qD8m+SZ6Qj5tKT8XPyMZq3Vhmw0YpeT9km6cPTzXED JInHOT8nrcj40lcIgEq6DjazRW+XDOEspDqWflxgminv7amZ/3j96aKjKDl5yial0phQanhGYB+ hGg8A2a7Dqgk5W5TQvCTP4qg/77k= X-Google-Smtp-Source: AGHT+IFhpZvKqd9zA+V4h9dNdOBe3CHZ6FNDaQ946zoiREPcpEmBaA1/CvjlFLV9otQo2BZGncf9NX87ZE9N9KjeVQ0= X-Received: by 2002:a05:6e02:1689:b0:399:ed4:6e9e with SMTP id e9e14a558f8ab-39f4e119137mr170171565ab.17.1725456057730; Wed, 04 Sep 2024 06:20:57 -0700 (PDT) MIME-Version: 1.0 References: <86le0dasp9.fsf@gnu.org> <8734miuz05.fsf@gmail.com> <87h6avtvx8.fsf@gmail.com> <86h6av5zu1.fsf@gnu.org> In-Reply-To: <86h6av5zu1.fsf@gnu.org> From: Paul Nelson Date: Wed, 4 Sep 2024 15:20:46 +0200 Message-ID: Content-Type: multipart/mixed; boundary="00000000000065a80d06214b0b94" 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 (-) --00000000000065a80d06214b0b94 Content-Type: text/plain; charset="UTF-8" Thanks Robert, I've implemented your suggestions. I hope someone will check that I've used "+++" correctly in NEWS, affirming that I updated the documentation -- hopefully I didn't miss anything. Any other comments welcome. Paul --00000000000065a80d06214b0b94 Content-Type: application/octet-stream; name="0001-Add-Ediff-feature-for-copying-all-differences.patch" Content-Disposition: attachment; filename="0001-Add-Ediff-feature-for-copying-all-differences.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_m0nvx6ai0 RnJvbSA4NzY1NzRkYTg4NGExZjBkZTU5NWNjZTkxNDY5YjM3ZjhkODg2YjU1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQYXVsIE5lbHNvbiA8dWx0cm9ub0BnbWFpbC5jb20+CkRhdGU6 IFdlZCwgNCBTZXAgMjAyNCAwOToyNDoyNSArMDIwMApTdWJqZWN0OiBbUEFUQ0hdIEFkZCBFZGlm ZiBmZWF0dXJlIGZvciBjb3B5aW5nIGFsbCBkaWZmZXJlbmNlcwoKKiBsaXNwL3ZjL2VkaWZmLXV0 aWwuZWwgKGVkaWZmLWRpZmYtdG8tZGlmZik6IFdpdGggdW5pdmVyc2FsCnByZWZpeCwgY29weSBh bGwgZGlmZmVyZW5jZXMuCgoqIGRvYy9taXNjL2VkaWZmLnRleGkgKFF1aWNrIEhlbHAgQ29tbWFu ZHMpOgoqIGV0Yy9ORVdTOiAoQ2hhbmdlcyBpbiBTcGVjaWFsaXplZCBNb2RlcyBhbmQgUGFja2Fn ZXMgaW4gRW1hY3MKMzEuMSk6IERvY3VtZW50IHRoZSBuZXcgZmVhdHVyZS4KLS0tCiBkb2MvbWlz Yy9lZGlmZi50ZXhpICAgfCAyNyArKysrKysrKysrKysrKystLS0tLS0tLS0tLS0KIGV0Yy9ORVdT ICAgICAgICAgICAgICB8IDE4ICsrKysrKysrKysrKysrKysrKwogbGlzcC92Yy9lZGlmZi11dGls LmVsIHwgMzIgKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0KIDMgZmlsZXMgY2hhbmdl ZCwgNTIgaW5zZXJ0aW9ucygrKSwgMjUgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZG9jL21p c2MvZWRpZmYudGV4aSBiL2RvYy9taXNjL2VkaWZmLnRleGkKaW5kZXggNzQ5MDI1Yzg3MGIuLjdh MmRiZTU1NzFiIDEwMDY0NAotLS0gYS9kb2MvbWlzYy9lZGlmZi50ZXhpCisrKyBiL2RvYy9taXNj L2VkaWZmLnRleGkKQEAgLTQ4OSwxNSArNDg5LDE3IEBAIFF1aWNrIEhlbHAgQ29tbWFuZHMKIEBp dGVtIGEKIEBraW5kZXggYQogQGVtcGh7SW4gY29tcGFyaXNvbiBzZXNzaW9uczp9Ci1Db3BpZXMg dGhlIGN1cnJlbnQgZGlmZmVyZW5jZSByZWdpb24gKG9yIHRoZSByZWdpb24gc3BlY2lmaWVkIGFz IHRoZSBwcmVmaXgKLXRvIHRoaXMgY29tbWFuZCkgZnJvbSBidWZmZXIgQSB0byBidWZmZXIgQkAu Ci1FZGlmZiBzYXZlcyB0aGUgb2xkIGNvbnRlbnRzIG9mIGJ1ZmZlciBCJ3MgcmVnaW9uOyBpdCBj YW4KLWJlIHJlc3RvcmVkIHZpYSB0aGUgY29tbWFuZCBAa2Jke3JifSwgd2hpY2ggc2VlLgorQ29w aWVzIHRoZSBjdXJyZW50IGRpZmZlcmVuY2UgcmVnaW9uIChvciB0aGUgcmVnaW9uIHNwZWNpZmll ZCBhcyB0aGUKK251bWVyaWNhbCBwcmVmaXggdG8gdGhpcyBjb21tYW5kLCBvciBAZW1waHthbGx9 IHJlZ2lvbnMgd2l0aCBAa2Jke0MtdX0KK3ByZWZpeCkgZnJvbSBidWZmZXIgQSB0byBidWZmZXIg QkAuICBFZGlmZiBzYXZlcyB0aGUgb2xkIGNvbnRlbnRzIG9mCitidWZmZXIgQidzIHJlZ2lvbjsg aXQgY2FuIGJlIHJlc3RvcmVkIHZpYSB0aGUgY29tbWFuZCBAa2Jke3JifSwgd2hpY2gKK3NlZS4K IAogQGVtcGh7SW4gbWVyZ2Ugc2Vzc2lvbnM6fQotQ29waWVzIHRoZSBjdXJyZW50IGRpZmZlcmVu Y2UgcmVnaW9uIChvciB0aGUgcmVnaW9uIHNwZWNpZmllZCBhcyB0aGUgcHJlZml4Ci10byB0aGlz IGNvbW1hbmQpIGZyb20gYnVmZmVyIEEgdG8gdGhlIG1lcmdlIGJ1ZmZlci4gIFRoZSBvbGQgY29u dGVudHMgb2YKLXRoaXMgcmVnaW9uIGluIGJ1ZmZlciBDIGNhbiBiZSByZXN0b3JlZCB2aWEgdGhl IGNvbW1hbmQgQGtiZHtyfS4KK0NvcGllcyB0aGUgY3VycmVudCBkaWZmZXJlbmNlIHJlZ2lvbiAo b3IgdGhlIHJlZ2lvbiBzcGVjaWZpZWQgYXMgdGhlCitudW1lcmljYWwgcHJlZml4IHRvIHRoaXMg Y29tbWFuZCwgb3IgQGVtcGh7YWxsfSByZWdpb25zIHdpdGggQGtiZHtDLXV9CitwcmVmaXgpIGZy b20gYnVmZmVyIEEgdG8gdGhlIG1lcmdlIGJ1ZmZlci4gIFRoZSBvbGQgY29udGVudHMgb2YgdGhp cworcmVnaW9uIGluIGJ1ZmZlciBDIGNhbiBiZSByZXN0b3JlZCB2aWEgdGhlIGNvbW1hbmQgQGti ZHtyfS4KIAogQGl0ZW0gYgogQGtpbmRleCBiCkBAIC01MTEsMTEgKzUxMywxMiBAQCBRdWljayBI ZWxwIENvbW1hbmRzCiAKIEBpdGVtIGFiCiBAa2luZGV4IGFiCi1Db3BpZXMgdGhlIGN1cnJlbnQg ZGlmZmVyZW5jZSByZWdpb24gKG9yIHRoZSByZWdpb24gc3BlY2lmaWVkIGFzIHRoZSBwcmVmaXgK LXRvIHRoaXMgY29tbWFuZCkgZnJvbSBidWZmZXIgQSB0byBidWZmZXIgQkAuICBUaGlzIChhbmQg dGhlIG5leHQgZml2ZSkKLWNvbW1hbmQgaXMgZW5hYmxlZCBvbmx5IGluIHNlc3Npb25zIHRoYXQg Y29tcGFyZSB0aHJlZSBmaWxlcwotc2ltdWx0YW5lb3VzbHkuICBUaGUgb2xkIHJlZ2lvbiBpbiBi dWZmZXIgQiBpcyBzYXZlZCBhbmQgY2FuIGJlIHJlc3RvcmVkCi12aWEgdGhlIGNvbW1hbmQgQGti ZHtyYn0uCitDb3BpZXMgdGhlIGN1cnJlbnQgZGlmZmVyZW5jZSByZWdpb24gKG9yIHRoZSByZWdp b24gc3BlY2lmaWVkIGFzIHRoZQorbnVtZXJpY2FsIHByZWZpeCB0byB0aGlzIGNvbW1hbmQsIG9y IEBlbXBoe2FsbH0gcmVnaW9ucyB3aXRoIEBrYmR7Qy11fQorcHJlZml4KSBmcm9tIGJ1ZmZlciBB IHRvIGJ1ZmZlciBCQC4gIFRoaXMgKGFuZCB0aGUgbmV4dCBmaXZlKSBjb21tYW5kIGlzCitlbmFi bGVkIG9ubHkgaW4gc2Vzc2lvbnMgdGhhdCBjb21wYXJlIHRocmVlIGZpbGVzIHNpbXVsdGFuZW91 c2x5LiAgVGhlCitvbGQgcmVnaW9uIGluIGJ1ZmZlciBCIGlzIHNhdmVkIGFuZCBjYW4gYmUgcmVz dG9yZWQgdmlhIHRoZSBjb21tYW5kCitAa2Jke3JifS4KIEBpdGVtIGFjCiBAa2luZGV4IGFjCiBD b3BpZXMgdGhlIGRpZmZlcmVuY2UgcmVnaW9uIGZyb20gYnVmZmVyIEEgdG8gYnVmZmVyIENALgpk aWZmIC0tZ2l0IGEvZXRjL05FV1MgYi9ldGMvTkVXUwppbmRleCBmMTBmOWFlNGQ2NS4uNWJiYThl MzU3OGYgMTAwNjQ0Ci0tLSBhL2V0Yy9ORVdTCisrKyBiL2V0Yy9ORVdTCkBAIC0xMDYsNiArMTA2 LDI0IEBAIFRoaXMgYWZmZWN0cyBjYWxscyB0byAnd2FybicsICdsd2FybicsICdkaXNwbGF5LXdh cm5pbmcnLCBhbmQKIEluIG1vc3QgY2FzZXMsIGhhdmluZyBpdCBlbmFibGVkIGxlYWRzIHRvIGEg bGFyZ2UgYW1vdW50IG9mIGZhbHNlCiBwb3NpdGl2ZXMuCiAKKyoqIEVkaWZmCisKKysrKworKioq IEVkaWZmJ3MgY29weSBjb21tYW5kcyBub3cgYXBwbHkgdG8gYWxsIGNoYW5nZXMgd2l0aCAnQy11 JyBwcmVmaXguCitUaGUgRWRpZmYgY29weSBjb21tYW5kcywgYm91bmQgdG8gJ2EnLCAnYicsICdh YicsIGV0Yy4sIG5vdyBjb3B5IGFsbAorY2hhbmdlcyB3aGVuIHN1cHBsaWVkIHdpdGggYSB1bml2 ZXJzYWwgcHJlZml4IGFyZ3VtZW50IHZpYSAnQy11JzoKKworLSAnQy11IGEnIGNvcGllcyBhbGwg Y2hhbmdlcyBmcm9tIGJ1ZmZlciBBIHRvIGJ1ZmZlciBCIChpbiAyLXdheSBkaWZmKQorICBvciB0 byBidWZmZXIgQyAoaW4gMy13YXkgZGlmZiBvciBtZXJnZSkuCistICdDLXUgYicgY29waWVzIGFs bCBjaGFuZ2VzIGZyb20gYnVmZmVyIEIgdG8gYnVmZmVyIEEgKGluIDItd2F5IGRpZmYpCisgIG9y IHRvIGJ1ZmZlciBDIChpbiAzLXdheSBkaWZmIG9yIG1lcmdlKS4KKy0gJ0MtdSBhIGInIGNvcGll cyBhbGwgY2hhbmdlcyBmcm9tIGJ1ZmZlciBBIHRvIGJ1ZmZlciBCLgorLSAnQy11IGIgYScgY29w aWVzIGFsbCBjaGFuZ2VzIGZyb20gYnVmZmVyIEIgdG8gYnVmZmVyIEEuCistICdDLXUgYSBjJyBj b3BpZXMgYWxsIGNoYW5nZXMgZnJvbSBidWZmZXIgQSB0byBidWZmZXIgQy4KKy0gJ0MtdSBiIGMn IGNvcGllcyBhbGwgY2hhbmdlcyBmcm9tIGJ1ZmZlciBCIHRvIGJ1ZmZlciBDLgorLSAnQy11IGMg YScgY29waWVzIGFsbCBjaGFuZ2VzIGZyb20gYnVmZmVyIEMgdG8gYnVmZmVyIEEuCistICdDLXUg YyBiJyBjb3BpZXMgYWxsIGNoYW5nZXMgZnJvbSBidWZmZXIgQyB0byBidWZmZXIgQi4KKwogDAog KiBOZXcgTW9kZXMgYW5kIFBhY2thZ2VzIGluIEVtYWNzIDMxLjEKIApkaWZmIC0tZ2l0IGEvbGlz cC92Yy9lZGlmZi11dGlsLmVsIGIvbGlzcC92Yy9lZGlmZi11dGlsLmVsCmluZGV4IDU5N2Q4YTVl NjQzLi42MDM4ZjNlYWUzMCAxMDA2NDQKLS0tIGEvbGlzcC92Yy9lZGlmZi11dGlsLmVsCisrKyBi L2xpc3AvdmMvZWRpZmYtdXRpbC5lbApAQCAtMTg5MCw4ICsxODkwLDggQEAgZWRpZmYtZGlmZi1h dC1wb2ludAogCiAoZGVmdW4gZWRpZmYtZGlmZi10by1kaWZmIChhcmcgJm9wdGlvbmFsIGtleXMp CiAgICJDb3B5IGJ1ZmZlci1YJ3RoIGRpZmZlcmVuY2UgcmVnaW9uIHRvIGJ1ZmZlciBZIChYLFkg YXJlIEEsIEIsIG9yIEMpLgotV2l0aCBudW1lcmljYWwgcHJlZml4IGFyZ3VtZW50IEFSRywgY29w eSB0aGUgZGlmZmVyZW5jZSBzcGVjaWZpZWQKLWluIHRoZSBhcmcuCitXaXRoIG51bWVyaWNhbCBw cmVmaXggYXJndW1lbnQgQVJHLCBjb3B5IHRoZSBkaWZmZXJlbmNlIHNwZWNpZmllZCBpbiB0aGUK K2FyZy4gIFdpdGggcHJlZml4IGBcXFt1bml2ZXJzYWwtYXJndW1lbnRdJywgY29weSBhbGwgZGlm ZmVyZW5jZXMuCiBPdGhlcndpc2UsIGNvcHkgdGhlIGRpZmZlcmVuY2UgZ2l2ZW4gYnkgYGVkaWZm LWN1cnJlbnQtZGlmZmVyZW5jZScuCiBUaGlzIGNvbW1hbmQgYXNzdW1lcyBpdCBpcyBib3VuZCB0 byBhIDItY2hhcmFjdGVyIGtleSBzZXF1ZW5jZSwgYGFiJywgYGJhJywKIGBhYycsIGV0Yy4sIHdo aWNoIGlzIHVzZWQgdG8gZGV0ZXJtaW5lIHRoZSB0eXBlcyBvZiBidWZmZXJzIHRvIGJlIHVzZWQg Zm9yCkBAIC0xOTA0LDE3ICsxOTA0LDIzIEBAIGVkaWZmLWRpZmYtdG8tZGlmZgogICAoaW50ZXJh Y3RpdmUgIlAiKQogICAoZWRpZmYtYmFyZi1pZi1ub3QtY29udHJvbC1idWZmZXIpCiAgIChvciBr ZXlzIChzZXRxIGtleXMgKHRoaXMtY29tbWFuZC1rZXlzKSkpCi0gIChpZiAoZXEgYXJnICctKSAo c2V0cSBhcmcgLTEpKSA7IHRyYW5zbGF0ZSBuZWcgYXJnIHRvIC0xCi0gIChpZiAobnVtYmVycCBh cmcpIChlZGlmZi1qdW1wLXRvLWRpZmZlcmVuY2UgYXJnKSkKLQotICAobGV0KiAoKGNoYXIxIChh cmVmIGtleXMgMCkpCi0JIChjaGFyMiAoYXJlZiBrZXlzIDEpKQotCSBlZGlmZi12ZXJib3NlLXAp Ci0gICAgKGVkaWZmLWNvcHktZGlmZiBlZGlmZi1jdXJyZW50LWRpZmZlcmVuY2UKLQkJICAgICAo ZWRpZmYtY2hhci10by1idWZ0eXBlIGNoYXIxKQotCQkgICAgIChlZGlmZi1jaGFyLXRvLWJ1ZnR5 cGUgY2hhcjIpKQotICAgIDs7IHJlY2VudGVyIHdpdGggcmVoaWdobGlnaHRpbmcsIGJ1dCBubyBt ZXNzYWdlcwotICAgIChlZGlmZi1yZWNlbnRlcikpKQorICAoaWYgKGVxdWFsIGFyZyAnKDQpKQor ICAgICAgOzsgY29weSBhbGwgZGlmZmVyZW5jZXMgd2l0aCBgQy11JyBwcmVmaXgKKyAgICAgIChs ZXQgKChuIDApKQorICAgICAgICAod2hpbGUgKGVkaWZmLXZhbGlkLWRpZmZlcmVuY2UtcCBuKQor ICAgICAgICAgIChlZGlmZi1kaWZmLXRvLWRpZmYgKDErIG4pIGtleXMpCisgICAgICAgICAgKHNl dHEgbiAoMSsgbikpKSkKKyAgICAoaWYgKGVxIGFyZyAnLSkgKHNldHEgYXJnIC0xKSkgICAgICA7 IHRyYW5zbGF0ZSBuZWcgYXJnIHRvIC0xCisgICAgKGlmIChudW1iZXJwIGFyZykgKGVkaWZmLWp1 bXAtdG8tZGlmZmVyZW5jZSBhcmcpKQorCisgICAgKGxldCogKChjaGFyMSAoYXJlZiBrZXlzIDAp KQorCSAgIChjaGFyMiAoYXJlZiBrZXlzIDEpKQorCSAgIGVkaWZmLXZlcmJvc2UtcCkKKyAgICAg IChlZGlmZi1jb3B5LWRpZmYgZWRpZmYtY3VycmVudC1kaWZmZXJlbmNlCisJCSAgICAgICAoZWRp ZmYtY2hhci10by1idWZ0eXBlIGNoYXIxKQorCQkgICAgICAgKGVkaWZmLWNoYXItdG8tYnVmdHlw ZSBjaGFyMikpCisgICAgICA7OyByZWNlbnRlciB3aXRoIHJlaGlnaGxpZ2h0aW5nLCBidXQgbm8g bWVzc2FnZXMKKyAgICAgIChlZGlmZi1yZWNlbnRlcikpKSkKIAogKGRlZnVuIGVkaWZmLWNvcHkt QS10by1CIChhcmcpCiAgICJDb3B5IEFSR3RoIGRpZmZlcmVuY2UgcmVnaW9uIGZyb20gYnVmZmVy IEEgdG8gQi4KLS0gCjIuMzkuMyAoQXBwbGUgR2l0LTE0NSkKCg== --00000000000065a80d06214b0b94-- From unknown Wed Jun 25 00:26:09 2025 X-Loop: help-debbugs@gnu.org Subject: bug#72866: [PATCH] Add ediff-copy-all-X-to-Y functions Resent-From: Robert Pluim Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 11 Sep 2024 08:48:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72866 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch To: Paul Nelson Cc: Eli Zaretskii , 72866@debbugs.gnu.org Received: via spool by 72866-submit@debbugs.gnu.org id=B72866.172604447118130 (code B ref 72866); Wed, 11 Sep 2024 08:48:02 +0000 Received: (at 72866) by debbugs.gnu.org; 11 Sep 2024 08:47:51 +0000 Received: from localhost ([127.0.0.1]:37773 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1soJ0w-0004iH-K3 for submit@debbugs.gnu.org; Wed, 11 Sep 2024 04:47:51 -0400 Received: from mail-wm1-f44.google.com ([209.85.128.44]:56759) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1soJ0t-0004hy-FG; Wed, 11 Sep 2024 04:47:48 -0400 Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-42cae6bb895so40884955e9.1; Wed, 11 Sep 2024 01:47:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1726044395; x=1726649195; darn=debbugs.gnu.org; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=f7s+dXOSPBOyFIkj5GjMLmLzgFWEMg9Ju4d/EH0fjNo=; b=DA4b62FLj75jX//NwULvTJbqAatl444Th62lzm2bveHimXbOQQv340jzZnyT+eWn+m iZG1ocHcQV/Y39p+8yIoaqGpJqrvXJ6y0RzAf/0QOYL5yIuBCXs/4r/UOXusha9CbPcd zMeILV/efTy07ZXsTgfc/fMyD0Ku9ROOhV2+NJJgNlEDlQqkdL8HVkNBiMV4OaMh41Oz MyA96ZivauTcuo5lF7L9iCk3yweSsC1ywwMj7pJgx4swP6UQfCFI7ckwBf2/tksQ9042 vKA+eKNl/I2XpCDQWYTDFsQ0AOh6h9ogU2lBJBGF3EzDTAXzFKyjPKC0lxoYN/YsL7oC oAUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1726044395; x=1726649195; h=mime-version:message-id:date:references:in-reply-to:subject:cc:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=f7s+dXOSPBOyFIkj5GjMLmLzgFWEMg9Ju4d/EH0fjNo=; b=lHvsPs3WsC4nt8PYhCWjAwWKlGnEgWMUJZxZFKWKgpo+QWZtiZiDkSz8PH/eUZhyKX UBJ1OXQGxb5zdBK0syX4j7ggJhY63AQkVc6s6I0EmrCsyQJ811/oSI3T8G8h0EB/pcGc dEcUNVFTf7YtVo9kMe2JAPsRO87sAGszN/CgpA3ADNiyPQXr52ZDbv1EMnQMoI2iKq1s 7/Q0zckY9IqyRXrYHyDGYnYbsgYeL36mjFZBA2mG7qsaHPv03bYH0lKjanBhj/6+nEAg tzr7kWu/vD/eGg5CsjcPkxhJffM0CQQP9oi5Zn/DclwXsyqF+OhzIDzex62D68ii/x9B qiBA== X-Forwarded-Encrypted: i=1; AJvYcCUCs61CNEEV1NCAMebJ3Nxjf5j5eCmKhHf7lg/U32PQUMgedByzfFiWZpg4iMM5aaSy0Fvc6w==@debbugs.gnu.org, AJvYcCV8nPXFoKyZeSsQh0LEUo8FNONgOhB6JlAUfGWCPsRcf41nvYiST8719iF5EIQOj5lQ4sa5nX1OFw==@debbugs.gnu.org X-Gm-Message-State: AOJu0Yx2qHJQyTjEEcDacTGua3dFDp+rjh/ptCqQfvlYi466hdLwv2mU y1w/jzmt9OIodrB8Dxy46HYhqOW5ERI6QGkCTE0fAwC9sqYmMsmk+ShQsw== X-Google-Smtp-Source: AGHT+IHhrzghjP6K6lYLOY2OelYryDwnAlndS6KDq9l/2PLIOTjH+R7fb3U/s27uHe/ws9+G5xN1zw== X-Received: by 2002:a05:6000:184e:b0:378:7e74:cc25 with SMTP id ffacd0b85a97d-3788967e4e6mr15823404f8f.39.1726044395171; Wed, 11 Sep 2024 01:46:35 -0700 (PDT) Received: from rltb ([2a01:e0a:3f3:fb51:8061:cf5c:603f:ba35]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3789564aef9sm10958958f8f.5.2024.09.11.01.46.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2024 01:46:34 -0700 (PDT) From: Robert Pluim In-Reply-To: (Paul Nelson's message of "Wed, 4 Sep 2024 15:20:46 +0200") References: <86le0dasp9.fsf@gnu.org> <8734miuz05.fsf@gmail.com> <87h6avtvx8.fsf@gmail.com> <86h6av5zu1.fsf@gnu.org> Date: Wed, 11 Sep 2024 10:46:34 +0200 Message-ID: <8734m6mvbp.fsf@gmail.com> MIME-Version: 1.0 Content-Type: text/plain 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 (-) tags 72866 fixed close 72866 31.1 quit >>>>> On Wed, 4 Sep 2024 15:20:46 +0200, Paul Nelson said: Paul> Thanks Robert, I've implemented your suggestions. Paul> I hope someone will check that I've used "+++" correctly in NEWS, Paul> affirming that I updated the documentation -- hopefully I didn't miss Paul> anything. Looks fine to me. I slightly adjusted your commit message and added the bug number to it. Closing. Committed as 833158c0b78 Robert --