From: Bernt Hansen <bernt@norang.ca>
To: Carsten Dominik <carsten.dominik@gmail.com>
Cc: emacs-orgmode@gnu.org
Subject: Re: [PATCH] Fix dangling clocks created by org-clock-out-hook clocking in again
Date: Sun, 03 Oct 2010 17:53:01 -0400 [thread overview]
Message-ID: <87zkuvj64i.fsf@gollum.intra.norang.ca> (raw)
In-Reply-To: <7A156256-30D5-4E51-8E7E-DBEE9A760BCF@gmail.com> (Carsten Dominik's message of "Sun, 3 Oct 2010 23:23:12 +0200")
Hi Carsten,
Sure - although I think my patch is already against origin/master that
is up to date.
It's available at git://git.norang.ca/org-mode.git fixup-dangling-clock
Let me know if you want the patch reposted to the mailing list.
Regards,
Bernt
Carsten Dominik <carsten.dominik@gmail.com> writes:
> Hi Bernt,
>
> I am having some problem here with the patches - could you please make
> me a new patch against the current master?
>
> Thanks!
>
> - Carsten
>
> On Oct 3, 2010, at 5:52 PM, Bernt Hansen wrote:
>
>> This is a fixup patch to commit
>> 17c71a40c6d07baae2e9cac606668683ddb3759c. The org-clock-clocking-in
>> variable needs to be set when we are clocking out - in case the clock
>> out hook clocks-in again. This fixes a bug that creates dangling
>> clock entries.
>> ---
>> lisp/org-clock.el | 3 ++-
>> 1 files changed, 2 insertions(+), 1 deletions(-)
>>
>> diff --git a/lisp/org-clock.el b/lisp/org-clock.el
>> index 5b4b39c..c6f05fc 100644
>> --- a/lisp/org-clock.el
>> +++ b/lisp/org-clock.el
>> @@ -975,7 +975,8 @@ the clocking selection, associated with the
>> letter `d'."
>> (move-marker org-clock-interrupted-task
>> (marker-position org-clock-marker)
>> (marker-buffer org-clock-marker))
>> - (org-clock-out t))
>> + (let ((org-clock-clocking-in t))
>> + (org-clock-out t)))
>>
>> (when (equal select '(16))
>> ;; Mark as default clocking task
>> --
>> 1.7.3.1.50.g1e633
>>
>>
>> _______________________________________________
>> 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
next prev parent reply other threads:[~2010-10-03 21:53 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-10-03 15:21 [PATCH] Revert "Update modeline with effort and task name on re-clock-in" Bernt Hansen
2010-10-03 15:28 ` Carsten Dominik
2010-10-03 15:52 ` [PATCH] Fix dangling clocks created by org-clock-out-hook clocking in again Bernt Hansen
2010-10-03 21:23 ` Carsten Dominik
2010-10-03 21:53 ` Bernt Hansen [this message]
2010-10-04 4:19 ` 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=87zkuvj64i.fsf@gollum.intra.norang.ca \
--to=bernt@norang.ca \
--cc=carsten.dominik@gmail.com \
--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).