diff options
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2016-12-02 10:55:49 +0100 |
|---|---|---|
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2016-12-02 13:01:22 +0100 |
| commit | 9950252f342ea5b877f1f43c99d2e06adca7b596 (patch) | |
| tree | 93962c599fb760849a68f6b740eab688657c0586 | |
| parent | 6d5e207c7dab5932cff5a7b81a912739e291d19c (diff) | |
| download | org-mode-9950252f342ea5b877f1f43c99d2e06adca7b596.tar.gz | |
org-agenda: Fix repeats with nil `org-agenda-repeating-timestamp-show-all'
* lisp/org-agenda.el (org-agenda-get-timestamps):
(org-agenda-get-deadlines):
(org-agenda-get-scheduled): When
`org-agenda-repeating-timestamp-show-all' is nil, only display repeat
before and repeat after today (or only repeat at today if those
coincide). Also, computations of warnings are done with last repeat
before today instead of base date.
| -rw-r--r-- | lisp/org-agenda.el | 44 |
1 files changed, 28 insertions, 16 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 88b2ff8..3e99504 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -5653,13 +5653,19 @@ displayed in agenda view." (throw :skip nil)) ;; When time-stamp doesn't match CURRENT but has a repeater, ;; make sure it repeats on CURRENT. Furthermore, if - ;; SHOW-ALL is nil, ensure that repeater is the very first - ;; one to trigger since today. + ;; SHOW-ALL is nil, ensure that repeats are only the first + ;; before and the first after today. (when (and repeat - (let ((base (if show-all current today))) - (/= current - (org-agenda--timestamp-to-absolute - repeat base 'future (current-buffer) pos)))) + (if show-all + (/= current + (org-agenda--timestamp-to-absolute + repeat current 'future (current-buffer) pos)) + (and (/= current + (org-agenda--timestamp-to-absolute + repeat today 'past (current-buffer) pos)) + (/= current + (org-agenda--timestamp-to-absolute + repeat today 'future (current-buffer) pos))))) (throw :skip nil)) (save-excursion (re-search-backward org-outline-regexp-bol nil t) @@ -6065,11 +6071,14 @@ specification like [h]h:mm." (member todo-state org-agenda-repeating-timestamp-show-all))) ;; DEADLINE is the bare deadline date, i.e., without - ;; any repeater. REPEAT is closest repeat after - ;; CURRENT, if all repeated time stamps are to be - ;; shown, or after TODAY otherwise. REPEAT only - ;; applies to future dates. - (deadline (org-agenda--timestamp-to-absolute s)) + ;; any repeater, or the last repeat if SHOW-ALL is + ;; non-nil. REPEAT is closest repeat after CURRENT, if + ;; all repeated time stamps are to be shown, or after + ;; TODAY otherwise. REPEAT only applies to future + ;; dates. + (deadline (if show-all (org-agenda--timestamp-to-absolute s) + (org-agenda--timestamp-to-absolute + s today 'past (current-buffer) pos))) (repeat (if (< current today) deadline (org-agenda--timestamp-to-absolute @@ -6225,11 +6234,14 @@ scheduled items with an hour specification like [h]h:mm." (member todo-state org-agenda-repeating-timestamp-show-all))) ;; SCHEDULE is the bare scheduled date, i.e., without - ;; any repeater. REPEAT is the closest repeat after - ;; CURRENT, if all repeated time stamps are to be - ;; shown, or after TODAY otherwise. REPEAT only - ;; applies to future dates. - (schedule (org-agenda--timestamp-to-absolute s)) + ;; any repeater if non-nil, or last repeat if SHOW-ALL + ;; is nil. REPEAT is the closest repeat after CURRENT, + ;; if all repeated time stamps are to be shown, or + ;; after TODAY otherwise. REPEAT only applies to + ;; future dates. + (schedule (if show-all (org-agenda--timestamp-to-absolute s) + (org-agenda--timestamp-to-absolute + s today 'past (current-buffer) pos))) (repeat (cond ((< current today) schedule) (show-all (org-agenda--timestamp-to-absolute |