dot/lisp-init.lisp: Use a single ASDF rune everywhere.

[profile] / dot / lisp-init.lisp

diff --git a/dot/lisp-init.lisp b/dot/lisp-init.lisp
index de02915fc0ff4a601363c86ec8a6a3cfc030f693..1a22d1951ae348c47e85eac603ebe264825126bb 100644 (file)
--- a/dot/lisp-init.lisp
+++ b/dot/lisp-init.lisp
@@ -1,19 +1,10 @@
-(defpackage #:mdw-hacks
-  (:use #:cl)
-  (:export #:crank-swank))
-(use-package '#:mdw-hacks)
+(cl:defpackage #:mdw-hacks
+  (:use #:cl))
+(cl:defparameter mdw-hacks::*previous-package* cl:*package*)
+(cl:in-package #:mdw-hacks)

 
 ;; Obtain ASDF from somewhere.
 
 ;; Obtain ASDF from somewhere.

-#+sbcl (require :asdf)
-#+clisp (let ((*compile-verbose* nil)
-             (*load-verbose* nil))
-         (handler-bind ((warning (lambda (cond)
-                                   (declare (ignore cond))
-                                   (muffle-warning))))
-           (load "/usr/share/common-lisp/source/cl-asdf/asdf.lisp"
-                 :verbose nil)
-           (funcall (find-symbol "LOAD-SYSTEM" :asdf) :asdf
-                    :verbose nil)))
+(require "asdf")

 
 ;; Shut up.
 (setf *load-verbose* nil)
 
 ;; Shut up.
 (setf *load-verbose* nil)


@@ -22,12 +13,20 @@ (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/")
+
+;; Tell some Lisps about my home directory.
+#+(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 "**/*.*" home 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)


@@ -35,21 +34,24 @@ (let ((#1=#:sbcl-src #p"/usr/share/sbcl-source/"))
 ;; Shebang.
 (set-dispatch-macro-character
  #\# #\!
 ;; 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.
 
 ;; Start up swank.

-(defun mdw-hacks:crank-swank (&rest #1=#:args)
-  (let ((#2=#:swank #3=(find-package "SWANK")))
-    (unless #2#
+(export 'crank-swank)
+(defun crank-swank (&rest args)
+  (let ((swank (find-package "SWANK")))
+    (unless swank

       (load "/usr/share/common-lisp/source/slime/swank-loader.lisp")
       (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#)))
+      (funcall (find-symbol "INIT" (find-package "SWANK-LOADER")))
+      (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)
 
 #+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*)