* etc/ORG-NEWS: Fix typos.
* testing/lisp/test-org-agenda.el: Fix typos.
---
Hello!
I was reading through the news and found this entry a little confusing. Also
the variable names wheren't quite right.
Thanks,
Morgan
etc/ORG-NEWS | 13 +++++--------
testing/lisp/test-org-agenda.el | 26 +++++++++++++-------------
2 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/etc/ORG-NEWS b/etc/ORG-NEWS
index 585b2b262..e2bbe3e0e 100644
--- a/etc/ORG-NEWS
+++ b/etc/ORG-NEWS
@@ -666,19 +666,16 @@ arrived.
Users who often work with altering REPL prompts may consider reducing
the default 5 second value of the new option.
-*** ~repeated-after-deadline~ value of
~org-agenda-skip-scheduled-repeats-after-deadline~ is moved to a new
customization
+*** ~repeated-after-deadline~ value of
~org-agenda-skip-scheduled-if-deadline-is-shown~ is moved to a new customization
A new custom option ~org-agenda-skip-scheduled-repeats-after-deadline~
is introduced in place of ~repeated-after-deadline~ value of
-~org-agenda-skip-scheduled-repeats-after-deadline~.
+~org-agenda-skip-scheduled-if-deadline-is-shown~.
-Introducing a new option allow more control over agenda display and
-resolves a confusion about the meaning of ~repeated-after-deadline~.
-~repeated-after-deadline~ has nothing to do with /showing/ deadline.
-It just prevents agenda display repeated scheduled entries past
-deadline. The following example illustrates the meaning:
+The following example would no longer show in the agenda as scheduled
+after January 5th with the new customization set to ~t~.
-: * TODO Do me every day before Jan, 12th (included)
+: * TODO Do me every day until Jan, 5th (inclusive)
: SCHEDULED: <2024-01-03 Wed +1d> DEADLINE: <2024-01-05 Fri>
The old customization will continue to work, ensuring backwards compatibility.
diff --git a/testing/lisp/test-org-agenda.el b/testing/lisp/test-org-agenda.el
index d4f7e71b4..72a005e71 100644
--- a/testing/lisp/test-org-agenda.el
+++ b/testing/lisp/test-org-agenda.el
@@ -598,7 +598,7 @@ DEADLINE: " (cdr timestamp))))
(dolist (org-agenda-skip-scheduled-repeats-after-deadline '(nil t))
(org-test-at-time "2024-01-01 8:00"
(org-test-with-temp-text-in-file "
-* TODO Do me every day before Jan, 12th (included)
+* TODO Do me every day until Jan, 5th (inclusive)
SCHEDULED: <2024-01-03 Wed +1d> DEADLINE: <2024-01-05 Fri>
"
(let ((org-agenda-span 'week)
@@ -614,15 +614,15 @@ SCHEDULED: <2024-01-03 Wed +1d> DEADLINE: <2024-01-05 Fri>
(string-match-p
"Week-agenda (W01):
Monday 1 January 2024 W01
- [^:]+:In 4 d.: TODO Do me every day before Jan, 12th (included)
+ [^:]+:In 4 d.: TODO Do me every day until Jan, 5th (inclusive)
Tuesday 2 January 2024
Wednesday 3 January 2024
- [^:]+:Scheduled: TODO Do me every day before Jan, 12th (included)
+ [^:]+:Scheduled: TODO Do me every day until Jan, 5th (inclusive)
Thursday 4 January 2024
- [^:]+:Scheduled: TODO Do me every day before Jan, 12th (included)
+ [^:]+:Scheduled: TODO Do me every day until Jan, 5th (inclusive)
Friday 5 January 2024
- [^:]+:Scheduled: TODO Do me every day before Jan, 12th (included)
- [^:]+:Deadline: TODO Do me every day before Jan, 12th (included)
+ [^:]+:Scheduled: TODO Do me every day until Jan, 5th (inclusive)
+ [^:]+:Deadline: TODO Do me every day until Jan, 5th (inclusive)
Saturday 6 January 2024
Sunday 7 January 2024"
(buffer-string)))
@@ -631,19 +631,19 @@ Sunday 7 January 2024"
(string-match-p
"Week-agenda (W01):
Monday 1 January 2024 W01
- [^:]+:In 4 d.: TODO Do me every day before Jan, 12th (included)
+ [^:]+:In 4 d.: TODO Do me every day until Jan, 5th (inclusive)
Tuesday 2 January 2024
Wednesday 3 January 2024
- [^:]+:Scheduled: TODO Do me every day before Jan, 12th (included)
+ [^:]+:Scheduled: TODO Do me every day until Jan, 5th (inclusive)
Thursday 4 January 2024
- [^:]+:Scheduled: TODO Do me every day before Jan, 12th (included)
+ [^:]+:Scheduled: TODO Do me every day until Jan, 5th (inclusive)
Friday 5 January 2024
- [^:]+:Scheduled: TODO Do me every day before Jan, 12th (included)
- [^:]+:Deadline: TODO Do me every day before Jan, 12th (included)
+ [^:]+:Scheduled: TODO Do me every day until Jan, 5th (inclusive)
+ [^:]+:Deadline: TODO Do me every day until Jan, 5th (inclusive)
Saturday 6 January 2024
- [^:]+:Scheduled: TODO Do me every day before Jan, 12th (included)
+ [^:]+:Scheduled: TODO Do me every day until Jan, 5th (inclusive)
Sunday 7 January 2024
- [^:]+:Scheduled: TODO Do me every day before Jan, 12th (included)"
+ [^:]+:Scheduled: TODO Do me every day until Jan, 5th (inclusive)"
(buffer-string))))))
(org-test-agenda--kill-all-agendas))))
--
2.41.0
