> I do not think that setting visibility the leading stars is a correct > approach to control the movement commands. After second though about the > issue you raised in the first email, I think that it would make more > sense for org-forward-heading-same-level to check if any part of the > heading line is visible to decide if we need to skip it (instead of > current approach checking only the point at the beginning of the > headline). Any mode aiming to make org-forward-heading-same-level skip a > heading will then just need to make the whole heading invisible. > Skipping partially visible headlines would be a violation of the > docstring.
Good point! I think this would be a more or less reasonable patch, then. Cheers, D.
>From 4c0f638104f689780de317af5f715384152459bd Mon Sep 17 00:00:00 2001 From: "D. Williams" <d.willi...@posteo.net> Date: Fri, 28 Aug 2020 14:15:31 +0200 Subject: [PATCH] org.el: let heading navigation check the entire heading for visibility * org.el (org-forward-heading-same-level): check complete heading instead of the first char TINYCHANGE --- lisp/org.el | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lisp/org.el b/lisp/org.el index 71dbc611e..26f815e19 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -20478,6 +20478,15 @@ entry." ((looking-at-p re) (forward-line)) (t (throw 'exit t)))))))) +(defun org--line-visible-p () + "Return t if the current line is partially visible." + (and + (memq nil + (mapcar #'org-invisible-p + (number-sequence (line-beginning-position) + (1- (line-end-position))))) + t)) + (defun org-forward-heading-same-level (arg &optional invisible-ok) "Move forward to the ARG'th subheading at same level as this one. Stop at the first and last subheadings of a superior heading. @@ -20499,8 +20508,7 @@ non-nil it will also look at invisible ones." (cond ((< l level) (setq count 0)) ((and (= l level) (or invisible-ok - (not (org-invisible-p - (line-beginning-position))))) + (org--line-visible-p))) (cl-decf count) (when (= l level) (setq result (point))))))) (goto-char result)) -- 2.26.2