Remove custom let*.

While it was nice, the most important part was the multi-valued let from
srfi-71 (which is implemented in srfi-71)). The minor pattern matching
structures could often be replaced with car+cdr, or a propper match.

2 files changed, 6 insertions, 5 deletions

diff --git a/module/vulgar/components.scm b/module/vulgar/components.scm
index 882da849..740e64c3 100644
--- a/module/vulgar/components.scm
+++ b/module/vulgar/components.scm
@@ -4,9 +4,9 @@
   #:export ())
 
 (define-public (display-calendar-header! date)
-  (let* ((day   (number->string (day   date)))
-         (month (number->string (month date)))
-         (year  (number->string (year  date))))
+  (let ((day   (number->string (day   date)))
+        (month (number->string (month date)))
+        (year  (number->string (year  date))))
     ;; BSD cal only supports setting highlighted day explicitly for
     ;; testing the functionality. This seems to at least give me
     ;; an (almost) working display, albeit ugly.
diff --git a/module/vulgar/info.scm b/module/vulgar/info.scm
index 963e20c8..0f55c942 100644
--- a/module/vulgar/info.scm
+++ b/module/vulgar/info.scm
@@ -1,10 +1,11 @@
 (define-module (vulgar info)
-  :use-module (hnh util))
+  :use-module ((srfi srfi-1) :select (car+cdr))
+  :use-module (srfi srfi-71))
 
 ;; Sort-of backwards subprocess call since we want the current terminal to be
 ;; inherited by stty
 (define-public (get-terminal-size)
- (let* (((rpipe . wpipe) (pipe)))
+ (let ((rpipe wpipe (car+cdr (pipe))))
    (system (format #f "stty size > /proc/~s/fd/~s"
                    (getpid) (port->fdes wpipe)))
    (values (read rpipe)