Import Debian changes 3a1-4.2debian/3a1-4.2

slib (3a1-4.2) unstable; urgency=low

  * Non-maintainer upload.
  * Add guile.init.local for use within the build dir, since otherwise we
    have an (earlier unnoticed) circular build-dep due to a difference
    between scm and guile.

slib (3a1-4.1) unstable; urgency=low

  * Non-maintainer upload.
  * Build-depend on guile-1.6 instead of scm, since the new version of
    scm is wedged in unstable (closes: #281809).

slib (3a1-4) unstable; urgency=low

  * Also check for expected creation on slibcat. (Closes: #240096)

slib (3a1-3) unstable; urgency=low

  * Also check for /usr/share/guile/1.6/slib before installing for guile
    1.6. (Closes: #239267)

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

  * Add format.scm back into slib until gnucash stops using it.
  * Call guile-1.6 new-catalog (Closes: #238231)

slib (3a1-1) unstable; urgency=low

  * New upstream release
  * Remove Info section from doc-base file (Closes: #186950)
  * Remove period from end of description (linda, lintian)
  * html gen fixed upstream (Closes: #111778)

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

  * Fix url for upstream source (Closes: #144981)
  * Fix typo in slib.texi (enquque->enqueue) (Closes: #147475)
  * Add build depends.

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

  * New upstream.

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

  * New upstream.
  * Remove texi2html call in debian/rules.  Now done upstream.  Add make
    html instead.
  * Changes to rules and doc-base to conform to upstream html gen
  * Clean up upstream makefile to make sure it cleans up after itself.

1 files changed, 35 insertions, 37 deletions

diff --git a/mbe.scm b/mbe.scm
index 8cfe433..cd3e25d 100644
--- a/mbe.scm
+++ b/mbe.scm
@@ -8,7 +8,7 @@
 ;1.  Any copy made of this software must include this copyright notice
 ;in full.
 ;
-;2.  I have made no warrantee or representation that the operation of
+;2.  I have made no warranty or representation that the operation of
 ;this software will be error-free, and I am under no obligation to
 ;provide any services, by way of maintenance, update, or otherwise.
 ;
@@ -18,7 +18,7 @@
 ;each case.
 
 ;;; revised Dec. 6, 1993 to R4RS syntax (if not semantics).
-;;; revised Mar. 2 1994 for SLIB (jaffer@ai.mit.edu).
+;;; revised Mar. 2 1994 for SLIB (agj @ alum.mit.edu).
 ;;; corrections, Apr. 24, 1997.
 ;;; corr., Jan. 30, 1999. (mflatt@cs.rice.edu, dorai@cs.rice.edu)
 
@@ -27,9 +27,8 @@
 ;;; defmacro.
 
 (require 'common-list-functions)	;nconc, some, every
-;(require 'rev2-procedures)		;append! alternate for nconc
 (require 'rev4-optional-procedures)	;list-tail
-(require 'defmacroexpand)
+(require 'defmacroexpand)		;defmacro:expand*
 
 (define hyg:rassq
   (lambda (k al)
@@ -401,43 +400,42 @@
 (define mbe:ellipsis?
   (lambda (x)
     (and (pair? x) (pair? (cdr x)) (eq? (cadr x) '...))))
+;@
+(define macro:eval slib:eval)
+(define macro:load slib:load)
+(define macro:expand defmacro:expand*)
 
-;define-syntax
-
+;@ define-syntax
 (defmacro define-syntax (macro-name syn-rules)
   (if (or (not (pair? syn-rules))
-	(not (eq? (car syn-rules) 'syntax-rules)))
-    (slib:error 'define-syntax 'not-an-r4rs-high-level-macro
-      macro-name syn-rules)
-    (let ((keywords (cons macro-name (cadr syn-rules)))
-	   (clauses (cddr syn-rules)))
-      `(defmacro ,macro-name macro-arg
-	 (let ((macro-arg (cons ',macro-name macro-arg))
-		(keywords ',keywords))
-	   (cond ,@(map
-		     (lambda (clause)
-		       (let ((in-pattern (car clause))
+	  (not (eq? (car syn-rules) 'syntax-rules)))
+      (slib:error 'define-syntax 'not-an-r4rs-high-level-macro
+		  macro-name syn-rules)
+      (let ((keywords (cons macro-name (cadr syn-rules)))
+	    (clauses (cddr syn-rules)))
+	`(defmacro ,macro-name macro-arg
+	   (let ((macro-arg (cons ',macro-name macro-arg))
+		 (keywords ',keywords))
+	     (cond ,@(map
+		      (lambda (clause)
+			(let ((in-pattern (car clause))
 			      (out-pattern (cadr clause)))
-			 `((mbe:matches-pattern? ',in-pattern macro-arg
-			     keywords)
+			  `((mbe:matches-pattern? ',in-pattern macro-arg
+						  keywords)
 			    (let ((tagged-out-pattern+alist
-				    (hyg:tag
-				      ',out-pattern
-				      (nconc (hyg:flatten ',in-pattern)
-					keywords) '())))
+				   (hyg:tag
+				    ',out-pattern
+				    (nconc (hyg:flatten ',in-pattern)
+					   keywords) '())))
 			      (hyg:untag
-				(mbe:expand-pattern
-				  (car tagged-out-pattern+alist)
-				  (mbe:get-bindings ',in-pattern macro-arg
-				    keywords)
-				  keywords)
-				(cdr tagged-out-pattern+alist)
-				'())))))
-		     clauses)
-	     (else (slib:error ',macro-name 'no-matching-clause
-		     ',clauses))))))))
+			       (mbe:expand-pattern
+				(car tagged-out-pattern+alist)
+				(mbe:get-bindings ',in-pattern macro-arg
+						  keywords)
+				keywords)
+			       (cdr tagged-out-pattern+alist)
+			       '())))))
+		      clauses)
+		   (else (slib:error ',macro-name 'no-matching-clause
+				     ',clauses))))))))
 
-(define macro:eval slib:eval)
-(define macro:load slib:load)
-(provide 'macro)
-;eof