From: Juri Linkov <juri@linkov.net>
To: Matthias Meulien <orontee@gmail.com>
Cc: 51809@debbugs.gnu.org
Subject: bug#51809: 29.0.50; [PATCH] Support for outline default state in Diff buffers
Date: Sat, 13 Nov 2021 21:29:12 +0200 [thread overview]
Message-ID: <86k0hbam7r.fsf@mail.linkov.net> (raw)
In-Reply-To: <87a6i7x5iq.fsf@gmail.com> (Matthias Meulien's message of "Sat, 13 Nov 2021 19:41:17 +0100")
>>> (...) Could the above hook be replaced with customization of
>>> diff-outline-default-state?
>
> With the attached patch, Outline minor mode is automatically enabled
> when `diff-outline-default-state' is customized. Tested within "emacs
> -q". That said, I am not a proficient elisper and my use of the
> autoload, declare-function, eval-when-compile machinery may not be
> standard. Sorry for this.
> +(autoload 'outline-minor-mode "outline")
Actually, outline-minor-mode is already autoloaded, so no special
handling is needed for it.
But the problem is that too many outline functions are used in
diff-mode.el in your patch. This is a clear indication that
some part should be moved to outline.el.
Note that the following function has no diff-specific code, so it could
be refactored and some generalized function added to outline.el. Such
function could be like `outline-map-region' to accept arguments `beg', `end'
and a predicate function that defines whether to hide or show the body.
> + (when outline-minor-mode
> + (save-excursion
> + (let* (outline-view-change-hook
> + (beg (progn
> + (goto-char (point-min))
> + ;; Skip the prelude, if any.
> + (unless (outline-on-heading-p t) (outline-next-heading))
> + (point)))
> + (end (progn
> + (goto-char (point-max))
> + ;; Keep empty last line, if available.
> + (if (bolp) (1- (point)) (point)))))
> + (if (< end beg)
> + (setq beg (prog1 end (setq end beg))))
> + ;; First hide sublevels
> + (outline-hide-sublevels 1)
> + ;; Then unhide short subtrees
> + (outline-map-region
> + (lambda ()
> + (when (= (funcall outline-level) 1)
> + (goto-char (match-end 0))
> + (let ((overlays (overlays-at (point))))
> + (while overlays
> + (let ((overlay (car overlays)))
> + (progn
> + (when (eq (overlay-get overlay 'invisible) 'outline)
> + (let ((size (count-lines
> + (overlay-end overlay)
> + (overlay-start overlay))))
> + (goto-char (match-beginning 0))
> + (if (< size diff-file-outline-threshold)
> + (outline-show-subtree)
> + (outline-show-branches))))
> + (setq overlays (cdr overlays))))))))
> + beg end)))))
next prev parent reply other threads:[~2021-11-13 19:29 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 [this message]
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
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=86k0hbam7r.fsf@mail.linkov.net \
--to=juri@linkov.net \
--cc=51809@debbugs.gnu.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).