Import Debian changes 2c7-1debian/2c7-1

slib (2c7-1) unstable; urgency=low

  * New upstream.
  * Add slibconfig back in.

slib (2c6-2) unstable; urgency=low

  * Remove the slib$(VERSION).info file.  Cut the diff back down to
    size. 

slib (2c6-1) unstable; urgency=low

  * New upstream.
  * Move docs to /usr/share. Up standards version. add /usr/doc symlink.
    Move info files.  Remove undocumented link.

slib (2c5-6) unstable; urgency=low

  * Lowercase two vars in yasyn.scm (Fixes bug #37222)

slib (2c5-5) unstable; urgency=low

  * Fix it so string-index isn't defined (now there is a
    strsrch:string-index) (Fixes #38812)

slib (2c5-4) unstable; urgency=low

  * Don't run slibconfig in postinst.  (Fixes bug #38253, #37733, #37715,
    #37746,  #37809, #37917, #38123, #38462)

slib (2c5-3) unstable; urgency=low

  * Run slibconfig in postinst.  It was commented out there, but I don't
    see any old bug reports on why it was commented out, so let's try
    again. :)  (Fixes bug #37221)

slib (2c5-2) unstable; urgency=low

  * Link mklibcat.scm to mklibcat.  Fixes a problem with using slib with
    guile. 

slib (2c5-1) unstable; urgency=low

  * New upstream.

slib (2c3-4) unstable; urgency=low

  * New maintainer.

1 files changed, 19 insertions, 24 deletions

diff --git a/fluidlet.scm b/fluidlet.scm
index c93b288..59ba481 100644
--- a/fluidlet.scm
+++ b/fluidlet.scm
@@ -1,5 +1,5 @@
 ; "fluidlet.scm", FLUID-LET for Scheme
-; Copyright (c) 1992, Dorai Sitaram (dorai@cs.rice.edu)
+; Copyright (c) 1998, Aubrey Jaffer
 ;
 ;Permission to copy this software, to redistribute it, and to use it
 ;for any purpose is granted, subject to the following restrictions and
@@ -17,29 +17,24 @@
 ;promotional, or sales literature without prior written consent in
 ;each case.
 
-(require 'rev4-optional-procedures)
-(require 'common-list-functions)
 (require 'dynamic-wind)
-(require 'macro)
+(require 'common-list-functions)	;MAKE-LIST
 
-(define list-set! (lambda (s i v) (set-car! (list-tail s i) v)))
-
-(define-syntax fluid-let
-  (syntax-rules ()
-    ((fluid-let ((x v) ...) . body)
-     (let ((%x-names (list 'x ...))
-	   (%x-values (list x ...))
-	   (%fluid-x-values (list v ...)))
+(defmacro fluid-let (clauses . body)
+  (let ((ids (map car clauses))
+	(new-tmps (map (lambda (x) (gentemp)) clauses))
+	(old-tmps (map (lambda (x) (gentemp)) clauses)))
+    `(let (,@(map list new-tmps (map cadr clauses))
+	   ,@(map list old-tmps (make-list (length clauses) #f)))
        (dynamic-wind
-	 (lambda ()
-           (set! x (list-ref %fluid-x-values
-		       (comlist:position 'x %x-names)))
-           ...)
-	 (lambda () . body)
-	 (lambda ()
-           (let ((%x-position (comlist:position 'x %x-names)))
-             (list-set! %fluid-x-values %x-position x)
-	     (set! x (list-ref %x-values %x-position)))
-	   ...))))))
-
-;--- end of file
+	   (lambda ()
+	     ,@(map (lambda (ot id) `(set! ,ot ,id))
+		    old-tmps ids)
+	     ,@(map (lambda (id nt) `(set! ,id ,nt))
+		    ids new-tmps))
+	   (lambda () ,@body)
+	   (lambda ()
+	     ,@(map (lambda (nt id) `(set! ,nt ,id))
+		    new-tmps ids)
+	     ,@(map (lambda (id ot) `(set! ,id ,ot))
+		    ids old-tmps))))))