1.0.19.31: correct shadowing-import of NIL in NAME-CONFLICT

 * Was missing the surrounding LIST -- NIL alone is a designator for
   the empty list.

   Patch by Michael Weber.

diff --git a/src/code/target-package.lisp b/src/code/target-package.lisp
index e92c43f..9c10525 100644 (file)
--- a/src/code/target-package.lisp
+++ b/src/code/target-package.lisp
@@ -883,7 +883,7 @@ implementation it is ~S." *default-package-use-list*)
                  (if (eq package-symbol chosen-symbol)
                      nil                ; re-importing the same symbol
                      (shadowing-import (list chosen-symbol) package))
-                 (shadowing-import chosen-symbol package)))))))))
+                 (shadowing-import (list chosen-symbol) package)))))))))
 
 ;;; If we are uninterning a shadowing symbol, then a name conflict can
 ;;; result, otherwise just nuke the symbol.

diff --git a/version.lisp-expr b/version.lisp-expr
index 20751b5..1688b95 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"1.0.19.30"
+"1.0.19.31"