From 39e7f02a79dc792333b8ebf109798337e69f52bb Mon Sep 17 00:00:00 2001
From: Juan Jose Garcia Ripoll <jjgarcia@users.sourceforge.net>
Date: Fri, 21 May 2010 23:04:43 +0200
Subject: [PATCH] WITH-COUNT did not allow inserting declarations at the
 beginning of the body

---
 src/lsp/seqmacros.lsp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/lsp/seqmacros.lsp b/src/lsp/seqmacros.lsp
index 45bbd9861..2ce2550cb 100644
--- a/src/lsp/seqmacros.lsp
+++ b/src/lsp/seqmacros.lsp
@@ -16,13 +16,14 @@
 
 (defmacro with-count ((count &optional (value count) &key (output nil output-p))
                       &body body)
+  (setf body `(locally ,@body))
   `(let ((,count (sequence-count ,value)))
      (declare (fixnum ,count))
      ,(if output-p
 	  `(if (plusp ,count)
-	       ,@body
+	       ,body
 	       ,output)
-	  `(progn ,@body))))
+	  body)))
 
 (defmacro with-predicate ((predicate) &body body)
   `(let ((,predicate (si::coerce-to-function ,predicate)))