martin/emacs-doom
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

calfw capture: fix calendar-day-name args (use date list, not encode-time)

Browse Source
This commit is contained in:
Daneel
2026-02-25 15:52:02 +01:00
parent 2d07377d42
commit 2d4b276a67
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config.el
View File

@@ -1621,7 +1621,7 @@ Formats matching what org-caldav/ox-icalendar export correctly:
(y (calendar-extract-year date)) (y (calendar-extract-year date))
(m (calendar-extract-month date)) (m (calendar-extract-month date))
(d (calendar-extract-day date)) (d (calendar-extract-day date))
(dow (calendar-day-name (encode-time 0 0 0 d m y) nil t)) (dow (calendar-day-name date nil t))
(start-time (read-string "Start time (HH:MM, empty=all-day): ")) (start-time (read-string "Start time (HH:MM, empty=all-day): "))
(end-input (unless (string-empty-p start-time) (end-input (unless (string-empty-p start-time)
(read-string "End time or end date (HH:MM / YYYY-MM-DD / YYYY-MM-DD HH:MM, empty=same day open): ")))) (read-string "End time or end date (HH:MM / YYYY-MM-DD / YYYY-MM-DD HH:MM, empty=same day open): "))))
@@ -1633,7 +1633,7 @@ Formats matching what org-caldav/ox-icalendar export correctly:
(format "<%04d-%02d-%02d %s>" y m d dow) (format "<%04d-%02d-%02d %s>" y m d dow)
(let* ((parsed (parse-time-string (concat end-date " 00:00"))) (let* ((parsed (parse-time-string (concat end-date " 00:00")))
(ed (nth 3 parsed)) (em (nth 4 parsed)) (ey (nth 5 parsed)) (ed (nth 3 parsed)) (em (nth 4 parsed)) (ey (nth 5 parsed))
(edow (calendar-day-name (encode-time 0 0 0 ed em ey) nil t))) (edow (calendar-day-name (list em ed ey) nil t)))
(format "<%04d-%02d-%02d %s>--<%04d-%02d-%02d %s>" y m d dow ey em ed edow))))) (format "<%04d-%02d-%02d %s>--<%04d-%02d-%02d %s>" y m d dow ey em ed edow)))))
;; Timed event - check if end contains a date (multi-day) ;; Timed event - check if end contains a date (multi-day)
((and end-input (not (string-empty-p end-input)) ((and end-input (not (string-empty-p end-input))
@@ -1644,7 +1644,7 @@ Formats matching what org-caldav/ox-icalendar export correctly:
(end-date-part (substring end-input 0 10)) (end-date-part (substring end-input 0 10))
(parsed (parse-time-string (concat end-date-part " 00:00"))) (parsed (parse-time-string (concat end-date-part " 00:00")))
(ed (nth 3 parsed)) (em (nth 4 parsed)) (ey (nth 5 parsed)) (ed (nth 3 parsed)) (em (nth 4 parsed)) (ey (nth 5 parsed))
(edow (calendar-day-name (encode-time 0 0 0 ed em ey) nil t))) (edow (calendar-day-name (list em ed ey) nil t)))
(if (string-empty-p end-time-part) (if (string-empty-p end-time-part)
(format "<%04d-%02d-%02d %s %s>--<%04d-%02d-%02d %s>" (format "<%04d-%02d-%02d %s %s>--<%04d-%02d-%02d %s>"
y m d dow start-time ey em ed edow) y m d dow start-time ey em ed edow)