projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.8.7.4:
[sbcl.git]
/
src
/
code
/
target-package.lisp
diff --git
a/src/code/target-package.lisp
b/src/code/target-package.lisp
index
23e9150
..
5caa525
100644
(file)
--- 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))
(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))
((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)))))))
(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."
(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))))
(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)
(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)))
:external))
(search string (symbol-name symbol) :test #'char-equal))
(push symbol result)))
@@
-938,7
+940,9
@@
(add-symbol external symbol))
;; Put shadowing symbols in the shadowing symbols list.
(add-symbol external symbol))
;; Put shadowing symbols in the shadowing symbols list.
- (setf (package-%shadowing-symbols pkg) (sixth spec))))
+ (setf (package-%shadowing-symbols pkg) (sixth spec))
+ ;; Set the package documentation
+ (setf (package-doc-string pkg) (seventh spec))))
;; FIXME: These assignments are also done at toplevel in
;; boot-extensions.lisp. They should probably only be done once.
;; FIXME: These assignments are also done at toplevel in
;; boot-extensions.lisp. They should probably only be done once.