tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Speed-up `org-(next|previous)-visible-heading 

* lisp/org.el (org-next-visible-heading): Do not stop at every
invisible heading.
(org-previous-visible-heading): Use `org-next-visible-heading'.
This commit is contained in:
Nicolas Goaziou 2020-05-15 23:48:48 +02:00
parent bbf9c062a4
commit 93c50e3a78
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lisp/org.el
View File

@ -20458,24 +20458,37 @@ Stop at the first and last subheadings of a superior heading."
(org-forward-heading-same-level (if arg (- arg) -1) invisible-ok))
(defun org-next-visible-heading (arg)
"Move to the next visible heading.
This function wraps `outline-next-visible-heading' with
`org-with-limited-levels' in order to skip over inline tasks and
respect customization of `org-odd-levels-only'."
"Move to the next visible heading line.
With ARG, repeats or can move backward if negative."
(interactive "p")
(org-with-limited-levels
(outline-next-visible-heading arg)))
(let ((regexp (concat "^" (org-get-limited-outline-regexp)))
(initial-arg arg))
(if (< arg 0)
(beginning-of-line)
(end-of-line))
(while (and (< arg 0) (re-search-backward regexp nil :move))
(unless (bobp)
(pcase (get-char-property-and-overlay (point) 'invisible)
(`(outline . ,o)
(goto-char (overlay-start o))
(beginning-of-line))
(_ nil)))
(cl-incf arg))
(while (and (> arg 0) (re-search-forward regexp nil :move))
(pcase (get-char-property-and-overlay (point) 'invisible)
(`(outline . ,o)
(goto-char (overlay-end o))
(end-of-line 2))
(_
(end-of-line)))
(cl-decf arg))
(when (/= arg initial-arg) (beginning-of-line))))
(defun org-previous-visible-heading (arg)
"Move to the previous visible heading.
This function wraps `outline-previous-visible-heading' with
`org-with-limited-levels' in order to skip over inline tasks and
respect customization of `org-odd-levels-only'."
With ARG, repeats or can move forward if negative."
(interactive "p")
(org-with-limited-levels
(outline-previous-visible-heading arg)))
(org-next-visible-heading (- arg)))
(defun org-forward-paragraph ()
"Move forward to beginning of next paragraph or equivalent.