0.7.13.28:

[sbcl.git] / src / cold / chill.lisp

diff --git a/src/cold/chill.lisp b/src/cold/chill.lisp
index 92b19c9..9878c7e 100644 (file)
--- a/src/cold/chill.lisp
+++ b/src/cold/chill.lisp
@@ -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))))))