From mboxrd@z Thu Jan  1 00:00:00 1970
From: Carsten Dominik <cdominik@newartisans.com>
Subject: [Accepted] [Orgmode,3/4] org-capture: use org-today
Date: Wed,  1 Dec 2010 00:50:15 +0100 (CET)
Message-ID: <20101130235015.8D49A79635F@carsten-dominiks-macbook-pro.local>
References: <1291040314-1884-3-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=52006 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PO9eH-0001gL-Uu
	for emacs-orgmode@gnu.org; Thu, 02 Dec 2010 08:58:29 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <cdominik@newartisans.com>) id 1PO9cN-0004bX-AV
	for emacs-orgmode@gnu.org; Thu, 02 Dec 2010 08:56:32 -0500
Received: from ehef114.hef.ru.nl ([131.174.192.114]:54008)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <cdominik@newartisans.com>) id 1PO9cM-0004SC-Tu
	for emacs-orgmode@gnu.org; Thu, 02 Dec 2010 08:54:39 -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 419 (http://patchwork.newartisans.com/patch/419/) is now "Accepted".

Maintainer comment: No comment

This relates to the following submission:

http://mid.gmane.org/%3C1291040314-1884-3-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,3/4] org-capture: use org-today
> Date: Mon, 29 Nov 2010 19:18:33 -0000
> From: Julien Danjou <julien@danjou.info>
> X-Patchwork-Id: 419
> Message-Id: <1291040314-1884-3-git-send-email-julien@danjou.info>
> To: emacs-orgmode@gnu.org
> Cc: Julien Danjou <julien@danjou.info>
> 
> * org-capture.el: Use org-today.
> 
> Signed-off-by: Julien Danjou <julien@danjou.info>
> 
> ---
> lisp/org-capture.el |    9 ++-------
>  1 files changed, 2 insertions(+), 7 deletions(-)
> 
> diff --git a/lisp/org-capture.el b/lisp/org-capture.el
> index a5c6a4d..7d0f1ac 100644
> --- a/lisp/org-capture.el
> +++ b/lisp/org-capture.el
> @@ -671,15 +671,10 @@ already gone."
>  	    ;; prompt for date
>  	    (time-to-days (org-read-date 
>  			   nil t nil "Date for tree entry:"
> -			   (time-subtract (current-time)
> -					  (list 0 (* 3600 
> -						     org-extend-today-until)
> -						0)))))
> +			   (days-to-time (org-today)))))
>  	   (t
>  	    ;; current date, possible corrected for late night workers
> -	    (time-to-days
> -	     (time-subtract (current-time)
> -			    (list 0 (* 3600 org-extend-today-until) 0))))))))
> +	    (org-today))))))
>         
>         ((eq (car target) 'file+function)
>  	(set-buffer (org-capture-target-buffer (nth 1 target)))
>