[slime-cvs] CVS slime

[CVS User trittweiler]

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

Modified Files:
	ChangeLog swank-sbcl.lisp 
Log Message:
	* swank-sbcl.lisp (swank-compile-file): Return T for the FAILURE-P
	return value in case of a FATA-COMPILER-ERROR.


--- /project/slime/cvsroot/slime/ChangeLog	2009/04/03 20:43:11	1.1724
+++ /project/slime/cvsroot/slime/ChangeLog	2009/04/03 21:13:00	1.1725
@@ -1,5 +1,12 @@
 2009-04-03  Tobias C. Rittweiler  <tcr at freebits.de>
 
+	* swank-sbcl.lisp (swank-compile-file): Return T for the FAILURE-P
+	return value in case of a FATA-COMPILER-ERROR.
+
+	Reported by Philipp M. Schäfer
+
+2009-04-03  Tobias C. Rittweiler  <tcr at freebits.de>
+
 	* slime.el (slime-inspector-mode-map): Remove binding for
 	M-RET. (It'll be added by the slime-repl contrib.)
 	(slime-inspector-copy-down): Removed.
--- /project/slime/cvsroot/slime/swank-sbcl.lisp	2009/03/07 19:08:03	1.237
+++ /project/slime/cvsroot/slime/swank-sbcl.lisp	2009/04/03 21:13:00	1.238
@@ -485,10 +485,14 @@
 
 (defimplementation call-with-compilation-hooks (function)
   (declare (type function function))
-  (handler-bind ((sb-c:fatal-compiler-error #'handle-file-compiler-termination)
-                 (sb-c:compiler-error  #'handle-notification-condition)
-                 (sb-ext:compiler-note #'handle-notification-condition)
-                 (warning              #'handle-notification-condition))
+  (handler-bind
+      ;; N.B. Even though these handlers are called HANDLE-FOO they
+      ;; actually decline, i.e. the signalling of the original
+      ;; condition continues upward.
+      ((sb-c:fatal-compiler-error #'handle-file-compiler-termination)
+       (sb-c:compiler-error  #'handle-notification-condition)
+       (sb-ext:compiler-note #'handle-notification-condition)
+       (warning              #'handle-notification-condition))
     (funcall function)))
 
 (defun handle-file-compiler-termination (condition)
@@ -512,7 +516,8 @@
                       (source-cache-get input-file 
                                         (file-write-date input-file))
                       (not (load output-file))))))
-    (sb-c:fatal-compiler-error () nil)))
+    ;; N.B. This comes through despite of WITH-COMPILATION-HOOKS.
+    (sb-c:fatal-compiler-error () (values nil nil t))))
 
 ;;;; compile-string