X-Git-Url: https://git.distorted.org.uk/~mdw/sod/blobdiff_plain/3dca7758421664a838c54b273bd9221f02072045..c43f7bbf89a0653ed3665146f6f9586efbc07c5c:/src/class-make-proto.lisp

diff --git a/src/class-make-proto.lisp b/src/class-make-proto.lisp
index c04727c..df4b4f0 100644
--- a/src/class-make-proto.lisp
+++ b/src/class-make-proto.lisp
@@ -7,7 +7,7 @@
 
 ;;;----- Licensing notice ---------------------------------------------------
 ;;;
-;;; This file is part of the Sensble Object Design, an object system for C.
+;;; This file is part of the Sensible Object Design, an object system for C.
 ;;;
 ;;; SOD is free software; you can redistribute it and/or modify
 ;;; it under the terms of the GNU General Public License as published by
@@ -45,8 +45,14 @@
 
   (with-default-error-location (location)
     (let* ((pset (property-set pset))
-	   (class (make-instance (get-property pset :lisp-metaclass :symbol
-					       'sod-class)
+	   (best-class (or (get-property pset :lisp-metaclass :symbol nil)
+			   (if superclasses
+			       (maximum (mapcar #'class-of superclasses)
+					#'subtypep
+					(format nil "Lisp metaclass for ~A"
+						name))
+			       'sod-class)))
+	   (class (make-instance best-class
 				 :name name
 				 :superclasses superclasses
 				 :location (file-location location)