From: Julien Danjou <julien@danjou.info>
To: emacs-orgmode@gnu.org
Cc: Julien Danjou <julien@danjou.info>
Subject: [PATCH 2/4] org-habit: Use org-today.
Date: Mon, 29 Nov 2010 15:18:32 +0100 [thread overview]
Message-ID: <1291040314-1884-2-git-send-email-julien@danjou.info> (raw)
In-Reply-To: <1291040314-1884-1-git-send-email-julien@danjou.info>
* org-habit.el: Use org-today.
Signed-off-by: Julien Danjou <julien@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))
--
1.7.2.3
next prev parent reply other threads:[~2010-11-29 14:18 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-29 14:18 [PATCH 1/4] Rename org-agenda-today to org-today Julien Danjou
2010-11-29 14:18 ` Julien Danjou [this message]
2010-11-30 23:49 ` [Accepted] [Orgmode,2/4] org-habit: Use org-today Carsten Dominik
2010-11-29 14:18 ` [PATCH 3/4] org-capture: use org-today Julien Danjou
2010-11-30 23:50 ` [Accepted] [Orgmode,3/4] " Carsten Dominik
2010-11-29 14:18 ` [PATCH 4/4] org: use org-today in habits auto repeat Julien Danjou
2010-11-30 23:49 ` [Accepted] [Orgmode, " Carsten Dominik
2010-11-30 6:27 ` [PATCH 1/4] Rename org-agenda-today to org-today Carsten Dominik
2010-11-30 9:06 ` Julien Danjou
2010-11-30 23:50 ` Carsten Dominik
2010-12-01 13:26 ` Bernt Hansen
2010-11-30 23:48 ` [Accepted] [Orgmode, " Carsten Dominik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1291040314-1884-2-git-send-email-julien@danjou.info \
--to=julien@danjou.info \
--cc=emacs-orgmode@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).