~bzg/org-contrib

223390ea2c2f728ca4bfd1c4a33cac25d003693a — Marcel van der Boom a month ago d0cebeb master
Use format function for timestamp; combine both time-stamp-format fixes

A redo of 0927d5f319d6168b0df3a118f2269535a15557ef">https://git.sr.ht/~mrvdb/org-contrib/commit/0927d5f319d6168b0df3a118f2269535a15557ef
taking the change from
b6712e688b3a54c54b80ab34525d4672ff2a8d7a">https://git.sr.ht/~bzg/org-contrib/commit/b6712e688b3a54c54b80ab34525d4672ff2a8d7a into account
1 files changed, 14 insertions(+), 17 deletions(-)

M lisp/org-expiry.el
M lisp/org-expiry.el => lisp/org-expiry.el +14 -17
@@ 302,16 302,13 @@ update the date."
      (setq d-hour (format-time-string "%H:%M" d-time))
      (setq timestr
	    ;; 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) "]")))
            (org-expiry-format-timestamp
             (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))))
             org-expiry-inactive-timestamps))
      (save-excursion
	(org-entry-put
	 (point) org-expiry-created-property-name timestr)))))


@@ 326,13 323,13 @@ 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 (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))
                          ">"))
    (setq timestr (org-expiry-format-timestamp
                   (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))
                   org-expiry-inactive-timestamps))
    ;; maybe transform to inactive timestamp
    (if org-expiry-inactive-timestamps
	(setq timestr (concat "[" (substring timestr 1 -1) "]")))