* [PATCH] Optimize calls to org-is-habit-p
@ 2010-12-12 20:16 Matt Lundin
2010-12-12 21:26 ` Carsten Dominik
0 siblings, 1 reply; 2+ messages in thread
From: Matt Lundin @ 2010-12-12 20:16 UTC (permalink / raw)
To: Org Mode
* 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
---
lisp/org-agenda.el | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index fb26ee9..dea9d9d 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -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))
- (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))))
+ (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)))
(setq category (org-get-category))
(if (not (re-search-backward "^\\*+[ \t]+" nil t))
(setq txt org-agenda-no-heading-message)
--
1.7.3.3
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Optimize calls to org-is-habit-p
2010-12-12 20:16 [PATCH] Optimize calls to org-is-habit-p Matt Lundin
@ 2010-12-12 21:26 ` Carsten Dominik
0 siblings, 0 replies; 2+ messages in thread
From: Carsten Dominik @ 2010-12-12 21:26 UTC (permalink / raw)
To: Matt Lundin; +Cc: Org Mode
Applied, thanks.
- Carsten
On Dec 12, 2010, at 9:16 PM, Matt Lundin wrote:
>
> * 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
> ---
> lisp/org-agenda.el | 10 ++++++----
> 1 files changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
> index fb26ee9..dea9d9d 100644
> --- a/lisp/org-agenda.el
> +++ b/lisp/org-agenda.el
> @@ -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))
> - (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))))
> + (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)))
> (setq category (org-get-category))
> (if (not (re-search-backward "^\\*+[ \t]+" nil t))
> (setq txt org-agenda-no-heading-message)
> --
> 1.7.3.3
>
>
> _______________________________________________
> Emacs-orgmode mailing list
> Please use `Reply All' to send replies to the list.
> Emacs-orgmode@gnu.org
> http://lists.gnu.org/mailman/listinfo/emacs-orgmode
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-12-12 21:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-12-12 20:16 [PATCH] Optimize calls to org-is-habit-p Matt Lundin
2010-12-12 21:26 ` Carsten Dominik
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).