[slime-cvs] CVS slime

[CVS User trittweiler]

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

Modified Files:
	ChangeLog slime.el 
Log Message:
	* slime.el (slime-load-contribs): Do not call SWANK-REQUIRE
	asynchronously, if host Lisp uses :SPAWN that may result in the
	attempt to load in code concurrently -- the host Lisp may not
	support that.

	* slime-asdf.el, slime-autodoc.el, slime-c-p-c.el,
	slime-clipboard.el, slime-fancy-inspector.el, slime-fuzzy,el,
	slime-indentation.el, slime-motd.el,
	slime-presentation-streams.el, slime-presentations.el,
	slime-sbcl-exts, slime-snapshot.el, slime-sprof.el:

	Make sure that contrib code does not try to load in swank code
	asynchronously but use `slime-require' instead; also make sure to
	move the `slime-require' into the contribs' init function.


--- /project/slime/cvsroot/slime/ChangeLog	2010/02/14 18:26:01	1.1981
+++ /project/slime/cvsroot/slime/ChangeLog	2010/02/15 21:42:37	1.1982
@@ -1,3 +1,10 @@
+2010-02-15  Tobias C. Rittweiler <tcr at freebits.de>
+
+	* slime.el (slime-load-contribs): Do not call SWANK-REQUIRE
+	asynchronously, if host Lisp uses :SPAWN that may result in the
+	attempt to load in code concurrently -- the host Lisp may not
+	support that.
+
 2010-02-14  Tobias C. Rittweiler <tcr at freebits.de>
 
 	* slime.el (slime-attempt-connection): Fix typo. Thanks to Mark
--- /project/slime/cvsroot/slime/slime.el	2010/02/14 18:26:01	1.1269
+++ /project/slime/cvsroot/slime/slime.el	2010/02/15 21:42:37	1.1270
@@ -6876,9 +6876,11 @@
                                      (mapcar #'downcase (slime-lisp-modules))))
                            slime-required-modules)))
     (when needed
-      (slime-eval-async `(swank:swank-require ',needed)
-                        (lambda (new-modules)
-                          (setf (slime-lisp-modules) new-modules))))))
+      ;; No asynchronous request because with :SPAWN that could result
+      ;; in the attempt to load modules concurrently which may not be
+      ;; supported by the host Lisp.
+      (setf (slime-lisp-modules) 
+            (slime-eval `(swank:swank-require ',needed))))))
 
 
 ;;;;; Pull-down menu