From: Carsten Dominik <carsten.dominik@gmail.com>
To: Bernt Hansen <bernt@norang.ca>
Cc: emacs-orgmode@gnu.org
Subject: Re: [PATCH] Fix clock report when not clocking an entry
Date: Mon, 17 May 2010 13:56:34 +0200 [thread overview]
Message-ID: <0F688AE1-C1A7-4111-8669-F88A0C371778@gmail.com> (raw)
In-Reply-To: <1274097116-15970-1-git-send-email-bernt@norang.ca>
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
prev parent reply other threads:[~2010-05-17 11:56 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 ` [PATCH] Fix clock report when not clocking an entry Bernt Hansen
2010-05-17 11:56 ` Carsten Dominik [this message]
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=0F688AE1-C1A7-4111-8669-F88A0C371778@gmail.com \
--to=carsten.dominik@gmail.com \
--cc=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).