~ chicken-core (chicken-5) d28185aa00d74eec536a0c3eb118117377bdf291

commit d28185aa00d74eec536a0c3eb118117377bdf291
Author:     felix <felix@call-with-current-continuation.org>
AuthorDate: Sun May 1 01:49:48 2011 +0200
Commit:     felix <felix@call-with-current-continuation.org>
CommitDate: Sun May 1 01:49:48 2011 +0200

    fucked up conflict resolution

diff --git a/optimizer.scm b/optimizer.scm
index 779c47ee..edb53cfe 100644
--- a/optimizer.scm
+++ b/optimizer.scm
@@ -381,7 +381,7 @@
 							       (sub1 argc)
 							       (cdr args)
 							       (cons (car args) used) ) ] ) ) ) )
-				      ((and (test ifid 'explicit-rest)
+				      #;((and (test ifid 'explicit-rest)
 					    (not (memq n rest-consers)) ) ; make sure we haven't inlined rest-list already
 				       (let ([n (llist-length llist)])
 					 (if (< (length args) n)
diff --git a/setup-download.scm b/setup-download.scm
index 4edf6044..53511dcd 100644
--- a/setup-download.scm
+++ b/setup-download.scm
@@ -360,9 +360,6 @@
 
   (define (read-chunks in)
     (let get-chunks ([data '()])
-	(cond ((not size)
-	       (error "invalid response from server - please try again"))
-              ((zero? size)
       (let* ((szln (read-line in))
 	     ;;XXX workaround for "read-line" dropping the "\n" in certain situations
 	     ;;    (#568)