From: Carsten Dominik <carsten.dominik@gmail.com>
To: Matt Lundin <mdl@imapmail.org>
Cc: Org Mode <emacs-orgmode@gnu.org>
Subject: Re: [PATCH] Optimize calls to org-is-habit-p
Date: Sun, 12 Dec 2010 22:26:55 +0100 [thread overview]
Message-ID: <8296EBC3-6F1E-4F77-BF56-72B6A6BDB67E@gmail.com> (raw)
In-Reply-To: <874oai4uaj.fsf@fastmail.fm>
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
prev parent reply other threads:[~2010-12-12 21:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-12 20:16 [PATCH] Optimize calls to org-is-habit-p Matt Lundin
2010-12-12 21:26 ` Carsten Dominik [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8296EBC3-6F1E-4F77-BF56-72B6A6BDB67E@gmail.com \
--to=carsten.dominik@gmail.com \
--cc=emacs-orgmode@gnu.org \
--cc=mdl@imapmail.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).