From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#65854: Multi-file replacement diff Date: Fri, 22 Sep 2023 10:25:24 +0300 Message-ID: <83zg1e7jq3.fsf@gnu.org> References: <86sf7mgd54.fsf@mail.linkov.net> <86bke943tp.fsf@mail.linkov.net> <83jzswrios.fsf@gnu.org> <86o7i7oo9t.fsf@mail.linkov.net> <86sf7g548a.fsf@mail.linkov.net> <83pm2jkhsg.fsf@gnu.org> <86msxeu1q3.fsf@mail.linkov.net> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="23260"; mail-complaints-to="usenet@ciao.gmane.io" Cc: me@eshelyaron.com, 65854@debbugs.gnu.org To: Juri Linkov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Sep 22 09:26:06 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qjaY9-0005mz-Kg for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 22 Sep 2023 09:26:05 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjaXx-0000vd-RS; Fri, 22 Sep 2023 03:25:53 -0400 Original-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 1qjaXw-0000vF-84 for bug-gnu-emacs@gnu.org; Fri, 22 Sep 2023 03:25:52 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qjaXv-0003dj-Sx for bug-gnu-emacs@gnu.org; Fri, 22 Sep 2023 03:25:51 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qjaY6-0000Tj-AD for bug-gnu-emacs@gnu.org; Fri, 22 Sep 2023 03:26:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 22 Sep 2023 07:26:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65854 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 65854-submit@debbugs.gnu.org id=B65854.16953675361806 (code B ref 65854); Fri, 22 Sep 2023 07:26:02 +0000 Original-Received: (at 65854) by debbugs.gnu.org; 22 Sep 2023 07:25:36 +0000 Original-Received: from localhost ([127.0.0.1]:35213 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjaXg-0000T3-Bj for submit@debbugs.gnu.org; Fri, 22 Sep 2023 03:25:36 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:35336) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjaXd-0000Sq-QH for 65854@debbugs.gnu.org; Fri, 22 Sep 2023 03:25:34 -0400 Original-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 1qjaXM-0003QM-PA; Fri, 22 Sep 2023 03:25:16 -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=DtBlSdIOLFH4VvqJVeASe2Y5ykpWKNW966Fq+QzSaIE=; b=ijN2RbvsW/Mt B9XOtt/NpmcIbFcl7ZsjKpTQiH26FVVn15eSzEqftDgWISq1V5AYDL2zgQ/S8XiVAqr4rOBfmN/Pu fDZyd9BUGgf3XHzlU8wT0i5wwdgQRb6g0D7lPoKcWEcWP9QWkiE9HdCoxCJfQpNcJ35xY5uOc//KQ vH/hrPbVx4y8+6iLSNWIYDNgveJuWIrnKbt67xuiWOn2/QiVUsWbDuwp/vW6mYSHuYgTfOCwhXHYT 2BZbs6XnlrgvBlN0sOPz712utL/wn8YNKsAMJKJcctSCy2rcfEpQr6RcQU8azevBCwguhD5QWxgRw llqWD7YnEZjJgErPZnzs7w==; In-Reply-To: <86msxeu1q3.fsf@mail.linkov.net> (message from Juri Linkov on Fri, 22 Sep 2023 09:55:40 +0300) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:271047 Archived-At: > From: Juri Linkov > Cc: me@eshelyaron.com, 65854@debbugs.gnu.org > Date: Fri, 22 Sep 2023 09:55:40 +0300 > > +(defcustom multi-file-diff-unsaved 'save-buffers > + "What to do with unsaved edits when showing multi-file replacements as diffs. > +If the value is `save-buffers', save unsaved buffers before creating diff. > +If the value is `use-file', use text from the file even when the visiting > +file buffer is modified. > +If the value is `use-modified-buffer', use text from the file-visiting > +modified buffer to be able to use unsaved changes. However, when the file > +is not visited in a buffer, or the buffer is not modified, still read > +contents from the file." Please use consistent wording to describe the same entities. If you use "file-visiting buffer", use it everywhere, when you sometimes use that and sometimes "visiting file buffer", you are already half way to confusing the reader. Also, this part: > + However, when the file > +is not visited in a buffer, or the buffer is not modified, still read > +contents from the file." Seems to describe an implementation detail, and I don't think it should be there. E.g., what if the file visited by the buffer no longer exists? Thanks.