From: Bernt Hansen <bernt@norang.ca>
To: emacs-orgmode@gnu.org
Cc: Bernt Hansen <bernt@norang.ca>
Subject: [PATCH] Fix clock report when not clocking an entry
Date: Mon, 17 May 2010 07:51:56 -0400 [thread overview]
Message-ID: <1274097116-15970-1-git-send-email-bernt@norang.ca> (raw)
In-Reply-To: <0B970D2C-3E2D-40B6-BCFE-4FCA5487DF0A@gmail.com>
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
next prev parent reply other threads:[~2010-05-17 11:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-17 2:05 [PATCH] clock reports: Only include current clocking task when range includes task Bernt Hansen
2010-05-17 2:09 ` Bernt Hansen
2010-05-17 2:12 ` Bernt Hansen
2010-05-17 9:36 ` Carsten Dominik
2010-05-17 11:51 ` Bernt Hansen [this message]
2010-05-17 11:56 ` [PATCH] Fix clock report when not clocking an entry Carsten Dominik
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=1274097116-15970-1-git-send-email-bernt@norang.ca \
--to=bernt@norang.ca \
--cc=emacs-orgmode@gnu.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).