Merge branch 'maint'
This commit is contained in:
commit
1a5ca5fa83
|
@ -6001,8 +6001,12 @@ specification like [h]h:mm."
|
|||
(org-agenda--timestamp-to-absolute
|
||||
s base 'future (current-buffer) pos)))))
|
||||
(diff (- deadline current))
|
||||
(wdays
|
||||
(suppress-prewarning
|
||||
(let ((scheduled
|
||||
(and org-agenda-skip-deadline-prewarning-if-scheduled
|
||||
(org-entry-get nil "SCHEDULED"))))
|
||||
(cond
|
||||
((not scheduled) nil)
|
||||
;; The current item has a scheduled date, so
|
||||
;; evaluate its prewarning lead time.
|
||||
((integerp org-agenda-skip-deadline-prewarning-if-scheduled)
|
||||
|
@ -6012,13 +6016,11 @@ specification like [h]h:mm."
|
|||
'pre-scheduled)
|
||||
;; Set pre-warning to no earlier than SCHEDULED.
|
||||
(min (- deadline
|
||||
(org-agenda--timestamp-to-absolute
|
||||
(org-entry-get nil "SCHEDULED")))
|
||||
(org-agenda--timestamp-to-absolute scheduled))
|
||||
org-deadline-warning-days))
|
||||
;; Set pre-warning to 0
|
||||
(org-agenda-skip-deadline-prewarning-if-scheduled 0)
|
||||
;; Set pre-warning to deadline.
|
||||
(t (org-get-wdays s)))))
|
||||
(t 0))))
|
||||
(wdays (or suppress-prewarning (org-get-wdays s))))
|
||||
(cond
|
||||
;; Only display deadlines at their base date, at future
|
||||
;; repeat occurrences or in today agenda.
|
||||
|
|
Loading…
Reference in New Issue