diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2016-11-27 23:46:13 +0100 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2016-11-27 23:46:13 +0100 |
commit | aa15dc182097f38da800922ce5035b272cbe06c2 (patch) | |
tree | bfe702a953e9b92ed865b7a527dfcb303dae0ab7 | |
parent | 345449d088e473a4d6fd1604227b7bb767def419 (diff) | |
parent | 690776691314264849714f1e0bd127b0bd846e8d (diff) | |
download | org-mode-aa15dc182097f38da800922ce5035b272cbe06c2.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-agenda.el | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 905918c..e8696b5 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -844,10 +844,9 @@ restricted to unfinished TODO entries only." (defcustom org-agenda-skip-scheduled-if-done nil "Non-nil means don't show scheduled items in agenda when they are done. -This is relevant for the daily/weekly agenda, not for the TODO list. And -it applies only to the actual date of the scheduling. Warnings about -an item with a past scheduling dates are always turned off when the item -is DONE." +This is relevant for the daily/weekly agenda, not for the TODO list. It +applies only to the actual date of the scheduling. Warnings about an item +with a past scheduling dates are always turned off when the item is DONE." :group 'org-agenda-skip :group 'org-agenda-daily/weekly :type 'boolean) @@ -896,8 +895,8 @@ several times." (defcustom org-agenda-skip-deadline-if-done nil "Non-nil means don't show deadlines when the corresponding item is done. When nil, the deadline is still shown and should give you a happy feeling. -This is relevant for the daily/weekly agenda. And it applied only to the -actually date of the deadline. Warnings about approaching and past-due +This is relevant for the daily/weekly agenda. It applies only to the +actual date of the deadline. Warnings about approaching and past-due deadlines are always turned off when the item is DONE." :group 'org-agenda-skip :group 'org-agenda-daily/weekly @@ -6273,7 +6272,9 @@ scheduled items with an hour specification like [h]h:mm." (/= repeat current))) (throw :skip nil))) ;; Possibly skip done tasks. - (when (and donep org-agenda-skip-scheduled-if-done) + (when (and donep + (or org-agenda-skip-scheduled-if-done + (/= schedule current))) (throw :skip nil)) ;; Skip entry if it already appears as a deadline, per ;; `org-agenda-skip-scheduled-if-deadline-is-shown'. This |