diff options
| author | Kyle Meyer <kyle@kyleam.com> | 2020-04-12 01:44:21 -0400 |
|---|---|---|
| committer | Kyle Meyer <kyle@kyleam.com> | 2020-04-12 01:44:21 -0400 |
| commit | 32d8f2f32e5fb0cd597d240b4976cb83cab44edf (patch) | |
| tree | 7befb3460cf42d779981afc2e7cbf89c56296ae9 | |
| parent | b49aabdba4baf13766bd3fd49aacd43265ce4879 (diff) | |
| parent | 1de7eabf25f72398b280818b35086eefc1e937b6 (diff) | |
| download | org-mode-32d8f2f32e5fb0cd597d240b4976cb83cab44edf.tar.gz | |
Merge branch 'maint'
| -rw-r--r-- | lisp/org-agenda.el | 30 | ||||
| -rw-r--r-- | lisp/org-archive.el | 2 |
2 files changed, 8 insertions, 24 deletions
diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index ffb892b..c56e8c5 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -6297,10 +6297,6 @@ scheduled items with an hour specification like [h]h:mm." (org-agenda--timestamp-to-absolute deadline)) org-scheduled-delay-days)) (t 0)))) - (diff-r (abs (- repeat current))) - (ddays-once (or (and (string-match "--\\([0-9]+\\)[hdwmy]" s) - (string-to-number (match-string 1 s))) - 0)) (ddays (cond ;; Nullify delay when a repeater triggered already @@ -6319,25 +6315,13 @@ scheduled items with an hour specification like [h]h:mm." (unless (and todayp habitp (bound-and-true-p org-habit-show-all-today)) - (when (or - ;; no one-time delay, not repeated delay - (and (not ddays-once) (not (= ddays diff-r))) - ;; one-time delay, but not for today - (and ddays-once - (not (= diff diff-r)) - (= ddays-once diff-r)) - ;; normal delay, but already in the past - (and (> ddays 0) (< diff ddays)) - ;; a habit, but past `org-habit-scheduled-past-days' - (> diff (or (and habitp org-habit-scheduled-past-days) - org-scheduled-past-days)) - ;; schedule in the future - (> schedule current) - ;; no delay, not scheduled today, no deadline for today - (and (= ddays 0) - (/= current schedule) - (/= current today) - (/= current repeat))) + (when (or (and (> ddays 0) (< diff ddays)) + (> diff (or (and habitp org-habit-scheduled-past-days) + org-scheduled-past-days)) + (> schedule current) + (and (/= current schedule) + (/= current today) + (/= current repeat))) (throw :skip nil))) ;; Possibly skip done tasks. (when (and donep diff --git a/lisp/org-archive.el b/lisp/org-archive.el index 24012bb..d3e12d1 100644 --- a/lisp/org-archive.el +++ b/lisp/org-archive.el @@ -24,7 +24,7 @@ ;; ;;; Commentary: -;; This file contains the face definitions for Org. +;; This file contains the archive functionality for Org. ;;; Code: |