From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bernt Hansen Subject: Re: [RFC/PATCH v3] Stop generating superfluous clock entries Date: Wed, 09 Dec 2009 06:31:02 -0500 Message-ID: <87iqcg1j0p.fsf@gollum.intra.norang.ca> References: <1259424434-332-1-git-send-email-bernt@norang.ca> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1NIKlF-0000on-Vh for emacs-orgmode@gnu.org; Wed, 09 Dec 2009 06:31:14 -0500 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1NIKlC-0000oH-6F for emacs-orgmode@gnu.org; Wed, 09 Dec 2009 06:31:13 -0500 Received: from [199.232.76.173] (port=60083 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1NIKlB-0000oE-W6 for emacs-orgmode@gnu.org; Wed, 09 Dec 2009 06:31:10 -0500 Received: from mho-01-ewr.mailhop.org ([204.13.248.71]:56824) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1NIKlB-0005U1-GH for emacs-orgmode@gnu.org; Wed, 09 Dec 2009 06:31:09 -0500 In-Reply-To: <1259424434-332-1-git-send-email-bernt@norang.ca> (Bernt Hansen's message of "Sat\, 28 Nov 2009 11\:07\:14 -0500") List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org Cc: Carsten Dominik Bernt Hansen writes: > From: Carsten Dominik > > 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. > I've added the following patch on top of this one for my work flow. It allows clocking in the same task and to update the modeline task name and effort values. I've been using both of these patches for a week with no problems. Both patches are available at git://git.norang.ca/org-mode clock-in --8<---------------cut here---------------start------------->8--- >From 8f62f61aab3c1940b2a4e0fb73562d900568463c Mon Sep 17 00:00:00 2001 From: Bernt Hansen Date: Wed, 2 Dec 2009 11:40:42 -0500 Subject: [PATCH] Update modeline with effort and task name on re-clock-in Skip clocking out when we are clocking in the same task that is currently clocking but go through the normal clock-in setup so a modified task name or effort property is updated in the modeline. --- lisp/org-clock.el | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 2d625ae..c13f4dd 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -857,7 +857,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! - (when (save-excursion + (if (save-excursion (unless selected-task (org-back-to-heading t)) (and (equal (marker-buffer org-clock-hd-marker) @@ -868,12 +868,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) - (throw 'abort nil)) - (move-marker org-clock-interrupted-task - (marker-position org-clock-marker) - (marker-buffer org-clock-marker)) - (org-clock-out t)) + (message "Clock continues in \"%s\"" org-clock-heading) + (progn + (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.6.6.rc1.39.g9a42 --8<---------------cut here---------------end--------------->8---