0.8.6.5

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

diff --git a/src/pcl/boot.lisp b/src/pcl/boot.lisp
index 8541b0b..40c13b4 100644 (file)
--- a/src/pcl/boot.lisp
+++ b/src/pcl/boot.lisp
@@ -1524,8 +1524,6 @@ bootstrapping.
                 *))))
 
 (defun defgeneric-declaration (spec lambda-list)
-  (when (consp spec)
-    (setq spec (get-setf-fun-name (cadr spec))))
   `(ftype ,(ftype-declaration-from-lambda-list lambda-list spec) ,spec))
 \f
 ;;;; early generic function support
@@ -1808,6 +1806,8 @@ bootstrapping.
                                            &allow-other-keys)
   (declare (ignore keys))
   (cond ((and existing (early-gf-p existing))
+        (when lambda-list-p
+          (set-arg-info existing :lambda-list lambda-list))
         existing)
        ((assoc spec *!generic-function-fixups* :test #'equal)
         (if existing
@@ -1907,7 +1907,7 @@ bootstrapping.
                             (method-lambda-list method)))
                     (k (member '&key ll)))
                (if k
-                   (append (ldiff ll (cdr k)) '(&allow-other-keys))
+                   (ldiff ll (cdr k))
                    ll))))
        (arg-info-lambda-list arg-info))))