[slime-cvs] CVS slime

heller heller at common-lisp.net
Sat Feb 25 14:57:21 UTC 2006


Update of /project/slime/cvsroot/slime
In directory clnet:/tmp/cvs-serv12800

Modified Files:
	swank-loader.lisp 
Log Message:
(default-fasl-directory): Previously we return only the
directory-namestring which breaks SCL, because it loses the host and
device components.  Return the complete pathname instead.  Patch by
Douglas Crosher.


--- /project/slime/cvsroot/slime/swank-loader.lisp	2006/02/10 16:50:59	1.56
+++ /project/slime/cvsroot/slime/swank-loader.lisp	2006/02/25 14:57:21	1.57
@@ -14,7 +14,7 @@
 ;; swank-loader package.)
 ;; E.g.:
 ;;
-;;   (make-package :swank-laoder)
+;;   (make-package :swank-loader)
 ;;   (defparameter swank-loader::*fasl-directory* "/tmp/fasl/")
 ;;   (load ".../swank-loader.lisp")
 
@@ -28,8 +28,8 @@
 (cl:in-package :swank-loader)
 
 (defvar *source-directory* 
-  (let ((p (or *load-pathname* *default-pathname-defaults*)))
-    (if p (directory-namestring p)))
+  (make-pathname :name nil :type nil 
+                 :defaults (or *load-pathname* *default-pathname-defaults*))
   "The directory where to look for the source.")
 
 (defparameter *sysdep-files*
@@ -118,13 +118,12 @@
           (t nil))))
 
 (defun default-fasl-directory ()
-  (directory-namestring 
-   (merge-pathnames
-    (make-pathname  
-     :directory `(:relative ".slime" "fasl" 
-                  ,@(if (slime-version-string) (list (slime-version-string)))
-                  ,(unique-directory-name)))
-    (user-homedir-pathname))))
+  (merge-pathnames
+   (make-pathname  
+    :directory `(:relative ".slime" "fasl" 
+                 ,@(if (slime-version-string) (list (slime-version-string)))
+                 ,(unique-directory-name)))
+   (user-homedir-pathname)))
 
 (defun binary-pathname (source-pathname binary-directory)
   "Return the pathname where SOURCE-PATHNAME's binary should be compiled."
@@ -184,7 +183,7 @@
                            :directory (pathname-directory source-directory)))
           `("swank-backend" ,@*sysdep-files* "swank")))
 
-(defvar *fasl-directory* (directory-namestring (default-fasl-directory))
+(defvar *fasl-directory* (default-fasl-directory)
   "The directory where fasl files should be placed.")
 
 (defun load-swank (&key 




More information about the slime-cvs mailing list