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 c15886ac1f7ea7ba75c1171452103dcaf913342a..1a22d1951ae348c47e85eac603ebe264825126bb 100644 (file)
--- a/dot/lisp-init.lisp
+++ b/dot/lisp-init.lisp
@@ -1,20 +1,10 @@
 (cl:defpackage #:mdw-hacks
-  (:use #:cl)
-  (:export #:crank-swank))
+  (:use #:cl))
 (cl:defparameter mdw-hacks::*previous-package* cl:*package*)
 (cl:in-package #:mdw-hacks)
 
 ;; 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)
@@ -49,10 +39,12 @@ (set-dispatch-macro-character
    (values (read-line stream))))
 
 ;; Start up swank.
+(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")
+      (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)))