[slime-cvs] CVS slime

[heller]

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

Modified Files:
	swank.lisp ChangeLog 
Log Message:
* swank.lisp (swank-require): Don't search the file if the
module-name is present in *modules*. That should avoid problems if
swank is included in a core file and moved to a different
location.  Reported by John Wiegley.



--- /project/slime/cvsroot/slime/swank.lisp	2007/11/01 14:29:23	1.513
+++ /project/slime/cvsroot/slime/swank.lisp	2007/11/22 22:33:39	1.514
@@ -2282,7 +2282,8 @@
 
 (defslimefun swank-require (module &optional filename)
   "Load the module MODULE."
-  (require module (or filename (module-filename module)))
+  (unless (member (string module) *modules* :key #'string=)
+    (require module (or filename (module-filename module))))
   nil)
 
 (defvar *find-module* 'find-module
--- /project/slime/cvsroot/slime/ChangeLog	2007/11/19 20:18:29	1.1242
+++ /project/slime/cvsroot/slime/ChangeLog	2007/11/22 22:33:39	1.1243
@@ -1,3 +1,10 @@
+2007-11-22  Helmut Eller  <heller at common-lisp.net>
+
+	* swank.lisp (swank-require): Don't search the file if the
+	module-name is present in *modules*. That should avoid problems if
+	swank is included in a core file and moved to a different
+	location.  Reported by John Wiegley.
+
 2007-11-19  Tobias C. Rittweiler  <tcr at freebits.de>
 
 	* slime.el (slime-repl-mode-map, slime-repl-read-mode),