[PATCH] Fix clock-in with effort and percent complete cookie

[PATCH] Fix clock-in with effort and percent complete cookie

[Bernt Hansen]

Fixes Lisp error: (error "Not enough arguments for format string") when the
task to be clocked in has both a % in the heading due to the [%] cookie and an effort.
---

I had a task "Update environment [90%]" that triggered this error when it
contained an effort estimate.  This commit is available at
git://git.norang.ca/org-mode for-carsten

 lisp/org-clock.el |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 6e895bf..e3866be 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -405,8 +405,8 @@ pointing to it."
   "Number of seconds between mode line clock string updates.")
 
 (defun org-clock-get-clock-string ()
-  "Form a clock-string, that will be show in the mode line.
-If an effort estimate was defined for current item, use
+  "Form a clock-string, that will be shown in the mode line.
+If an effort estimate was defined for the current item, use
 01:30/01:50 format (clocked/estimated).
 If not, show simply the clocked time like 01:50."
   (let* ((clocked-time (org-clock-get-clocked-time))
@@ -425,7 +425,7 @@ If not, show simply the clocked time like 01:50."
 	       (effort-str (format org-time-clocksum-format effort-h effort-m))
 	       (clockstr (org-propertize
 			  (concat  "[%s/" effort-str
-				   "] (" org-clock-heading ")")
+				   "] (" (replace-regexp-in-string "%" "%%" org-clock-heading) ")")
 			  'face 'org-mode-line-clock)))
 	  (format clockstr work-done-str))
       (org-propertize (format
-- 
1.7.0.14.g7e948

Re: [PATCH] Fix clock-in with effort and percent complete cookie

[Carsten Dominik]

Applied, thanks.

- Carsten
On Feb 20, 2010, at 5:47 PM, Bernt Hansen wrote:

> Fixes Lisp error: (error "Not enough arguments for format string")  
> when the
> task to be clocked in has both a % in the heading due to the [%]  
> cookie and an effort.
> ---
>
> I had a task "Update environment [90%]" that triggered this error  
> when it
> contained an effort estimate.  This commit is available at
> git://git.norang.ca/org-mode for-carsten
>
> lisp/org-clock.el |    6 +++---
> 1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/lisp/org-clock.el b/lisp/org-clock.el
> index 6e895bf..e3866be 100644
> --- a/lisp/org-clock.el
> +++ b/lisp/org-clock.el
> @@ -405,8 +405,8 @@ pointing to it."
>   "Number of seconds between mode line clock string updates.")
>
> (defun org-clock-get-clock-string ()
> -  "Form a clock-string, that will be show in the mode line.
> -If an effort estimate was defined for current item, use
> +  "Form a clock-string, that will be shown in the mode line.
> +If an effort estimate was defined for the current item, use
> 01:30/01:50 format (clocked/estimated).
> If not, show simply the clocked time like 01:50."
>   (let* ((clocked-time (org-clock-get-clocked-time))
> @@ -425,7 +425,7 @@ If not, show simply the clocked time like 01:50."
> 	       (effort-str (format org-time-clocksum-format effort-h effort- 
> m))
> 	       (clockstr (org-propertize
> 			  (concat  "[%s/" effort-str
> -				   "] (" org-clock-heading ")")
> +				   "] (" (replace-regexp-in-string "%" "%%" org-clock-heading)  
> ")")
> 			  'face 'org-mode-line-clock)))
> 	  (format clockstr work-done-str))
>       (org-propertize (format
> -- 
> 1.7.0.14.g7e948
>
>
>
> _______________________________________________
> Emacs-orgmode mailing list
> Please use `Reply All' to send replies to the list.
> Emacs-orgmode@gnu.org
> http://lists.gnu.org/mailman/listinfo/emacs-orgmode

- Carsten