[PATCH] org.el: Respect org-extend-today-until in timestamps with ++

[PATCH] org.el: Respect org-extend-today-until in timestamps with ++

[Valentin Herrmann via General discussions about Org-mode.]

* 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'.
---
 lisp/org.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index c037b3ee0..d9cc9bee6 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -10099,9 +10099,10 @@ This function is run automatically after each state change to a DONE state."
 			 (- (org-today) (time-to-days time)) 'day)))
 		     ((equal "+" repeater-type)
 		      (let ((nshiftmax 10)
-			    (nshift 0))
+			    (nshift 0)
+                            (time-to-extend (seconds-to-time (* 3600 org-extend-today-until))))
 			(while (or (= nshift 0)
-				   (not (time-less-p nil time)))
+                                   (not (time-less-p nil (time-add time-to-extend time))))
 			  (when (= nshiftmax (cl-incf nshift))
 			    (or (y-or-n-p
 				 (format "%d repeater intervals were not \
-- 
2.40.1

Re: [PATCH] org.el: Respect org-extend-today-until in timestamps with ++

[Ihor Radchenko]

Valentin Herrmann via "General discussions about Org-mode."
<emacs-orgmode@gnu.org> writes:

> * 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'.

Thanks, this would make sense. However, I have comments on your patch.

> -			    (nshift 0))
> +			    (nshift 0)
> +                            (time-to-extend (seconds-to-time (* 3600 org-extend-today-until))))

This will return time since epoch:

(format-time-string "%x %X" (seconds-to-time (* 3600 org-extend-today-until)))
;; => "01/01/1970 06:00:00 AM"

>  			(while (or (= nshift 0)
> -				   (not (time-less-p nil time)))
> +                                   (not (time-less-p nil (time-add time-to-extend time))))

And this compares "now" with year 1970. Will always return nil.

It would make things easier if you added a test for this fix into
`test-org/auto-repeat-maybe' in testing/lisp/test-org.el

-- 
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>

Re: [PATCH] org.el: Respect org-extend-today-until in timestamps with ++

[Ihor Radchenko]

Ihor Radchenko <yantar92@posteo.net> writes:

>>  			(while (or (= nshift 0)
>> -				   (not (time-less-p nil time)))
>> +                                   (not (time-less-p nil (time-add time-to-extend time))))
>
> And this compares "now" with year 1970. Will always return nil.

Hmm. I somehow missed `time-add'.
However, this is still fishy.
What if we have something like <2023-08-13 2:00 ++8h>?
`org-extend-today-until' should probably be ignored then.

-- 
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>

Re: [PATCH] org.el: Respect org-extend-today-until in timestamps with ++

[Valentin G. J. Herrmann via General discussions about Org-mode.]

[-- Attachment #1: Type: text/plain, Size: 902 bytes --]

In the attachments is a better version with tests that also addresses 
your latest critique.

On 13/08/2023 14.44, Ihor Radchenko wrote:
 > Ihor Radchenko <yantar92@posteo.net> writes:
 >
 >>>               (while (or (= nshift 0)
 >>> -                   (not (time-less-p nil time)))
 >>> +                                   (not (time-less-p nil (time-add 
time-to-extend time))))
 >>
 >> And this compares "now" with year 1970. Will always return nil.
 >
 > Hmm. I somehow missed `time-add'.
 > However, this is still fishy.
 > What if we have something like <2023-08-13 2:00 ++8h>?
 > `org-extend-today-until' should probably be ignored then.
 >
Attachments:
0001-org.el-Respect-org-extend-today-until-in-timestamps-.patch	3.0 KB
[Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 
Thunderbird/102.14.0]
This user agent is already supported !
[http://www.mozilla.com/thunderbird/]
[Options]

[-- Attachment #2: 0001-org.el-Respect-org-extend-today-until-in-timestamps-.patch --]
[-- Type: text/x-patch, Size: 3096 bytes --]

From 317ab3f132825af9e5caaf0dc1812df545f0ad5f Mon Sep 17 00:00:00 2001
From: Valentin Herrmann <me@valentin-herrmann.de>
Date: Sun, 13 Aug 2023 09:48:42 +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'.
---
 lisp/org.el              | 10 +++++++---
 testing/lisp/test-org.el | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index c037b3ee0..9c98d7538 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -10111,9 +10111,13 @@ enough to shift date past today.  Continue? "
 			  (org-timestamp-change n (cdr (assoc what whata)))
 			  (org-in-regexp org-ts-regexp3)
 			  (setq ts (match-string 1))
-			  (setq time
-				(save-match-data
-				  (org-time-string-to-time ts)))))
+                          (setq time
+                                (save-match-data
+                                  (org-time-string-to-time ts)))
+                          (unless (equal what "h")
+                            (setq time
+                                  (time-add time
+                                            (seconds-to-time (* 3600 org-extend-today-until)))))))
 		      (org-timestamp-change (- n) (cdr (assoc what whata)))
 		      ;; Rematch, so that we have everything in place
 		      ;; for the real shift.
diff --git a/testing/lisp/test-org.el b/testing/lisp/test-org.el
index 1b00f6c45..0cf765af4 100644
--- a/testing/lisp/test-org.el
+++ b/testing/lisp/test-org.el
@@ -8390,6 +8390,39 @@ Paragraph<point>"
       (org-test-with-temp-text "* TODO H\n<2014-03-03 18:00 .+8h>"
 	(org-todo "DONE")
 	(buffer-string)))))
+  ;; Handle `org-extend-today-until'.
+  (should
+   (string-match-p
+    "2014-03-04 .* 18:00"
+    (let ((org-extend-today-until 4))
+      (org-test-at-time "<2014-03-04 02:35>"
+        (org-test-with-temp-text "* TODO H\n<2014-03-02 18:00 ++1d>"
+	  (org-todo "DONE")
+	  (buffer-string))))))
+  (should
+   (string-match-p
+    "2014-03-04 .* 10:00"
+    (let ((org-extend-today-until 4))
+      (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-match-p
+    "2014-03-04 .* 18:00"
+    (let ((org-extend-today-until 4))
+      (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-match-p
+    "2014-03-04 .* 10:35"
+    (let ((org-extend-today-until 4))
+      (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

Re: [PATCH] org.el: Respect org-extend-today-until in timestamps with ++

[Valentin G. J. Herrmann via General discussions about Org-mode.]

[-- Attachment #1: Type: text/plain, Size: 647 bytes --]

In the attachments is a better version with tests that also addresses 
your latest critique.

On 13/08/2023 14.44, Ihor Radchenko wrote:
 > Ihor Radchenko <yantar92@posteo.net> writes:
 >
 >>>               (while (or (= nshift 0)
 >>> -                   (not (time-less-p nil time)))
 >>> +                                   (not (time-less-p nil (time-add 
time-to-extend time))))
 >>
 >> And this compares "now" with year 1970. Will always return nil.
 >
 > Hmm. I somehow missed `time-add'.
 > However, this is still fishy.
 > What if we have something like <2023-08-13 2:00 ++8h>?
 > `org-extend-today-until' should probably be ignored then.

[-- Attachment #2: 0001-org.el-Respect-org-extend-today-until-in-timestamps-.patch --]
[-- Type: text/x-patch, Size: 3096 bytes --]

From 317ab3f132825af9e5caaf0dc1812df545f0ad5f Mon Sep 17 00:00:00 2001
From: Valentin Herrmann <me@valentin-herrmann.de>
Date: Sun, 13 Aug 2023 09:48:42 +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'.
---
 lisp/org.el              | 10 +++++++---
 testing/lisp/test-org.el | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index c037b3ee0..9c98d7538 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -10111,9 +10111,13 @@ enough to shift date past today.  Continue? "
 			  (org-timestamp-change n (cdr (assoc what whata)))
 			  (org-in-regexp org-ts-regexp3)
 			  (setq ts (match-string 1))
-			  (setq time
-				(save-match-data
-				  (org-time-string-to-time ts)))))
+                          (setq time
+                                (save-match-data
+                                  (org-time-string-to-time ts)))
+                          (unless (equal what "h")
+                            (setq time
+                                  (time-add time
+                                            (seconds-to-time (* 3600 org-extend-today-until)))))))
 		      (org-timestamp-change (- n) (cdr (assoc what whata)))
 		      ;; Rematch, so that we have everything in place
 		      ;; for the real shift.
diff --git a/testing/lisp/test-org.el b/testing/lisp/test-org.el
index 1b00f6c45..0cf765af4 100644
--- a/testing/lisp/test-org.el
+++ b/testing/lisp/test-org.el
@@ -8390,6 +8390,39 @@ Paragraph<point>"
       (org-test-with-temp-text "* TODO H\n<2014-03-03 18:00 .+8h>"
 	(org-todo "DONE")
 	(buffer-string)))))
+  ;; Handle `org-extend-today-until'.
+  (should
+   (string-match-p
+    "2014-03-04 .* 18:00"
+    (let ((org-extend-today-until 4))
+      (org-test-at-time "<2014-03-04 02:35>"
+        (org-test-with-temp-text "* TODO H\n<2014-03-02 18:00 ++1d>"
+	  (org-todo "DONE")
+	  (buffer-string))))))
+  (should
+   (string-match-p
+    "2014-03-04 .* 10:00"
+    (let ((org-extend-today-until 4))
+      (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-match-p
+    "2014-03-04 .* 18:00"
+    (let ((org-extend-today-until 4))
+      (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-match-p
+    "2014-03-04 .* 10:35"
+    (let ((org-extend-today-until 4))
+      (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

Re: [PATCH] org.el: Respect org-extend-today-until in timestamps with ++

[Ihor Radchenko]

"Valentin G. J. Herrmann" via "General discussions about Org-mode."
<emacs-orgmode@gnu.org> writes:

> In the attachments is a better version with tests that also addresses 
> your latest critique.

Thanks!

> +                          (setq time
> +                                (save-match-data
> +                                  (org-time-string-to-time ts)))
> +                          (unless (equal what "h")
> +                            (setq time
> +                                  (time-add time
> +                                            (seconds-to-time (* 3600 org-extend-today-until)))))))

Another corner case:

(setq org-extend-today-until 4)
* TODO Heading
<2023-08-12 Sat 17:00 ++1d> Timestamp a bit (< 4 hours) earlier than current wall time

C-c C-t d
* TODO Heading
<2023-08-13 Sun 17:00 ++1d>

Expected:
* TODO Heading
<2023-08-14 Mon 17:00 ++1d>

I generally feel that the approach with `time-add' will have a number of
weird corner cases.

-- 
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>

Re: [PATCH] org.el: Respect org-extend-today-until in timestamps with ++

[Ihor Radchenko]

"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.

-- 
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>

Re: [PATCH] org.el: Respect org-extend-today-until in timestamps with ++

[Valentin G. J. Herrmann via General discussions about Org-mode.]

[-- 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

Re: [PATCH] org.el: Respect org-extend-today-until in timestamps with ++

[Ihor Radchenko]

"Valentin G. J. Herrmann" <me@valentin-herrmann.de> writes:

> 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 .*
> ...
> +    (org-test-with-time-locale "en_US.UTF-8"
> +     (org-test-at-time "<2014-03-04 02:35>"

This is fine, but not all the installations will have en_US.UTF-8 locale.
You may use `org-test-without-dow' instead.

-- 
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>

Re: [PATCH] org.el: Respect org-extend-today-until in timestamps with ++

[Bastien Guerry]

Ihor Radchenko <yantar92@posteo.net> writes:

> "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?

I did, I'll provide more information offlist.

-- 
 Bastien Guerry

[PATCH] org.el: Respect org-extend-today-until in timestamps with ++

[Valentin Herrmann via General discussions about Org-mode.]

* 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'.
---
 lisp/org.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/org.el b/lisp/org.el
index c037b3ee0..d9cc9bee6 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -10099,9 +10099,10 @@ This function is run automatically after each state change to a DONE state."
 			 (- (org-today) (time-to-days time)) 'day)))
 		     ((equal "+" repeater-type)
 		      (let ((nshiftmax 10)
-			    (nshift 0))
+			    (nshift 0)
+                            (time-to-extend (seconds-to-time (* 3600 org-extend-today-until))))
 			(while (or (= nshift 0)
-				   (not (time-less-p nil time)))
+                                   (not (time-less-p nil (time-add time-to-extend time))))
 			  (when (= nshiftmax (cl-incf nshift))
 			    (or (y-or-n-p
 				 (format "%d repeater intervals were not \
-- 
2.40.1