From: D <d.williams@posteo.net>
To: Ihor Radchenko <yantar92@gmail.com>
Cc: emacs-orgmode@gnu.org
Subject: [PATCH] Re: Re: Re: org-forward-heading-same-level and the invisible-ok argument
Date: Mon, 31 Aug 2020 00:07:12 +0200 [thread overview]
Message-ID: <7365d467-2a31-85b4-4f0b-8c8871c4e180@posteo.net> (raw)
In-Reply-To: <87364611hw.fsf@localhost>
[-- Attachment #1: Type: text/plain, Size: 488 bytes --]
> Probably, it is easier if you just use seq-every-p instead of
> mapcar on (number-sequence max-pos min-pos -1). The result of
> seq-every-p will be inverse of the currently used expression.
Oh yeah, that's much nicer. I also made the predicate check
right-to-left, which just causes it to check the text bit of a heading
first, which is useful for the cases where the predicate returns t and
makes no difference otherwise. I again ran the tests and it seems ready
to go.
Cheers,
D.
[-- Attachment #2: 0001-org.el-let-heading-navigation-check-the-entire-headi.patch --]
[-- Type: text/x-patch, Size: 1425 bytes --]
From 9ae3dd4b73b2b9b41244bb7f9c610ed3f4777398 Mon Sep 17 00:00:00 2001
From: "D. Williams" <d.williams@posteo.net>
Date: Sun, 30 Aug 2020 23:58:55 +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 | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/lisp/org.el b/lisp/org.el
index 71dbc611e..f44f94ec4 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -20478,6 +20478,14 @@ 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."
+ (not
+ (seq-every-p #'org-invisible-p
+ (number-sequence (1- (line-end-position))
+ (line-beginning-position)
+ -1))))
+
(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 +20507,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
next prev parent reply other threads:[~2020-08-30 22:07 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-25 16:46 org-forward-heading-same-level and the invisible-ok argument D
2020-08-26 1:30 ` Ihor Radchenko
2020-08-26 21:33 ` [PATCH] " D
2020-08-27 11:49 ` Ihor Radchenko
2020-08-28 12:27 ` [PATCH] " D
2020-08-28 13:43 ` Ihor Radchenko
2020-08-28 17:49 ` D
2020-08-29 5:10 ` Ihor Radchenko
2020-08-30 22:07 ` D [this message]
2020-09-06 6:35 ` [PATCH] " Bastien
2020-09-06 11:09 ` D
2020-09-07 5:06 ` Bastien
2020-09-07 6:25 ` Ihor Radchenko
2020-09-07 18:31 ` D
2020-09-08 9:28 ` Bastien
2020-09-08 20:00 ` D
2020-09-09 8:09 ` Bastien
2020-09-09 4:15 ` Ihor Radchenko
2020-09-09 8:08 ` Bastien
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.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7365d467-2a31-85b4-4f0b-8c8871c4e180@posteo.net \
--to=d.williams@posteo.net \
--cc=emacs-orgmode@gnu.org \
--cc=yantar92@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/org-mode.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).