From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id QCk+JqXD3GRYfAAASxT56A (envelope-from ) for ; Wed, 16 Aug 2023 14:40:05 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id ULgJJaXD3GQLYgAAG6o9tA (envelope-from ) for ; Wed, 16 Aug 2023 14:40:05 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 27D5B4DC7C for ; Wed, 16 Aug 2023 14:40:05 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=valentin-herrmann.de header.s=2022 header.b=vWauk0D4; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1692189605; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:list-id:list-help: list-unsubscribe:list-subscribe:list-post:dkim-signature; bh=3Hl3yQRZGLbA9ibgrxm2x+DRb8RnC6kiOFJt5zkk+94=; b=QGO4Ye7UnpF7wlXdKXE0TPmPZ/51G3LpVVzs4daKhL1ot7GaWsnwWr29T1NLtwp0k6SDvz B+6XBNPN2x7cBIdFL7SAXZLCQm5YekTKPsc/Xvtnku22oU1GPzHnVRem2wzU5Hf0xgkbUC SLYVqZ8q1Ij5aSwub2Et5higOPjQfQiiG5flqeWnVcUFiNe7PTUxWXH8KBe5PBkiig3Ym+ /pjJyanQ6KFBIIH6wKyuA6REKMJiBai2l7NiC38/H5a4Cfs6Ou+xDReU3BbTKlyuyjmW7n nbRiq+E8LWhResG/vaAsigRuh2sZz41+PUCAO3gNrK8dLJNAoNuTEmcTAhznxw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=valentin-herrmann.de header.s=2022 header.b=vWauk0D4; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "emacs-orgmode-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="emacs-orgmode-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1692189605; a=rsa-sha256; cv=none; b=msJ/ayaGoLjdDuc5oH9bQPeDCBEstgG3goxGzkNcRVL6w27NhwnaoogQvAFhPqlTJn/EiO Br/dUmCpGFs/iNJC9kZ/FXg00EihPpAC3T65FbRSZzsPR6ewWXUZ96h3YQ6jC0Dg4DjcBl kwp9ANo1UEq4pj3IgdOFiDkE/nLAGtZk+o5Gz/6HxrPyLdicOYOxAY3rXMMRG1iPvltVbZ 0zj428brXXmWiqEZ7hKYSP9Bz3MPkkjr/OM1Awsy2tT5GGtp1lkPpHW8h0yp+nZL2QZ1R1 ROLcmrLw20KDBVwqtahXiEZf++ZnMoqlMp2pubNUNioE2xCITNxkAvO3O+eiSA== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWFnm-0004tH-Sb; Wed, 16 Aug 2023 08:39:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qV6Sg-0006sq-81 for emacs-orgmode@gnu.org; Sun, 13 Aug 2023 04:28:34 -0400 Received: from mx00.shmerver.de ([88.99.4.159]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qV6Se-0002vF-5S for emacs-orgmode@gnu.org; Sun, 13 Aug 2023 04:28:33 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) by localhost (Mailerdaemon) with ESMTPSA id 2E68C2A0073; Sun, 13 Aug 2023 10:28:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=valentin-herrmann.de; s=2022; t=1691915290; h=from:subject:date:message-id:to:cc:mime-version:content-type: content-transfer-encoding; bh=3Hl3yQRZGLbA9ibgrxm2x+DRb8RnC6kiOFJt5zkk+94=; b=vWauk0D4Y+JyCYIR2lSgFyiDL2jJmJsfWzUkgKYqKfbRA7GnXJXcWCoRZ35I4HtUzU5dzj 4tFB5Zplvb9VhYtqviGuMN26SrUdabMSxtsOU/Zm/glxddHaRMHuVyH8Mj/UxvvFpWz49d ALiHm6d/iHIBtrsm6+KLz2g4GhuITHEB45UVL94Vg/zdIBeH+XR9cFXfKwlw0S9uxwMXgz mBBvr+/QNSG/CdeBQTn2twvfM6+OBnGogHsNk4oV7B9/9ZbmWh6jSdWPGptdTYjpbGLUj9 VEH5YmYHpbRj2Ydw+D8pHTYRaXb3rHpKwDKM525m+2QQKgnaS5kOHA965/Opkw== To: emacs-orgmode@gnu.org Cc: Valentin Herrmann Subject: [PATCH] org.el: Respect org-extend-today-until in timestamps with ++ Date: Sun, 13 Aug 2023 10:27:53 +0200 Message-Id: <20230813082753.1428930-1-me@valentin-herrmann.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Last-TLS-Session-Version: TLSv1.3 Received-SPF: pass client-ip=88.99.4.159; envelope-from=me@valentin-herrmann.de; helo=mx00.shmerver.de X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Wed, 16 Aug 2023 08:39:03 -0400 X-BeenThere: emacs-orgmode@gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Valentin Herrmann From: Valentin Herrmann via "General discussions about Org-mode." Errors-To: emacs-orgmode-bounces+larch=yhetil.org@gnu.org Sender: emacs-orgmode-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -5.68 X-Spam-Score: -5.68 X-Migadu-Queue-Id: 27D5B4DC7C X-Migadu-Scanner: mx2.migadu.com X-TUID: s5sPvlOhTfqY * 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