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

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

* 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