Really restore proper load-time behavior of declaim.

diff --git a/src/lsp/evalmacros.lsp b/src/lsp/evalmacros.lsp
index 27b37f8..f94d1ef 100644 (file)
--- a/src/lsp/evalmacros.lsp
+++ b/src/lsp/evalmacros.lsp
@@ -368,9 +368,9 @@ values of the last FORM.  If no FORM is given, returns NIL."
 ;; Declarations
 (defmacro declaim (&rest decl-specs)
   (if (cdr decl-specs)
-    `(eval-when (:compile-toplevel :execute)
+    `(eval-when (:compile-toplevel :load-toplevel :execute)
        (mapcar #'proclaim ',decl-specs))
-    `(eval-when (:load-toplevel :execute)
+    `(eval-when (:compile-toplevel :load-toplevel :execute)
        (proclaim ',(car decl-specs)))))