From 5db0ac7115b86a12d1a2106eb54b07d339f69ed6 Mon Sep 17 00:00:00 2001 From: Tim Ruffing Date: Tue, 13 Feb 2024 10:57:29 +0100 Subject: [PATCH] org-agenda: Make sure skipping warning/delay days never increases their number * lisp/org-agenda.el (org-agenda-get-deadlines, org-agenda-get-scheduled): Use minimum of warning/delay days specified in timestamp cookie and the limit specified by `org-agenda-skip-deadline-prewarning-if-scheduled' or `org-agenda-skip-scheduled-delay-if-deadline`, respectively. * lisp/org.el (org-get-wdays): Remove unused (and confusing) ZERO-DELAY argument. --- lisp/org-agenda.el | 15 ++++++--------- lisp/org.el | 7 ++----- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/lisp/org-agenda.el b/lisp/org-agenda.el index 514359b62..53878e441 100644 --- a/lisp/org-agenda.el +++ b/lisp/org-agenda.el @@ -6399,14 +6399,14 @@ specification like [h]h:mm." (org-agenda--timestamp-to-absolute s base 'future (current-buffer) pos))))) (diff (- deadline current)) - (suppress-prewarning + (max-wdays (let ((scheduled (and org-agenda-skip-deadline-prewarning-if-scheduled (org-element-property :raw-value (org-element-property :scheduled el))))) (cond - ((not scheduled) nil) + ((not scheduled) most-positive-fixnum) ;; The current item has a scheduled date, so ;; evaluate its prewarning lead time. ((integerp org-agenda-skip-deadline-prewarning-if-scheduled) @@ -6420,7 +6420,7 @@ specification like [h]h:mm." org-deadline-warning-days)) ;; Set pre-warning to deadline. (t 0)))) - (wdays (or suppress-prewarning (org-get-wdays s)))) + (wdays (min max-wdays (org-get-wdays s)))) (cond ;; Only display deadlines at their base date, at future ;; repeat occurrences or in today agenda. @@ -6610,13 +6610,13 @@ scheduled items with an hour specification like [h]h:mm." (futureschedp (> schedule today)) (habitp (and (fboundp 'org-is-habit-p) (string= "habit" (org-element-property :STYLE el)))) - (suppress-delay + (max-ddays (let ((deadline (and org-agenda-skip-scheduled-delay-if-deadline (org-element-property :raw-value (org-element-property :deadline el))))) (cond - ((not deadline) nil) + ((not deadline) most-positive-fixnum) ;; The current item has a deadline date, so ;; evaluate its delay time. ((integerp org-agenda-skip-scheduled-delay-if-deadline) @@ -6636,10 +6636,7 @@ scheduled items with an hour specification like [h]h:mm." ((and (string-match-p "--[0-9]+[hdwmy]" s) (> schedule (org-agenda--timestamp-to-absolute s))) 0) - (suppress-delay - (let ((org-scheduled-delay-days suppress-delay)) - (org-get-wdays s t t))) - (t (org-get-wdays s t))))) + (t (min max-ddays (org-get-wdays s t)))))) ;; Display scheduled items at base date (SCHEDULE), today if ;; scheduled before the current date, and at any repeat past ;; today. However, skip delayed items and items that have diff --git a/lisp/org.el b/lisp/org.el index 7da23310d..75f062508 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -14454,17 +14454,14 @@ If SECONDS is non-nil, return the difference in seconds." (and (<= (org-timestamp-to-now timestamp-string) ndays) (not (org-entry-is-done-p)))) -(defun org-get-wdays (ts &optional delay zero-delay) +(defun org-get-wdays (ts &optional delay) "Get the deadline lead time appropriate for timestring TS. When DELAY is non-nil, get the delay time for scheduled items -instead of the deadline lead time. When ZERO-DELAY is non-nil -and `org-scheduled-delay-days' is 0, enforce 0 as the delay, -don't try to find the delay cookie in the scheduled timestamp." +instead of the deadline lead time." (let ((tv (if delay org-scheduled-delay-days org-deadline-warning-days))) (cond ((or (and delay (< tv 0)) - (and delay zero-delay (<= tv 0)) (and (not delay) (<= tv 0))) ;; Enforce this value no matter what (- tv)) -- 2.43.1