[slime-cvs] CVS slime

[CVS User heller]

Update of /project/slime/cvsroot/slime
In directory tiger.common-lisp.net:/tmp/cvs-serv27744

Modified Files:
	ChangeLog swank-ccl.lisp 
Log Message:
* swank-ccl.lisp: If 'xref is not provided warn about it but continue.

--- /project/slime/cvsroot/slime/ChangeLog	2012/03/06 21:42:10	1.2299
+++ /project/slime/cvsroot/slime/ChangeLog	2012/03/06 22:04:21	1.2300
@@ -1,5 +1,10 @@
 2012-03-06  Helmut Eller  <heller at common-lisp.net>
 
+	* swank-ccl.lisp: If 'xref is not provided warn about it but
+	continue.
+
+2012-03-06  Helmut Eller  <heller at common-lisp.net>
+
 	Fix SBCL backend for Windows.
 
 	* swank-sbcl.lisp (fd-stream-input-buffer-empty-p): Restore it.
--- /project/slime/cvsroot/slime/swank-ccl.lisp	2012/01/06 09:02:43	1.25
+++ /project/slime/cvsroot/slime/swank-ccl.lisp	2012/03/06 22:04:21	1.26
@@ -23,7 +23,9 @@
 (import-from :ccl *gray-stream-symbols* :swank-backend)
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
-  (require 'xref))
+  (multiple-value-bind (ok err) (ignore-errors (require 'xref))
+    (unless ok
+      (warn "~a~%" err))))
 
 ;;; swank-mop
 
@@ -235,8 +237,8 @@
   (delete-duplicates
    (mapcan #'find-definitions
            (if inverse 
-             (ccl:get-relation relation name :wild :exhaustive t)
-             (ccl:get-relation relation :wild name :exhaustive t)))
+             (ccl::get-relation relation name :wild :exhaustive t)
+             (ccl::get-relation relation :wild name :exhaustive t)))
    :test 'equal))
 
 (defimplementation who-binds (name)