From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bastien Guerry Subject: [Accepted] [O, 1/2] Allow setting default clocking task to current clocking task Date: Thu, 10 Mar 2011 10:21:03 +0100 (CET) Message-ID: <20110310092103.1A5256A42@myhost.localdomain> References: <1299721221-10196-2-git-send-email-bernt@norang.ca> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from [140.186.70.92] (port=38983 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pxc3f-0007ye-O4 for emacs-orgmode@gnu.org; Thu, 10 Mar 2011 04:21:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pxc3e-00066k-8l for emacs-orgmode@gnu.org; Thu, 10 Mar 2011 04:21:23 -0500 Received: from mail-wy0-f169.google.com ([74.125.82.169]:62903) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pxc3e-00066c-40 for emacs-orgmode@gnu.org; Thu, 10 Mar 2011 04:21:22 -0500 Received: by wyf19 with SMTP id 19so1488358wyf.0 for ; Thu, 10 Mar 2011 01:21:21 -0800 (PST) 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 Patch 668 (http://patchwork.newartisans.com/patch/668/) is now "Accepted". Maintainer comment: none This relates to the following submission: http://mid.gmane.org/%3C1299721221-10196-2-git-send-email-bernt%40norang.ca%3E Here is the original message containing the patch: > Content-Type: text/plain; charset="utf-8" > MIME-Version: 1.0 > Content-Transfer-Encoding: 7bit > Subject: [O,1/2] Allow setting default clocking task to current clocking task > Date: Thu, 10 Mar 2011 06:40:20 -0000 > From: Bernt Hansen > X-Patchwork-Id: 668 > Message-Id: <1299721221-10196-2-git-send-email-bernt@norang.ca> > To: emacs-orgmode@gnu.org > Cc: Bernt Hansen > > * lisp/org-clock.el (org-clock-in): Set default clocking task when already clocking the task > > The default clocking task can now be set to the current clocking task. > Previously this just threw an error stating the clock continues in the > current clocking task. The double prefix now forces setting the > default clocking task instead of forcing the user to clock out and > back in again just to set the default clocking task to the current > clocking task. > > --- > lisp/org-clock.el | 11 +++++++---- > 1 files changed, 7 insertions(+), 4 deletions(-) > > diff --git a/lisp/org-clock.el b/lisp/org-clock.el > index c0c6c82..693025a 100644 > --- a/lisp/org-clock.el > +++ b/lisp/org-clock.el > @@ -992,6 +992,7 @@ the clocking selection, associated with the letter `d'." > ts selected-task target-pos (msg-extra "") > (leftover (and (not org-clock-resolving-clocks) > org-clock-leftover-time))) > + > (when (and org-clock-auto-clock-resolution > (or (not interrupting) > (eq t org-clock-auto-clock-resolution)) > @@ -1000,11 +1001,17 @@ the clocking selection, associated with the letter `d'." > (setq org-clock-leftover-time nil) > (let ((org-clock-clocking-in t)) > (org-resolve-clocks))) ; check if any clocks are dangling > + > (when (equal select '(4)) > (setq selected-task (org-clock-select-task "Clock-in on task: ")) > (if selected-task > (setq selected-task (copy-marker selected-task)) > (error "Abort"))) > + > + (when (equal select '(16)) > + ;; Mark as default clocking task > + (org-clock-mark-default-task)) > + > (when interrupting > ;; We are interrupting the clocking of a different task. > ;; Save a marker to this task, so that we can go back. > @@ -1028,10 +1035,6 @@ the clocking selection, associated with the letter `d'." > (let ((org-clock-clocking-in t)) > (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))) >