From mboxrd@z Thu Jan  1 00:00:00 1970
From: Carsten Dominik <carsten.dominik@gmail.com>
Subject: Re: [PATCH] Fix clock report when not clocking an entry
Date: Mon, 17 May 2010 13:56:34 +0200
Message-ID: <0F688AE1-C1A7-4111-8669-F88A0C371778@gmail.com>
References: <0B970D2C-3E2D-40B6-BCFE-4FCA5487DF0A@gmail.com>
	<1274097116-15970-1-git-send-email-bernt@norang.ca>
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=33248 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1ODyw4-0007dy-Qs
	for emacs-orgmode@gnu.org; Mon, 17 May 2010 07:56:41 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <carsten.dominik@gmail.com>) id 1ODyw2-0004G2-Sh
	for emacs-orgmode@gnu.org; Mon, 17 May 2010 07:56:40 -0400
Received: from mail-ww0-f41.google.com ([74.125.82.41]:49328)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <carsten.dominik@gmail.com>) id 1ODyw2-0004Fp-NI
	for emacs-orgmode@gnu.org; Mon, 17 May 2010 07:56:38 -0400
Received: by wwa36 with SMTP id 36so2178511wwa.0
	for <emacs-orgmode@gnu.org>; Mon, 17 May 2010 04:56:37 -0700 (PDT)
In-Reply-To: <1274097116-15970-1-git-send-email-bernt@norang.ca>
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: Bernt Hansen <bernt@norang.ca>
Cc: emacs-orgmode@gnu.org

Applied, thanks.

- Carsten

On May 17, 2010, at 1:51 PM, Bernt Hansen wrote:

> diff --git a/lisp/org-clock.el b/lisp/org-clock.el
> index 07e2e45..68a40ce 100644
> --- a/lisp/org-clock.el
> +++ b/lisp/org-clock.el
> @@ -1396,17 +1396,18 @@ nil are excluded from the clock summation."
>  		      (* 60 (string-to-number (match-string 4))))))
>  	 (t ;; A headline
>  	  ;; Add the currently clocking item time to the total
> -	  (let ((org-clock-start-time-as-float (org-float-time org-clock- 
> start-time)))
> -	    (when (and org-clock-report-include-clocking-task
> -		       (equal (org-clocking-buffer) (current-buffer))
> -		       (equal (marker-position org-clock-hd-marker) (point))
> -		       (>= org-clock-start-time-as-float tstart)
> -		       (<= org-clock-start-time-as-float tend))
> -	      (let ((time (floor (- (org-float-time)
> -				    org-clock-start-time-as-float) 60)))
> -		(setq t1 (+ t1 time)))))
> +	  (when (and org-clock-report-include-clocking-task
> +		     (equal (org-clocking-buffer) (current-buffer))
> +		     (equal (marker-position org-clock-hd-marker) (point))
> +		     tstart
> +		     tend
> +		     (>= (org-float-time org-clock-start-time) tstart)
> +		     (<= (org-float-time org-clock-start-time) tend))
> +	    (let ((time (floor (- (org-float-time)
> +				  (org-float-time org-clock-start-time)) 60)))
> +	      (setq t1 (+ t1 time))))
>  	  (let* ((headline-forced
> -                  (get-text-property (point)
> +		  (get-text-property (point)
>                                       :org-clock-force-headline- 
> inclusion))
>                   (headline-included
>                    (or (null headline-filter)

- Carsten