Merge branch 'master' into proper-mq

The 'hat-let' fix wil be used.

1 files changed, 7 insertions, 5 deletions

diff --git a/gnu/gnunet/utils/hat-let.scm b/gnu/gnunet/utils/hat-let.scm
index 9382867..181ed5a 100644
--- a/gnu/gnunet/utils/hat-let.scm
+++ b/gnu/gnunet/utils/hat-let.scm
@@ -30,8 +30,10 @@
 ;;          with <--.
 ;;   * (2 1): Refer to '_' as a symbol, not as the _ from
 ;;            (rnrs base)
+;;   * (2 2): Make (! (procedure-name argument) code code* ...)
+;;            usable.
 
-(library (gnu gnunet utils hat-let (2 1))
+(library (gnu gnunet utils hat-let (2 2))
   (export let^)
   ;; Avoid letting users of (gnu gnunet utils hat-let)
   ;; having to import _ from (rnrs base).
@@ -50,15 +52,15 @@
        (if x
            (begin esc esc* ...)
            (let^ (etc ...) code ...)))
-      ;; Bind y to x
-      ((: ((! x y) etc ...) code ...)
-       (let ((x y))
-         (let^ (etc ...) code ...)))
       ;; Define a procedure
       ((: ((! (x . args) body ...) etc ...) code ...)
        (let ((x (lambda args body ...)))
          (let^ (etc ...)
                code ...)))
+      ;; Bind y to x
+      ((: ((! x y) etc ...) code ...)
+       (let ((x y))
+         (let^ (etc ...) code ...)))
       ;; Assert it is true!
       ((: ((!! x) etc ...) code ...)
        (begin