X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Ftarget-package.lisp;h=035da80ba5580b6b722ebf47995ad32f98145d24;hb=cd176690400f8b6fa23faa4dc6fa8494bcbce480;hp=40a95763acbebbbaeef6f749e8de2e6ac5697910;hpb=dec94b039e8ec90baf21463df839a6181de606f6;p=sbcl.git

diff --git a/src/code/target-package.lisp b/src/code/target-package.lisp
index 40a9576..035da80 100644
--- a/src/code/target-package.lisp
+++ b/src/code/target-package.lisp
@@ -425,7 +425,7 @@
 
 (defun list-all-packages ()
   #!+sb-doc
-  "Returns a list of all existing packages."
+  "Return a list of all existing packages."
   (let ((res ()))
     (maphash #'(lambda (k v)
 		 (declare (ignore k))
@@ -435,7 +435,7 @@
 
 (defun intern (name &optional (package (sane-package)))
   #!+sb-doc
-  "Returns a symbol having the specified name, creating it if necessary."
+  "Return a symbol having the specified name, creating it if necessary."
   ;; We just simple-stringify the name and call INTERN*, where the real
   ;; logic is.
   (let ((name (if (simple-string-p name)
@@ -448,7 +448,7 @@
 
 (defun find-symbol (name &optional (package (sane-package)))
   #!+sb-doc
-  "Returns the symbol named String in Package. If such a symbol is found
+  "Return the symbol named String in Package. If such a symbol is found
   then the second value is :internal, :external or :inherited to indicate
   how the symbol is accessible. If no symbol is found then both values
   are NIL."
@@ -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)
@@ -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