X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/profile/blobdiff_plain/cd93b4347be1a8f5312383bcb5a98f3ebbf6fd3b..152e7f69bf9c78db62f5e9ce5b97c5809510f05b:/dot/lisp-init.lisp

diff --git a/dot/lisp-init.lisp b/dot/lisp-init.lisp
index 14bdac3..b374e54 100644
--- a/dot/lisp-init.lisp
+++ b/dot/lisp-init.lisp
@@ -1,7 +1,8 @@
-(defpackage #:mdw-hacks
+(cl:defpackage #:mdw-hacks
   (:use #:cl)
   (:export #:crank-swank))
-(use-package '#:mdw-hacks)
+(cl:defparameter mdw-hacks::*previous-package* cl:*package*)
+(cl:in-package #:mdw-hacks)
 
 ;; Obtain ASDF from somewhere.
 #+sbcl (require :asdf)
@@ -22,24 +23,20 @@ (setf *compile-verbose* nil)
 
 ;; 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)
-#+cmu (ext:clear-search-list "HOME")
-#+(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.
+#+(and unix (or sbcl clisp))
+(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")
-	`(("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)
@@ -65,3 +62,4 @@ (defun mdw-hacks:crank-swank (&rest #1=#:args)
 ;; Done.
 (pushnew :mdw *features*)
 ;;#+(and cmu mp) (mp::startup-idle-and-top-level-loops)
+(setf *package* *previous-package*)