From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bastien <bzg@altern.org>
Subject: Re: [PATCH 1/2] Fix error with %e agenda prefix format when there is
 no effort set
Date: Fri, 22 Jul 2011 15:36:39 +0200
Message-ID: <87r55i1lp4.fsf@gnu.org>
References: <87ipqv5xga.wl%max@openchat.com>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([140.186.70.92]:44025)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bastienguerry@googlemail.com>) id 1QkFtr-0007EY-Ug
	for emacs-orgmode@gnu.org; Fri, 22 Jul 2011 09:36:20 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <bastienguerry@googlemail.com>) id 1QkFtq-0004Fu-Nb
	for emacs-orgmode@gnu.org; Fri, 22 Jul 2011 09:36:19 -0400
Received: from mail-wy0-f169.google.com ([74.125.82.169]:35822)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <bastienguerry@googlemail.com>) id 1QkFtq-0004Fq-GB
	for emacs-orgmode@gnu.org; Fri, 22 Jul 2011 09:36:18 -0400
Received: by wyg36 with SMTP id 36so1846425wyg.0
	for <emacs-orgmode@gnu.org>; Fri, 22 Jul 2011 06:36:17 -0700 (PDT)
In-Reply-To: <87ipqv5xga.wl%max@openchat.com> (Max Mikhanosha's message of
	"Thu, 21 Jul 2011 13:56:53 -0400")
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: </archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: Max Mikhanosha <max@openchat.com>
Cc: Org Mode List <emacs-orgmode@gnu.org>

Hi Max,

thanks for the patch.

Max Mikhanosha <max@openchat.com> writes:

> `org-agenda-prefix-format' has un undocumented format %e for Effort, which
> is broken. it throws error on entries without effort property.

Yep, right.

> Following patch fixes that problem. TODO: make agenda redraw current line
> when `org-agenda-set-effort' sets a new effort
>
> From c06b376737142eff5cdec71e8fc8129552aba673 Mon Sep 17 00:00:00 2001
> From: Max Mikhanosha <max@openchat.com>
> Date: Wed, 6 Jul 2011 20:05:06 -0400
> Subject: [PATCH 1/2] Fix error with %e agenda prefix format when there is no effort set
>
> ---
>  lisp/org-agenda.el |    5 ++++-
>  1 files changed, 4 insertions(+), 1 deletions(-)
>
> diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
> index cd09a74..f34ffae 100644
> --- a/lisp/org-agenda.el
> +++ b/lisp/org-agenda.el
> @@ -5511,7 +5511,9 @@ Any match of REMOVE-RE will be removed from TXT."
>  		(error nil)))
>  	(when effort
>  	  (setq neffort (org-duration-string-to-minutes effort)
> -		effort (setq effort (concat "[" effort "]" )))))
> +		effort (setq effort (concat "[" effort "]")))))
> +      ;; prevent erroring out with %e format when there is no effort
> +      (or effort (setq effort ""))
>  
>        (when remove-re
>  	(while (string-match remove-re txt)
> @@ -5549,6 +5551,7 @@ Any match of REMOVE-RE will be removed from TXT."
>  		 (>= (length category) org-prefix-category-max-length))
>  	    (setq category (substring category 0 (1- org-prefix-category-max-length)))))
>        ;; Evaluate the compiled format
> +      (assert effort)

Why is this needed?  

>        (setq rtn (concat (eval org-prefix-format-compiled) txt))
>  
>        ;; And finally add the text properties

Thanks,

-- 
 Bastien