Enclose the forms in DEFINE-SETF-EXPANDER in a block

src/CHANGELOG

@@ -8,9 +8,6 @@ ECL 0.9g
  - Based on version 6.5 of Boehm-Weiser garbage collector, which fixes some
    problems related to the OSX port.
 
- - Cross-compilation now uses ecl_min instead of ecl, which is now installed by
-   default. (M. Pasternacki)
-
 * Foreign function interface (FFI):
 
  - Added nickname UFFI for FFI package; functions ALLOCATE-FOREIGN-STRING,
@@ -118,6 +115,9 @@ ECL 0.9g
 
  - #\Space has constituent trait "invalid".
 
+ - DEFINE-SETF-EXPANDER encloses the form in an implicit block with the name of
+   the SETF function.
+
 * New features:
 
  - Added function si:rmdir (M. Pasternacki)

src/lsp/setf.lsp

@@ -84,7 +84,7 @@ by (DOCUMENTATION 'SYMBOL 'SETF)."
 	  (setq args (cons env args))
 	  (push `(declare (ignore ,env)) body))))
   `(eval-when (compile load eval)
-	  (put-sysprop ',access-fn 'SETF-METHOD #'(lambda ,args ,@body))
+	  (put-sysprop ',access-fn 'SETF-METHOD #'(ext::lambda-block ,access-fn ,args ,@body))
           (rem-sysprop ',access-fn 'SETF-LAMBDA)
           (rem-sysprop ',access-fn 'SETF-UPDATE-FN)
 	  (rem-sysprop ',access-fn 'SETF-SYMBOL)