GNU logs - #78269, boring messages

Message sent to monnier@HIDDEN, bug-gnu-emacs@HIDDEN:

Subject: bug#78269: diff-outline-regexp
Resent-From: Juri Linkov <juri@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: monnier@HIDDEN, bug-gnu-emacs@HIDDEN
Resent-Date: Mon, 05 May 2025 19:12:01 +0000
Resent-Message-ID: <handler.78269.B.174647230814742 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: 78269 <at> debbugs.gnu.org
Cc: Stefan Monnier <monnier@HIDDEN>
From: Juri Linkov <juri@HIDDEN>
Organization: LINKOV.NET
Date: Mon, 05 May 2025 22:10:25 +0300
Message-ID: <87y0vazxem.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/31.0.50 (x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain
Received-SPF: pass client-ip=2001:4b98:dc4:8::223;
 envelope-from=juri@HIDDEN; helo=relay3-d.mail.gandi.net
X-Spam_score_int: -25
X-Spam_score: -2.6
X-Spam_bar: --
X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7,
 SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.7 (/)
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.3 (/)

I noticed that 'diff-setup-buffer-type' overrides the default value
of 'diff-outline-regexp'.  Here is the fix:

diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index a5f4169a7f3..76703526b63 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -1719,7 +1719,7 @@ diff-setup-buffer-type
                       'hg
                     nil))))
   (when (eq diff-buffer-type 'git)
-    (setq diff-outline-regexp
+    (setq-local diff-outline-regexp
           (concat "\\(^diff --git.*\\|" diff-hunk-header-re "\\)")))
   (setq-local outline-level #'diff--outline-level)
   (setq-local outline-regexp diff-outline-regexp))

Probably no one noticed this problem because its current default value
is not useful to anyone:

  (defvar diff-outline-regexp
    "\\([*+][*+][*+] [^0-9]\\|@@ ...\\|\\*\\*\\* [0-9].\\|--- [0-9]..\\)")

Maybe the default should be replaced with something like

  (defvar diff-outline-regexp
    (concat "\\(^diff -.*\\|" diff-hunk-header-re "\\)"))

that is useful for file-based diff.  Or maybe the value for file-based diff
should be set in 'diff-no-select' like this?

diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el
index c8a1b7c0efa..62c4ba6d302 100644
--- a/lisp/vc/diff.el
+++ b/lisp/vc/diff.el
@@ -196,6 +196,9 @@ diff-no-select
 	(erase-buffer))
       (buffer-enable-undo (current-buffer))
       (diff-mode)
+      (setq-local diff-outline-regexp
+                  (concat "\\(^" diff-command ".*\\|" diff-hunk-header-re "\\)")
+                  outline-regexp diff-outline-regexp)
       (setq-local revert-buffer-function
                   (lambda (_ignore-auto _noconfirm)
                     (diff-no-select old new switches no-async (current-buffer))))

But I might be missing more use cases.

Message sent:

Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Juri Linkov <juri@HIDDEN>
Subject: bug#78269: Acknowledgement (diff-outline-regexp)
Message-ID: <handler.78269.B.174647230814742.ack <at> debbugs.gnu.org>
References: <87y0vazxem.fsf@HIDDEN>
X-Gnu-PR-Message: ack 78269
X-Gnu-PR-Package: emacs
Reply-To: 78269 <at> debbugs.gnu.org
Date: Mon, 05 May 2025 19:12:02 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

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.

As you requested using X-Debbugs-CC, your message was also forwarded to
  Stefan Monnier <monnier@HIDDEN>
(after having been given a bug report number, if it did not have one).

Your message has been sent to the package maintainer(s):
 bug-gnu-emacs@HIDDEN

If you wish to submit further information on this problem, please
send it to 78269 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
78269: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D78269
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message sent to bug-gnu-emacs@HIDDEN:

Subject: bug#78269: diff-outline-regexp
Resent-From: Stefan Monnier <monnier@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Mon, 05 May 2025 22:43:01 +0000
Resent-Message-ID: <handler.78269.B78269.174648493925490 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: Juri Linkov <juri@HIDDEN>
Cc: 78269 <at> debbugs.gnu.org
From: Stefan Monnier <monnier@HIDDEN>
In-Reply-To: <87y0vazxem.fsf@HIDDEN>
Message-ID: <jwvfrhisn08.fsf-monnier+emacs@HIDDEN>
References: <87y0vazxem.fsf@HIDDEN>
Date: Mon, 05 May 2025 18:42:07 -0400
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

> diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
> index a5f4169a7f3..76703526b63 100644
> --- a/lisp/vc/diff-mode.el
> +++ b/lisp/vc/diff-mode.el
> @@ -1719,7 +1719,7 @@ diff-setup-buffer-type
>                        'hg
>                      nil))))
>    (when (eq diff-buffer-type 'git)
> -    (setq diff-outline-regexp
> +    (setq-local diff-outline-regexp
>            (concat "\\(^diff --git.*\\|" diff-hunk-header-re "\\)")))
>    (setq-local outline-level #'diff--outline-level)
>    (setq-local outline-regexp diff-outline-regexp))

LGTM, thanks.

> Probably no one noticed this problem because its current default value
> is not useful to anyone:
>
>   (defvar diff-outline-regexp
>     "\\([*+][*+][*+] [^0-9]\\|@@ ...\\|\\*\\*\\* [0-9].\\|--- [0-9]..\\)")

I think the idea was to recognize file header and hunk headers, in the
case where the "diff" command itself is absent (as is the case in the
output of the (non-recursive) `diff` command).

> Maybe the default should be replaced with something like
>
>   (defvar diff-outline-regexp
>     (concat "\\(^diff -.*\\|" diff-hunk-header-re "\\)"))

LGTM (I'd even drop the `-` after `diff`).  AFAICT nowadays the "diff
..." command is absent only in cases where there's only one file in the
diff, so matching the file header is not very useful, indeed.


        Stefan

Message sent to bug-gnu-emacs@HIDDEN:

Subject: bug#78269: diff-outline-regexp
Resent-From: Juri Linkov <juri@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Wed, 07 May 2025 06:35:02 +0000
Resent-Message-ID: <handler.78269.B78269.174659969027079 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
To: Stefan Monnier <monnier@HIDDEN>
Cc: 78269 <at> debbugs.gnu.org
From: Juri Linkov <juri@HIDDEN>
In-Reply-To: <jwvfrhisn08.fsf-monnier+emacs@HIDDEN>
Organization: LINKOV.NET
References: <87y0vazxem.fsf@HIDDEN>
 <jwvfrhisn08.fsf-monnier+emacs@HIDDEN>
Date: Wed, 07 May 2025 09:31:20 +0300
Message-ID: <87ldr99blv.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/31.0.50 (x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain
Precedence: list
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>

close 78269 31.0.50
thanks

>> -    (setq diff-outline-regexp
>> +    (setq-local diff-outline-regexp
>
> LGTM, thanks.
>
>> Probably no one noticed this problem because its current default value
>> is not useful to anyone:
>>
>>   (defvar diff-outline-regexp
>>     "\\([*+][*+][*+] [^0-9]\\|@@ ...\\|\\*\\*\\* [0-9].\\|--- [0-9]..\\)")
>
> I think the idea was to recognize file header and hunk headers, in the
> case where the "diff" command itself is absent (as is the case in the
> output of the (non-recursive) `diff` command).
>
>> Maybe the default should be replaced with something like
>>
>>   (defvar diff-outline-regexp
>>     (concat "\\(^diff -.*\\|" diff-hunk-header-re "\\)"))
>
> LGTM (I'd even drop the `-` after `diff`).  AFAICT nowadays the "diff
> ..." command is absent only in cases where there's only one file in the
> diff, so matching the file header is not very useful, indeed.

So now pushed.

Message received at control <at> debbugs.gnu.org:

Received: (at control) by debbugs.gnu.org; 7 May 2025 06:34:55 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed May 07 02:34:55 2025
Received: from localhost ([127.0.0.1]:39171 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1uCYMo-000734-RS
	for submit <at> debbugs.gnu.org; Wed, 07 May 2025 02:34:55 -0400
Received: from relay1-d.mail.gandi.net ([217.70.183.193]:41791)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <juri@HIDDEN>)
 id 1uCYMf-00071p-GY; Wed, 07 May 2025 02:34:46 -0400
Received: by mail.gandi.net (Postfix) with ESMTPSA id 08D3043A4E;
 Wed,  7 May 2025 06:34:35 +0000 (UTC)
From: Juri Linkov <juri@HIDDEN>
To: Stefan Monnier <monnier@HIDDEN>
Subject: Re: bug#78269: diff-outline-regexp
In-Reply-To: <jwvfrhisn08.fsf-monnier+emacs@HIDDEN>
Organization: LINKOV.NET
References: <87y0vazxem.fsf@HIDDEN>
 <jwvfrhisn08.fsf-monnier+emacs@HIDDEN>
Date: Wed, 07 May 2025 09:31:20 +0300
Message-ID: <87ldr99blv.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/31.0.50 (x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain
X-GND-State: clean
X-GND-Score: -100
X-GND-Cause: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgddvkeeiudehucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuifetpfffkfdpucggtfgfnhhsuhgsshgtrhhisggvnecuuegrihhlohhuthemuceftddunecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvfevufgjohhffffkfgggtgesthdtredttdertdenucfhrhhomheplfhurhhiucfnihhnkhhovhcuoehjuhhriheslhhinhhkohhvrdhnvghtqeenucggtffrrghtthgvrhhnpeffgeetfeevlefhleejfeeuheeiudeitdffhfdutdekfeffgffhveehteegueekheenucfkphepledurdduvdelrddutdehrdduudejnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepledurdduvdelrddutdehrdduudejpdhhvghlohepmhgrihhlrdhgrghnughirdhnvghtpdhmrghilhhfrhhomhepjhhurhhisehlihhnkhhovhdrnhgvthdpnhgspghrtghpthhtohepfedprhgtphhtthhopegtohhnthhrohhlseguvggssghughhsrdhgnhhurdhorhhgpdhrtghpthhtohepjeekvdeileesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopehmohhnnhhivghrsehirhhordhumhhonhhtrhgvrghlrdgtrg
X-GND-Sasl: juri@HIDDEN
X-Spam-Score: -0.7 (/)
X-Debbugs-Envelope-To: control
Cc: 78269 <at> debbugs.gnu.org
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.7 (-)

close 78269 31.0.50
thanks

>> -    (setq diff-outline-regexp
>> +    (setq-local diff-outline-regexp
>
> LGTM, thanks.
>
>> Probably no one noticed this problem because its current default value
>> is not useful to anyone:
>>
>>   (defvar diff-outline-regexp
>>     "\\([*+][*+][*+] [^0-9]\\|@@ ...\\|\\*\\*\\* [0-9].\\|--- [0-9]..\\)")
>
> I think the idea was to recognize file header and hunk headers, in the
> case where the "diff" command itself is absent (as is the case in the
> output of the (non-recursive) `diff` command).
>
>> Maybe the default should be replaced with something like
>>
>>   (defvar diff-outline-regexp
>>     (concat "\\(^diff -.*\\|" diff-hunk-header-re "\\)"))
>
> LGTM (I'd even drop the `-` after `diff`).  AFAICT nowadays the "diff
> ..." command is absent only in cases where there's only one file in the
> diff, so matching the file header is not very useful, indeed.

So now pushed.

Last modified: Wed, 7 May 2025 06:45:01 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.