New upstream version 3b5upstream/3b5upstream

1 files changed, 7 insertions, 7 deletions

diff --git a/dbsyn.scm b/dbsyn.scm
index f807642..84d4c7b 100644..100755
--- a/dbsyn.scm
+++ b/dbsyn.scm
@@ -46,25 +46,25 @@
      database)
                                         ; define-table
     ((within-database database
-       (define-table (name primary columns) row ...)
-       rest ...)
+		      (define-table (name primary columns) row ...)
+		      rest ...)
      (begin (define-tables database '(name primary columns (row ...)))
             (within-database database rest ...)))
                                         ; define-command
     ((within-database database
-       (define-command template arg-1 arg-2 ...)
-       rest ...)
+		      (define-command template arg-1 arg-2 ...)
+		      rest ...)
      (begin (define-*commands* database '(template arg-1 arg-2 ...))
             (within-database database rest ...)))
                                         ;
     ((within-database database
-       (command arg-1 ...)
-       rest ...)
+		      (command arg-1 ...)
+		      rest ...)
      (begin (cond ((let ((p (database '*macro*)))
                      (and p (slib:eval (p 'command))))
                    => (lambda (proc)
                         (slib:eval
-                         (apply proc database '(arg-1 ...)))))
+                         (apply proc (cons database '(arg-1 ...))))))
                   (else
                    ((database 'command) arg-1 ...)))
             (within-database database rest ...)))))