diff options
| author | Hugo Hörnquist <hugo@lysator.liu.se> | 2020-05-19 23:20:28 +0200 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2020-05-19 23:21:57 +0200 |
| commit | 2e8870e61ddacff8dbcbe59b26fa1556dd0afc76 (patch) | |
| tree | dd92f2b3d998bfa0d5496bba4b7b39bdfdadd7ef | |
| parent | Remove old recurrence generator. (diff) | |
| download | calp-2e8870e61ddacff8dbcbe59b26fa1556dd0afc76.tar.gz calp-2e8870e61ddacff8dbcbe59b26fa1556dd0afc76.tar.xz | |
Move new recurrence generator to generate.scm.
| -rw-r--r-- | module/vcomponent/datetime.scm | 2 | ||||
| -rw-r--r-- | module/vcomponent/recurrence.scm | 2 | ||||
| -rw-r--r-- | module/vcomponent/recurrence/display/test.scm | 4 | ||||
| -rw-r--r-- | module/vcomponent/recurrence/generate.scm (renamed from module/vcomponent/recurrence/generate-alt.scm) | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/module/vcomponent/datetime.scm b/module/vcomponent/datetime.scm index fabe3978..28d48361 100644 --- a/module/vcomponent/datetime.scm +++ b/module/vcomponent/datetime.scm @@ -109,7 +109,7 @@ Event must have the DTSTART and DTEND attribute set." (define (final-spanned-time event) (if (not ((@ (vcomponent recurrence) repeating?) event)) (or (attr event 'DTEND) (attr event 'DTSTART)) - (let ((final ((@ (vcomponent recurrence generate-alt) final-event-occurence) + (let ((final ((@ (vcomponent recurrence generate) final-event-occurence) event))) (if final (aif (attr event 'DTEND) diff --git a/module/vcomponent/recurrence.scm b/module/vcomponent/recurrence.scm index 28decce7..12f901d2 100644 --- a/module/vcomponent/recurrence.scm +++ b/module/vcomponent/recurrence.scm @@ -1,5 +1,5 @@ (define-module (vcomponent recurrence) - #:use-module (vcomponent recurrence generate-alt) + #:use-module (vcomponent recurrence generate) #:use-module (vcomponent recurrence parse) #:use-module (vcomponent recurrence internal) #:re-export (generate-recurrence-set diff --git a/module/vcomponent/recurrence/display/test.scm b/module/vcomponent/recurrence/display/test.scm index e369eda4..71a049da 100644 --- a/module/vcomponent/recurrence/display/test.scm +++ b/module/vcomponent/recurrence/display/test.scm @@ -5,7 +5,7 @@ (use-modules (vcomponent recurrence display) (vcomponent recurrence parse) - (vcomponent recurrence generate-alt) + (vcomponent recurrence generate) (vcomponent) (datetime) (datetime util) @@ -25,7 +25,7 @@ (attr comp 'RRULE)) (map (lambda (d) (datetime->string d "~a ~1 ~3")) (stream->list - 10 ((@@ (vcomponent recurrence generate-alt) rrule-instances) + 10 ((@@ (vcomponent recurrence generate) rrule-instances) comp))))))) diff --git a/module/vcomponent/recurrence/generate-alt.scm b/module/vcomponent/recurrence/generate.scm index 1d32d793..b951c5a3 100644 --- a/module/vcomponent/recurrence/generate-alt.scm +++ b/module/vcomponent/recurrence/generate.scm @@ -1,4 +1,4 @@ -(define-module (vcomponent recurrence generate-alt) +(define-module (vcomponent recurrence generate) :export (generate-recurrence-set) :use-module (util) :use-module (util exceptions) |