I tried to save a few calls to org-float-time but org-clock-start-time is not
valid as a parameter to org-float-time when it is an empty string (when you
are not clocking anything).
Verify tstart and tend are non-nil so we can compare them to the current
clocking time
using <= and >=
---
I need to test more :/
I ran into two cases this morning where the clock report patch throws an error.
Here's a fix for both.
-Bernt
lisp/org-clock.el | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
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)
--
1.7.1.86.g0e460
_______________________________________________
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
