[slime-cvs] CVS update: slime/swank.lisp slime/swank-loader.lisp

[Luke Gorrie]

Update of /project/slime/cvsroot/slime
In directory common-lisp.net:/tmp/cvs-serv17536

Modified Files:
	swank.lisp swank-loader.lisp 
Log Message:
Take into account `pathname-device' when deriving paths. A fix for
Windows.

Date: Fri Mar 19 16:07:36 2004
Author: lgorrie

Index: slime/swank.lisp
diff -u slime/swank.lisp:1.150 slime/swank.lisp:1.151
--- slime/swank.lisp:1.150	Thu Mar 18 16:57:14 2004
+++ slime/swank.lisp	Fri Mar 19 16:07:35 2004
@@ -286,6 +286,7 @@
                (let* ((here (or *compile-file-truename* *load-truename*))
 		      (changelog (make-pathname 
 				  :name "ChangeLog" 
+                  :device (pathname-device here)
 				  :directory (pathname-directory here)
 				  :host (pathname-host here)))
 		      (date (with-open-file (file changelog :direction :input)


Index: slime/swank-loader.lisp
diff -u slime/swank-loader.lisp:1.19 slime/swank-loader.lisp:1.20
--- slime/swank-loader.lisp:1.19	Tue Mar  9 14:35:36 2004
+++ slime/swank-loader.lisp	Fri Mar 19 16:07:35 2004
@@ -18,6 +18,10 @@
   (merge-pathnames name 
                    (make-pathname 
                     :type type
+                    :device 
+                    (pathname-device 
+                     (or *compile-file-pathname* *load-pathname*
+                         *default-pathname-defaults*))
                     :directory 
                     (pathname-directory
                      (or *compile-file-pathname* *load-pathname*