emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed

From: David Maus <dmaus@ictsoc.de>
To: emacs-orgmode@gnu.org
Subject: [Accepted] Fix J in agenda when clock out hook clocks in again
Date: Sun, 12 Feb 2012 19:48:27 +0100 (CET)	[thread overview]
Message-ID: <20120212184827.380DED45@w500.ictsoc.de> (raw)
In-Reply-To: 1328809420-31933-1-git-send-email-bernt@norang.ca

Patch 1160 (http://patchwork.newartisans.com/patch/1160/) is now "Accepted".

Maintainer comment: none

This relates to the following submission:

http://mid.gmane.org/%3C1328809420-31933-1-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] Fix J in agenda when clock out hook clocks in again
> Date: Thu, 09 Feb 2012 22:43:40 -0000
> From: Bernt Hansen <bernt@norang.ca>
> X-Patchwork-Id: 1160
> Message-Id: <1328809420-31933-1-git-send-email-bernt@norang.ca>
> To: emacs-orgmode@gnu.org
> Cc: Bernt Hansen <bernt@norang.ca>
> 
> * org-clock.el (org-clock-out): Do not delete the current clocking task
> when org-clock-out-hook clocks in another task
> 
> My clock out hook keeps the clock running by automatically clocking in
> a new task (the parent task, or the default task).  This sets a new
> clocking task which was then clobbered at the end of org-clock-out
> so that J in the agenda would return
> 
>     "No running clock, use `C-c C-x C-j' to jump to the most recent one"
> 
> We now detect that another task is clocked in and skip clearing the
> org-clock-current-task variable used by the agenda to determine if
> the clock is currently running.
> 
> ---
> lisp/org-clock.el |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/lisp/org-clock.el b/lisp/org-clock.el
> index a1df776..7dff094 100644
> --- a/lisp/org-clock.el
> +++ b/lisp/org-clock.el
> @@ -1387,7 +1387,8 @@ If there is no running clock, throw an error, unless FAIL-QUIETLY is set."
>  	  (message (concat "Clock stopped at %s after HH:MM = " org-time-clocksum-format "%s") te h m
>  		   (if remove " => LINE REMOVED" ""))
>            (run-hooks 'org-clock-out-hook)
> -	  (org-clock-delete-current))))))
> +	  (unless (org-clocking-p)
> +	    (org-clock-delete-current)))))))
>  
>  (add-hook 'org-clock-out-hook 'org-clock-remove-empty-clock-drawer)
>  
> 

     prev parent reply	other threads:[~2012-02-12 18:48 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-09 17:43 [PATCH] Fix J in agenda when clock out hook clocks in again Bernt Hansen
2012-02-12 18:48 ` David Maus [this message]

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=20120212184827.380DED45@w500.ictsoc.de \
    --to=dmaus@ictsoc.de \
    --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

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).