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

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2016-11-30 00:17:49 +01:00
parent 28f6fa844d c3146209ec
commit 3271cbab65
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lisp/org-agenda.el
View File

@ -6165,16 +6165,13 @@ specification like [h]h:mm."
'level level 'level level
'ts-date deadline 'ts-date deadline
'priority 'priority
;; Adjust priority according to the associated ;; Adjust priority to today reminders about deadlines.
;; deadline of the item. Past-due deadlines get ;; Overdue deadlines get the highest priority
;; increased priority. ;; increase, then imminent deadlines and eventually
(let ((adjust (cond ((< current today) diff) ;; more distant deadlines.
((> current today) (- repeat current)) (let ((adjust (cond ((not today?) 0)
;; Since a nil SHOW-ALL prefer
;; repeated deadlines, set
;; adjustment accordingly.
((and (not show-all) (= repeat current)) 0) ((and (not show-all) (= repeat current)) 0)
(t diff)))) (t (- diff)))))
(+ adjust (org-get-priority item))) (+ adjust (org-get-priority item)))
'todo-state todo-state 'todo-state todo-state
'type (if upcoming? "upcoming-deadline" "deadline") 'type (if upcoming? "upcoming-deadline" "deadline")