unofficial mirror of bug-gnu-emacs@gnu.org 
 help / color / mirror / code / Atom feed
From: Matthias Meulien <orontee@gmail.com>
To: Juri Linkov <juri@linkov.net>
Cc: Lars Ingebrigtsen <larsi@gnus.org>, 51809@debbugs.gnu.org
Subject: bug#51809: 29.0.50; [PATCH] Support for outline default state in Diff buffers
Date: Mon, 14 Feb 2022 22:07:32 +0100	[thread overview]
Message-ID: <871r0517jf.fsf@gmail.com> (raw)
In-Reply-To: <86y22gypxn.fsf@mail.linkov.net> (Juri Linkov's message of "Sat,  12 Feb 2022 19:09:00 +0200")

Juri Linkov <juri@linkov.net> writes:

> But the problem with the reported attached file is different:
> in that file outlines are never displayed even outside of Gnus.
> This is because the diff format is slightly different, but
> `outline--show-headings-up-to-level' first hides all outlines,
> but then fails to unhide them back.
>
> Matthias, could you please check what is wrong with the reported diff file
> and why vasibility of its outlines can't be changed?

First note that with the reported attached file `diff-buffer-type' isn't
equal to 'git: There's no "diff --git" header.

If you replace the file first three lines with the following four lines
then there's no outline problem:

diff --git a/woman.el.orig b/woman.el
index 44328a2b28..214f7435d9 100644
--- a/woman.el.orig
+++ b/woman.el

When `diff-buffer-type' is nil, `outline-regexp' is set to
`diff-outline-regex', which default to "\\([*+][*+][*+] [^0-9]\\|@@
...\\|\\*\\*\\* [0-9].\\|--- [0-9]..\\)", and `outline-level' use the
default function which returns the number of characters matched by
‘outline-regexp’

Since the regexp match the first 5 characters of the first line of the
diff ("+++ w") and the first 6 characters of the second line ("@@
-22"), the file has two headings at level 5 and 6!

If you have set `outline-default-state' to be equal to 1 and kept
`outline-default-rules' to its default nil (meaning the subtree starting
at level 1 must be hidden), then the file outlines are logically hidden
by `outline-apply-default-state'.

I suspect that it's what you see.

From my pov, the problem doesn't come from the "default outline state
machinery" but from wrong defaults for `outline-level' when
`diff-buffer-type' is  nil.

My first impression is that setting `outline-level' to
`diff--outline-level' inconditionnaly should work but since I don't
understand why `diff-outline-regex' hasn't been defined in terms of
`diff-file-header-re' and `diff-hunk-header-re' I guess I am missing
some subtleties.

(Note that there's another minor bug when `diff-buffer-type` isn't equal
to 'git: `diff--font-lock-prettify` should be a no-op since the regexp
written there match only Git generated diffs, confirmed by the FIXME
string "This has only been tested with Git's diff output." written in
the implementation).
-- 
Matthias





  parent reply	other threads:[~2022-02-14 21:07 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-11-13 13:04 bug#51809: 29.0.50; [PATCH] Support for outline default state in Diff buffers Matthias Meulien
2021-11-13 17:45 ` Juri Linkov
2021-11-13 18:08   ` Matthias Meulien
2021-11-13 18:27     ` Juri Linkov
2021-11-13 18:41     ` Matthias Meulien
2021-11-13 19:29       ` Juri Linkov
2021-11-13 21:27         ` Matthias Meulien
2021-11-13 23:29         ` Matthias Meulien
2021-11-29 17:06           ` Juri Linkov
2021-11-30 19:33             ` Matthias Meulien
2021-12-11 18:18             ` Matthias Meulien
2021-12-12  8:43               ` Juri Linkov
2021-12-13  7:55                 ` Matthias Meulien
2021-12-13  8:58                   ` Juri Linkov
2021-12-26 16:05                   ` Matthias Meulien
2021-12-26 16:21                     ` Eli Zaretskii
2021-12-26 19:19                       ` Matthias Meulien
2021-12-26 20:32                     ` Matthias Meulien
2021-12-26 20:55                       ` Matthias Meulien
2021-12-27 19:52                         ` Juri Linkov
2021-12-28 18:37                         ` Juri Linkov
2021-12-28 21:46                           ` Matthias Meulien
2021-12-28 22:28                           ` Matthias Meulien
2022-01-11 17:46                             ` Juri Linkov
2022-01-14 16:41                               ` Matthias Meulien
2022-01-16 18:14                                 ` Juri Linkov
2022-01-17 21:10                                 ` Matthias Meulien
2022-01-29 19:12                                   ` Juri Linkov
2022-02-05 18:45                                   ` Juri Linkov
2022-02-05 22:00                                     ` Lars Ingebrigtsen
2022-02-12 17:09                                       ` Juri Linkov
2022-02-12 17:26                                         ` Matthias Meulien
2022-02-14 21:07                                         ` Matthias Meulien [this message]
2022-02-14 21:13                                           ` Matthias Meulien
2022-02-14 21:33                                           ` Matthias Meulien
2022-02-14 21:39                                             ` Matthias Meulien
2022-02-16 19:20                                             ` Juri Linkov
2021-12-28 18:32                     ` Juri Linkov
2021-12-28 21:45                       ` Matthias Meulien
2021-11-14 18:25     ` Juri Linkov
2021-11-14 19:35       ` Matthias Meulien
2021-11-14 19:46         ` Juri Linkov
2021-11-14 19:54       ` Matthias Meulien
2021-11-14 20:31         ` Juri Linkov
2021-12-28  8:09 ` Matthias Meulien

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=871r0517jf.fsf@gmail.com \
    --to=orontee@gmail.com \
    --cc=51809@debbugs.gnu.org \
    --cc=juri@linkov.net \
    --cc=larsi@gnus.org \
    /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).