[slime-cvs] CVS slime/contrib

[CVS User trittweiler]

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

Modified Files:
	ChangeLog slime-asdf.el swank-asdf.lisp 
Log Message:
	* swank-asdf.lisp (operate-on-system-for-emacs),
	(operate-on-system): Muffle ASDF:COMPILE-ERROR because we reuse
	Slime's compilation error reportery anyway, and sldb popping up is
	just annoying.


--- /project/slime/cvsroot/slime/contrib/ChangeLog	2009/11/23 09:56:02	1.283
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2009/11/23 12:23:35	1.284
@@ -1,5 +1,12 @@
 2009-11-23  Tobias C. Rittweiler  <tcr at freebits.de>
 
+	* swank-asdf.lisp (operate-on-system-for-emacs),
+	(operate-on-system): Muffle ASDF:COMPILE-ERROR because we reuse
+	Slime's compilation error reportery anyway, and sldb popping up is
+	just annoying.
+
+2009-11-23  Tobias C. Rittweiler  <tcr at freebits.de>
+
 	* swank-asdf.lisp (system-contains-file-p): Previous definition
 	didn't properly propagate positive return value of recursive
 	call. Fix that.
--- /project/slime/cvsroot/slime/contrib/slime-asdf.el	2009/11/21 16:27:55	1.16
+++ /project/slime/cvsroot/slime/contrib/slime-asdf.el	2009/11/23 12:23:35	1.17
@@ -1,8 +1,10 @@
 ;;; slime-asdf.el -- ASDF support
 ;;
-;; Authors: Daniel Barlow  <dan at telent.net>
-;;          Marco Baringer <mb at bese.it>
-;;          Edi Weitz <edi at agharta.de>
+;; Authors: Daniel Barlow       <dan at telent.net>
+;;          Marco Baringer      <mb at bese.it>
+;;          Edi Weitz           <edi at agharta.de>
+;;          Stas Boukarev       <stassats at gmail.com>
+;;          Tobias C Rittweiler <tcr at freebits.de>
 ;;          and others 
 ;; License: GNU GPL (same license as Emacs)
 ;;
@@ -130,7 +132,7 @@
                   ((buffers-forward  (mapcar #'find-file-noselect files))
                    (buffers-backward (reverse buffers-forward)))
                 #'(lambda (current-buffer wrap)
-                    ;; Contrary to the the docstring of
+                    ;; Contrarily to the the docstring of
                     ;; `multi-isearch-next-buffer-function', the first
                     ;; arg is not necessarily a buffer. Report sent
                     ;; upstream. (2009-11-17)
--- /project/slime/cvsroot/slime/contrib/swank-asdf.lisp	2009/11/23 09:56:02	1.14
+++ /project/slime/cvsroot/slime/contrib/swank-asdf.lisp	2009/11/23 12:23:35	1.15
@@ -18,19 +18,21 @@
 Record compiler notes signalled as `compiler-condition's."
    (collect-notes
     (lambda ()
-      (apply #'operate-on-system system-name operation keywords)
-      t)))
+      (apply #'operate-on-system system-name operation keywords))))
 
 (defun operate-on-system (system-name operation-name &rest keyword-args)
   "Perform OPERATION-NAME on SYSTEM-NAME using ASDF.
 The KEYWORD-ARGS are passed on to the operation.
 Example:
 \(operate-on-system \"SWANK\" \"COMPILE-OP\" :force t)"
-  (with-compilation-hooks ()
-    (let ((operation (find-symbol operation-name :asdf)))
-      (when (null operation)
-        (error "Couldn't find ASDF operation ~S" operation-name))
-      (apply #'asdf:operate operation system-name keyword-args))))
+  (handler-case 
+      (with-compilation-hooks ()
+	(let ((operation (find-symbol operation-name :asdf)))
+	  (when (null operation)
+	    (error "Couldn't find ASDF operation ~S" operation-name))
+	  (apply #'asdf:operate operation system-name keyword-args)
+	  t))
+    (asdf:compile-error () nil)))
 
 (defun asdf-central-registry ()
   asdf:*central-registry*)