[slime-cvs] CVS slime

[heller]

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

Modified Files:
	ChangeLog slime-autoloads.el slime.el 
Log Message:
* slime.el (slime-setup): Call the respective init functions of contribs.
* slime-autoloads.el (slime-setup-contribs): Ditto.



--- /project/slime/cvsroot/slime/ChangeLog	2007/09/19 11:58:20	1.1230
+++ /project/slime/cvsroot/slime/ChangeLog	2007/09/20 14:59:08	1.1231
@@ -1,3 +1,10 @@
+2007-09-20  Helmut Eller  <heller at common-lisp.net>
+
+	* slime.el (slime-setup): Call the respective init functions of
+	contribs.
+
+	* slime-autoloads.el (slime-setup-contribs): Ditto.
+
 2007-09-19  Helmut Eller  <heller at common-lisp.net>
 
 	Simplify slime-compile-file.
--- /project/slime/cvsroot/slime/slime-autoloads.el	2007/09/15 15:15:26	1.2
+++ /project/slime/cvsroot/slime/slime-autoloads.el	2007/09/20 14:59:08	1.3
@@ -33,13 +33,17 @@
 CONTRIBS is a list of contrib packages to load."
   (when (member 'lisp-mode slime-lisp-modes)
     (add-hook 'lisp-mode-hook 'slime-lisp-mode-hook))
-  (when (member 'scheme-mode slime-lisp-modes)
-    (add-hook 'scheme-mode-hook 'slime-scheme-mode-hook))
   (setq slime-setup-contribs contribs)
   (add-hook 'slime-load-hook 'slime-setup-contribs))
 
 (defvar slime-setup-contribs nil)
-(defun slime-setup-contribs () (mapc #'require slime-setup-contribs))
+
+(defun slime-setup-contribs () 
+  (dolist (c slime-setup-contribs)
+    (require c)
+    (let ((init (intern (format "%s-init" c))))
+      (when (fboundp init)
+        (funcall init)))))
 
 (provide 'slime-autoloads)
 
--- /project/slime/cvsroot/slime/slime.el	2007/09/19 11:58:20	1.872
+++ /project/slime/cvsroot/slime/slime.el	2007/09/20 14:59:08	1.873
@@ -71,7 +71,11 @@
 CONTRIBS is a list of contrib packages to load."
   (when (member 'lisp-mode slime-lisp-modes)
     (add-hook 'lisp-mode-hook 'slime-lisp-mode-hook))
-  (mapc #'require contribs))
+  (dolist (c contribs)
+    (require c)
+    (let ((init (intern (format "%s-init" c))))
+      (when (fboundp init)
+        (funcall init)))))
 
 (defun slime-lisp-mode-hook ()
   (slime-mode 1)
@@ -9510,9 +9514,8 @@
           slime-insert-propertized
           slime-tree-insert)))
 
-(run-hooks 'slime-load-hook)
-
 (provide 'slime)
+(run-hooks 'slime-load-hook)
 
 ;; Local Variables: 
 ;; outline-regexp: ";;;;+"