From mboxrd@z Thu Jan  1 00:00:00 1970
From: Carsten Dominik <carsten.dominik@gmail.com>
Subject: Re: [PATCH] Optimize calls to org-is-habit-p
Date: Sun, 12 Dec 2010 22:26:55 +0100
Message-ID: <8296EBC3-6F1E-4F77-BF56-72B6A6BDB67E@gmail.com>
References: <874oai4uaj.fsf@fastmail.fm>
Mime-Version: 1.0 (Apple Message framework v936)
Content-Type: text/plain; charset=US-ASCII; format=flowed; delsp=yes
Content-Transfer-Encoding: 7bit
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from [140.186.70.92] (port=59975 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PRtRf-0000y7-QJ
	for emacs-orgmode@gnu.org; Sun, 12 Dec 2010 16:27:04 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <carsten.dominik@gmail.com>) id 1PRtRe-0003av-0m
	for emacs-orgmode@gnu.org; Sun, 12 Dec 2010 16:27:03 -0500
Received: from mail-ew0-f43.google.com ([209.85.215.43]:48794)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <carsten.dominik@gmail.com>) id 1PRtRd-0003ae-Me
	for emacs-orgmode@gnu.org; Sun, 12 Dec 2010 16:27:01 -0500
Received: by ewy22 with SMTP id 22so3414604ewy.30
	for <emacs-orgmode@gnu.org>; Sun, 12 Dec 2010 13:27:00 -0800 (PST)
In-Reply-To: <874oai4uaj.fsf@fastmail.fm>
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: Matt Lundin <mdl@imapmail.org>
Cc: Org Mode <emacs-orgmode@gnu.org>

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