From abbf497b8433d00e0513809b77038d090207f71d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 27 Nov 2016 23:43:00 +0100 Subject: [PATCH 1/2] org-agenda: Fix done scheduled display * lisp/org-agenda.el (org-agenda-get-scheduled): Skip done scheduled unconditionally whenever the base date is not the one currently considered. --- lisp/org-agenda.el | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 905918ccb..2144c9160 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -6273,7 +6273,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 From 690776691314264849714f1e0bd127b0bd846e8d Mon Sep 17 00:00:00 2001 From: Nicolas Goaziou Date: Sun, 27 Nov 2016 23:45:35 +0100 Subject: [PATCH 2/2] org-agenda: Fix docstrings * lisp/org-agenda.el (org-agenda-skip-scheduled-if-done): Tiny rewording. (org-agenda-skip-deadline-if-done): Fix typo. --- lisp/org-agenda.el | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 2144c9160..e8696b585 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