unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Juri Linkov <juri@linkov.net>
To: Matthias Meulien <orontee@gmail.com>
Cc: Lars Ingebrigtsen <larsi@gnus.org>, 51016@debbugs.gnu.org
Subject: bug#51016: 28.0.50; 'diff-font-lock-prettify' breaks display of outline headers
Date: Sun, 21 Nov 2021 19:41:51 +0200	[thread overview]
Message-ID: <86h7c5qucg.fsf@mail.linkov.net> (raw)
In-Reply-To: <87r1b92zea.fsf@gmail.com> (Matthias Meulien's message of "Sun, 21 Nov 2021 18:26:37 +0100")

>> Perhaps we could just change the .+ thing to .* and see whether it
>> breaks anything?
>
> Good point.
>
> But am I missing something or commit f0768d3145 didn't change
> `diff-hunk-header-re' matching an entire line? I thus don't understand
> why Juri is seing a regression w.r. to cycling after that commit has
> been installed. Note that I've not been able to reproduce the "working"
> behavior described by Juri after reverting that commit.
>
> Juri can you confirm there's a relation between cycling not working and
> that commit? Otherwise should we open another bug?

I confirm there is a relation because the commit f0768d3145

  +  (when (eq diff-buffer-type 'git)
  +    (setq diff-outline-regexp
  +          (concat "\\(^diff --git.*\n\\|" diff-hunk-header-re "\\)"))
  +    (setq-local outline-level #'diff--outline-level))
  +  (setq-local outline-regexp diff-outline-regexp))

changed diff-outline-regexp to contain diff-hunk-header-re that matches an entire line.
This commit replaced the default value of diff-outline-regexp that is

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

that didn't match entire lines.

However, changing the .+ thing to .* in outline-font-lock-keywords
fixes this problem.  So we need to decide whether to try to remove
entire line mathing from diff-hunk-header-re (not sure how easy to do),
or just change .+ to .* in outline-font-lock-keywords.





  reply	other threads:[~2021-11-21 17:41 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-04 21:05 bug#51016: 28.0.50; 'diff-font-lock-prettify' breaks display of outline headers Matthias Meulien
2021-10-09  0:26 ` bug#51016: Status: " Matthias Meulien
2021-10-09  0:37 ` Matthias Meulien
2021-10-13 20:30 ` bug#51016: " Matthias Meulien
2021-11-05  2:51   ` Lars Ingebrigtsen
2021-11-06 16:40     ` Juri Linkov
2021-11-06 18:30       ` Lars Ingebrigtsen
2021-11-08 22:38         ` Matthias Meulien
2021-11-09  3:47           ` Lars Ingebrigtsen
2021-11-09  8:19             ` Juri Linkov
2021-11-18 18:06     ` Juri Linkov
2021-11-19  7:22       ` Lars Ingebrigtsen
2021-11-19  8:31         ` Juri Linkov
2021-11-20  8:37           ` Lars Ingebrigtsen
2021-11-20 19:17             ` Juri Linkov
2021-11-21 17:02               ` Lars Ingebrigtsen
2021-11-21 17:26                 ` Matthias Meulien
2021-11-21 17:41                   ` Juri Linkov [this message]
2021-11-21 17:54                     ` Matthias Meulien
2021-11-22 22:11                       ` Matthias Meulien
2021-11-22 23:03                         ` Matthias Meulien
2021-11-24  6:54                           ` Lars Ingebrigtsen
2021-11-24 18:48                             ` Juri Linkov
2021-12-15 17:08                               ` Juri Linkov
2021-12-16  5:50                                 ` Lars Ingebrigtsen
2021-12-16 17:22                                   ` Juri Linkov
2021-12-16 17:48                                     ` Eli Zaretskii
2021-12-16 19:04                                       ` Juri Linkov
2021-12-16 20:06                                         ` Eli Zaretskii
2021-12-16 21:02                                           ` Kévin Le Gouguec
2021-12-17  6:36                                             ` Eli Zaretskii
2021-12-17  7:07                                               ` Kévin Le Gouguec
2021-12-17  7:55                                                 ` Eli Zaretskii
2021-12-17 21:27                                                   ` Kévin Le Gouguec
2021-12-18  6:23                                                     ` Eli Zaretskii
2021-12-18  9:18                                                       ` Kévin Le Gouguec
2021-12-18 17:05                                                         ` Juri Linkov
2021-12-18 17:52                                                           ` Eli Zaretskii
2021-12-18 19:43                                                             ` Kévin Le Gouguec
2021-12-18 20:03                                                               ` Eli Zaretskii
2021-12-18 23:30                                                                 ` Kévin Le Gouguec
2021-12-19 11:00                                                                   ` Lars Ingebrigtsen
2021-12-19 11:27                                                                     ` Eli Zaretskii
2021-12-17  4:25                                   ` Richard Stallman
2021-11-21 17:49                 ` Juri Linkov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://www.gnu.org/software/emacs/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=86h7c5qucg.fsf@mail.linkov.net \
    --to=juri@linkov.net \
    --cc=51016@debbugs.gnu.org \
    --cc=larsi@gnus.org \
    --cc=orontee@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).