Merge branch 'master' of us:git/staging/profile

[profile] / dot / lisp-init.lisp

diff --git a/dot/lisp-init.lisp b/dot/lisp-init.lisp
index e060815448b1ed177169b88200681cb42be9542c..146b25037cf4aa8fabbad230d6d1eab4c6c2874d 100644 (file)
--- a/dot/lisp-init.lisp
+++ b/dot/lisp-init.lisp
@@ -22,23 +22,21 @@ (setf *compile-verbose* nil)
 
 ;; Tell SBCL where to find its source source.
 #+sbcl
 
 ;; Tell SBCL where to find its source source.
 #+sbcl

-(let ((#1=#:sbcl-src #p"/usr/share/sbcl-source/"))
-  (flet ((#2=#:sbcl-dir (#3=#:p)
-          (merge-pathnames #3# #1#)))
-    (setf (logical-pathname-translations "SYS")
-         `(("SYS:SRC;**;*.*.*" ,(#2# "src/**/*.*"))
-           ("SYS:CONTRIB;**;*.*.*" ,(#2# "contrib/**/*.*"))))))
+(sb-ext:set-sbcl-source-location #p"/usr/share/sbcl-source/")

 
 

-#+sbcl (require :sb-posix)
-#+(and unix (or sbcl cmu))
-(let ((#1=#:home (pathname (concatenate 'string
-                                       (or #+sbcl (sb-posix:getenv "HOME")
-                                           #+clisp (ext:getenv "HOME")
-                                           #+cmu (unix:unix-getenv "HOME")
-                                           "/home/mdw")
-                                       "/"))))
+;; Tell some Lisps about my home directory.
+#+cmu (ext:clear-search-list "HOME")
+#+(and unix (or sbcl clisp cmu))
+(let* ((#1=#:homestring (or #+sbcl (sb-ext:posix-getenv "HOME")
+                           #+clisp (ext:getenv "HOME")
+                           #+cmu (unix:unix-getenv "HOME")
+                           "/home/mdw"))
+       (#2=#:home (pathname (concatenate 'string #1# "/"))))

   (setf (logical-pathname-translations "HOME")
   (setf (logical-pathname-translations "HOME")

-       `(("HOME:**;*.*.*" ,(merge-pathnames "**/*.*" #1#)))))
+       `(("HOME:**;*.*.*" ,(merge-pathnames "**/*.*" #2# nil)))
+       (logical-pathname-translations "CL")
+       '(("CL:SOURCE;**;*.*.*" #p"/usr/share/common-lisp/source/**/*.*")
+         ("CL:SYSTEMS;**;*.*.*" #p"/usr/share/common-lisp/systems/**/*.*"))))

 
 ;; Various fixings.
 #+clisp (setf custom:*parse-namestring-ansi* t)
 
 ;; Various fixings.
 #+clisp (setf custom:*parse-namestring-ansi* t)