diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2016-12-15 22:18:43 +0100 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2016-12-15 22:18:43 +0100 |
commit | 0863f8d1ca46f4f25fa6bc6273a9695ec404bb76 (patch) | |
tree | f7197f93c2b2e0a8bdccce2bc12572016ed356ef | |
parent | a5e91f5e51b9929b64f41a14f173fd91a2c09a96 (diff) | |
parent | a1f516f8a5082de84f7929960e004dbb0f0fdfa5 (diff) | |
download | org-mode-0863f8d1ca46f4f25fa6bc6273a9695ec404bb76.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-agenda.el | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index df77eff..6c41d10 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -5964,7 +5964,9 @@ specification like [h]h:mm." ((eq org-agenda-skip-deadline-prewarning-if-scheduled 'pre-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. (t 0)))) (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 'post-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)))) (ddays (cond |