Patch 418 (http://patchwork.newartisans.com/patch/418/) is now "Accepted".
Maintainer comment: No comment This relates to the following submission: http://mid.gmane.org/%3C1291040314-1884-2-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,2/4] org-habit: Use org-today. > Date: Mon, 29 Nov 2010 19:18:32 -0000 > From: Julien Danjou <jul...@danjou.info> > X-Patchwork-Id: 418 > Message-Id: <1291040314-1884-2-git-send-email-jul...@danjou.info> > To: emacs-orgmode@gnu.org > Cc: Julien Danjou <jul...@danjou.info> > > * org-habit.el: Use org-today. > > Signed-off-by: Julien Danjou <jul...@danjou.info> > > --- > 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)) > _______________________________________________ Emacs-orgmode mailing list Please use `Reply All' to send replies to the list. Emacs-orgmode@gnu.org http://lists.gnu.org/mailman/listinfo/emacs-orgmode
