Here's the rebased patch. It should apply without issue. Best!
Tom
From 5247d2459800f82434f1bc3aeea136c18af7923c Mon Sep 17 00:00:00 2001
From: Tom Gillespie <tgb...@gmail.com>
Date: Sun, 4 Dec 2022 01:02:35 -0800
Subject: [PATCH] lisp/org-expiry.el: Account for org-time-stamp-formats
refactor
* lisp/org-expiry.el (org-expiry-insert-created)
(org-expiry-insert-expiry): timestamp formats dropped delimiters so a
slight modification is required following org commit
e3a7c01874c9bb80e04ffa58c578619faf09e7f0, the change is made backward
compatible by removing < and > from the old timestamp format
---
lisp/org-expiry.el | 32 +++++++++++++++++++++-----------
1 file changed, 21 insertions(+), 11 deletions(-)
diff --git a/lisp/org-expiry.el b/lisp/org-expiry.el
index b359610..c3dad28 100644
--- a/lisp/org-expiry.el
+++ b/lisp/org-expiry.el
@@ -301,12 +301,17 @@ update the date."
(current-time)))
(setq d-hour (format-time-string "%H:%M" d-time))
(setq timestr
- (org-expiry-format-timestamp
- ;; two C-u prefixes will call org-read-date
- (if (equal arg '(16))
- (org-read-date nil nil nil nil d-time d-hour)
- (format-time-string (cdr org-time-stamp-formats)))
- org-expiry-inactive-timestamps))
+ ;; two C-u prefixes will call org-read-date
+ (concat "<"
+ (if (equal arg '(16))
+ (org-read-date nil nil nil nil d-time d-hour)
+ (format-time-string
+ (replace-regexp-in-string "\\(^<\\|>$\\)" ""
+ (cdr org-time-stamp-formats))))
+ ">"))
+ ;; maybe transform to inactive timestamp
+ (if org-expiry-inactive-timestamps
+ (setq timestr (concat "[" (substring timestr 1 -1) "]")))
(save-excursion
(org-entry-put
(point) org-expiry-created-property-name timestr)))))
@@ -321,11 +326,16 @@ and insert today's date."
(setq d-time (if d (org-time-string-to-time d)
(current-time)))
(setq d-hour (format-time-string "%H:%M" d-time))
- (setq timestr (org-expiry-format-timestamp
- (if today
- (format-time-string (cdr org-time-stamp-formats))
- (org-read-date nil nil nil nil d-time d-hour))
- org-expiry-inactive-timestamps))
+ (setq timestr (concat "<"
+ (if today
+ (format-time-string
+ (replace-regexp-in-string "\\(^<\\|>$\\)" ""
+ (cdr org-time-stamp-formats)))
+ (org-read-date nil nil nil nil d-time d-hour))
+ ">"))
+ ;; maybe transform to inactive timestamp
+ (if org-expiry-inactive-timestamps
+ (setq timestr (concat "[" (substring timestr 1 -1) "]")))
(save-excursion
(org-entry-put
--
2.37.4
