[PATCH] org-agenda: fix org-agenda-category-icon-alist defcustom type

[PATCH] org-agenda: fix org-agenda-category-icon-alist defcustom type

[Julien Danjou]

* list/org-agenda.el (org-agenda-category-icon-alist): Fix defcustom
  type.

Signed-off-by: Julien Danjou <julien@danjou.info>
---
 lisp/org-agenda.el |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
index 9dbda4d..68aaa86 100644
--- a/lisp/org-agenda.el
+++ b/lisp/org-agenda.el
@@ -1463,14 +1463,13 @@ category, you can use:
 
   (\"Emacs\" '(space . (:width (16))))"
   :group 'org-agenda-line-format
-  :type '(list :tag "Category icons"
-	       (repeat
-		(list
-		 (string :tag "Category regexp")
-		 (string :tag "File or data")
-		 (string :tag "Type")
-		 (boolean :tag "Data?")
-		 (list :tag "Properties")))))
+  :type '(alist :key-type (string :tag "Regexp matching category")
+		:value-type (choice (list :tag "Icon"
+					  (string :tag "File or data")
+					  (symbol :tag "Type")
+					  (boolean :tag "Data?")
+					  (repeat :tag "Extra image properties" :inline t symbol))
+				    (list :tag "Display properties" sexp))))
 
 (defgroup org-agenda-column-view nil
   "Options concerning column view in the agenda."
-- 
1.7.2.3

[Accepted] org-agenda: fix org-agenda-category-icon-alist defcustom type

[Bastien Guerry]

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

Maintainer comment: none

This relates to the following submission:

http://mid.gmane.org/%3C1288968225-10023-1-git-send-email-julien%40danjou.info%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: [Orgmode] org-agenda: fix org-agenda-category-icon-alist defcustom
> 	type
> Date: Fri, 05 Nov 2010 19:43:45 -0000
> From: Julien Danjou <julien@danjou.info>
> X-Patchwork-Id: 364
> Message-Id: <1288968225-10023-1-git-send-email-julien@danjou.info>
> To: emacs-orgmode@gnu.org
> Cc: Julien Danjou <julien@danjou.info>
> 
> * list/org-agenda.el (org-agenda-category-icon-alist): Fix defcustom
>   type.
> 
> Signed-off-by: Julien Danjou <julien@danjou.info>
> 
> ---
> lisp/org-agenda.el |   15 +++++++--------
>  1 files changed, 7 insertions(+), 8 deletions(-)
> 
> diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
> index 9dbda4d..68aaa86 100644
> --- a/lisp/org-agenda.el
> +++ b/lisp/org-agenda.el
> @@ -1463,14 +1463,13 @@ category, you can use:
>  
>    (\"Emacs\" '(space . (:width (16))))"
>    :group 'org-agenda-line-format
> -  :type '(list :tag "Category icons"
> -	       (repeat
> -		(list
> -		 (string :tag "Category regexp")
> -		 (string :tag "File or data")
> -		 (string :tag "Type")
> -		 (boolean :tag "Data?")
> -		 (list :tag "Properties")))))
> +  :type '(alist :key-type (string :tag "Regexp matching category")
> +		:value-type (choice (list :tag "Icon"
> +					  (string :tag "File or data")
> +					  (symbol :tag "Type")
> +					  (boolean :tag "Data?")
> +					  (repeat :tag "Extra image properties" :inline t symbol))
> +				    (list :tag "Display properties" sexp))))
>  
>  (defgroup org-agenda-column-view nil
>    "Options concerning column view in the agenda."
> 

Re: [Accepted] org-agenda: fix org-agenda-category-icon-alist defcustom type

[Julien Danjou]

On Fri, Nov 05 2010, Bastien Guerry wrote:

Thanks.

Clearly this patch works fine, but it's probably not as good as it could
be. I suck at defcustom, so if anyone can do a better job on the
properties part, please go ahead.

-- 
Julien Danjou
// ᐰ <julien@danjou.info>   http://julien.danjou.info