diff options
| author | Hugo Hörnquist <hugo@lysator.liu.se> | 2019-04-09 23:34:18 +0200 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2019-04-09 23:34:18 +0200 |
| commit | 6a4ca54f8e533ece589d03a6fd4fb291faceb777 (patch) | |
| tree | ab62b25f9c1683a64c68efe3b31f1d9defac7f2b | |
| parent | Add slightly better terminal drawing procedures. (diff) | |
| download | calp-6a4ca54f8e533ece589d03a6fd4fb291faceb777.tar.gz calp-6a4ca54f8e533ece589d03a6fd4fb291faceb777.tar.xz | |
Start using multi-set!
| -rwxr-xr-x | module/main.scm | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/module/main.scm b/module/main.scm index 909bac15..0e3c23be 100755 --- a/module/main.scm +++ b/module/main.scm @@ -109,9 +109,15 @@ (let ((char (read-char))) (case char - ((#\L #\l) (mod! time add-day) (set! cur-event 0)) - ((#\h #\H) (mod! time remove-day) (set! cur-event 0)) - ((#\t) (set! time (now)) (set! cur-event 0)) + ((#\L #\l) + (set! time (add-day time) + cur-event 0)) + ((#\h #\H) + (set! time (remove-day time) + cur-event 0)) + ((#\t) + (set! time (now) + cur-event 0)) ((#\j #\J) (unless (= cur-event (1- (length events))) (mod! cur-event 1+))) ((#\k #\K) (unless (= cur-event 0) @@ -136,8 +142,8 @@ (let* ((repeating regular (partition repeating? events))) - (set! repeating (sort*! repeating time<? (extract 'DTSTART))) - (set! regular (sort*! regular time<? (extract 'DTSTART))) + (set! repeating (sort*! repeating time<? (extract 'DTSTART)) + regular (sort*! regular time<? (extract 'DTSTART))) (let ((repeating (interleave-streams ev-time<? (map generate-recurrence-set repeating)))) |