0.pre7.124:

[sbcl.git] / src / code / target-package.lisp

diff --git a/src/code/target-package.lisp b/src/code/target-package.lisp
index 7201b7a..8ef4ca9 100644 (file)
--- a/src/code/target-package.lisp
+++ b/src/code/target-package.lisp
@@ -427,9 +427,9 @@
   #!+sb-doc
   "Return a list of all existing packages."
   (let ((res ()))
-    (maphash #'(lambda (k v)
-                (declare (ignore k))
-                (pushnew v res))
+    (maphash (lambda (k v)
+              (declare (ignore k))
+              (pushnew v res))
             *package-names*)
     res))
 \f
@@ -834,7 +834,7 @@
 
 (defun unuse-package (packages-to-unuse &optional (package (sane-package)))
   #!+sb-doc
-  "Remove Packages-To-Unuse from the use list for Package."
+  "Remove PACKAGES-TO-UNUSE from the USE list for PACKAGE."
   (let ((package (find-undeleted-package-or-lose package)))
     (dolist (p (package-listify packages-to-unuse))
       (setf (package-%use-list package)
@@ -851,10 +851,10 @@
   "Return a list of all symbols in the system having the specified name."
   (let ((string (string string-or-symbol))
        (res ()))
-    (maphash #'(lambda (k v)
-                (declare (ignore k))
-                (multiple-value-bind (s w) (find-symbol string v)
-                  (when w (pushnew s res))))
+    (maphash (lambda (k v)
+              (declare (ignore k))
+              (multiple-value-bind (s w) (find-symbol string v)
+                (when w (pushnew s res))))
             *package-names*)
     res))
 \f
@@ -868,24 +868,28 @@
   (when (fboundp symbol)
     (write-string " (fbound)")))
 
-(defun apropos-list (string-designator &optional package external-only)
+(defun apropos-list (string-designator
+                    &optional
+                    package-designator
+                    external-only)
   #!+sb-doc
   "Like APROPOS, except that it returns a list of the symbols found instead
   of describing them."
-  (if package
-    (let ((string (stringify-name string-designator "APROPOS search"))
-         (result nil))
-      (do-symbols (symbol package)
-       (when (and (eq (symbol-package symbol) package)
-                  (or (not external-only)
-                      (eq (find-symbol (symbol-name symbol) package)
-                          :external))
-                  (search string (symbol-name symbol) :test #'char-equal))
-         (push symbol result)))
-      result)
-    (mapcan (lambda (package)
-             (apropos-list string-designator package external-only))
-           (list-all-packages))))
+  (if package-designator
+      (let ((package (find-undeleted-package-or-lose package-designator))
+           (string (stringify-name string-designator "APROPOS search"))
+           (result nil))
+       (do-symbols (symbol package)
+         (when (and (eq (symbol-package symbol) package)
+                    (or (not external-only)
+                        (eq (find-symbol (symbol-name symbol) package)
+                            :external))
+                    (search string (symbol-name symbol) :test #'char-equal))
+           (push symbol result)))
+       result)
+      (mapcan (lambda (package)
+               (apropos-list string-designator package external-only))
+             (list-all-packages))))
 
 (defun apropos (string-designator &optional package external-only)
   #!+sb-doc