tec/org-mode
tec/org-mode
1
0
Fork 0
forked from mirrors/org-mode
Code Pull requests Releases Activity

Revert "org-habit: Use org-today."

Browse source 
This reverts commit 1dcb374f48.
This commit is contained in:
Carsten Dominik 2010-12-04 00:23:30 +01:00
parent 238c815502
commit 8cdd4ff98a
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lisp/org-habit.el
View file

@ -197,7 +197,10 @@ 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 (if moment (time-to-days moment) (org-today)))
(now (time-to-days
(or moment
(time-subtract (current-time)
(list 0 (* 3600 org-extend-today-until) 0)))))
(scheduled (org-habit-scheduled habit))
(deadline (org-habit-deadline habit)))
;; add 10 for every day past the scheduled date, and subtract for every
@ -237,7 +240,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 (org-today))))
(m-days (or now-days (time-to-days (current-time)))))
(cond
((< m-days scheduled)
'(org-habit-clear-face . org-habit-clear-future-face))
@ -316,7 +319,8 @@ current time."
"Insert consistency graph for any habitual tasks."
(let ((inhibit-read-only t) l c
(buffer-invisibility-spec '(org-link))
(moment (days-to-time (org-today))))
(moment (time-subtract (current-time)
(list 0 (* 3600 org-extend-today-until) 0))))
(save-excursion
(goto-char (if line (point-at-bol) (point-min)))
(while (not (eobp))