0.9.18.64:

        Add a REPLACE restart for the annoying "FOO already names an ordinary
        function or a macro" error for DEFGENERIC.

diff --git a/src/pcl/boot.lisp b/src/pcl/boot.lisp
index 8c4e28e..8d1535d 100644 (file)
--- a/src/pcl/boot.lisp
+++ b/src/pcl/boot.lisp
@@ -1603,7 +1603,12 @@ bootstrapping.
     (if (and existing
              (eq *boot-state* 'complete)
              (null (generic-function-p existing)))
-        (generic-clobbers-function fun-name)
+        (restart-case
+            (generic-clobbers-function fun-name)
+          (replace ()
+            :report "Replace the function binding"
+            (fmakunbound fun-name)
+            (apply #'ensure-generic-function fun-name all-keys)))
         (apply #'ensure-generic-function-using-class
                existing fun-name all-keys))))
 

diff --git a/version.lisp-expr b/version.lisp-expr
index b52785d..f8829e9 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.9.18.63"
+"0.9.18.64"