Do not override VALIDATE-SUPERCLASS (FUNCALLABLE-STANDARD-CLASS STANDARD-CLASS) on CLISP.

darcs-hash:caed8a613bac4239d26a45281e0c15281d501a27

1 files changed, 9 insertions, 5 deletions

diff --git a/Lisp/data-types.lisp b/Lisp/data-types.lisp
index 8ec2e49..333cc10 100644
--- a/Lisp/data-types.lisp
+++ b/Lisp/data-types.lisp
@@ -63,11 +63,15 @@
 
 ;; FIXME: I'm not confident about this, but it is needed in order to
 ;; make (DEFCLASS SELECTOR ...) work.
-(#+clisp ext:without-package-lock #+clisp (#:clos)
- #-clisp progn
-  (defmethod c2mop:validate-superclass ((class c2mop:funcallable-standard-class)
-                                        (superclass standard-class))
-    t))
+;;
+;; On the other hand, CLISP's implementation notes specify this method
+;; to return true by default for "some `obvious' cases" [29.12] such as
+;; this one.  Therefore, we needn't override it.  In fact, we can't, at
+;; least without disabling #<PACKAGE CLOS>'s package lock.
+#-clisp
+(defmethod c2mop:validate-superclass ((class c2mop:funcallable-standard-class)
+                                      (superclass standard-class))
+  t)
 
 
 (defclass selector (c2mop:funcallable-standard-object c-pointer-wrapper)