From mboxrd@z Thu Jan  1 00:00:00 1970
From: Carsten Dominik <cdominik@newartisans.com>
Subject: [Accepted] org-agenda: convert category to string
Date: Mon, 29 Nov 2010 10:23:51 +0100 (CET)
Message-ID: <20101129092351.33683883AE0@u016822.science.uva.nl>
References: <1290628932-6922-1-git-send-email-julien@danjou.info>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from [140.186.70.92] (port=47299 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PMzxk-000219-EH
	for emacs-orgmode@gnu.org; Mon, 29 Nov 2010 04:23:57 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <cdominik@newartisans.com>) id 1PMzxi-0007ur-Gu
	for emacs-orgmode@gnu.org; Mon, 29 Nov 2010 04:23:56 -0500
Received: from u016822.science.uva.nl ([146.50.39.34]:60754)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <cdominik@newartisans.com>) id 1PMzxi-0007sr-9v
	for emacs-orgmode@gnu.org; Mon, 29 Nov 2010 04:23:54 -0500
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: emacs-orgmode@gnu.org

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

Maintainer comment: none

This relates to the following submission:

http://mid.gmane.org/%3C1290628932-6922-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: convert category to string
> Date: Thu, 25 Nov 2010 01:02:12 -0000
> From: Julien Danjou <julien@danjou.info>
> X-Patchwork-Id: 406
> Message-Id: <1290628932-6922-1-git-send-email-julien@danjou.info>
> To: emacs-orgmode@gnu.org
> Cc: Julien Danjou <julien@danjou.info>
> 
> * org-agenda.el (org-format-agenda-item): Convert category to a string
> if it is a symbol. This fixes the following call to
> org-agenda-get-category-icon which fails if category is not a string.
> 
> Signed-off-by: Julien Danjou <julien@danjou.info>
> 
> ---
> lisp/org-agenda.el |    4 +++-
>  1 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
> index a248068..638629d 100644
> --- a/lisp/org-agenda.el
> +++ b/lisp/org-agenda.el
> @@ -5044,7 +5044,9 @@ Any match of REMOVE-RE will be removed from TXT."
>  	       org-agenda-show-inherited-tags
>  	       org-agenda-hide-tags-regexp))
>      (let* ((category (or category
> -			 org-category
> +			 (if (stringp org-category)
> +			     org-category
> +			   (symbol-name org-category))
>  			 (if buffer-file-name
>  			     (file-name-sans-extension
>  			      (file-name-nondirectory buffer-file-name))
>