Optimize calls to org-is-habit-p
* lisp/org-agenda.el: (org-agenda-get-scheduled) Don't call org-is-habit-p until after checking for for org-agenda-skip-scheduled-if-done. Org-agenda-get-scheduled was calling org-is-habit-p on every scheduled item (including DONE items when org-agenda-skip-scheduled-if-done was set to t). Tweaking the timing of the test shaves some time off of agenda construction when org-habit is loaded and org-agenda-skip-scheduled-if-done is t. Before: org-is-habit-p 478 0.2434439999 0.0005092970 After: org-is-habit-p 81 0.057944 0.0007153580
This commit is contained in:
parent
b65ba05758
commit
bca4ac9998
|
@ -4968,12 +4968,14 @@ FRACTION is what fraction of the head-warning time has passed."
|
|||
(save-excursion
|
||||
(setq todo-state (org-get-todo-state))
|
||||
(setq donep (member todo-state org-done-keywords))
|
||||
(if (and donep
|
||||
(or org-agenda-skip-scheduled-if-done
|
||||
(not (= diff 0))
|
||||
(and (functionp 'org-is-habit-p)
|
||||
(org-is-habit-p))))
|
||||
(setq txt nil)
|
||||
(setq habitp (and (functionp 'org-is-habit-p)
|
||||
(org-is-habit-p)))
|
||||
(if (and donep
|
||||
(or habitp org-agenda-skip-scheduled-if-done
|
||||
(not (= diff 0))))
|
||||
(setq txt nil)
|
||||
(setq category (org-get-category))
|
||||
(if (not (re-search-backward "^\\*+[ \t]+" nil t))
|
||||
(setq txt org-agenda-no-heading-message)
|
||||
|
|
Loading…
Reference in New Issue