From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Danjou Subject: [PATCH 2/4] org-habit: Use org-today. Date: Mon, 29 Nov 2010 15:18:32 +0100 Message-ID: <1291040314-1884-2-git-send-email-julien@danjou.info> References: <1291040314-1884-1-git-send-email-julien@danjou.info> Return-path: Received: from [140.186.70.92] (port=55134 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PN4Yx-0007hW-6G for emacs-orgmode@gnu.org; Mon, 29 Nov 2010 09:18:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PN4Yv-0008NG-As for emacs-orgmode@gnu.org; Mon, 29 Nov 2010 09:18:39 -0500 Received: from coquelicot-s.easter-eggs.com ([213.215.37.94]:45885) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PN4Yv-0008Mv-5y for emacs-orgmode@gnu.org; Mon, 29 Nov 2010 09:18:37 -0500 In-Reply-To: <1291040314-1884-1-git-send-email-julien@danjou.info> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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 Cc: Julien Danjou * org-habit.el: Use org-today. Signed-off-by: Julien Danjou --- lisp/org-habit.el | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lisp/org-habit.el b/lisp/org-habit.el index 394b4fb..04a2328 100644 --- a/lisp/org-habit.el +++ b/lisp/org-habit.el @@ -197,10 +197,7 @@ This list represents a \"habit\" for the rest of this module." "Determine the relative priority of a habit. This must take into account not just urgency, but consistency as well." (let ((pri 1000) - (now (time-to-days - (or moment - (time-subtract (current-time) - (list 0 (* 3600 org-extend-today-until) 0))))) + (now (if moment (time-to-days moment) (org-today))) (scheduled (org-habit-scheduled habit)) (deadline (org-habit-deadline habit))) ;; add 10 for every day past the scheduled date, and subtract for every @@ -240,7 +237,7 @@ Habits are assigned colors on the following basis: (deadline (if scheduled-days (+ scheduled-days (- d-repeat s-repeat)) (org-habit-deadline habit))) - (m-days (or now-days (time-to-days (current-time))))) + (m-days (or now-days (org-today)))) (cond ((< m-days scheduled) '(org-habit-clear-face . org-habit-clear-future-face)) @@ -319,8 +316,7 @@ current time." "Insert consistency graph for any habitual tasks." (let ((inhibit-read-only t) l c (buffer-invisibility-spec '(org-link)) - (moment (time-subtract (current-time) - (list 0 (* 3600 org-extend-today-until) 0)))) + (moment (days-to-time (org-today)))) (save-excursion (goto-char (if line (point-at-bol) (point-min))) (while (not (eobp)) -- 1.7.2.3