X-Git-Url: https://git.distorted.org.uk/~mdw/profile/blobdiff_plain/0a7f6970608262f399c9c6ec6eea16576eaf3290..9af2290baca1a1a491adbb3ba4f2e27bd457b0bc:/dot/lisp-init.lisp

diff --git a/dot/lisp-init.lisp b/dot/lisp-init.lisp
index 146b250..c15886a 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)
@@ -25,15 +26,14 @@
 (sb-ext:set-sbcl-source-location #p"/usr/share/sbcl-source/")
 
 ;; 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# "/"))))
+#+(and unix (or sbcl clisp))
+(let* ((homestring (or #+sbcl (sb-ext:posix-getenv "HOME")
+		       #+clisp (ext:getenv "HOME")
+		       #+cmu (unix:unix-getenv "HOME")
+		       "/home/mdw"))
+       (home (pathname (concatenate 'string homestring "/"))))
   (setf (logical-pathname-translations "HOME")
-	`(("HOME:**;*.*.*" ,(merge-pathnames "**/*.*" #2# nil)))
+	`(("HOME:**;*.*.*" ,(merge-pathnames "**/*.*" home nil)))
 	(logical-pathname-translations "CL")
 	'(("CL:SOURCE;**;*.*.*" #p"/usr/share/common-lisp/source/**/*.*")
 	  ("CL:SYSTEMS;**;*.*.*" #p"/usr/share/common-lisp/systems/**/*.*"))))
@@ -44,21 +44,22 @@
 ;; Shebang.
 (set-dispatch-macro-character
  #\# #\!
- (lambda (#1=#:stream . #2=(#:char #:arg))
-   (declare (ignore . #2#))
-   (values (read-line #1#))))
+ (lambda (stream char arg)
+   (declare (ignore char arg))
+   (values (read-line stream))))
 
 ;; Start up swank.
-(defun mdw-hacks:crank-swank (&rest #1=#:args)
-  (let ((#2=#:swank #3=(find-package "SWANK")))
-    (unless #2#
+(defun crank-swank (&rest args)
+  (let ((swank (find-package "SWANK")))
+    (unless swank
       (load "/usr/share/common-lisp/source/slime/swank-loader.lisp")
-      (setf #2# #3#))
-    (set (find-symbol "*GLOBAL-DEBUGGER*" #2#) nil)
-    (apply (find-symbol "CREATE-SERVER" #2#) #1#)))
+      (setf swank (find-package "SWANK")))
+    (set (find-symbol "*GLOBAL-DEBUGGER*" swank) nil)
+    (apply (find-symbol "CREATE-SERVER" swank) args)))
 
 #+asdf (setf asdf:*compile-file-failure-behaviour* :warn)
 
 ;; Done.
 (pushnew :mdw *features*)
 ;;#+(and cmu mp) (mp::startup-idle-and-top-level-loops)
+(setf *package* *previous-package*)