From: Bernt Hansen <bernt@norang.ca>
To: emacs-orgmode@gnu.org
Cc: Carsten Dominik <carsten.dominik@gmail.com>
Subject: [RFC/PATCH v3] Stop generating superfluous clock entries
Date: Sat, 28 Nov 2009 11:07:14 -0500 [thread overview]
Message-ID: <1259424434-332-1-git-send-email-bernt@norang.ca> (raw)
In-Reply-To: <C2F01D3B-497A-4856-9DF0-C434F6AAD20F@gmail.com>
From: Carsten Dominik <carsten.dominik@gmail.com>
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.
---
Carsten,
I think this patch works but I want to let it cook for a week or so before
committing it in master. The previous patches had issues clocking in with a
prefix when not in an org-mode buffer.
I've squashed the previous two reverted commits into this patch and added a
check to prevent org-back-to-heading if we are using a selected task.
There is also some whitespace cleanup at the bottom.
This makes C-u C-c C-x C-i work in the agenda and non-org-mode buffers again.
lisp/org-clock.el | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index f598cc3..b79e66e 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -850,15 +850,29 @@ the clocking selection, associated with the letter `d'."
(when interrupting
;; 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!
+ (when (save-excursion
+ (unless selected-task
+ (org-back-to-heading t))
+ (and (equal (marker-buffer org-clock-hd-marker)
+ (if selected-task
+ (marker-buffer selected-task)
+ (current-buffer)))
+ (= (marker-position org-clock-hd-marker)
+ (if selected-task
+ (marker-position selected-task)
+ (point)))))
+ (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
(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.61.g41d5b
next prev parent reply other threads:[~2009-11-28 16:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-27 2:21 [PATCH] Stop generating superfluous clock entries Bernt Hansen
2009-11-27 7:09 ` Carsten Dominik
2009-11-28 16:07 ` Bernt Hansen [this message]
2009-12-09 11:31 ` [RFC/PATCH v3] " 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=1259424434-332-1-git-send-email-bernt@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).