[Accepted] [Orgmode] org-agenda: Fix category string for agenda

[Carsten Dominik]

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

Maintainer comment: Thanks for the perfect commit message.  One less I need to 
tweak.

This relates to the following submission:

http://mid.gmane.org/%3C87d3pkvtz8.fsf%40fastmail.fm%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 category string for agenda
> Date: Fri, 03 Dec 2010 00:37:54 -0000
> From: Matt Lundin <address@hidden>
> X-Patchwork-Id: 431
> Message-Id: <address@hidden>
> To: Org Mode <address@hidden>
> 
> * lisp/org-agenda.el: (org-format-agenda-item) The value of
> org-category is not converted to a string unless it is defined.
> 
> This fixes commit 3061c7083d8caa849cf2d3f2f53b8b71d45dd6de, which
> resulted in org-format-agenda-item always returning the symbol-name for
> org-category even if it was not defined. I.e., in some instances,
> org-format-agenda-item returned the string "nil", thus bypassing the
> buffer-file-name method of deriving the category.
> 
> ---
> lisp/org-agenda.el |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el
> index 48856c9..c339f60 100644
> --- a/lisp/org-agenda.el
> +++ b/lisp/org-agenda.el
> @@ -5097,7 +5097,7 @@ Any match of REMOVE-RE will be removed from TXT."
>      (let* ((category (or category
>                        (if (stringp org-category)
>                            org-category
> -                        (symbol-name org-category))
> +                        (and org-category (symbol-name org-category)))
>                        (if buffer-file-name
>                            (file-name-sans-extension
>                             (file-name-nondirectory buffer-file-name))
>