[slime-cvs] CVS slime

[heller]

Update of /project/slime/cvsroot/slime
In directory clnet:/tmp/cvs-serv20006

Modified Files:
	ChangeLog swank-loader.lisp swank.lisp 
Log Message:
* swank-loader.lisp (load-swank): Call swank::before-init.

* swank.lisp (before-init): New function.
(init): Renamed from setup.

--- /project/slime/cvsroot/slime/ChangeLog	2008/03/27 11:46:33	1.1338
+++ /project/slime/cvsroot/slime/ChangeLog	2008/03/27 11:46:41	1.1339
@@ -30,6 +30,11 @@
 	* slime.el (slime-check-version): New function.  Make the
 	prompt fit in a single line.
 
+	* swank-loader.lisp (load-swank): Call swank::before-init.
+
+	* swank.lisp (before-init): New function.
+	(init): Renamed from setup.
+
 2008-03-24  Tobias C. Rittweiler  <tcr at freebits.de>
 
 	* HACKING: Updated due to broken links. 
--- /project/slime/cvsroot/slime/swank-loader.lisp	2008/02/25 17:23:00	1.83
+++ /project/slime/cvsroot/slime/swank-loader.lisp	2008/03/27 11:46:41	1.84
@@ -199,28 +199,30 @@
 (defun contrib-dir (base-dir)
   (append-dir base-dir "contrib"))
 
+(defun q (s) (read-from-string s))
+
 (defun load-swank (&key (src-dir *source-directory*)
                    (fasl-dir *fasl-directory*))
-  (compile-files (src-files *swank-files* src-dir) fasl-dir t))
+  (compile-files (src-files *swank-files* src-dir) fasl-dir t)
+  (funcall (q "swank::before-init")
+           (slime-version-string)
+           (list (contrib-dir fasl-dir)
+                 (contrib-dir src-dir))))
 
 (defun compile-contribs (&key (src-dir (contrib-dir *source-directory*))
                          (fasl-dir (contrib-dir *fasl-directory*))
                          load)
   (compile-files (src-files *contribs* src-dir) fasl-dir load))
-
+  
 (defun loadup ()
   (load-swank)
   (compile-contribs :load t))
 
 (defun setup ()
-  (flet ((q (s) (read-from-string s)))
-    (load-site-init-file *source-directory*)
-    (load-user-init-file)
-    (eval `(pushnew 'compile-contribs ,(q "swank::*after-init-hook*")))
-    (funcall (q "swank::setup") 
-             (slime-version-string)
-             (list (contrib-dir *fasl-directory*)    
-                   (contrib-dir *source-directory*)))))
+  (load-site-init-file *source-directory*)
+  (load-user-init-file)
+  (eval `(pushnew 'compile-contribs ,(q "swank::*after-init-hook*")))
+  (funcall (q "swank::init")))
 
 (defun init (&key delete reload load-contribs (setup t))
   (when (and delete (find-package :swank))
--- /project/slime/cvsroot/slime/swank.lisp	2008/03/16 10:44:05	1.540
+++ /project/slime/cvsroot/slime/swank.lisp	2008/03/27 11:46:41	1.541
@@ -3076,10 +3076,12 @@
 
 (add-hook *pre-reply-hook* 'sync-indentation-to-emacs)
 
-(defun setup (version load-path)
+(defun before-init (version init)
   (setq *swank-wire-protocol-version* version)
   (setq *load-path* load-path)
-  (swank-backend::warn-unimplemented-interfaces)
+  (swank-backend::warn-unimplemented-interfaces))
+
+(defun init ()
   (run-hook *after-init-hook*))
 
 ;;; swank.lisp ends here