X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-package.lisp;h=5caa5254e68aa2a2f5d4f1f47af9f62ee887a54b;hb=4ed3f0d08c3a57a6762018d9622f253ab9d0f2b6;hp=e7a79f23fed9aa000bca8dd30020a68e616b3ef1;hpb=acce826c593a188b231b7b7918c752bda21d0201;p=sbcl.git

diff --git a/src/code/target-package.lisp b/src/code/target-package.lisp
index e7a79f2..5caa525 100644
--- a/src/code/target-package.lisp
+++ b/src/code/target-package.lisp
@@ -540,9 +540,9 @@
 	   (let ((sym (read *query-io*)))
 	     (cond
 	      ((not (symbolp sym))
-	       (format *query-io* "~S is not a symbol."))
+	       (format *query-io* "~S is not a symbol." sym))
 	      ((not (member sym cset))
-	       (format *query-io* "~S is not one of the conflicting symbols."))
+	       (format *query-io* "~S is not one of the conflicting symbols." sym))
 	      (t
 	       (shadowing-import sym package)
 	       (return-from unintern t)))))))
@@ -818,7 +818,8 @@
 	  (when cset
 	    (cerror
 	     "Unintern the conflicting symbols in the ~2*~A package."
-	     "Use'ing package ~A results in name conflicts for these symbols:~%~S"
+	     "Using package ~A results in name conflicts for these symbols:~%~
+              ~S"
 	     (package-%name pkg) cset (package-%name package))
 	    (dolist (s cset) (moby-unintern s package))))
 
@@ -877,7 +878,8 @@
 	(do-symbols (symbol package)
 	  (when (and (eq (symbol-package symbol) package)
 		     (or (not external-only)
-			 (eq (find-symbol (symbol-name symbol) package)
+			 (eq (nth-value 1 (find-symbol (symbol-name symbol)
+						       package))
 			     :external))
 		     (search string (symbol-name symbol) :test #'char-equal))
 	    (push symbol result)))