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

[Luke Gorrie]

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

Modified Files:
	swank-loader.lisp 
Log Message:
(binary-pathname, user-init-file): Removed Win32
conditionalization. The init file is now called ~/.swank.lisp instead
of ~/_swank.lsp.

Date: Thu Jun 17 10:41:16 2004
Author: lgorrie

Index: slime/swank-loader.lisp
diff -u slime/swank-loader.lisp:1.27 slime/swank-loader.lisp:1.28
--- slime/swank-loader.lisp:1.27	Thu Jun 17 09:04:52 2004
+++ slime/swank-loader.lisp	Thu Jun 17 10:41:16 2004
@@ -61,9 +61,8 @@
   "Return the pathname where SOURCE-PATHNAME's binary should be compiled."
   (let ((cfp (compile-file-pathname source-pathname)))
     (merge-pathnames (make-pathname
-                      :directory `(:relative #-mswindows ".slime"
-                                   #+mswindows "_slime"
-                                   "fasl" ,*lisp-name*)
+                      :directory `(:relative
+                                   ".slime" "fasl" ,*lisp-name*)
                       :name (pathname-name cfp)
                       :type (pathname-type cfp))
                      (user-homedir-pathname))))
@@ -97,8 +96,7 @@
   "Return the name of the user init file or nil."
   (probe-file
    (merge-pathnames (user-homedir-pathname)
-                    #-mswindows (make-pathname :name ".swank" :type "lisp")
-                    #+mswindows (make-pathname :name "_swank" :type "lsp"))))
+                    (make-pathname :name ".swank" :type "lisp"))))
 
        
 (compile-files-if-needed-serially