From a986a152dd3b40d402fc0a85e16e94582ab2006c Mon Sep 17 00:00:00 2001
From: Juan Jose Garcia Ripoll <jjgarcia@jjgr-2.local>
Date: Sun, 13 Sep 2009 20:43:40 +0200
Subject: [PATCH] When rebasing the latest changes, the code for with-lock got
 corrupt.

---
 src/lsp/mp.lsp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lsp/mp.lsp b/src/lsp/mp.lsp
index e65026ded..63c7dc1de 100644
--- a/src/lsp/mp.lsp
+++ b/src/lsp/mp.lsp
@@ -83,7 +83,7 @@ WITHOUT-INTERRUPTS in:
        (when si:*interrupts-enabled*
          (si::check-pending-interrupts)))))
 
-(defmacro with-lock ((lock &rest options) &body body)
+(defmacro with-lock ((lock-form &rest options) &body body)
   #-threads
   `(progn ,@body)
   ;; Why do we need %count? Even if get-lock succeeeds, an interrupt may
@@ -102,7 +102,7 @@ WITHOUT-INTERRUPTS in:
        (without-interrupts
            (unwind-protect
                 (with-restored-interrupts
-                    (mp::get-lock ,lock, @options)
+                    (mp::get-lock ,lock)
                   (locally ,@body))
              (when (> (mp:lock-count ,lock) ,count)
                (mp::giveup-lock ,lock)))))))