From: Carsten Dominik <carsten.dominik@gmail.com>
To: Bernt Hansen <bernt@norang.ca>
Cc: emacs-orgmode@gnu.org
Subject: Re: [PATCH] Revert "Update modeline with effort and task name on re-clock-in"
Date: Sun, 3 Oct 2010 17:28:18 +0200 [thread overview]
Message-ID: <6D4243EC-B56A-49C8-9032-A1B0FDE5A435@gmail.com> (raw)
In-Reply-To: <1286119319-28485-1-git-send-email-bernt@norang.ca>
Applied, thanks.
- Carsten
On Oct 3, 2010, at 5:21 PM, Bernt Hansen wrote:
> This reverts commit 4a4fbf1b8caa338a3a59f7b6f3f89b279615725d.
>
> Clocking in the currently clocking task was leaving open clock entries
> which is incorrect. Updating the modeline is less important than
> keeping correct clocking data.
> ---
> This reverts a commit I made back in December. I ran into this bug
> this morning
> clocking in the same task quickly. This was leaving open clocks
> which the
> dangling clock code tried to fix.
>
> Regards,
> Bernt
>
> lisp/org-clock.el | 15 +++++++--------
> 1 files changed, 7 insertions(+), 8 deletions(-)
>
> diff --git a/lisp/org-clock.el b/lisp/org-clock.el
> index 8979396..5b4b39c 100644
> --- a/lisp/org-clock.el
> +++ b/lisp/org-clock.el
> @@ -959,7 +959,7 @@ the clocking selection, associated with the
> letter `d'."
> ;; We are interrupting the clocking of a different task.
> ;; Save a marker to this task, so that we can go back.
> ;; First check if we are trying to clock into the same task!
> - (if (save-excursion
> + (when (save-excursion
> (unless selected-task
> (org-back-to-heading t))
> (and (equal (marker-buffer org-clock-hd-marker)
> @@ -970,13 +970,12 @@ the clocking selection, associated with the
> letter `d'."
> (if selected-task
> (marker-position selected-task)
> (point)))))
> - (message "Clock continues in \"%s\"" org-clock-heading)
> - (progn
> - (move-marker org-clock-interrupted-task
> - (marker-position org-clock-marker)
> - (org-clocking-buffer))
> - (let ((org-clock-clocking-in t))
> - (org-clock-out t)))))
> + (message "Clock continues in \"%s\"" org-clock-heading)
> + (throw 'abort nil))
> + (move-marker org-clock-interrupted-task
> + (marker-position org-clock-marker)
> + (marker-buffer org-clock-marker))
> + (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 15:28 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 [this message]
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
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=6D4243EC-B56A-49C8-9032-A1B0FDE5A435@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).