tec/org-mode
tec/org-mode
1
0
Fork 0
forked from mirrors/org-mode
Code Pull requests Releases Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Nicolas Goaziou 2016-12-15 22:18:43 +01:00
parent a5e91f5e51 a1f516f8a5
commit 0863f8d1ca
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lisp/org-agenda.el
View file

@ -5964,7 +5964,9 @@ specification like [h]h:mm."
((eq org-agenda-skip-deadline-prewarning-if-scheduled ((eq org-agenda-skip-deadline-prewarning-if-scheduled
'pre-scheduled) 'pre-scheduled)
;; Set pre-warning to no earlier than SCHEDULED. ;; Set pre-warning to no earlier than SCHEDULED.
(min (- deadline scheduled) org-deadline-warning-days)) (min (- deadline
(org-agenda--timestamp-to-absolute scheduled))
org-deadline-warning-days))
;; Set pre-warning to deadline. ;; Set pre-warning to deadline.
(t 0)))) (t 0))))
(wdays (if suppress-prewarning (wdays (if suppress-prewarning
@ -6127,7 +6129,9 @@ scheduled items with an hour specification like [h]h:mm."
((eq org-agenda-skip-scheduled-delay-if-deadline ((eq org-agenda-skip-scheduled-delay-if-deadline
'post-deadline) 'post-deadline)
;; Set delay to no later than DEADLINE. ;; Set delay to no later than DEADLINE.
(min (- schedule deadline) org-scheduled-delay-days)) (min (- schedule
(org-agenda--timestamp-to-absolute deadline))
org-scheduled-delay-days))
(t 0)))) (t 0))))
(ddays (ddays
(cond (cond