X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcold%2Fchill.lisp;h=9878c7e88753979d00a3db24b53470a850dd478d;hb=f1407e424f1063203af07d2e61ceef58515a4797;hp=7158435c3d6754f03ab1e78f5fab8566a4611a2d;hpb=28d9bb7a509695caaf78d647b6aa1b0f02c0e83a;p=sbcl.git

diff --git a/src/cold/chill.lisp b/src/cold/chill.lisp
index 7158435..9878c7e 100644
--- a/src/cold/chill.lisp
+++ b/src/cold/chill.lisp
@@ -1,6 +1,6 @@
-;;;; This file is not used cold load time. Instead, it can be loaded
-;;;; into an initialized SBCL to get it into a nostalgic frame of
-;;;; mind, remembering the way things were in cold init, so that it
+;;;; This file is not used at cold load time. Instead, it can be
+;;;; loaded into an initialized SBCL to get it into a nostalgic frame
+;;;; of mind, remembering the way things were in cold init, so that it
 ;;;; can READ code which is ordinarily read only when bootstrapping.
 ;;;; (This can be useful when debugging the system, since the debugger
 ;;;; likes to be able to read the source for the code. It can also be
@@ -20,7 +20,7 @@
 (in-package "SB-COLD")
 
 ;;; We need the #! readtable modifications.
-(load "src/cold/shebang.lisp")
+(load (merge-pathnames "shebang.lisp" *load-truename*))
 
 ;;; #!+ and #!- now refer to *FEATURES* values (as opposed to the way
 ;;; that they referred to special target-only *SHEBANG-FEATURES* values
@@ -40,7 +40,8 @@
 	(nicknames (package-nicknames package))
 	(warm-name-prefix "SB-")
 	(cold-name-prefix "SB!"))
-    (when (string= name warm-name-prefix :end1 (length warm-name-prefix))
+    (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))))))