From mboxrd@z Thu Jan  1 00:00:00 1970
From: Carsten Dominik <cdominik@newartisans.com>
Subject: [Accepted] [Orgmode, 4/4] org: use org-today in habits auto repeat
Date: Wed,  1 Dec 2010 00:49:22 +0100 (CET)
Message-ID: <20101130234922.293CF79628B@carsten-dominiks-macbook-pro.local>
References: <1291040314-1884-4-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=51901 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1PO9eO-0001cn-F6
	for emacs-orgmode@gnu.org; Thu, 02 Dec 2010 08:58:42 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <cdominik@newartisans.com>) id 1PO9cN-0004bQ-9r
	for emacs-orgmode@gnu.org; Thu, 02 Dec 2010 08:56:30 -0500
Received: from ehef114.hef.ru.nl ([131.174.192.114]:54006)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <cdominik@newartisans.com>) id 1PO9cM-0004SE-Ts
	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 417 (http://patchwork.newartisans.com/patch/417/) is now "Accepted".

Maintainer comment: No comment

This relates to the following submission:

http://mid.gmane.org/%3C1291040314-1884-4-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,4/4] org: use org-today in habits auto repeat
> Date: Mon, 29 Nov 2010 19:18:34 -0000
> From: Julien Danjou <julien@danjou.info>
> X-Patchwork-Id: 417
> Message-Id: <1291040314-1884-4-git-send-email-julien@danjou.info>
> To: emacs-orgmode@gnu.org
> Cc: Julien Danjou <julien@danjou.info>
> 
> * org.el (org-auto-repeat-maybe): Use org-today.
> 
> Signed-off-by: Julien Danjou <julien@danjou.info>
> 
> ---
> lisp/org.el |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/lisp/org.el b/lisp/org.el
> index 6c4c433..7a76559 100644
> --- a/lisp/org.el
> +++ b/lisp/org.el
> @@ -11393,13 +11393,13 @@ This function is run automatically after each state change to a DONE state."
>  	     ((equal (match-string 1 ts) ".")
>  	      ;; Shift starting date to today
>  	      (org-timestamp-change
> -	       (- (time-to-days (current-time)) (time-to-days time))
> +	       (- (org-today) (time-to-days time))
>  	       'day))
>  	     ((equal (match-string 1 ts) "+")
>  	      (let ((nshiftmax 10) (nshift 0))
>  		(while (or (= nshift 0)
>  			   (<= (time-to-days time)
> -			       (time-to-days (current-time))))
> +			       (org-today)))
>  		  (when (= (incf nshift) nshiftmax)
>  		    (or (y-or-n-p (message "%d repeater intervals were not enough to shift date past today.  Continue? " nshift))
>  			(error "Abort")))
>