X-Loop: owner@HIDDEN
Subject: bug#3348: 23.0.92.1; Ediff: Creating a multi-file patch
Reply-To: Jon Strait <jstrait@HIDDEN>, 3348 <at> debbugs.gnu.org
Resent-From: Jon Strait <jstrait@HIDDEN>
Resent-To: bug-submit-list@HIDDEN
Resent-CC: Emacs Bugs <bug-gnu-emacs@HIDDEN>
Resent-Date: Fri, 22 May 2009 03:45:03 +0000
Resent-Message-ID: <handler.3348.B.124296368122522@HIDDEN>
Resent-Sender: help-debbugs@HIDDEN
X-Emacs-PR-Message: report 3348
X-Emacs-PR-Package: emacs
X-Emacs-PR-Keywords:
Received: via spool by submit@HIDDEN id=B.124296368122522
(code B ref -1); Fri, 22 May 2009 03:45:03 +0000
Received: (at submit) by emacsbugs.donarmstrong.com; 22 May 2009 03:41:21 +0000
X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02
(2008-06-10) on rzlab.ucr.edu
X-Spam-Level:
X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available.
hammytokens:Tokens not available.
X-Spam-Status: No, score=0.0 required=4.0 tests=MURPHY_DRUGS_REL8
autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02
Received: from lists.gnu.org (lists.gnu.org [199.232.76.165])
by rzlab.ucr.edu (8.13.8/8.13.8/Debian-3) with ESMTP id n4M3fIoP022515
for <submit@HIDDEN>; Thu, 21 May 2009 20:41:19 -0700
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
id 1M7LdG-00079p-5z
for bug-gnu-emacs@HIDDEN; Thu, 21 May 2009 23:41:18 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
id 1M7LdA-00079d-CI
for bug-gnu-emacs@HIDDEN; Thu, 21 May 2009 23:41:16 -0400
Received: from [199.232.76.173] (port=50977 helo=monty-python.gnu.org)
by lists.gnu.org with esmtp (Exim 4.43)
id 1M7LdA-00079a-6H
for bug-gnu-emacs@HIDDEN; Thu, 21 May 2009 23:41:12 -0400
Received: from smtp.novuscom.net ([216.19.176.3]:39520 helo=novuscom.net)
by monty-python.gnu.org with esmtp (Exim 4.60)
(envelope-from <jstrait@HIDDEN>)
id 1M7Ld9-00067V-Qn
for bug-gnu-emacs@HIDDEN; Thu, 21 May 2009 23:41:12 -0400
Received: (qmail 11114 invoked from network); 22 May 2009 03:40:58 -0000
Received: from 216-19-179-189.dyn.novuscom.net (HELO [192.168.0.101]) ([216.19.179.189])
(envelope-sender <jstrait@HIDDEN>)
by smtp.novuscom.net (qmail-ldap-1.03) with SMTP
for <bug-gnu-emacs@HIDDEN>; 22 May 2009 03:40:58 -0000
Message-ID: <4A161D61.6010100@HIDDEN>
Date: Thu, 21 May 2009 20:34:57 -0700
From: Jon Strait <jstrait@HIDDEN>
User-Agent: Thunderbird 2.0.0.19 (X11/20090213)
MIME-Version: 1.0
To: bug-gnu-emacs@HIDDEN
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6, seldom 2.4 (older, 4)
The modified flag is not being set on the patch results buffer when
ediff-collect-custom-diffs is rerun.
1. Mark the sessions within an ediff-directories session.
2. Run ediff-collect-custom-diffs, which creates a multi-file patch
and displays the buffer with this patch.
3. Save this buffer to a file 'foo.patch' with write-file.
4. Change one of the files included in the session group.
5. Run ediff-collect-custom-diffs on the same session group
again.
6. The new patch will be displayed as the buffer 'foo.patch', but
the buffer's modified flag is not set.
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.420 (Entity 5.420) Content-Type: text/plain; charset=utf-8 X-Loop: owner@HIDDEN From: help-debbugs@HIDDEN (Emacs bug Tracking System) To: Jon Strait <jstrait@HIDDEN> Subject: bug#3348: Acknowledgement (23.0.92.1; Ediff: Creating a multi-file patch) Message-ID: <handler.3348.B.124296368122522.ack@HIDDEN> References: <4A161D61.6010100@HIDDEN> X-Emacs-PR-Message: ack 3348 X-Emacs-PR-Package: emacs Reply-To: 3348 <at> debbugs.gnu.org Date: Fri, 22 May 2009 03:45:04 +0000 Thank you for filing a new bug report with Emacs. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): Emacs Bugs <bug-gnu-emacs@HIDDEN> If you wish to submit further information on this problem, please send it to 3348 <at> debbugs.gnu.org, as before. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 3348: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D3348 Emacs Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN
Subject: bug#3348: 23.0.92.1; Ediff: Creating a multi-file patch
References: <4A161D61.6010100@HIDDEN>
In-Reply-To: <4A161D61.6010100@HIDDEN>
Resent-From: Noam Postavsky <npostavs@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Fri, 03 Jun 2016 20:11:02 +0000
Resent-Message-ID: <handler.3348.B3348.1464984649476 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 3348
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords:
To: 3348 <at> debbugs.gnu.org
Received: via spool by 3348-submit <at> debbugs.gnu.org id=B3348.1464984649476
(code B ref 3348); Fri, 03 Jun 2016 20:11:02 +0000
Received: (at 3348) by debbugs.gnu.org; 3 Jun 2016 20:10:49 +0000
Received: from localhost ([127.0.0.1]:53497 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1b8vQf-00007a-LN
for submit <at> debbugs.gnu.org; Fri, 03 Jun 2016 16:10:49 -0400
Received: from mail-oi0-f45.google.com ([209.85.218.45]:33550)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <npostavs@HIDDEN>) id 1b8vQd-00007B-TY
for 3348 <at> debbugs.gnu.org; Fri, 03 Jun 2016 16:10:48 -0400
Received: by mail-oi0-f45.google.com with SMTP id k23so144003755oih.0
for <3348 <at> debbugs.gnu.org>; Fri, 03 Jun 2016 13:10:47 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=mime-version:sender:from:date:message-id:subject:to;
bh=31sdiF+IUprb6HnBaa15yc+rNFeEK2f1mChT6BO/rro=;
b=q8ykzCXMS4nI3Pfj27Wy3NwIgo1Rq4NNGfkqsoD6C2wPQXgnQoMaz08VA2kCi6kkkk
piU4VtNGf7PMbptgRIPsqKKhPXJPa2/6JD+PZGSl8x4gi169NaUK7Cvq3zgSUYSaLtDu
c45QgL1E0bVew0pVYQ6rsYOPiMkbdLFU+bJ+ZhKlnCgzbP/TDM9JSX81VdOXzRNyRFux
jzYIhU4I/7+kVHy5A5umfLxVcu5rn7mT2WBxWlDePeDwOxGkLRMhrGvc3dnoP7bnP53/
97ddxlk2cC11Hmj/0VLOWF3PDGbsEWRssJtd73gb0BECC7tjzKGGcktW3qaraWiAANpR
WPng==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20130820;
h=x-gm-message-state:mime-version:sender:from:date:message-id:subject
:to; bh=31sdiF+IUprb6HnBaa15yc+rNFeEK2f1mChT6BO/rro=;
b=aYfhv0V3Un58Vhs7Tidtiwu/rGkp574wauIk6wpmUu+nhm8wLY0X9i13Hp2LvKG9Np
P5m5+ZsSCaTU981fAHC+y7t/Ip28Oa/l4y//ko53o1B712DQ1jwpSP9qnv+GqKVU0VpE
ICLfGlKfI+q2ACGezDHaBY8I5J0MS35K+ErGn2glNF4PYLNcnSs7nt3Vz/xqpnMh3mw1
kpJnI4nyThqJKPq3awa2Yls0x8BXllJNjXF/duZ+KDis7XsyOOu552GpNHVpoKjgjg1V
a5PH5xLJEPNGE3m+M8voOQcPEexrRc7qCjMaJKWKKscn6ZkVc8qMkysrGpER+CU/3eeh
H8Vw==
X-Gm-Message-State: ALyK8tI3xRFvmUKfFS5vBqshGtCmvmx11PewbYIrj6GLYQfNtYuS6K3UTTxM52IeawegsJYHXANA4a3jtB0r+A==
X-Received: by 10.157.1.165 with SMTP id e34mr3080852ote.35.1464984642341;
Fri, 03 Jun 2016 13:10:42 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.157.34.169 with HTTP; Fri, 3 Jun 2016 13:10:41 -0700 (PDT)
From: Noam Postavsky <npostavs@HIDDEN>
Date: Fri, 3 Jun 2016 16:10:41 -0400
X-Google-Sender-Auth: Mu5NvNaVJQiTqq8MzHpQ3cxIUkY
Message-ID: <CAM-tV--4OodvFzFAL17j==fkP-EnTGfien_qjQ7dCi7U6N16aw@HIDDEN>
Content-Type: text/plain; charset=UTF-8
X-Spam-Score: -0.5 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.5 (/)
tag 3348 + confirmed
severity 3348 minor
found 3348 25.0.94
quit
Confirmed this is still an issue. Here is an elisp script for easier
reproduction (run as emacs -Q -l bug-3348.el):
(defconst bug-3348-test-dir
(expand-file-name "bug-3348-testdir" temporary-file-directory))
(make-directory bug-3348-test-dir t)
(cd bug-3348-test-dir)
(make-directory "dir-a" t)
(make-directory "dir-b" t)
(with-temp-file "dir-a/file"
(insert "aaa"))
(with-temp-file "dir-b/file"
(insert "bbb"))
(ediff-directories "dir-a" "dir-b" nil)
(switch-to-buffer "*Ediff Session Group Panel*")
(ediff-next-meta-item 1)
(ediff-mark-for-operation-at-pos nil)
(ediff-collect-custom-diffs)
(with-current-buffer "*Ediff Multifile Diffs*"
(write-file "foo.patch"))
(with-temp-file "dir-b/file"
(insert "BBB"))
(ediff-collect-custom-diffs)
(switch-to-buffer "foo.patch")
(diff-buffer-with-file)
(message (concat "Observe foo.patch buffer is different from its file,\n"
"but is marked read-only, not modified"))
Received: (at control) by debbugs.gnu.org; 3 Jun 2016 20:10:50 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jun 03 16:10:50 2016
Received: from localhost ([127.0.0.1]:53499 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1b8vQf-00007c-Sh
for submit <at> debbugs.gnu.org; Fri, 03 Jun 2016 16:10:50 -0400
Received: from mail-oi0-f49.google.com ([209.85.218.49]:34688)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <npostavs@HIDDEN>) id 1b8vQd-00007A-V9
for control <at> debbugs.gnu.org; Fri, 03 Jun 2016 16:10:48 -0400
Received: by mail-oi0-f49.google.com with SMTP id e72so143933814oib.1
for <control <at> debbugs.gnu.org>; Fri, 03 Jun 2016 13:10:47 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=mime-version:sender:from:date:message-id:subject:to;
bh=31sdiF+IUprb6HnBaa15yc+rNFeEK2f1mChT6BO/rro=;
b=q8ykzCXMS4nI3Pfj27Wy3NwIgo1Rq4NNGfkqsoD6C2wPQXgnQoMaz08VA2kCi6kkkk
piU4VtNGf7PMbptgRIPsqKKhPXJPa2/6JD+PZGSl8x4gi169NaUK7Cvq3zgSUYSaLtDu
c45QgL1E0bVew0pVYQ6rsYOPiMkbdLFU+bJ+ZhKlnCgzbP/TDM9JSX81VdOXzRNyRFux
jzYIhU4I/7+kVHy5A5umfLxVcu5rn7mT2WBxWlDePeDwOxGkLRMhrGvc3dnoP7bnP53/
97ddxlk2cC11Hmj/0VLOWF3PDGbsEWRssJtd73gb0BECC7tjzKGGcktW3qaraWiAANpR
WPng==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20130820;
h=x-gm-message-state:mime-version:sender:from:date:message-id:subject
:to; bh=31sdiF+IUprb6HnBaa15yc+rNFeEK2f1mChT6BO/rro=;
b=iPyCUl6hWAk7W9mDLyVtEpXT94bXF/tF5J+jT/sNn1U71jcrYKqSTwTDbb7xTbebQQ
1muargHokgeIK25JeFnW/XDJKC4fvFIdr3Kkp28yom7IX3+UUQXU7iA86TQnK8YW3/oN
nraftAEbqpiXYFanqd9xpo6AsknHXb63oJtiv8BLnCbUlLupyVSpejvzTTMou/vybPfB
LcNTXeKGAfg5fhSQI4nCQAyz7VhkhqgxvuXBZwPFPorr30l0eWr+A3MluPdw5PIMPH4d
cFo67h5BRvTnVD1dGAzbry2MvnvJCPOjMzKvYwx2bAb6mgXnVeFIrqVMTXbBRcMMN+tB
owOQ==
X-Gm-Message-State: ALyK8tILkqROVXHqaeXhZCB1Hus1vnxaoK82LoKihtv6FSuC9MEFzEiZCa5G5/OkyA0cv1+9dlexIugcvKxlgQ==
X-Received: by 10.157.1.165 with SMTP id e34mr3080852ote.35.1464984642341;
Fri, 03 Jun 2016 13:10:42 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.157.34.169 with HTTP; Fri, 3 Jun 2016 13:10:41 -0700 (PDT)
From: Noam Postavsky <npostavs@HIDDEN>
Date: Fri, 3 Jun 2016 16:10:41 -0400
X-Google-Sender-Auth: Mu5NvNaVJQiTqq8MzHpQ3cxIUkY
Message-ID: <CAM-tV--4OodvFzFAL17j==fkP-EnTGfien_qjQ7dCi7U6N16aw@HIDDEN>
Subject: 23.0.92.1; Ediff: Creating a multi-file patch
To: 3348 <at> debbugs.gnu.org
Content-Type: text/plain; charset=UTF-8
Bcc: control <at> debbugs.gnu.org
X-Spam-Score: -0.5 (/)
X-Debbugs-Envelope-To: control
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.5 (/)
tag 3348 + confirmed
severity 3348 minor
found 3348 25.0.94
quit
Confirmed this is still an issue. Here is an elisp script for easier
reproduction (run as emacs -Q -l bug-3348.el):
(defconst bug-3348-test-dir
(expand-file-name "bug-3348-testdir" temporary-file-directory))
(make-directory bug-3348-test-dir t)
(cd bug-3348-test-dir)
(make-directory "dir-a" t)
(make-directory "dir-b" t)
(with-temp-file "dir-a/file"
(insert "aaa"))
(with-temp-file "dir-b/file"
(insert "bbb"))
(ediff-directories "dir-a" "dir-b" nil)
(switch-to-buffer "*Ediff Session Group Panel*")
(ediff-next-meta-item 1)
(ediff-mark-for-operation-at-pos nil)
(ediff-collect-custom-diffs)
(with-current-buffer "*Ediff Multifile Diffs*"
(write-file "foo.patch"))
(with-temp-file "dir-b/file"
(insert "BBB"))
(ediff-collect-custom-diffs)
(switch-to-buffer "foo.patch")
(diff-buffer-with-file)
(message (concat "Observe foo.patch buffer is different from its file,\n"
"but is marked read-only, not modified"))
Received: (at control) by debbugs.gnu.org; 3 Jun 2016 20:10:50 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jun 03 16:10:50 2016
Received: from localhost ([127.0.0.1]:53499 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1b8vQf-00007c-Sh
for submit <at> debbugs.gnu.org; Fri, 03 Jun 2016 16:10:50 -0400
Received: from mail-oi0-f49.google.com ([209.85.218.49]:34688)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <npostavs@HIDDEN>) id 1b8vQd-00007A-V9
for control <at> debbugs.gnu.org; Fri, 03 Jun 2016 16:10:48 -0400
Received: by mail-oi0-f49.google.com with SMTP id e72so143933814oib.1
for <control <at> debbugs.gnu.org>; Fri, 03 Jun 2016 13:10:47 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=mime-version:sender:from:date:message-id:subject:to;
bh=31sdiF+IUprb6HnBaa15yc+rNFeEK2f1mChT6BO/rro=;
b=q8ykzCXMS4nI3Pfj27Wy3NwIgo1Rq4NNGfkqsoD6C2wPQXgnQoMaz08VA2kCi6kkkk
piU4VtNGf7PMbptgRIPsqKKhPXJPa2/6JD+PZGSl8x4gi169NaUK7Cvq3zgSUYSaLtDu
c45QgL1E0bVew0pVYQ6rsYOPiMkbdLFU+bJ+ZhKlnCgzbP/TDM9JSX81VdOXzRNyRFux
jzYIhU4I/7+kVHy5A5umfLxVcu5rn7mT2WBxWlDePeDwOxGkLRMhrGvc3dnoP7bnP53/
97ddxlk2cC11Hmj/0VLOWF3PDGbsEWRssJtd73gb0BECC7tjzKGGcktW3qaraWiAANpR
WPng==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20130820;
h=x-gm-message-state:mime-version:sender:from:date:message-id:subject
:to; bh=31sdiF+IUprb6HnBaa15yc+rNFeEK2f1mChT6BO/rro=;
b=iPyCUl6hWAk7W9mDLyVtEpXT94bXF/tF5J+jT/sNn1U71jcrYKqSTwTDbb7xTbebQQ
1muargHokgeIK25JeFnW/XDJKC4fvFIdr3Kkp28yom7IX3+UUQXU7iA86TQnK8YW3/oN
nraftAEbqpiXYFanqd9xpo6AsknHXb63oJtiv8BLnCbUlLupyVSpejvzTTMou/vybPfB
LcNTXeKGAfg5fhSQI4nCQAyz7VhkhqgxvuXBZwPFPorr30l0eWr+A3MluPdw5PIMPH4d
cFo67h5BRvTnVD1dGAzbry2MvnvJCPOjMzKvYwx2bAb6mgXnVeFIrqVMTXbBRcMMN+tB
owOQ==
X-Gm-Message-State: ALyK8tILkqROVXHqaeXhZCB1Hus1vnxaoK82LoKihtv6FSuC9MEFzEiZCa5G5/OkyA0cv1+9dlexIugcvKxlgQ==
X-Received: by 10.157.1.165 with SMTP id e34mr3080852ote.35.1464984642341;
Fri, 03 Jun 2016 13:10:42 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.157.34.169 with HTTP; Fri, 3 Jun 2016 13:10:41 -0700 (PDT)
From: Noam Postavsky <npostavs@HIDDEN>
Date: Fri, 3 Jun 2016 16:10:41 -0400
X-Google-Sender-Auth: Mu5NvNaVJQiTqq8MzHpQ3cxIUkY
Message-ID: <CAM-tV--4OodvFzFAL17j==fkP-EnTGfien_qjQ7dCi7U6N16aw@HIDDEN>
Subject: 23.0.92.1; Ediff: Creating a multi-file patch
To: 3348 <at> debbugs.gnu.org
Content-Type: text/plain; charset=UTF-8
Bcc: control <at> debbugs.gnu.org
X-Spam-Score: -0.5 (/)
X-Debbugs-Envelope-To: control
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.5 (/)
tag 3348 + confirmed
severity 3348 minor
found 3348 25.0.94
quit
Confirmed this is still an issue. Here is an elisp script for easier
reproduction (run as emacs -Q -l bug-3348.el):
(defconst bug-3348-test-dir
(expand-file-name "bug-3348-testdir" temporary-file-directory))
(make-directory bug-3348-test-dir t)
(cd bug-3348-test-dir)
(make-directory "dir-a" t)
(make-directory "dir-b" t)
(with-temp-file "dir-a/file"
(insert "aaa"))
(with-temp-file "dir-b/file"
(insert "bbb"))
(ediff-directories "dir-a" "dir-b" nil)
(switch-to-buffer "*Ediff Session Group Panel*")
(ediff-next-meta-item 1)
(ediff-mark-for-operation-at-pos nil)
(ediff-collect-custom-diffs)
(with-current-buffer "*Ediff Multifile Diffs*"
(write-file "foo.patch"))
(with-temp-file "dir-b/file"
(insert "BBB"))
(ediff-collect-custom-diffs)
(switch-to-buffer "foo.patch")
(diff-buffer-with-file)
(message (concat "Observe foo.patch buffer is different from its file,\n"
"but is marked read-only, not modified"))
Received: (at control) by debbugs.gnu.org; 3 Jun 2016 20:10:50 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Fri Jun 03 16:10:50 2016
Received: from localhost ([127.0.0.1]:53499 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1b8vQf-00007c-Sh
for submit <at> debbugs.gnu.org; Fri, 03 Jun 2016 16:10:50 -0400
Received: from mail-oi0-f49.google.com ([209.85.218.49]:34688)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <npostavs@HIDDEN>) id 1b8vQd-00007A-V9
for control <at> debbugs.gnu.org; Fri, 03 Jun 2016 16:10:48 -0400
Received: by mail-oi0-f49.google.com with SMTP id e72so143933814oib.1
for <control <at> debbugs.gnu.org>; Fri, 03 Jun 2016 13:10:47 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
h=mime-version:sender:from:date:message-id:subject:to;
bh=31sdiF+IUprb6HnBaa15yc+rNFeEK2f1mChT6BO/rro=;
b=q8ykzCXMS4nI3Pfj27Wy3NwIgo1Rq4NNGfkqsoD6C2wPQXgnQoMaz08VA2kCi6kkkk
piU4VtNGf7PMbptgRIPsqKKhPXJPa2/6JD+PZGSl8x4gi169NaUK7Cvq3zgSUYSaLtDu
c45QgL1E0bVew0pVYQ6rsYOPiMkbdLFU+bJ+ZhKlnCgzbP/TDM9JSX81VdOXzRNyRFux
jzYIhU4I/7+kVHy5A5umfLxVcu5rn7mT2WBxWlDePeDwOxGkLRMhrGvc3dnoP7bnP53/
97ddxlk2cC11Hmj/0VLOWF3PDGbsEWRssJtd73gb0BECC7tjzKGGcktW3qaraWiAANpR
WPng==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20130820;
h=x-gm-message-state:mime-version:sender:from:date:message-id:subject
:to; bh=31sdiF+IUprb6HnBaa15yc+rNFeEK2f1mChT6BO/rro=;
b=iPyCUl6hWAk7W9mDLyVtEpXT94bXF/tF5J+jT/sNn1U71jcrYKqSTwTDbb7xTbebQQ
1muargHokgeIK25JeFnW/XDJKC4fvFIdr3Kkp28yom7IX3+UUQXU7iA86TQnK8YW3/oN
nraftAEbqpiXYFanqd9xpo6AsknHXb63oJtiv8BLnCbUlLupyVSpejvzTTMou/vybPfB
LcNTXeKGAfg5fhSQI4nCQAyz7VhkhqgxvuXBZwPFPorr30l0eWr+A3MluPdw5PIMPH4d
cFo67h5BRvTnVD1dGAzbry2MvnvJCPOjMzKvYwx2bAb6mgXnVeFIrqVMTXbBRcMMN+tB
owOQ==
X-Gm-Message-State: ALyK8tILkqROVXHqaeXhZCB1Hus1vnxaoK82LoKihtv6FSuC9MEFzEiZCa5G5/OkyA0cv1+9dlexIugcvKxlgQ==
X-Received: by 10.157.1.165 with SMTP id e34mr3080852ote.35.1464984642341;
Fri, 03 Jun 2016 13:10:42 -0700 (PDT)
MIME-Version: 1.0
Received: by 10.157.34.169 with HTTP; Fri, 3 Jun 2016 13:10:41 -0700 (PDT)
From: Noam Postavsky <npostavs@HIDDEN>
Date: Fri, 3 Jun 2016 16:10:41 -0400
X-Google-Sender-Auth: Mu5NvNaVJQiTqq8MzHpQ3cxIUkY
Message-ID: <CAM-tV--4OodvFzFAL17j==fkP-EnTGfien_qjQ7dCi7U6N16aw@HIDDEN>
Subject: 23.0.92.1; Ediff: Creating a multi-file patch
To: 3348 <at> debbugs.gnu.org
Content-Type: text/plain; charset=UTF-8
Bcc: control <at> debbugs.gnu.org
X-Spam-Score: -0.5 (/)
X-Debbugs-Envelope-To: control
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.5 (/)
tag 3348 + confirmed
severity 3348 minor
found 3348 25.0.94
quit
Confirmed this is still an issue. Here is an elisp script for easier
reproduction (run as emacs -Q -l bug-3348.el):
(defconst bug-3348-test-dir
(expand-file-name "bug-3348-testdir" temporary-file-directory))
(make-directory bug-3348-test-dir t)
(cd bug-3348-test-dir)
(make-directory "dir-a" t)
(make-directory "dir-b" t)
(with-temp-file "dir-a/file"
(insert "aaa"))
(with-temp-file "dir-b/file"
(insert "bbb"))
(ediff-directories "dir-a" "dir-b" nil)
(switch-to-buffer "*Ediff Session Group Panel*")
(ediff-next-meta-item 1)
(ediff-mark-for-operation-at-pos nil)
(ediff-collect-custom-diffs)
(with-current-buffer "*Ediff Multifile Diffs*"
(write-file "foo.patch"))
(with-temp-file "dir-b/file"
(insert "BBB"))
(ediff-collect-custom-diffs)
(switch-to-buffer "foo.patch")
(diff-buffer-with-file)
(message (concat "Observe foo.patch buffer is different from its file,\n"
"but is marked read-only, not modified"))
X-Loop: help-debbugs@HIDDEN
Subject: bug#3348: 23.0.92.1; Ediff: Creating a multi-file patch
References: <4A161D61.6010100@HIDDEN>
In-Reply-To: <4A161D61.6010100@HIDDEN>
Resent-From: Mauro Aranda <maurooaranda@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 15 Oct 2023 11:18:01 +0000
Resent-Message-ID: <handler.3348.B3348.169736864430769 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 3348
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: confirmed
To: 3348 <at> debbugs.gnu.org
Cc: jstrait@HIDDEN, Noam Postavsky <npostavs@HIDDEN>
Received: via spool by 3348-submit <at> debbugs.gnu.org id=B3348.169736864430769
(code B ref 3348); Sun, 15 Oct 2023 11:18:01 +0000
Received: (at 3348) by debbugs.gnu.org; 15 Oct 2023 11:17:24 +0000
Received: from localhost ([127.0.0.1]:51360 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qrz7b-00080D-Hd
for submit <at> debbugs.gnu.org; Sun, 15 Oct 2023 07:17:23 -0400
Received: from mail-pf1-x436.google.com ([2607:f8b0:4864:20::436]:54569)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <maurooaranda@HIDDEN>) id 1qrz7Z-0007xb-2w
for 3348 <at> debbugs.gnu.org; Sun, 15 Oct 2023 07:17:21 -0400
Received: by mail-pf1-x436.google.com with SMTP id
d2e1a72fcca58-6b497c8575aso1838934b3a.1
for <3348 <at> debbugs.gnu.org>; Sun, 15 Oct 2023 04:16:56 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1697368610; x=1697973410; darn=debbugs.gnu.org;
h=content-transfer-encoding:subject:from:cc:to:content-language
:user-agent:mime-version:date:message-id:from:to:cc:subject:date
:message-id:reply-to;
bh=iE4ab6FcbLX3o51CB3Wr58of+u8hVtus6Sh+m/HX/pI=;
b=Ha1U5Rott1IGwTx4zwVhNZMk6VYP1nOmFxsOa+f7xJ+S/Pnoq746tRg6xbJzsGRCL2
qHIEROnnb7im/dGiz/o6TIczODNoR+U/4cja6zCBUGY3oaQ6EIt0LtkT4lwU6dlj3r2g
BzT6QRyzcOQ0GJYDi9CPRgNy+jlQcWMfB/t6Buo90gsYjH0ehViXYdPGBVTCi8m5vM60
eVrhbTRR+yh8fndLs40+1b8tD2matt3sJJJuJjgaQsPVWDRY2Sb68dT4ElK0XfDvq2N3
m4/y0hBcPD9nImE2fPMsyKvJ2zZEIgWyb3ZnMttfOUpxiW/zBRY+tBvaYINYfJLQ0/j4
i37g==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1697368610; x=1697973410;
h=content-transfer-encoding:subject:from:cc:to:content-language
:user-agent:mime-version:date:message-id:x-gm-message-state:from:to
:cc:subject:date:message-id:reply-to;
bh=iE4ab6FcbLX3o51CB3Wr58of+u8hVtus6Sh+m/HX/pI=;
b=a2qLB85xyHNN/lpizexfsuJ9tSeB7W0a/GAbxtUA0ata7AqbVjKIA4idkQI7bHlo6v
ZUYSiNOvO3Xp54XeySOHMW7Al6Ql9rOYc+kuif3h+ZMUB0tGUrtd1gbJSOhXATWU/98t
NWMXtflDUe877EzUX4t4M4XtV7889C1bJ6KqG/qOeDUrMRISss7w8DDmJk/TyMEJ5i7Z
JyWbcV1ikcVSHJmNY8hhTB/y4j4GOpJ9GyF//aYsf6EnDdHQIUguUIg6hK8jYr3P185x
oHPvx7AEk3iu8BVPfPgLzfRDtnYkJL1a3qo2Kv9sFUAHvBD2wvyLxwdr0NMxCkL/eEr0
U9pQ==
X-Gm-Message-State: AOJu0YwJxW67LMO9SocP165yTtn95YLzJbOwyqYwic6hUyHMS8mmYpjA
tiWzMqnRbNQA9zmH9sR1h22u6AHetyXLaMzS
X-Google-Smtp-Source: AGHT+IGRJJq5MHOaiGoe4e07J/CCECA7t/WfGIxUpjap2y2ozi+RXYnjoADNbyYJdjM93L5gq/LWdQ==
X-Received: by 2002:a05:6a21:6d88:b0:162:d056:9f52 with SMTP id
wl8-20020a056a216d8800b00162d0569f52mr37858928pzb.14.1697368609997;
Sun, 15 Oct 2023 04:16:49 -0700 (PDT)
Received: from [192.168.0.234] ([152.168.142.156])
by smtp.gmail.com with ESMTPSA id
r6-20020a63b106000000b0056946623d7esm6024964pgf.55.2023.10.15.04.16.48
(version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
Sun, 15 Oct 2023 04:16:49 -0700 (PDT)
Message-ID: <dcbfc6a1-d318-41c2-b6d1-83935e6b12bc@HIDDEN>
Date: Sun, 15 Oct 2023 08:16:46 -0300
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Content-Language: en-US
From: Mauro Aranda <maurooaranda@HIDDEN>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
Noam Postavsky <npostavs@HIDDEN> writes:
> tag 3348 + confirmed
> severity 3348 minor
> found 3348 25.0.94
> quit
>
> Confirmed this is still an issue. Here is an elisp script for easier
> reproduction (run as emacs -Q -l bug-3348.el):
>
> (defconst bug-3348-test-dir
> (expand-file-name "bug-3348-testdir" temporary-file-directory))
> (make-directory bug-3348-test-dir t)
> (cd bug-3348-test-dir)
>
> (make-directory "dir-a" t)
> (make-directory "dir-b" t)
>
> (with-temp-file "dir-a/file"
> (insert "aaa"))
> (with-temp-file "dir-b/file"
> (insert "bbb"))
>
> (ediff-directories "dir-a" "dir-b" nil)
> (switch-to-buffer "*Ediff Session Group Panel*")
>
> (ediff-next-meta-item 1)
> (ediff-mark-for-operation-at-pos nil)
> (ediff-collect-custom-diffs)
>
> (with-current-buffer "*Ediff Multifile Diffs*"
> (write-file "foo.patch"))
>
> (with-temp-file "dir-b/file"
> (insert "BBB"))
>
> (ediff-collect-custom-diffs)
>
> (switch-to-buffer "foo.patch")
> (diff-buffer-with-file)
> (message (concat "Observe foo.patch buffer is different from its file,\n"
> "but is marked read-only, not modified"))
This still happens, but I'm not really sure if this should be called a
bug. ediff-collect-custom-diffs explicitly marks this buffer as not
modified with (set-buffer-modified-p nil). I can't find the reasons for
that, but that doesn't mean there isn't a good one. And it is
consistent about doing that.
The first call to ediff-collect-custom-diffs creates the buffer
*Ediff Multifile Diffs* and also marks it as unmodified, even though it
is. So, why is that not a problem? Why is the second time a problem?
Using write-file again is possible, so what are the expectations of the
second time of typing `P' (or calling ediff-collect-custom-diffs) and
why do they differ from the expectations for the 1st call?
X-Loop: help-debbugs@HIDDEN
Subject: bug#3348: 23.0.92.1; Ediff: Creating a multi-file patch
Resent-From: Mauro Aranda <maurooaranda@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sat, 01 Mar 2025 11:04:02 +0000
Resent-Message-ID: <handler.3348.B3348.1740826991352 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 3348
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: confirmed
To: 3348 <at> debbugs.gnu.org
Cc: jstrait@HIDDEN, Noam Postavsky <npostavs@HIDDEN>
Received: via spool by 3348-submit <at> debbugs.gnu.org id=B3348.1740826991352
(code B ref 3348); Sat, 01 Mar 2025 11:04:02 +0000
Received: (at 3348) by debbugs.gnu.org; 1 Mar 2025 11:03:11 +0000
Received: from localhost ([127.0.0.1]:33912 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1toKch-00005a-1A
for submit <at> debbugs.gnu.org; Sat, 01 Mar 2025 06:03:11 -0500
Received: from mail-pl1-x632.google.com ([2607:f8b0:4864:20::632]:44117)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.84_2) (envelope-from <maurooaranda@HIDDEN>)
id 1toKcd-0008WM-QU
for 3348 <at> debbugs.gnu.org; Sat, 01 Mar 2025 06:03:08 -0500
Received: by mail-pl1-x632.google.com with SMTP id
d9443c01a7336-22356471820so47624375ad.0
for <3348 <at> debbugs.gnu.org>; Sat, 01 Mar 2025 03:03:07 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1740826981; x=1741431781; darn=debbugs.gnu.org;
h=in-reply-to:content-language:references:cc:to:from:subject
:user-agent:mime-version:date:message-id:from:to:cc:subject:date
:message-id:reply-to;
bh=47Ifl/DwF67NAqbhYA8/NI4zxufDODmbXE52fJvBj00=;
b=FRl79MG2A8sBk9Vp1ig+xL6zp9q2W/Nb6YcKaR3iePh3HXRErUMXtHdr9HpKxgkZGn
tVSUgVO6IT2Jl1E4bpg3aVbGu3oLNxqIrpEiB2NWOs2Z3JWJWXr4PUtiaVJpuWZLNIKq
l8Pad/mT3Yetjs1i+NvsabQymkulmje+boFc0n9n71e1JzNw4VxOxkVV9SNJ3oreMGc+
A81W06EKXxTt4BxKBSaaHbZPCAfXEpb+2z75y/iHAzPNHsrBps1g2nUVdMJKx/1EbcNf
e8NZOerApV/uonmJ8W+HfSIzhAazLX+LziPtZKYyXo2rLNuN7HN1j3jtLH7GNaqIQ5fd
f2fA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1740826981; x=1741431781;
h=in-reply-to:content-language:references:cc:to:from:subject
:user-agent:mime-version:date:message-id:x-gm-message-state:from:to
:cc:subject:date:message-id:reply-to;
bh=47Ifl/DwF67NAqbhYA8/NI4zxufDODmbXE52fJvBj00=;
b=Y3jsSCjOUUkrbgQHexbFttvk9G+PzAeTvDQZ/QI8yeAadw0EVHLdRxefz6BL/3TJe4
9dmhijvFDeBaaLLwnp+5cP5t2S3yzyoV8xpeKOVfikRzpyuhFMjGiq5jD+dkmLt9bYDE
N8c1G1/92pmMLzAaSNEMGe4TQrLpA4kWbBxeYQ3oEZQngrvm1QDVO8wtkVy+P32Ptsb/
HVgkYPGWeoFbxrdbQvYGBT1O1SiJ/uplyLBebUZa7byII350jXA8bzXW68zB/mTOZ6En
TF24/hYkrLF48l9VQ7QxiUq30n9NzAzfpg4wN7VtfHaY1iliURo+LpZfot8sKvA+fw2G
Pyxg==
X-Gm-Message-State: AOJu0YwEHuTlE585E2hj+L/1y8mnATYS8IBwFZnQ5ksY580Lbd3U3SQd
3roE3mjigj5CTwAjgYlILA8XLTOrjGaiUilBp6r4z5RdsHV8drrgZs3fQA==
X-Gm-Gg: ASbGnctVRkBsDObzdzLsNKaUwY7i17eyCEc2cAwzX9pZkiUfOZk4tVpjV4F6ilnPCQr
yRpz4dPiYOqICctoDTgWCmJjuhJ2m7aHofLHCpMvj1j2mgDROLcBxfVQ/X+AlfZmIF/6iB0C+oQ
6601uevIFN7LJMl8ccGd3p5ELpQ8+3jnSN+eJYEa7VvqsI42jqKf5yVraJtV2RNYVXWhk/6nkBf
qm9idXJl12qbdJvegzWlIHjfh2+GNTpdm2hrIJFW9YDfL89IPBLj7g/OGexPQWQn0KmX9fcY0Ux
tuYLxu+/jq4G7KH6XXTxGgUDorsAYrImKtmWK0o69HzbWt78L2g=
X-Google-Smtp-Source: AGHT+IEG+HnsuaseYVN1LUS1GCgXxcnQZng3qyKsMuO+RMRWzRETFs8XuuNUuV9dYT2o7QU2Fz/pNQ==
X-Received: by 2002:a05:6a00:3d47:b0:730:8e97:bd76 with SMTP id
d2e1a72fcca58-734ac35f72cmr10416144b3a.9.1740826980949;
Sat, 01 Mar 2025 03:03:00 -0800 (PST)
Received: from [192.168.0.234] ([181.228.33.6])
by smtp.gmail.com with ESMTPSA id
41be03b00d2f7-aee7de1f7a6sm4799135a12.30.2025.03.01.03.02.58
(version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
Sat, 01 Mar 2025 03:02:59 -0800 (PST)
Content-Type: multipart/mixed; boundary="------------lyo0O5SSkAcI5aepUngRtHLI"
Message-ID: <a971c5dc-2451-4b4a-a143-25416f6a7692@HIDDEN>
Date: Sat, 1 Mar 2025 08:02:57 -0300
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
From: Mauro Aranda <maurooaranda@HIDDEN>
References: <dcbfc6a1-d318-41c2-b6d1-83935e6b12bc@HIDDEN>
Content-Language: en-US
In-Reply-To: <dcbfc6a1-d318-41c2-b6d1-83935e6b12bc@HIDDEN>
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
This is a multi-part message in MIME format.
--------------lyo0O5SSkAcI5aepUngRtHLI
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
Mauro Aranda <maurooaranda@HIDDEN> writes:
> Noam Postavsky <npostavs@HIDDEN> writes:
>
>> tag 3348 + confirmed
>> severity 3348 minor
>> found 3348 25.0.94
>> quit
>>
>> Confirmed this is still an issue. Here is an elisp script for easier
>> reproduction (run as emacs -Q -l bug-3348.el):
>>
>> (defconst bug-3348-test-dir
>> (expand-file-name "bug-3348-testdir" temporary-file-directory))
>> (make-directory bug-3348-test-dir t)
>> (cd bug-3348-test-dir)
>>
>> (make-directory "dir-a" t)
>> (make-directory "dir-b" t)
>>
>> (with-temp-file "dir-a/file"
>> (insert "aaa"))
>> (with-temp-file "dir-b/file"
>> (insert "bbb"))
>>
>> (ediff-directories "dir-a" "dir-b" nil)
>> (switch-to-buffer "*Ediff Session Group Panel*")
>>
>> (ediff-next-meta-item 1)
>> (ediff-mark-for-operation-at-pos nil)
>> (ediff-collect-custom-diffs)
>>
>> (with-current-buffer "*Ediff Multifile Diffs*"
>> (write-file "foo.patch"))
>>
>> (with-temp-file "dir-b/file"
>> (insert "BBB"))
>>
>> (ediff-collect-custom-diffs)
>>
>> (switch-to-buffer "foo.patch")
>> (diff-buffer-with-file)
>> (message (concat "Observe foo.patch buffer is different from its
file,\n"
>> "but is marked read-only, not modified"))
>
> This still happens, but I'm not really sure if this should be called a
> bug. ediff-collect-custom-diffs explicitly marks this buffer as not
> modified with (set-buffer-modified-p nil). I can't find the reasons for
> that, but that doesn't mean there isn't a good one. And it is
> consistent about doing that.
>
> The first call to ediff-collect-custom-diffs creates the buffer
> *Ediff Multifile Diffs* and also marks it as unmodified, even though it
> is. So, why is that not a problem? Why is the second time a problem?
>
> Using write-file again is possible, so what are the expectations of the
> second time of typing `P' (or calling ediff-collect-custom-diffs) and
> why do they differ from the expectations for the 1st call?
After a year and a half, I think I got it :-)
After the call to write-file, ediff-meta-diff-buffer is visting a file,
and ediff assumes it never visits a file: that's why it erases, refills
it, and marks it as not modified.
So I think the attached patch fixes it.
--------------lyo0O5SSkAcI5aepUngRtHLI
Content-Type: text/x-patch; charset=UTF-8;
name="0001-Guard-against-user-saving-ediff-meta-diff-buffer.patch"
Content-Disposition: attachment;
filename*0="0001-Guard-against-user-saving-ediff-meta-diff-buffer.patch"
Content-Transfer-Encoding: base64
RnJvbSBlMWJjNTA0NzA0ZjRiZTcxZGIyOGUzNTVjNzJhNTkxNjg1NGM3ZjM1IE1vbiBTZXAg
MTcgMDA6MDA6MDAgMjAwMQpGcm9tOiBNYXVybyBBcmFuZGEgPG1hdXJvb2FyYW5kYUBnbWFp
bC5jb20+CkRhdGU6IFNhdCwgMSBNYXIgMjAyNSAwNzo0MjoyNCAtMDMwMApTdWJqZWN0OiBb
UEFUQ0hdIEd1YXJkIGFnYWluc3QgdXNlciBzYXZpbmcgZWRpZmYtbWV0YS1kaWZmLWJ1ZmZl
cgoKKiBsaXNwL3ZjL2VkaWZmLW11bHQuZWwgKGVkaWZmLWNvbGxlY3QtY3VzdG9tLWRpZmZz
KTogSWYgdGhlCmRpZmYgYnVmZmVyIGlzIHZpc2l0aW5nIGEgZmlsZSwgY3JlYXRlIGEgbmV3
IGJ1ZmZlci4gIChCdWcjMzM0OCkKCiogdGVzdC9saXNwL3ZjL2VkaWZmLW11bHQtdGVzdHMu
ZWw6IE5ldyB0ZXN0IGZpbGUuCi0tLQogbGlzcC92Yy9lZGlmZi1tdWx0LmVsICAgICAgICAg
ICAgfCAgOSArKysrKy0KIHRlc3QvbGlzcC92Yy9lZGlmZi1tdWx0LXRlc3RzLmVsIHwgNTQg
KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysKIDIgZmlsZXMgY2hhbmdlZCwgNjIg
aW5zZXJ0aW9ucygrKSwgMSBkZWxldGlvbigtKQogY3JlYXRlIG1vZGUgMTAwNjQ0IHRlc3Qv
bGlzcC92Yy9lZGlmZi1tdWx0LXRlc3RzLmVsCgpkaWZmIC0tZ2l0IGEvbGlzcC92Yy9lZGlm
Zi1tdWx0LmVsIGIvbGlzcC92Yy9lZGlmZi1tdWx0LmVsCmluZGV4IDQ5M2U5OGY3NmI3Li5h
ZGUyMGE0YTI5OSAxMDA2NDQKLS0tIGEvbGlzcC92Yy9lZGlmZi1tdWx0LmVsCisrKyBiL2xp
c3AvdmMvZWRpZmYtbXVsdC5lbApAQCAtMTcxOSw3ICsxNzE5LDE0IEBAIGVkaWZmLWNvbGxl
Y3QtY3VzdG9tLWRpZmZzCiBhbGwgbWFya2VkIHNlc3Npb25zIG11c3QgYmUgYWN0aXZlLiIK
ICAgKGludGVyYWN0aXZlKQogICAobGV0ICgoY29kaW5nLXN5c3RlbS1mb3ItcmVhZCBlZGlm
Zi1jb2Rpbmctc3lzdGVtLWZvci1yZWFkKSkKLSAgICAob3IgKGVkaWZmLWJ1ZmZlci1saXZl
LXAgZWRpZmYtbWV0YS1kaWZmLWJ1ZmZlcikKKyAgICAodW5sZXNzIChhbmQgKGVkaWZmLWJ1
ZmZlci1saXZlLXAgZWRpZmYtbWV0YS1kaWZmLWJ1ZmZlcikKKyAgICAgICAgICAgICAgICAg
OzsgV2UgYXNzdW1lIGBlZGlmZi1tZXRhLWRpZmYtYnVmZmVyJyBkb2Vzbid0CisgICAgICAg
ICAgICAgICAgIDs7IHZpc2l0IGFueSBmaWxlLiAgQnV0IGlmIHRoZSB1c2VyIHNhdmVzIHRo
ZQorICAgICAgICAgICAgICAgICA7OyBgZWRpZmYtbWV0YS1kaWZmLWJ1ZmZlcicgdG8gYSBm
aWxlLCB0aGF0CisgICAgICAgICAgICAgICAgIDs7IGFzc3VtcHRpb24gaXNuJ3QgcmlnaHQg
YW55bW9yZS4gIChCdWcjMzM0OCkKKyAgICAgICAgICAgICAgICAgOzsgU28sIGlmIGBlZGlm
Zi1tZXRhLWRpZmYtYnVmZmVyJyBpcyB2aXNpdGluZyBzb21lCisgICAgICAgICAgICAgICAg
IDs7IGZpbGUsIGNyZWF0ZSBhIG5ldyBidWZmZXIgcmF0aGVyIHRoYW4gcmV1c2luZyBpdC4K
KyAgICAgICAgICAgICAgICAgKG5vdCAoYnVmZmVyLWZpbGUtbmFtZSBlZGlmZi1tZXRhLWRp
ZmYtYnVmZmVyKSkpCiAJKHNldHEgZWRpZmYtbWV0YS1kaWZmLWJ1ZmZlcgogCSAgICAgIChn
ZXQtYnVmZmVyLWNyZWF0ZQogCSAgICAgICAoZWRpZmYtdW5pcXVlLWJ1ZmZlci1uYW1lICIq
RWRpZmYgTXVsdGlmaWxlIERpZmZzIiAiKiIpKSkpCmRpZmYgLS1naXQgYS90ZXN0L2xpc3Av
dmMvZWRpZmYtbXVsdC10ZXN0cy5lbCBiL3Rlc3QvbGlzcC92Yy9lZGlmZi1tdWx0LXRlc3Rz
LmVsCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwLi41MjUwODhiZjg1
NgotLS0gL2Rldi9udWxsCisrKyBiL3Rlc3QvbGlzcC92Yy9lZGlmZi1tdWx0LXRlc3RzLmVs
CkBAIC0wLDAgKzEsNTQgQEAKKzs7OyBlZGlmZi1tdWx0LXRlc3RzLmVsIC0tLSBUZXN0cyBm
b3IgZWRpZmYtbXVsdC5lbCAgLSotIGxleGljYWwtYmluZGluZzp0IC0qLQorCis7OyBDb3B5
cmlnaHQgKEMpIDIwMjUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uLCBJbmMuCisKKzs7IFRo
aXMgZmlsZSBpcyBwYXJ0IG9mIEdOVSBFbWFjcy4KKzs7Cis7OyBHTlUgRW1hY3MgaXMgZnJl
ZSBzb2Z0d2FyZTogeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCis7OyBtb2RpZnkg
aXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgR2VuZXJhbCBQdWJsaWMgTGljZW5zZSBh
cworOzsgcHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRpb24sIGVpdGhl
ciB2ZXJzaW9uIDMgb2YgdGhlCis7OyBMaWNlbnNlLCBvciAoYXQgeW91ciBvcHRpb24pIGFu
eSBsYXRlciB2ZXJzaW9uLgorOzsKKzs7IEdOVSBFbWFjcyBpcyBkaXN0cmlidXRlZCBpbiB0
aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLCBidXQKKzs7IFdJVEhPVVQgQU5ZIFdB
UlJBTlRZOyB3aXRob3V0IGV2ZW4gdGhlIGltcGxpZWQgd2FycmFudHkgb2YKKzs7IE1FUkNI
QU5UQUJJTElUWSBvciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0
aGUgR05VCis7OyBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMuCis7
OworOzsgWW91IHNob3VsZCBoYXZlIHJlY2VpdmVkIGEgY29weSBvZiB0aGUgR05VIEdlbmVy
YWwgUHVibGljIExpY2Vuc2UKKzs7IGFsb25nIHdpdGggR05VIEVtYWNzLiAgSWYgbm90LCBz
ZWUgPGh0dHBzOi8vd3d3LmdudS5vcmcvbGljZW5zZXMvPi4KKworOzs7IENvZGU6CisKKyhy
ZXF1aXJlICdlcnQpCisocmVxdWlyZSAnZWRpZmYtbXVsdCkKKworKGVydC1kZWZ0ZXN0IGVk
aWZmLXRlc3QtYnVnMzM0OCAoKQorICAiQWZ0ZXIgc2F2aW5nIGBlZGlmZi1tZXRhLWRpZmYt
YnVmZmVyJyB0byBhIGZpbGUsIHdlIHNob3VsZCBub3QgcmV1c2UgaXQuIgorICAobGV0ICgo
dGVzdC1kaXIKKyAgICAgICAgIChleHBhbmQtZmlsZS1uYW1lICJidWctMzM0OC10ZXN0ZGly
IiB0ZW1wb3JhcnktZmlsZS1kaXJlY3RvcnkpKSkKKyAgICAobWFrZS1kaXJlY3RvcnkgdGVz
dC1kaXIgdCkKKyAgICAoY2QgdGVzdC1kaXIpCisKKyAgICAobWFrZS1kaXJlY3RvcnkgImRp
ci1hIiB0KQorICAgIChtYWtlLWRpcmVjdG9yeSAiZGlyLWIiIHQpCisKKyAgICAod2l0aC10
ZW1wLWZpbGUgImRpci1hL2ZpbGUiCisgICAgICAoaW5zZXJ0ICJhYWFcbiIpKQorICAgICh3
aXRoLXRlbXAtZmlsZSAiZGlyLWIvZmlsZSIKKyAgICAgIChpbnNlcnQgImJiYlxuIikpCisK
KyAgICAoZWRpZmYtZGlyZWN0b3JpZXMgImRpci1hIiAiZGlyLWIiIG5pbCkKKyAgICAoc3dp
dGNoLXRvLWJ1ZmZlciAiKkVkaWZmIFNlc3Npb24gR3JvdXAgUGFuZWwqIikKKworICAgIChl
ZGlmZi1uZXh0LW1ldGEtaXRlbSAxKQorICAgIChlZGlmZi1tYXJrLWZvci1vcGVyYXRpb24t
YXQtcG9zIG5pbCkKKyAgICAoZWRpZmYtY29sbGVjdC1jdXN0b20tZGlmZnMpCisKKyAgICAo
d2l0aC1jdXJyZW50LWJ1ZmZlciAiKkVkaWZmIE11bHRpZmlsZSBEaWZmcyoiCisgICAgICAo
d3JpdGUtZmlsZSAiZm9vLnBhdGNoIikpCisKKyAgICAod2l0aC10ZW1wLWZpbGUgImRpci1i
L2ZpbGUiCisgICAgICAoaW5zZXJ0ICJCQkJcbiIpKQorICAgIChlZGlmZi1jb2xsZWN0LWN1
c3RvbS1kaWZmcykKKworICAgIChzaG91bGQtbm90IChlcXVhbCBlZGlmZi1tZXRhLWRpZmYt
YnVmZmVyIChnZXQtYnVmZmVyICJmb28ucGF0Y2giKSkpKSkKLS0gCjIuMzQuMQoK
--------------lyo0O5SSkAcI5aepUngRtHLI--
Received: (at control) by debbugs.gnu.org; 2 Mar 2025 01:35:53 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sat Mar 01 20:35:52 2025 Received: from localhost ([127.0.0.1]:47758 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1toYFA-0007Q9-1A for submit <at> debbugs.gnu.org; Sat, 01 Mar 2025 20:35:52 -0500 Received: from mail-ed1-x52c.google.com ([2a00:1450:4864:20::52c]:46258) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <stefankangas@HIDDEN>) id 1toYF8-0007PS-Ma for control <at> debbugs.gnu.org; Sat, 01 Mar 2025 20:35:47 -0500 Received: by mail-ed1-x52c.google.com with SMTP id 4fb4d7f45d1cf-5e4b410e48bso5078447a12.0 for <control <at> debbugs.gnu.org>; Sat, 01 Mar 2025 17:35:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1740879340; x=1741484140; darn=debbugs.gnu.org; h=to:subject:message-id:date:mime-version:from:from:to:cc:subject :date:message-id:reply-to; bh=q4PF5sY1pES7/3NhZJdkG4vaw3CGsTJ2dFSXGTJHzLk=; b=DMHzuIR6zaGVninKgWjxMPj84dWo+/Oijim75C1SBVxas4Xe76mAwqzLTY7vM8QIiE DRqe/yvYUx0s26KYHuBQIxcUxjWQbEOfra/8RgwLcdDKdDwLsYkaq0MJUyx6umWKQhTe SNBiy9aDipj2zrw7WSeDQ5AX5+/nXCPtirIti4WliAwaHlEq+eK2qPc1YpBwW3XMpxvM dlLYc+SJR+ErDqQVxlgZtHVypPwCB4vhe8eNyMHZLgVRPQ4zyJ2pm3j14GHk/o5xFeDz vEecaS28UVbpMd1m6gA+vUI85KBa1jjHAveg0QeVmze9nKgPEDioPqvPsR5iGWwoVRW6 wV7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740879340; x=1741484140; h=to:subject:message-id:date:mime-version:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=q4PF5sY1pES7/3NhZJdkG4vaw3CGsTJ2dFSXGTJHzLk=; b=kIFIdCk7VDxioI7hVy76Pz/baIu/QkIDhhOML1y/pdHxWyBKMvdDvx5aSqARS2EHom K5g6QwRlvMpqusq+5xLXHNC3rtFf5ZhDSA/SPXAISiv5bAdgBDve09/fVACrrbIEjvQp fadGov4LM/YtU5ET8jSo1CCGDUpNTd+g2ROVduFujnjVQNEklZ0iGbGiccd1Kngbl0Fh wv2I+lxMgKK/tnZ6H/hFdYPpaUI4QMRPxXgQ512/szNx41TL/JQlZSLb0ITcho7Et3YM dWLhgRb7LKufifkZmvDOjBFjmy4F14MTbK0uGTeoPbVKDvYNedAi71pugugaj7rAYcrs Mw7Q== X-Gm-Message-State: AOJu0YyLlr/ei7ekgkO4aPg73liSgMmcwbKs6zM3rLE3vWESz5DszHn3 PX9XvO87uvm43OtvnmaYSLeRarXVQEo58dNx4gMRVbo0AJX2RW1o7YpvOZwxlEmc/DTxS+a7VBc s/gLb2bNklJQW2RwM5qX8T/ZhbdjWEyH2CeY= X-Gm-Gg: ASbGncv753/W/6ZbLM7A4vEGACTsO/mByNKzAzA2d9vvsSrQ/ldyWqkY4p3ISwu+UiI SqT4InaPH0emfcwn5CDzLlB0pcTl7JeRzlbb7+Z9RBmVkQtkZr3600U7zEXK6IP3QDDB0D+W7oH lWN15ZBvRApE3Vd1UoDVJHLDyxvQ== X-Google-Smtp-Source: AGHT+IG3x3lm6eYrOINtlNvHTY43hqYpM+N8RbrM7qxbTO5XizobRQ/fNDK3p3Ms9DFoOyDhRLHgSEupJV+5EOKjL8g= X-Received: by 2002:a17:906:f587:b0:abf:6b14:6cfb with SMTP id a640c23a62f3a-abf6b146fb9mr117487766b.5.1740879340564; Sat, 01 Mar 2025 17:35:40 -0800 (PST) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Sat, 1 Mar 2025 17:35:39 -0800 From: Stefan Kangas <stefankangas@HIDDEN> MIME-Version: 1.0 Date: Sat, 1 Mar 2025 17:35:39 -0800 X-Gm-Features: AQ5f1JoBYHcOlT8TRhkkxs7fjnvkUKIx7Z4etgR-ld6YmMsiQJR-wyXdd3QDuT4 Message-ID: <CADwFkmnZMqF9AwX2SArPgqM4H9m5QsoAiT=cmnwpD7BkbSokyA@HIDDEN> Subject: control message for bug #3348 To: control <at> debbugs.gnu.org Content-Type: text/plain; charset="UTF-8" X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) tags 3348 + patch quit
X-Loop: help-debbugs@HIDDEN
Subject: bug#3348: 23.0.92.1; Ediff: Creating a multi-file patch
Resent-From: Eli Zaretskii <eliz@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 09 Mar 2025 09:53:02 +0000
Resent-Message-ID: <handler.3348.B3348.174151397821685 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 3348
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: confirmed patch
To: Mauro Aranda <maurooaranda@HIDDEN>
Cc: 3348 <at> debbugs.gnu.org, npostavs@HIDDEN, jstrait@HIDDEN
Received: via spool by 3348-submit <at> debbugs.gnu.org id=B3348.174151397821685
(code B ref 3348); Sun, 09 Mar 2025 09:53:02 +0000
Received: (at 3348) by debbugs.gnu.org; 9 Mar 2025 09:52:58 +0000
Received: from localhost ([127.0.0.1]:58400 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1trDL7-0005dg-H8
for submit <at> debbugs.gnu.org; Sun, 09 Mar 2025 05:52:57 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10]:47130)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <eliz@HIDDEN>) id 1trDL4-0005dT-Vi
for 3348 <at> debbugs.gnu.org; Sun, 09 Mar 2025 05:52:55 -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 <eliz@HIDDEN>)
id 1trDKx-0007Qc-MP; Sun, 09 Mar 2025 05:52:47 -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=Nxu12oo7HDQIr2j0KiOCeF2hfZ0uK+y3XUA8PGFGW3U=; b=Qg0zF5m215A1Nv4f66qJ
EIBNJYjgltGWOJPGqllogqFi6hl3y9lR7P0dwIB+ra+mM/JZ4LqeVkjjBbsBNenw1XfsludtZvkcB
cvFurL8krcfq78rbvC4q+XQVsq/XhRhmzDVWYENkE81XpMzKI9vJxV2hZxxMnZUD2Mh/dpZggQMLb
aEnSFvRxROGj0Mff/BYrVYV52fTLyy8v0SCxWFCKNjMbcB51O/bQ/QUra5yJH1V83LOTQJhdXETkW
Kj1P+j/7Q1gu+TA4YaVfVcuLJ9+8o3XKtHnu9+/ztVVnUcddiuUBOpZK9i+nOYNwDwGASr3MCaP40
uQnIyXMnCWXuzg==;
Date: Sun, 09 Mar 2025 11:52:43 +0200
Message-Id: <865xkih6ok.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
In-Reply-To: <a971c5dc-2451-4b4a-a143-25416f6a7692@HIDDEN> (message from
Mauro Aranda on Sat, 1 Mar 2025 08:02:57 -0300)
References: <dcbfc6a1-d318-41c2-b6d1-83935e6b12bc@HIDDEN>
<a971c5dc-2451-4b4a-a143-25416f6a7692@HIDDEN>
MIME-version: 1.0
Content-type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
> Cc: jstrait@HIDDEN, Noam Postavsky <npostavs@HIDDEN>
> Date: Sat, 1 Mar 2025 08:02:57 -0300
> From: Mauro Aranda <maurooaranda@HIDDEN>
>
> Mauro Aranda <maurooaranda@HIDDEN> writes:
>
> > Noam Postavsky <npostavs@HIDDEN> writes:
> >
> >> tag 3348 + confirmed
> >> severity 3348 minor
> >> found 3348 25.0.94
> >> quit
> >>
> >> Confirmed this is still an issue. Here is an elisp script for easier
> >> reproduction (run as emacs -Q -l bug-3348.el):
> >>
> >> (defconst bug-3348-test-dir
> >> (expand-file-name "bug-3348-testdir" temporary-file-directory))
> >> (make-directory bug-3348-test-dir t)
> >> (cd bug-3348-test-dir)
> >>
> >> (make-directory "dir-a" t)
> >> (make-directory "dir-b" t)
> >>
> >> (with-temp-file "dir-a/file"
> >> (insert "aaa"))
> >> (with-temp-file "dir-b/file"
> >> (insert "bbb"))
> >>
> >> (ediff-directories "dir-a" "dir-b" nil)
> >> (switch-to-buffer "*Ediff Session Group Panel*")
> >>
> >> (ediff-next-meta-item 1)
> >> (ediff-mark-for-operation-at-pos nil)
> >> (ediff-collect-custom-diffs)
> >>
> >> (with-current-buffer "*Ediff Multifile Diffs*"
> >> (write-file "foo.patch"))
> >>
> >> (with-temp-file "dir-b/file"
> >> (insert "BBB"))
> >>
> >> (ediff-collect-custom-diffs)
> >>
> >> (switch-to-buffer "foo.patch")
> >> (diff-buffer-with-file)
> >> (message (concat "Observe foo.patch buffer is different from its
> file,\n"
> >> "but is marked read-only, not modified"))
> >
> > This still happens, but I'm not really sure if this should be called a
> > bug. ediff-collect-custom-diffs explicitly marks this buffer as not
> > modified with (set-buffer-modified-p nil). I can't find the reasons for
> > that, but that doesn't mean there isn't a good one. And it is
> > consistent about doing that.
> >
> > The first call to ediff-collect-custom-diffs creates the buffer
> > *Ediff Multifile Diffs* and also marks it as unmodified, even though it
> > is. So, why is that not a problem? Why is the second time a problem?
> >
> > Using write-file again is possible, so what are the expectations of the
> > second time of typing `P' (or calling ediff-collect-custom-diffs) and
> > why do they differ from the expectations for the 1st call?
>
> After a year and a half, I think I got it :-)
>
> After the call to write-file, ediff-meta-diff-buffer is visting a file,
> and ediff assumes it never visits a file: that's why it erases, refills
> it, and marks it as not modified.
>
> So I think the attached patch fixes it.
Feel free to install on master, and thanks.
X-Loop: help-debbugs@HIDDEN
Subject: bug#3348: 23.0.92.1; Ediff: Creating a multi-file patch
Resent-From: Mauro Aranda <maurooaranda@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 09 Mar 2025 11:17:02 +0000
Resent-Message-ID: <handler.3348.B3348.174151896216121 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 3348
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: confirmed patch
To: Eli Zaretskii <eliz@HIDDEN>
Cc: 3348 <at> debbugs.gnu.org, npostavs@HIDDEN, jstrait@HIDDEN
Received: via spool by 3348-submit <at> debbugs.gnu.org id=B3348.174151896216121
(code B ref 3348); Sun, 09 Mar 2025 11:17:02 +0000
Received: (at 3348) by debbugs.gnu.org; 9 Mar 2025 11:16:02 +0000
Received: from localhost ([127.0.0.1]:58628 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1trEdW-0004Bw-71
for submit <at> debbugs.gnu.org; Sun, 09 Mar 2025 07:16:02 -0400
Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]:58665)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.84_2) (envelope-from <maurooaranda@HIDDEN>)
id 1trEdU-0004BK-RJ; Sun, 09 Mar 2025 07:16:01 -0400
Received: by mail-pl1-x634.google.com with SMTP id
d9443c01a7336-22409077c06so37901665ad.1;
Sun, 09 Mar 2025 04:16:00 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1741518955; x=1742123755; darn=debbugs.gnu.org;
h=content-transfer-encoding:in-reply-to:from:content-language
:references:cc:to:subject:user-agent:mime-version:date:message-id
:from:to:cc:subject:date:message-id:reply-to;
bh=BZMFNWdRHZrc0A0BVh5wsKsxjZYu05IIhjeiZp6jQ+M=;
b=ZCYc9/leecAbfQah5yEobk4vxFh05YT9ZF3YkFiICgqimZb+erAnyf1AxFD3fewFrb
wt6ZAQP9pyoRJB6Nc5TqJPegyLNTanLx9riUwBuikgX3rDSSmwYq3tytZWAaTyX+21VE
32xtuYZBzKT/6oZZhJqLKzqS9Jv4/jpeU7UNlmI1DiQojXcBmHBUC0sND2YuQms411qx
QVgI61s5glEGm6/xI6eaZav+OkYhXivzKa2KOsnbFOqi4pJHW3a4zS9TXiLWUn2NTUvM
a9Ea2RamoFWUAUVipWZoyhb77tfeo3wVpbDkjXSlzViUlyU7SclYPpryzv9AEGA84bce
XyZw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1741518955; x=1742123755;
h=content-transfer-encoding:in-reply-to:from:content-language
:references:cc:to:subject:user-agent:mime-version:date:message-id
:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
bh=BZMFNWdRHZrc0A0BVh5wsKsxjZYu05IIhjeiZp6jQ+M=;
b=kpMcZqtrGkge6TNHb/yN6yBsH6qOd0JLTZWuLQaRG6/1Wp+euoYBYiUMJKnYMwq7pE
qPzX86veQfWXJPRrQqhTv+UWA92QlZkuS6SaN9btciD9xS5mX5iSk8rK1uUZZe0wKAH+
j2lQMEuJ10CotB7pnKeeXnVtUbSLfuvE9QNcgGRFZvebbngESeIaNeZLviuAp6R4PC9x
CJl1C00D7T+KfdJeIfF3ncYO5bfmCSjBx5ZpIoWKKPf0EWBk+sHF9u4rKfZL8lOp+Q3g
4gq7P5kiy742m4XXd9F81mYcS6VqPQ+KT4By7qLzjxTT37mmaan+h8vQF4IUXWOPxndL
yjiQ==
X-Forwarded-Encrypted: i=1;
AJvYcCVmB5zi5Wuo4ZKPS45Q+AtgGrLdQGMkN+r6gGx9Yywv00uDKRJb57NlpECHxOvV6zYnzggk0r2n <at> debbugs.gnu.org
X-Gm-Message-State: AOJu0YwcPbF6K4HmtW4zW+/612nVd26Th5XY+gxE6AjZW9m/EfpbGTYf
UtV5k0DjRRKL8gDC89wtNGt++g51Uf9GGGFF1iuU8ZSs8m5UXYiU
X-Gm-Gg: ASbGncvzZ2wT1jA0iswBTcmiVH0ZtjWnBlP9WLizG7YMEWQu5/UgBviH757qgU+41HK
jnWppx84ABSQHTM99x6XbeSyIl8egP0gca5SSozr3Z5V3dQL66+8O8BqoX8GDkj/2rUpGFOJkgc
lPYC4/rgM/3gN0OeToviMbUt5/Fw9PlXm8XrXalOjSvlqpoXU27IjZAyy47kYdNb6wHxKjbVbLv
LSU/vb5rqmPGP9x6ROkdUq0+Gsx/ttlwzgNuWY4BUDCA/vSfv5eMGSJ6FokmiWum+xh6pOwKCl2
0DrVfQeY/ReFqY+KPfT9XnCm4vljOjaQRXcwo0h9EuBtMGUj+NM=
X-Google-Smtp-Source: AGHT+IEzMqcMZ4h1DYI5S+iEN/F+eVAONTzXDiiVeJFKVtzdoCPoV9jAnX07yI56cL26XgWaHtIXIg==
X-Received: by 2002:a05:6300:6713:b0:1f3:29a9:6197 with SMTP id
adf61e73a8af0-1f544aef521mr17797334637.18.1741518954747;
Sun, 09 Mar 2025 04:15:54 -0700 (PDT)
Received: from [192.168.0.234] ([181.228.33.6])
by smtp.gmail.com with ESMTPSA id
d2e1a72fcca58-736b0bb41edsm4417706b3a.136.2025.03.09.04.15.52
(version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128);
Sun, 09 Mar 2025 04:15:53 -0700 (PDT)
Message-ID: <5648aeb0-6346-4c7f-b45e-37f46590ea9d@HIDDEN>
Date: Sun, 9 Mar 2025 08:15:50 -0300
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
References: <dcbfc6a1-d318-41c2-b6d1-83935e6b12bc@HIDDEN>
<a971c5dc-2451-4b4a-a143-25416f6a7692@HIDDEN> <865xkih6ok.fsf@HIDDEN>
Content-Language: en-US
From: Mauro Aranda <maurooaranda@HIDDEN>
In-Reply-To: <865xkih6ok.fsf@HIDDEN>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
close 3348 31.1
quit
On 9/3/25 06:52, Eli Zaretskii wrote:
>> Cc: jstrait@HIDDEN, Noam Postavsky
<npostavs@HIDDEN>
>> Date: Sat, 1 Mar 2025 08:02:57 -0300
>> From: Mauro Aranda <maurooaranda@HIDDEN>
>>
>> Mauro Aranda <maurooaranda@HIDDEN> writes:
>>
>> > Noam Postavsky <npostavs@HIDDEN> writes:
>> >
>> >> tag 3348 + confirmed
>> >> severity 3348 minor
>> >> found 3348 25.0.94
>> >> quit
>> >>
>> >> Confirmed this is still an issue. Here is an elisp script for easier
>> >> reproduction (run as emacs -Q -l bug-3348.el):
>> >>
>> >> (defconst bug-3348-test-dir
>> >> (expand-file-name "bug-3348-testdir" temporary-file-directory))
>> >> (make-directory bug-3348-test-dir t)
>> >> (cd bug-3348-test-dir)
>> >>
>> >> (make-directory "dir-a" t)
>> >> (make-directory "dir-b" t)
>> >>
>> >> (with-temp-file "dir-a/file"
>> >> (insert "aaa"))
>> >> (with-temp-file "dir-b/file"
>> >> (insert "bbb"))
>> >>
>> >> (ediff-directories "dir-a" "dir-b" nil)
>> >> (switch-to-buffer "*Ediff Session Group Panel*")
>> >>
>> >> (ediff-next-meta-item 1)
>> >> (ediff-mark-for-operation-at-pos nil)
>> >> (ediff-collect-custom-diffs)
>> >>
>> >> (with-current-buffer "*Ediff Multifile Diffs*"
>> >> (write-file "foo.patch"))
>> >>
>> >> (with-temp-file "dir-b/file"
>> >> (insert "BBB"))
>> >>
>> >> (ediff-collect-custom-diffs)
>> >>
>> >> (switch-to-buffer "foo.patch")
>> >> (diff-buffer-with-file)
>> >> (message (concat "Observe foo.patch buffer is different from its
>> file,\n"
>> >> "but is marked read-only, not modified"))
>> >
>> > This still happens, but I'm not really sure if this should be
called a
>> > bug. ediff-collect-custom-diffs explicitly marks this buffer as not
>> > modified with (set-buffer-modified-p nil). I can't find the
reasons for
>> > that, but that doesn't mean there isn't a good one. And it is
>> > consistent about doing that.
>> >
>> > The first call to ediff-collect-custom-diffs creates the buffer
>> > *Ediff Multifile Diffs* and also marks it as unmodified, even
though it
>> > is. So, why is that not a problem? Why is the second time a problem?
>> >
>> > Using write-file again is possible, so what are the expectations
of the
>> > second time of typing `P' (or calling ediff-collect-custom-diffs) and
>> > why do they differ from the expectations for the 1st call?
>>
>> After a year and a half, I think I got it :-)
>>
>> After the call to write-file, ediff-meta-diff-buffer is visting a file,
>> and ediff assumes it never visits a file: that's why it erases, refills
>> it, and marks it as not modified.
>>
>> So I think the attached patch fixes it.
>
> Feel free to install on master, and thanks.
Thanks. Done, and closing the bug.
Received: (at control) by debbugs.gnu.org; 9 Mar 2025 11:16:31 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Sun Mar 09 07:16:31 2025 Received: from localhost ([127.0.0.1]:58630 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1trEdy-0004Cj-Ne for submit <at> debbugs.gnu.org; Sun, 09 Mar 2025 07:16:31 -0400 Received: from mail-pl1-x634.google.com ([2607:f8b0:4864:20::634]:58665) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <maurooaranda@HIDDEN>) id 1trEdU-0004BK-RJ; Sun, 09 Mar 2025 07:16:01 -0400 Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-22409077c06so37901665ad.1; Sun, 09 Mar 2025 04:16:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1741518955; x=1742123755; darn=debbugs.gnu.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=BZMFNWdRHZrc0A0BVh5wsKsxjZYu05IIhjeiZp6jQ+M=; b=ZCYc9/leecAbfQah5yEobk4vxFh05YT9ZF3YkFiICgqimZb+erAnyf1AxFD3fewFrb wt6ZAQP9pyoRJB6Nc5TqJPegyLNTanLx9riUwBuikgX3rDSSmwYq3tytZWAaTyX+21VE 32xtuYZBzKT/6oZZhJqLKzqS9Jv4/jpeU7UNlmI1DiQojXcBmHBUC0sND2YuQms411qx QVgI61s5glEGm6/xI6eaZav+OkYhXivzKa2KOsnbFOqi4pJHW3a4zS9TXiLWUn2NTUvM a9Ea2RamoFWUAUVipWZoyhb77tfeo3wVpbDkjXSlzViUlyU7SclYPpryzv9AEGA84bce XyZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1741518955; x=1742123755; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=BZMFNWdRHZrc0A0BVh5wsKsxjZYu05IIhjeiZp6jQ+M=; b=kpMcZqtrGkge6TNHb/yN6yBsH6qOd0JLTZWuLQaRG6/1Wp+euoYBYiUMJKnYMwq7pE qPzX86veQfWXJPRrQqhTv+UWA92QlZkuS6SaN9btciD9xS5mX5iSk8rK1uUZZe0wKAH+ j2lQMEuJ10CotB7pnKeeXnVtUbSLfuvE9QNcgGRFZvebbngESeIaNeZLviuAp6R4PC9x CJl1C00D7T+KfdJeIfF3ncYO5bfmCSjBx5ZpIoWKKPf0EWBk+sHF9u4rKfZL8lOp+Q3g 4gq7P5kiy742m4XXd9F81mYcS6VqPQ+KT4By7qLzjxTT37mmaan+h8vQF4IUXWOPxndL yjiQ== X-Forwarded-Encrypted: i=1; AJvYcCVmB5zi5Wuo4ZKPS45Q+AtgGrLdQGMkN+r6gGx9Yywv00uDKRJb57NlpECHxOvV6zYnzggk0r2n <at> debbugs.gnu.org X-Gm-Message-State: AOJu0YwcPbF6K4HmtW4zW+/612nVd26Th5XY+gxE6AjZW9m/EfpbGTYf UtV5k0DjRRKL8gDC89wtNGt++g51Uf9GGGFF1iuU8ZSs8m5UXYiU X-Gm-Gg: ASbGncvzZ2wT1jA0iswBTcmiVH0ZtjWnBlP9WLizG7YMEWQu5/UgBviH757qgU+41HK jnWppx84ABSQHTM99x6XbeSyIl8egP0gca5SSozr3Z5V3dQL66+8O8BqoX8GDkj/2rUpGFOJkgc lPYC4/rgM/3gN0OeToviMbUt5/Fw9PlXm8XrXalOjSvlqpoXU27IjZAyy47kYdNb6wHxKjbVbLv LSU/vb5rqmPGP9x6ROkdUq0+Gsx/ttlwzgNuWY4BUDCA/vSfv5eMGSJ6FokmiWum+xh6pOwKCl2 0DrVfQeY/ReFqY+KPfT9XnCm4vljOjaQRXcwo0h9EuBtMGUj+NM= X-Google-Smtp-Source: AGHT+IEzMqcMZ4h1DYI5S+iEN/F+eVAONTzXDiiVeJFKVtzdoCPoV9jAnX07yI56cL26XgWaHtIXIg== X-Received: by 2002:a05:6300:6713:b0:1f3:29a9:6197 with SMTP id adf61e73a8af0-1f544aef521mr17797334637.18.1741518954747; Sun, 09 Mar 2025 04:15:54 -0700 (PDT) Received: from [192.168.0.234] ([181.228.33.6]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-736b0bb41edsm4417706b3a.136.2025.03.09.04.15.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 09 Mar 2025 04:15:53 -0700 (PDT) Message-ID: <5648aeb0-6346-4c7f-b45e-37f46590ea9d@HIDDEN> Date: Sun, 9 Mar 2025 08:15:50 -0300 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: bug#3348: 23.0.92.1; Ediff: Creating a multi-file patch To: Eli Zaretskii <eliz@HIDDEN> References: <dcbfc6a1-d318-41c2-b6d1-83935e6b12bc@HIDDEN> <a971c5dc-2451-4b4a-a143-25416f6a7692@HIDDEN> <865xkih6ok.fsf@HIDDEN> Content-Language: en-US From: Mauro Aranda <maurooaranda@HIDDEN> In-Reply-To: <865xkih6ok.fsf@HIDDEN> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: control Cc: 3348 <at> debbugs.gnu.org, npostavs@HIDDEN, jstrait@HIDDEN X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) close 3348 31.1 quit On 9/3/25 06:52, Eli Zaretskii wrote: >> Cc: jstrait@HIDDEN, Noam Postavsky <npostavs@HIDDEN> >> Date: Sat, 1 Mar 2025 08:02:57 -0300 >> From: Mauro Aranda <maurooaranda@HIDDEN> >> >> Mauro Aranda <maurooaranda@HIDDEN> writes: >> >> > Noam Postavsky <npostavs@HIDDEN> writes: >> > >> >> tag 3348 + confirmed >> >> severity 3348 minor >> >> found 3348 25.0.94 >> >> quit >> >> >> >> Confirmed this is still an issue. Here is an elisp script for easier >> >> reproduction (run as emacs -Q -l bug-3348.el): >> >> >> >> (defconst bug-3348-test-dir >> >> (expand-file-name "bug-3348-testdir" temporary-file-directory)) >> >> (make-directory bug-3348-test-dir t) >> >> (cd bug-3348-test-dir) >> >> >> >> (make-directory "dir-a" t) >> >> (make-directory "dir-b" t) >> >> >> >> (with-temp-file "dir-a/file" >> >> (insert "aaa")) >> >> (with-temp-file "dir-b/file" >> >> (insert "bbb")) >> >> >> >> (ediff-directories "dir-a" "dir-b" nil) >> >> (switch-to-buffer "*Ediff Session Group Panel*") >> >> >> >> (ediff-next-meta-item 1) >> >> (ediff-mark-for-operation-at-pos nil) >> >> (ediff-collect-custom-diffs) >> >> >> >> (with-current-buffer "*Ediff Multifile Diffs*" >> >> (write-file "foo.patch")) >> >> >> >> (with-temp-file "dir-b/file" >> >> (insert "BBB")) >> >> >> >> (ediff-collect-custom-diffs) >> >> >> >> (switch-to-buffer "foo.patch") >> >> (diff-buffer-with-file) >> >> (message (concat "Observe foo.patch buffer is different from its >> file,\n" >> >> "but is marked read-only, not modified")) >> > >> > This still happens, but I'm not really sure if this should be called a >> > bug. ediff-collect-custom-diffs explicitly marks this buffer as not >> > modified with (set-buffer-modified-p nil). I can't find the reasons for >> > that, but that doesn't mean there isn't a good one. And it is >> > consistent about doing that. >> > >> > The first call to ediff-collect-custom-diffs creates the buffer >> > *Ediff Multifile Diffs* and also marks it as unmodified, even though it >> > is. So, why is that not a problem? Why is the second time a problem? >> > >> > Using write-file again is possible, so what are the expectations of the >> > second time of typing `P' (or calling ediff-collect-custom-diffs) and >> > why do they differ from the expectations for the 1st call? >> >> After a year and a half, I think I got it :-) >> >> After the call to write-file, ediff-meta-diff-buffer is visting a file, >> and ediff assumes it never visits a file: that's why it erases, refills >> it, and marks it as not modified. >> >> So I think the attached patch fixes it. > > Feel free to install on master, and thanks. Thanks. Done, and closing the bug.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.