From: Bernt Hansen <bernt@norang.ca>
To: emacs-orgmode@gnu.org
Cc: Bernt Hansen <bernt@norang.ca>
Subject: [PATCH] Stop generating superfluous clock entries
Date: Thu, 26 Nov 2009 21:21:18 -0500 [thread overview]
Message-ID: <1259288478-29642-1-git-send-email-bernt@norang.ca> (raw)
Avoid closing the currently clocking entry when clocking in the same task
again. Leave the clock entry open until some other task is clocked in.
This allows us to clock in tasks with hooks that are called frequently without
generating lots of short sequential clock entries for the same task.
---
This patch is available at git://git.norang.ca/org-mode.git clock-in
I haven't extensively tested this but it seems to work for for me. I currently
have clock resolution disabled.
lisp/ChangeLog | 5 +++++
lisp/org-clock.el | 29 ++++++++++++++++++++---------
2 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4acb99c..ecba8f7 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-11-26 Bernt Hansen <bernt@norang.ca>
+
+ * org-clock.el (org-clock-in): Avoid creating superfluous clock
+ entries when clocking in the task that is already running.
+
2009-11-26 Carsten Dominik <carsten.dominik@gmail.com>
* org-footnote.el (org-footnote-normalize): Don't take optional
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index f598cc3..9bfe53e 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -847,18 +847,29 @@ the clocking selection, associated with the letter `d'."
(if selected-task
(setq selected-task (copy-marker selected-task))
(error "Abort")))
- (when interrupting
- ;; We are interrupting the clocking of a different task.
- ;; Save a marker to this task, so that we can go back.
- (move-marker org-clock-interrupted-task
- (marker-position org-clock-marker)
- (marker-buffer org-clock-marker))
- (org-clock-out t))
-
+
+ (let ((current-hd-marker (make-marker)))
+ ; Find the heading for the current point
+ (move-marker current-hd-marker
+ (save-excursion
+ (org-back-to-heading t)
+ (point))
+ (buffer-base-buffer))
+ ; Do not clock out if we want to clock in the task
+ ; that is currently clocking
+ (when interrupting
+ (unless (equal current-hd-marker org-clock-hd-marker)
+ ;; We are interrupting the clocking of a different task.
+ ;; Save a marker to this task, so that we can go back.
+ (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
(org-clock-mark-default-task))
-
+
;; Clock in at which position?
(setq target-pos
(if (and (eobp) (not (org-on-heading-p)))
--
1.6.6.rc0.54.gb073b
next reply other threads:[~2009-11-27 2:21 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-27 2:21 Bernt Hansen [this message]
2009-11-27 7:09 ` [PATCH] Stop generating superfluous clock entries Carsten Dominik
2009-11-28 16:07 ` [RFC/PATCH v3] " Bernt Hansen
2009-12-09 11:31 ` Bernt Hansen
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=1259288478-29642-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).