From d8fff68543d8d39193d4a9cb369c7ae35d4b1b6a Mon Sep 17 00:00:00 2001 From: Christophe Rhodes Date: Tue, 26 Oct 2004 11:01:20 +0000 Subject: [PATCH] 0.8.16.3: Unlock packages in chill.lisp --- src/cold/chill.lisp | 34 +++++++++++++++++++--------------- version.lisp-expr | 2 +- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/cold/chill.lisp b/src/cold/chill.lisp index 9878c7e..1156698 100644 --- a/src/cold/chill.lisp +++ b/src/cold/chill.lisp @@ -29,19 +29,23 @@ ;;; Just in case we want to play with the initial value of ;;; backend-subfeatures (setf sb-cold:*shebang-backend-subfeatures* sb-c:*backend-subfeatures*) -;;; The nickname SB!XC now refers to the CL package. -(rename-package "COMMON-LISP" - "COMMON-LISP" - (cons "SB!XC" (package-nicknames "CL"))) -;;; Any other name SB!FOO refers to the package now called SB-FOO. -(dolist (package (list-all-packages)) - (let ((name (package-name package)) - (nicknames (package-nicknames package)) - (warm-name-prefix "SB-") - (cold-name-prefix "SB!")) - (when (and (> (length name) (length warm-name-prefix)) - (string= name warm-name-prefix :end1 (length warm-name-prefix))) - (let* ((stem (subseq name (length cold-name-prefix))) - (cold-name (concatenate 'simple-string cold-name-prefix stem))) - (rename-package package name (cons cold-name nicknames)))))) +(handler-bind ((sb-ext:package-locked-error #'continue)) + ;; The nickname SB!XC now refers to the CL package. + (rename-package "COMMON-LISP" "COMMON-LISP" + (cons "SB!XC" (package-nicknames "CL"))) + (sb-ext:unlock-package "CL") + + ;; Any other name SB!FOO refers to the package now called SB-FOO. + (dolist (package (list-all-packages)) + (let ((name (package-name package)) + (nicknames (package-nicknames package)) + (warm-name-prefix "SB-") + (cold-name-prefix "SB!")) + (when (and (> (length name) (length warm-name-prefix)) + (string= name warm-name-prefix + :end1 (length warm-name-prefix))) + (let* ((stem (subseq name (length cold-name-prefix))) + (cold-name (concatenate 'simple-string cold-name-prefix stem))) + (rename-package package name (cons cold-name nicknames))) + (sb-ext:unlock-package package))))) diff --git a/version.lisp-expr b/version.lisp-expr index 668a711..20d6f78 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".) -"0.8.16.2" +"0.8.16.3" -- 1.7.10.4