1.0.15.31: thread-safe FIND-CLASS -- really this time

[sbcl.git] / src / code / describe.lisp

diff --git a/src/code/describe.lisp b/src/code/describe.lisp
index 51a5cfd..79de2f8 100644 (file)
--- a/src/code/describe.lisp
+++ b/src/code/describe.lisp
@@ -95,7 +95,7 @@
               count (zerop count))
       (let ((n 0))
         (declare (type index n))
-        (dohash (k v x)
+        (dohash ((k v) x :locked t)
           (unless (zerop n)
             (write-char #\space s))
           (incf n)
@@ -353,10 +353,13 @@
   (%describe-doc x s 'type "Type")
   (%describe-doc x s 'setf "Setf macro")
   (dolist (assoc (info :random-documentation :stuff x))
-    (format s
-            "~&~@<Documentation on the ~(~A~):~@:_~A~:>"
-            (car assoc)
-            (cdr assoc)))
+    (let ((type (car assoc)))
+      (format s
+              "~&~@<Documentation on the ~(~A~):~@:_~A~:>"
+              (case type
+                ((optimize) "optimize quality")
+                (t (car assoc)))
+              (cdr assoc))))
 
   ;; Mention the associated type information, if any.
   ;;