ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien 2020-02-01 09:45:38 +01:00
parent c83f889826 39c656870c
commit 8651e3ff15
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
lisp/org-agenda.el
View File

@ -6273,6 +6273,10 @@ scheduled items with an hour specification like [h]h:mm."
(org-agenda--timestamp-to-absolute deadline))
org-scheduled-delay-days))
(t 0))))
(diff-r (abs (- repeat current)))
(ddays-once (or (and (string-match "--\\([0-9]+\\)[hdwmy]" s)
(string-to-number (match-string 1 s)))
0))
(ddays
(cond
;; Nullify delay when a repeater triggered already
@ -6291,11 +6295,23 @@ scheduled items with an hour specification like [h]h:mm."
(unless (and todayp
habitp
(bound-and-true-p org-habit-show-all-today))
(when (or (and (> ddays 0) (< diff ddays))
(when (or
;; no one-time delay, not repeated delay
(and (not ddays-once) (not (= ddays diff-r)))
;; one-time delay, but not for today
(and ddays-once
(not (= diff diff-r))
(= ddays-once diff-r))
;; normal delay, but already in the past
(and (> ddays 0) (< diff ddays))
;; a habit, but past `org-habit-scheduled-past-days'
(> diff (or (and habitp org-habit-scheduled-past-days)
org-scheduled-past-days))
;; schedule in the future
(> schedule current)
(and (/= current schedule)
;; no delay, not scheduled today, no deadline for today
(and (= ddays 0)
(/= current schedule)
(/= current today)
(/= current repeat)))
(throw :skip nil)))