Add running clock only to report if time scope is right

Patch by Bernt Hansen:

> When org-clock-report-include-clocking-task is set we always add the
> current clocking task to the clock report.  This is incorrect if you
> are looking at an agenda clock report for a time range that does not
> include the current clocking task (e.g. yesterday or last week).
>
> Now we only include the current clocking task if the clock report
> date range includes the current clocking task start time.

lisp/ChangeLog

@@ -1,3 +1,8 @@
+2010-05-17  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org-clock.el (org-clock-sum): Don't include running clock if
+	the time block is wrong.
+
 2010-05-16  John Wiegley  <jwiegley@gmail.com>
 
 	* org-clock.el (org-clock-clock-in, org-clock-in): Added

lisp/org-clock.el

@@ -1396,12 +1396,15 @@ 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
-	  (when (and org-clock-report-include-clocking-task
-		     (equal (org-clocking-buffer) (current-buffer))
-		     (equal (marker-position org-clock-hd-marker) (point)))
+	  (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-float-time org-clock-start-time)) 60)))
-		(setq t1 (+ t1 time))))
+				    org-clock-start-time-as-float) 60)))
+		(setq t1 (+ t1 time)))))
 	  (let* ((headline-forced
                   (get-text-property (point)
                                      :org-clock-force-headline-inclusion))