From: "Valentin G. J. Herrmann" via "General discussions about Org-mode." <emacs-orgmode@gnu.org>
To: Ihor Radchenko <yantar92@posteo.net>
Cc: emacs-orgmode@gnu.org, Bastien <bzg@gnu.org>
Subject: Re: [PATCH] org.el: Respect org-extend-today-until in timestamps with ++
Date: Mon, 14 Aug 2023 16:01:42 +0200 [thread overview]
Message-ID: <3d9b686c-e5ab-8352-0bee-2739af7001fa@valentin-herrmann.de> (raw)
In-Reply-To: <87leedpz1q.fsf@localhost>
[-- Attachment #1: Type: text/plain, Size: 849 bytes --]
I've now added org-test-with-time-locale so that the test results are
independent of the running machine. I think it's much cleaner this way
than using .*
On 14/08/2023 14.51, Ihor Radchenko wrote:
> "Valentin G. J. Herrmann" <me@valentin-herrmann.de> writes:
>
>> Ok, so I guess I was stupid in another way :E
>> I do in fact have the FSF copyright assignment (Though probably under an
>> old email address: herr.valentin.mann@gmail.com). I still included the
>> TINYCHANGE comment. The attached patch should finally work.
>
> Bastien, may you please check the FSF records?
>
>> - (string-match-p
>> - "2014-03-04 .* 02:00"
>> + (string-search
>> + "<2014-03-04 Tue 02:00 +8h>"
>
> This won't work for people testing in non-English language environments
> where the day names are in native language.
> .* was there for a reason.
>
[-- Attachment #2: 0001-org.el-Respect-org-extend-today-until-in-timestamps-.patch --]
[-- Type: text/x-patch, Size: 5092 bytes --]
From 44320eea066f6db6ee82e5fd78b74cdb3d026b82 Mon Sep 17 00:00:00 2001
From: Valentin Herrmann <me@valentin-herrmann.de>
Date: Sun, 13 Aug 2023 18:44:49 +0200
Subject: [PATCH] org.el: Respect org-extend-today-until in timestamps with ++
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* org.el (org-auto-repeat-maybe): Changed org-auto-repeat-maybe, so that
switching a repeating todo with a timestamp of the form <… ++…> respects
`org-extend-today-until'.
* test-org.el (test-org/auto-repeat-maybe, org-test-with-time-locale):
Tests for interaction of `org-extend-today-until' and
`org-auto-repeat-maybe'. Added `org-test-with-time-locale' to make test
results independent of running machine. Explicitly avoid matching log
note with old timestamp in all the tests to avoid confusion.
Co-authored-by: Ihor Radchenko <yantar92@posteo.net>
TINYCHANGE
---
lisp/org.el | 5 ++-
testing/lisp/test-org.el | 78 +++++++++++++++++++++++++++++++++-------
2 files changed, 70 insertions(+), 13 deletions(-)
diff --git a/lisp/org.el b/lisp/org.el
index c037b3ee0..325141b25 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -10101,7 +10101,10 @@ This function is run automatically after each state change to a DONE state."
(let ((nshiftmax 10)
(nshift 0))
(while (or (= nshift 0)
- (not (time-less-p nil time)))
+ (if (equal what "h")
+ (not (time-less-p nil time))
+ (>= (org-today)
+ (time-to-days time))))
(when (= nshiftmax (cl-incf nshift))
(or (y-or-n-p
(format "%d repeater intervals were not \
diff --git a/testing/lisp/test-org.el b/testing/lisp/test-org.el
index 1b00f6c45..40820dfb5 100644
--- a/testing/lisp/test-org.el
+++ b/testing/lisp/test-org.el
@@ -75,6 +75,11 @@ Otherwise, evaluate RESULT as an sexp and return its result."
`(let ((org-time-stamp-formats '("%Y-%m-%d" . "%Y-%m-%d %H:%M")))
,@body))
+(defmacro org-test-with-time-locale (time-loc &rest body)
+ (declare (indent 1))
+ `(let ((system-time-locale ,time-loc))
+ ,@body))
+
\f
;;; Comments
@@ -8370,26 +8375,75 @@ Paragraph<point>"
(buffer-string))))
;; Handle every repeater type using hours step.
(should
- (string-match-p
- "2014-03-04 .* 02:00"
- (org-test-at-time "<2014-03-04 02:35>"
+ (string-search
+ "<2014-03-04 Tue 02:00 +8h>"
+ (org-test-with-time-locale "en_US.UTF-8"
+ (org-test-at-time "<2014-03-04 02:35>"
(org-test-with-temp-text "* TODO H\n<2014-03-03 18:00 +8h>"
(org-todo "DONE")
- (buffer-string)))))
+ (buffer-string))))))
(should
- (string-match-p
- "2014-03-04 .* 10:00"
- (org-test-at-time "<2014-03-04 02:35>"
+ (string-search
+ "<2014-03-04 Tue 10:00 ++8h>"
+ (org-test-with-time-locale "en_US.UTF-8"
+ (org-test-at-time "<2014-03-04 02:35>"
(org-test-with-temp-text "* TODO H\n<2014-03-03 18:00 ++8h>"
(org-todo "DONE")
- (buffer-string)))))
+ (buffer-string))))))
(should
- (string-match-p
- "2014-03-04 .* 10:35"
- (org-test-at-time "<2014-03-04 02:35>"
+ (string-search
+ "<2014-03-04 Tue 10:35 .+8h>"
+ (org-test-with-time-locale "en_US.UTF-8"
+ (org-test-at-time "<2014-03-04 02:35>"
(org-test-with-temp-text "* TODO H\n<2014-03-03 18:00 .+8h>"
(org-todo "DONE")
- (buffer-string)))))
+ (buffer-string))))))
+ ;; Handle `org-extend-today-until'.
+ (should
+ (string-search
+ "<2014-03-04 Tue ++1d>"
+ (let ((org-extend-today-until 4))
+ (org-test-with-time-locale "en_US.UTF-8"
+ (org-test-at-time "<2014-03-04 02:35>"
+ (org-test-with-temp-text "* TODO H\n<2014-03-03 ++1d>"
+ (org-todo "DONE")
+ (buffer-string)))))))
+ (should
+ (string-search
+ "<2014-03-06 Thu 17:00 ++1d>"
+ (let ((org-extend-today-until 4))
+ (org-test-with-time-locale "en_US.UTF-8"
+ (org-test-at-time "<2014-03-05 18:00>"
+ (org-test-with-temp-text "* TODO H\n<2014-03-04 17:00 ++1d>"
+ (org-todo "DONE")
+ (buffer-string)))))))
+ (should
+ (string-search
+ "<2014-03-04 Tue 10:00 ++8h>"
+ (let ((org-extend-today-until 4))
+ (org-test-with-time-locale "en_US.UTF-8"
+ (org-test-at-time "<2014-03-04 02:35>"
+ (org-test-with-temp-text "* TODO H\n<2014-03-03 18:00 ++8h>"
+ (org-todo "DONE")
+ (buffer-string)))))))
+ (should
+ (string-search
+ "<2014-03-04 Tue 18:00 .+1d>"
+ (let ((org-extend-today-until 4))
+ (org-test-with-time-locale "en_US.UTF-8"
+ (org-test-at-time "<2014-03-04 02:35>"
+ (org-test-with-temp-text "* TODO H\n<2014-03-03 18:00 .+1d>"
+ (org-todo "DONE")
+ (buffer-string)))))))
+ (should
+ (string-search
+ "<2014-03-04 Tue 10:35 .+8h>"
+ (let ((org-extend-today-until 4))
+ (org-test-with-time-locale "en_US.UTF-8"
+ (org-test-at-time "<2014-03-04 02:35>"
+ (org-test-with-temp-text "* TODO H\n<2014-03-03 18:00 .+8h>"
+ (org-todo "DONE")
+ (buffer-string)))))))
;; Do not repeat inactive time stamps with a repeater.
(should-not
(string-match-p
--
2.40.1
next prev parent reply other threads:[~2023-08-16 12:41 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-13 9:18 [PATCH] org.el: Respect org-extend-today-until in timestamps with ++ Valentin Herrmann via General discussions about Org-mode.
2023-08-13 12:21 ` Ihor Radchenko
2023-08-13 12:44 ` Ihor Radchenko
2023-08-13 13:21 ` Valentin G. J. Herrmann via General discussions about Org-mode.
2023-08-13 14:01 ` Valentin G. J. Herrmann via General discussions about Org-mode.
2023-08-13 14:17 ` Ihor Radchenko
[not found] ` <89628d3e-5feb-a764-0bc4-ace385de7c80@valentin-herrmann.de>
[not found] ` <87a5uuq6s5.fsf@localhost>
[not found] ` <11240b6c-0017-0116-75bd-31eb052f42ab@valentin-herrmann.de>
2023-08-14 12:51 ` Ihor Radchenko
2023-08-14 14:01 ` Valentin G. J. Herrmann via General discussions about Org-mode. [this message]
2023-08-14 15:18 ` Ihor Radchenko
2023-08-14 16:22 ` Bastien Guerry
-- strict thread matches above, loose matches on Subject: below --
2023-08-13 8:27 Valentin Herrmann via General discussions about Org-mode.
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3d9b686c-e5ab-8352-0bee-2739af7001fa@valentin-herrmann.de \
--to=emacs-orgmode@gnu.org \
--cc=bzg@gnu.org \
--cc=me@valentin-herrmann.de \
--cc=yantar92@posteo.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).