[slime-cvs] CVS slime

[CVS User heller]

Update of /project/slime/cvsroot/slime
In directory cl-net:/tmp/cvs-serv26637

Modified Files:
	ChangeLog slime-autoloads.el slime.el 
Log Message:
* slime.el (slime-setup-contribs): Moved over from
slime-autoloads.el

--- /project/slime/cvsroot/slime/ChangeLog	2009/03/27 12:58:45	1.1721
+++ /project/slime/cvsroot/slime/ChangeLog	2009/03/27 20:49:41	1.1722
@@ -1,5 +1,9 @@
 2009-03-27  Helmut Eller  <heller at common-lisp.net>
 
+	* slime.el (slime-setup-contribs): Moved over from
+	slime-autoloads.el
+
+2009-03-27  Helmut Eller  <heller at common-lisp.net>
 	* swank-openmcl.lisp (toggle-trace): Replace ccl::%trace with
 	ccl:trace-function.
 	(kill-thread): Use an implementation that doesn't raise a
--- /project/slime/cvsroot/slime/slime-autoloads.el	2008/02/22 14:24:52	1.5
+++ /project/slime/cvsroot/slime/slime-autoloads.el	2009/03/27 20:49:41	1.6
@@ -27,6 +27,9 @@
 (autoload 'slime-scheme-mode-hook "slime")
 
 (defvar slime-lisp-modes '(lisp-mode))
+(defvar slime-setup-contribs nil
+  "List of contribst to load.
+Modified my slime-setup.")
 
 (defun slime-setup (&optional contribs)
   "Setup Emacs so that lisp-mode buffers always use SLIME.
@@ -36,17 +39,6 @@
   (setq slime-setup-contribs contribs)
   (add-hook 'slime-load-hook 'slime-setup-contribs))
 
-(defvar slime-setup-contribs nil)
-
-(defun slime-setup-contribs () 
-  (when slime-setup-contribs
-    (add-to-list 'load-path (expand-file-name "contrib" slime-path))
-    (dolist (c slime-setup-contribs)
-      (require c)
-      (let ((init (intern (format "%s-init" c))))
-        (when (fboundp init)
-          (funcall init))))))
-
 (provide 'slime-autoloads)
 
 ;;; slime-autoloads.el ends here
--- /project/slime/cvsroot/slime/slime.el	2009/03/27 12:58:31	1.1150
+++ /project/slime/cvsroot/slime/slime.el	2009/03/27 20:49:41	1.1151
@@ -82,15 +82,21 @@
 Emacs Lisp package."))
 
 (defvar slime-lisp-modes '(lisp-mode))
+(defvar slime-setup-contribs nil)
 
 (defun slime-setup (&optional contribs)
   "Setup Emacs so that lisp-mode buffers always use SLIME.
 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 contribs
+  (setq slime-setup-contribs contribs)
+  (slime-setup-contribs))
+
+(defun slime-setup-contribs ()
+  "Load and initialize contribs."
+  (when slime-setup-contribs
     (add-to-list 'load-path (expand-file-name "contrib" slime-path))
-    (dolist (c contribs)
+    (dolist (c slime-setup-contribs)
       (require c)
       (let ((init (intern (format "%s-init" c))))
         (when (fboundp init)