From aa2a1e907843b7f3bc7984b32fd0344c9cf24a94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hugo=20H=C3=B6rnquist?= Date: Sun, 22 Mar 2020 22:15:55 +0100 Subject: Date difference once again returns dates. --- module/vcomponent/recurrence/generate.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'module/vcomponent') diff --git a/module/vcomponent/recurrence/generate.scm b/module/vcomponent/recurrence/generate.scm index 42b3ca09..ac1402fa 100644 --- a/module/vcomponent/recurrence/generate.scm +++ b/module/vcomponent/recurrence/generate.scm @@ -81,7 +81,9 @@ (change (attr e 'X-HNH-DURATION))) (when end (set! (attr e 'DTEND) - (datetime+ (as-datetime start) (datetime time: change))))))) + (if (date? start) + (date+ start change) + (datetime+ start (datetime time: change)))))))) e)) @@ -155,7 +157,7 @@ ;; The value type of dtstart and dtend must be the same ;; according to RFC 5545 3.8.2.2 (Date-Time End). (if (date? end) - (time second: (date-difference end (attr event 'DTSTART))) + (date-difference end (attr event 'DTSTART)) (time second: (datetime-difference end (attr event 'DTSTART)))))])) (if (attr event "RRULE") (recur-event-stream event (parse-recurrence-rule -- cgit v1.2.3