diff options
| author | Bastien Guerry <bzg@altern.org> | 2013-02-12 17:31:37 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2013-02-12 17:31:37 +0100 |
| commit | d38f79be97c0873df661c6741de7d0796a756c16 (patch) | |
| tree | 1129d7f57cbef953724474436d076cbca5a7b59d | |
| parent | 060caa8023d1e73d66af34303354d87e7516383e (diff) | |
| download | org-mode-d38f79be97c0873df661c6741de7d0796a756c16.tar.gz | |
Fix commit 5bde60c
Thanks to Michael Brand for reporting those problems.
| -rw-r--r-- | lisp/org-agenda.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 10829c6..1ae4070 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -6298,14 +6298,15 @@ FRACTION is what fraction of the head-warning time has passed." ;; Use a delay of 0 when there is a repeater and the delay is ;; of the form --3d (when (and (save-match-data (string-match "--[0-9]+[hdwmy]" s)) - (not (= (org-time-string-to-absolute - s d1 'past nil (current-buffer) pos) d2))) + (< (org-time-string-to-absolute s) + (org-time-string-to-absolute + s d2 'past nil (current-buffer) pos))) (setq ddays 0)) ;; When to show a scheduled item in the calendar: ;; If it is on or past the date. (when (or (and (> ddays 0) (= diff (- ddays))) (and (zerop ddays) (= diff 0)) - (and (< diff 0) + (and (< (+ diff ddays) 0) (< (abs diff) org-scheduled-past-days) (and todayp (not org-agenda-only-exact-dates))) ;; org-is-habit-p uses org-entry-get, which is expansive |