From mboxrd@z Thu Jan  1 00:00:00 1970
From: Carsten Dominik <cdominik@newartisans.com>
Subject: [Accepted] org-agenda: return multiple results when sexp return a
 string with "; "
Date: Thu,  4 Nov 2010 13:06:03 +0100 (CET)
Message-ID: <20101104120603.09F7D8460E4@u016822.science.uva.nl>
References: <1288805538-13133-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=34947 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PDyZx-0001l1-CN
	for emacs-orgmode@gnu.org; Thu, 04 Nov 2010 08:06:06 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <cdominik@newartisans.com>) id 1PDyZv-0001MI-O5
	for emacs-orgmode@gnu.org; Thu, 04 Nov 2010 08:06:05 -0400
Received: from u016822.science.uva.nl ([146.50.39.34]:57298)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <cdominik@newartisans.com>) id 1PDyZv-0001MB-Dn
	for emacs-orgmode@gnu.org; Thu, 04 Nov 2010 08:06:03 -0400
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 358 (http://patchwork.newartisans.com/patch/358/) is now "Accepted".

Maintainer comment: none

This relates to the following submission:

http://mid.gmane.org/%3C1288805538-13133-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: return multiple results when sexp return a
> 	string with "; "
> Date: Wed, 03 Nov 2010 22:32:18 -0000
> From: Julien Danjou <julien@danjou.info>
> X-Patchwork-Id: 358
> Message-Id: <1288805538-13133-1-git-send-email-julien@danjou.info>
> To: emacs-orgmode@gnu.org
> Cc: Julien Danjou <julien@danjou.info>
> 
> When evaluating my %%(org-calendar-holidays) on October 31st, I got a
> line like:
> 
> "Halloween; Daylight Saving Time Ends 3:00am (CEST)"
> 
> And it displays in calendar:
> 3:00 .... Halloween; Daylight Saving Time Ends (CEST)
> 
> This is wrong since Halloween is all day, not only at 3:00.
> 
> Splitting results on "; " allows to have an independant entry on each
> event and displays things correctly.
> 
> Signed-off-by: Julien Danjou <julien@danjou.info>
> 
> ---
> lisp/org.el |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/lisp/org.el b/lisp/org.el
> index cb99712..effe9b2 100644
> --- a/lisp/org.el
> +++ b/lisp/org.el
> @@ -15025,7 +15025,7 @@ D may be an absolute day number, or a calendar-type list (month day year)."
>  			      (org-current-line)
>  			      (buffer-file-name) sexp)
>                       (sleep-for 2))))))
> -    (cond ((stringp result) result)
> +    (cond ((stringp result) (split-string result "; "))
>  	  ((and (consp result)
>  		(not (consp (cdr result)))
>  		(stringp (cdr result))) (cdr result))
>