[PATCH] Fixing when org-clock-in-prepare-hook is called

[PATCH] Fixing when org-clock-in-prepare-hook is called

[Myles English]

From d7c3f0a4611ced0a240af9115f29f888beb60af2 Mon Sep 17 00:00:00 2001
From: Myles English <mylesenglish@gmail.com>
Date: Fri, 26 Oct 2012 12:38:09 +0100
Subject: [PATCH] Clocking: Move to task before calling
 org-clock-in-prepare-hook

* lisp/org-clock.el (org-clock-in): Moved the call to
org-clock-in-prepare-hook until the task's properties
can be accessed.

The problem was when using a function to add an effort
property via the hook, it would not recognise an existing
effort property when called with the prefix (C-u C-c C-x C-i)
with the point at a place other than at the task.

TINYCHANGE
---
 lisp/org-clock.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index e5488e4..84eb2fd 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -1149,7 +1149,6 @@ make this the default behavior.)"
 	    (if (and (eobp) (not (org-at-heading-p)))
 		(point-at-bol 0)
 	      (point)))
-      (run-hooks 'org-clock-in-prepare-hook)
       (save-excursion
 	(when (and selected-task (marker-buffer selected-task))
 	  ;; There is a selected task, move to the correct buffer
@@ -1168,6 +1167,7 @@ make this the default behavior.)"
 	      ;; beginning of the heading, since the
 	      ;; user is liking to insert stuff here
 	      ;; manually
+	      (run-hooks 'org-clock-in-prepare-hook)
 	      (org-clock-history-push))
 	    (org-clock-set-current)
 	    (cond ((functionp org-clock-in-switch-to-state)
-- 
1.8.0

Re: [PATCH] Fixing when org-clock-in-prepare-hook is called

[Sebastien Vauban]

Hello Myles,

"Myles English" wrote:
> From d7c3f0a4611ced0a240af9115f29f888beb60af2 Mon Sep 17 00:00:00 2001
> From: Myles English <mylesenglish-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> Date: Fri, 26 Oct 2012 12:38:09 +0100
> Subject: [PATCH] Clocking: Move to task before calling
>  org-clock-in-prepare-hook
>
> * lisp/org-clock.el (org-clock-in): Moved the call to
> org-clock-in-prepare-hook until the task's properties
> can be accessed.
>
> The problem was when using a function to add an effort
> property via the hook, it would not recognise an existing
> effort property when called with the prefix (C-u C-c C-x C-i)
> with the point at a place other than at the task.
>
> TINYCHANGE
> ---
>  lisp/org-clock.el | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/lisp/org-clock.el b/lisp/org-clock.el
> index e5488e4..84eb2fd 100644
> --- a/lisp/org-clock.el
> +++ b/lisp/org-clock.el
> @@ -1149,7 +1149,6 @@ make this the default behavior.)"
>  	    (if (and (eobp) (not (org-at-heading-p)))
>  		(point-at-bol 0)
>  	      (point)))
> -      (run-hooks 'org-clock-in-prepare-hook)
>        (save-excursion
>  	(when (and selected-task (marker-buffer selected-task))
>  	  ;; There is a selected task, move to the correct buffer
> @@ -1168,6 +1167,7 @@ make this the default behavior.)"
>  	      ;; beginning of the heading, since the
>  	      ;; user is liking to insert stuff here
>  	      ;; manually
> +	      (run-hooks 'org-clock-in-prepare-hook)
>  	      (org-clock-history-push))
>  	    (org-clock-set-current)
>  	    (cond ((functionp org-clock-in-switch-to-state)

That hits me for months...

Tested your patch: the promised behavior does work as expected. Thanks!

Best regards,
  Seb

--
Sebastien Vauban

Re: [PATCH] Fixing when org-clock-in-prepare-hook is called

[Bastien]

Hi Myles,

"Myles English" <mylesenglish@gmail.com> writes:

> * lisp/org-clock.el (org-clock-in): Moved the call to
> org-clock-in-prepare-hook until the task's properties
> can be accessed.
>
> The problem was when using a function to add an effort
> property via the hook, it would not recognise an existing
> effort property when called with the prefix (C-u C-c C-x C-i)
> with the point at a place other than at the task.

Applied, thanks a lot.

-- 
 Bastien