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 2018-04-27 03:17:44 +02:00
parent 67f1a33b45 5d0792057d
commit 1a5ca5fa83
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lisp/org-agenda.el
View File

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