0.7.7.10:

[sbcl.git] / src / pcl / defcombin.lisp

diff --git a/src/pcl/defcombin.lisp b/src/pcl/defcombin.lisp
index dacd520..0b2111e 100644 (file)
--- a/src/pcl/defcombin.lisp
+++ b/src/pcl/defcombin.lisp
@@ -208,9 +208,10 @@
                         (declare (ignore nms cm-args))
                         (apply
                          (lambda (generic-function type options)
-                           (declare (ignore generic-function options))
+                           (declare (ignore generic-function))
                            (make-instance 'long-method-combination
                                           :type type
+                                          :options options
                                           :documentation doc))
                          args))
             :definition-source `((define-method-combination ,type)
@@ -230,10 +231,10 @@
 
 (defun make-long-method-combination-function
        (type ll method-group-specifiers args-option gf-var body)
-  ;;(declare (values documentation function))
   (declare (ignore type))
-  (multiple-value-bind (documentation declarations real-body)
-      (extract-declarations body)
+  (multiple-value-bind (real-body declarations documentation)
+      ;; (Note that PARSE-BODY ignores its second arg ENVIRONMENT.)
+      (parse-body body nil)
 
     (let ((wrapped-body
            (wrap-method-group-specifier-bindings method-group-specifiers