jiri/org-ql
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change: Remove extra code

Browse source 
We don't need to find the next heading, because
org-element-headline-parser doesn't care.
This commit is contained in:
Adam Porter 2018-01-06 04:18:48 -06:00
parent 5dd90e07e0
commit bdea8c923a
1 changed files with 1 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

28
org-agenda-ng.el
View file

@ -99,33 +99,7 @@ NONE-PREDS."
(when (org-before-first-heading-p)
(outline-next-heading))
(cl-loop when (funcall pred)
collect (let* ((next-heading (save-excursion
;; Limit next search to up to the next heading. It
;; would be nice to avoid doing this extra
;; re-search-forward, but I don't see any way to avoid
;; it.
(outline-next-heading)
(point)))
(limit (save-excursion
;; Skip drawers and planning lines (see
;; `org-agenda-get-some-entry-text'. I wish there were a
;; cleaner, more canonical way to do this.)
(if (re-search-forward (rx (or (repeat 2 "\n")
(regexp ;; This is org-drawer-regexp
"^[ ]*:\\(\\(?:\\w\\|[-_]\\)+\\):[ ]*$")
(eval (concat "^[ \t]*" org-keyword-time-regexp
".*\n?"))))
next-heading 'noerror)
(point)
(point-max)))))
;; NOTE: As an alternative to the two searches above, we could just move one
;; or two lines down so that the headline parser can be sure to get the
;; planning lines. And that does work fine in my limited testing. But then
;; we have to keep in mind that the headline parser will never see property
;; drawers, so if we need to search properties, we have to do that manually
;; in predicates. So I'm going to leave it this way for now. It should
;; probably be profiled both ways to see what the performance impact is.
(org-element-headline-parser limit))
collect (org-element-headline-parser (line-end-position))
while (outline-next-heading)))))
;;;; Faces/properties