diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2016-11-30 00:17:49 +0100 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2016-11-30 00:17:49 +0100 |
commit | 3271cbab6575176e9663c0ddc77ee98bf53d9fb9 (patch) | |
tree | 50c25764f6d9e3c4dc0af226772f4b10ea4ba729 | |
parent | 28f6fa844d80e5689ab059e1f093b110adde4ee0 (diff) | |
parent | c3146209ec752d516502b0fab258534436b0908f (diff) | |
download | org-mode-3271cbab6575176e9663c0ddc77ee98bf53d9fb9.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-agenda.el | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index f7af31b..024773b 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -6165,16 +6165,13 @@ specification like [h]h:mm." 'level level 'ts-date deadline 'priority - ;; Adjust priority according to the associated - ;; deadline of the item. Past-due deadlines get - ;; increased priority. - (let ((adjust (cond ((< current today) diff) - ((> current today) (- repeat current)) - ;; Since a nil SHOW-ALL prefer - ;; repeated deadlines, set - ;; adjustment accordingly. + ;; Adjust priority to today reminders about deadlines. + ;; Overdue deadlines get the highest priority + ;; increase, then imminent deadlines and eventually + ;; more distant deadlines. + (let ((adjust (cond ((not today?) 0) ((and (not show-all) (= repeat current)) 0) - (t diff)))) + (t (- diff))))) (+ adjust (org-get-priority item))) 'todo-state todo-state 'type (if upcoming? "upcoming-deadline" "deadline") |