From mboxrd@z Thu Jan  1 00:00:00 1970
From: Carsten Dominik <cdominik@newartisans.com>
Subject: [Accepted] org-agenda: Fix category string for agenda
Date: Fri,  3 Dec 2010 09:14:20 +0100 (CET)
Message-ID: <20101203081420.44BC98934EB@u016822.science.uva.nl>
References: <87d3pkvtz8.fsf@fastmail.fm>
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=40658 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1POQme-000891-Mc
	for emacs-orgmode@gnu.org; Fri, 03 Dec 2010 03:14:25 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <cdominik@newartisans.com>) id 1POQmd-0003I0-IC
	for emacs-orgmode@gnu.org; Fri, 03 Dec 2010 03:14:24 -0500
Received: from u016822.science.uva.nl ([146.50.39.34]:49375)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <cdominik@newartisans.com>) id 1POQmd-0003Hg-77
	for emacs-orgmode@gnu.org; Fri, 03 Dec 2010 03:14:23 -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 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 <mdl@imapmail.org>
> X-Patchwork-Id: 431
> Message-Id: <87d3pkvtz8.fsf@fastmail.fm>
> To: Org Mode <emacs-orgmode@gnu.org>
> 
> * 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))
>