forked from mirrors/org-mode
org-element: Optimize parser only when cache is active
* lisp/org-element.el (org-element-at-point): Try opportunistic shortcut only when cache is active.
This commit is contained in:
parent
15246d1165
commit
5a2dabc21b
|
@ -5087,14 +5087,15 @@ first row."
|
|||
(point)
|
||||
(list (org-element-headline-parser (point-max) t))))))
|
||||
(t
|
||||
;; Opportunistic shortcut. Instead of going back to headline
|
||||
;; above (or beginning of buffer) and descending again, first
|
||||
;; try to find a known element above current position. Give up
|
||||
;; after 3 tries or when we hit a headline (or beginning of
|
||||
;; buffer).
|
||||
(catch 'loop
|
||||
(when org-element-use-cache
|
||||
;; Opportunistic shortcut. Instead of going back to
|
||||
;; headline above (or beginning of buffer) and descending
|
||||
;; again, first try to find a known element above current
|
||||
;; position. Give up after 3 tries or when we hit
|
||||
;; a headline (or beginning of buffer).
|
||||
(beginning-of-line)
|
||||
(skip-chars-backward " \r\t\n")
|
||||
(catch 'loop
|
||||
(dotimes (i 3)
|
||||
(unless (re-search-backward org-element-paragraph-separate nil t)
|
||||
(throw 'loop (goto-char (point-min))))
|
||||
|
@ -5125,11 +5126,11 @@ first row."
|
|||
(throw 'loop nil))
|
||||
(let ((cached (org-element-cache-get (point) 'element)))
|
||||
;; Search successful: we know an element before point
|
||||
;; which is not an headline. If it has a common ancestor
|
||||
;; with ORIGIN, set this ancestor as the current parent
|
||||
;; and the element as the one to check. Otherwise, move
|
||||
;; at top level and start parsing right after its broader
|
||||
;; ancestor.
|
||||
;; which is not an headline. If it has a common
|
||||
;; ancestor with ORIGIN, set this ancestor as the
|
||||
;; current parent and the element as the one to check.
|
||||
;; Otherwise, move at top level and start parsing right
|
||||
;; after its broader ancestor.
|
||||
(when cached
|
||||
(let ((cache-end (org-element-property :end cached)))
|
||||
(if (or (> cache-end origin)
|
||||
|
@ -5146,7 +5147,7 @@ first row."
|
|||
(setq element up
|
||||
parent (org-element-property :parent up)
|
||||
end (org-element-property :end up))))))
|
||||
(throw 'loop nil))))
|
||||
(throw 'loop nil)))))
|
||||
;; Opportunistic search failed. Move back to beginning of
|
||||
;; section in current headline, if any, or to first non-empty
|
||||
;; line in buffer otherwise.
|
||||
|
|
Loading…
Reference in a new issue