emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Bastien Guerry <bzg@altern.org>
To: emacs-orgmode@gnu.org
Subject: [Accepted] [O, 1/2] Allow setting default clocking task to current clocking task
Date: Thu, 10 Mar 2011 10:21:03 +0100 (CET)	[thread overview]
Message-ID: <20110310092103.1A5256A42@myhost.localdomain> (raw)
In-Reply-To: 1299721221-10196-2-git-send-email-bernt@norang.ca

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 <bernt@norang.ca>
> X-Patchwork-Id: 668
> Message-Id: <1299721221-10196-2-git-send-email-bernt@norang.ca>
> To: emacs-orgmode@gnu.org
> Cc: Bernt Hansen <bernt@norang.ca>
> 
> * 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)))
> 

  reply	other threads:[~2011-03-10  9:21 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-10  1:40 [PATCH 0/2] Clocking fixes Bernt Hansen
2011-03-10  1:40 ` [PATCH 1/2] Allow setting default clocking task to current clocking task Bernt Hansen
2011-03-10  9:21   ` Bastien Guerry [this message]
2011-03-10  1:40 ` [PATCH 2/2] Allow clocking in new tasks inserted before the " Bernt Hansen
2011-03-10  9:21   ` [Accepted] [O, " Bastien Guerry
2011-03-10  9:36 ` [PATCH 0/2] Clocking fixes Bastien
2011-03-10 13:11   ` 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=20110310092103.1A5256A42@myhost.localdomain \
    --to=bzg@altern.org \
    --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).