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

38
lisp/org-agenda.el
View File

@ -6001,24 +6001,26 @@ 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
(cond (let ((scheduled
;; The current item has a scheduled date, so (and org-agenda-skip-deadline-prewarning-if-scheduled
;; evaluate its prewarning lead time. (org-entry-get nil "SCHEDULED"))))
((integerp org-agenda-skip-deadline-prewarning-if-scheduled) (cond
;; Use global prewarning-restart lead time. ((not scheduled) nil)
org-agenda-skip-deadline-prewarning-if-scheduled) ;; The current item has a scheduled date, so
((eq org-agenda-skip-deadline-prewarning-if-scheduled ;; evaluate its prewarning lead time.
'pre-scheduled) ((integerp org-agenda-skip-deadline-prewarning-if-scheduled)
;; Set pre-warning to no earlier than SCHEDULED. ;; Use global prewarning-restart lead time.
(min (- deadline org-agenda-skip-deadline-prewarning-if-scheduled)
(org-agenda--timestamp-to-absolute ((eq org-agenda-skip-deadline-prewarning-if-scheduled
(org-entry-get nil "SCHEDULED"))) 'pre-scheduled)
org-deadline-warning-days)) ;; Set pre-warning to no earlier than SCHEDULED.
;; Set pre-warning to 0 (min (- deadline
(org-agenda-skip-deadline-prewarning-if-scheduled 0) (org-agenda--timestamp-to-absolute scheduled))
;; Set pre-warning to deadline. org-deadline-warning-days))
(t (org-get-wdays s))))) ;; Set pre-warning to deadline.
(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.