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-27 23:46:13 +01:00
parent 345449d088 6907766913
commit aa15dc1820
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lisp/org-agenda.el
View File

@ -844,10 +844,9 @@ restricted to unfinished TODO entries only."
(defcustom org-agenda-skip-scheduled-if-done nil (defcustom org-agenda-skip-scheduled-if-done nil
"Non-nil means don't show scheduled items in agenda when they are done. "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 This is relevant for the daily/weekly agenda, not for the TODO list. It
it applies only to the actual date of the scheduling. Warnings about applies only to the actual date of the scheduling. Warnings about an item
an item with a past scheduling dates are always turned off when the item with a past scheduling dates are always turned off when the item is DONE."
is DONE."
:group 'org-agenda-skip :group 'org-agenda-skip
:group 'org-agenda-daily/weekly :group 'org-agenda-daily/weekly
:type 'boolean) :type 'boolean)
@ -896,8 +895,8 @@ several times."
(defcustom org-agenda-skip-deadline-if-done nil (defcustom org-agenda-skip-deadline-if-done nil
"Non-nil means don't show deadlines when the corresponding item is done. "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. 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 This is relevant for the daily/weekly agenda. It applies only to the
actually date of the deadline. Warnings about approaching and past-due actual date of the deadline. Warnings about approaching and past-due
deadlines are always turned off when the item is DONE." deadlines are always turned off when the item is DONE."
:group 'org-agenda-skip :group 'org-agenda-skip
:group 'org-agenda-daily/weekly :group 'org-agenda-daily/weekly
@ -6273,7 +6272,9 @@ scheduled items with an hour specification like [h]h:mm."
(/= repeat current))) (/= repeat current)))
(throw :skip nil))) (throw :skip nil)))
;; Possibly skip done tasks. ;; 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)) (throw :skip nil))
;; Skip entry if it already appears as a deadline, per ;; Skip entry if it already appears as a deadline, per
;; `org-agenda-skip-scheduled-if-deadline-is-shown'. This ;; `org-agenda-skip-scheduled-if-deadline-is-shown'. This