From 2133b263023f6372983a4c1a8bc23fb77e2562ce Mon Sep 17 00:00:00 2001 From: Nikodemus Siivola Date: Sun, 17 Aug 2008 10:05:36 +0000 Subject: [PATCH] 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. --- src/code/target-package.lisp | 2 +- version.lisp-expr | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/code/target-package.lisp b/src/code/target-package.lisp index e92c43f41..9c1052517 100644 --- 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 20751b549..1688b952e 100644 --- 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" -- 2.11.4.GIT