[slime-cvs] CVS slime

[heller]

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

Modified Files:
	swank-loader.lisp 
Log Message:
(compile-files-if-needed-serially): Don't wrap
everything in a compilation unit.  If we abort on load errors and
it is confusing to see compiler warnings after the abort message.

(handle-loadtime-error): CLISP's format implements ~< differently
as everybody else, so use a explicit pprint-logical-block instead.

--- /project/slime/cvsroot/slime/swank-loader.lisp	2006/11/19 21:28:16	1.63
+++ /project/slime/cvsroot/slime/swank-loader.lisp	2007/01/12 15:23:48	1.64
@@ -130,11 +130,11 @@
                                     :type (pathname-type cfp))
                      binary-directory)))
 
-
 (defun handle-loadtime-error (condition binary-pathname)
-  (format *error-output*
-          "~%~<;; ~@;Error while loading: ~A~%  Condition: ~A~%Aborting.~:>~%"
-          (list binary-pathname condition))
+  (pprint-logical-block (*error-output* () :per-line-prefix ";; ")
+    (format *error-output*
+            "~%Error while loading: ~A~%Condition: ~A~%Aborting.~%"
+            binary-pathname condition))
   (when (equal (directory-namestring binary-pathname)
                (directory-namestring (default-fasl-directory)))
     (ignore-errors (delete-file binary-pathname)))
@@ -144,27 +144,26 @@
   "Compile each file in FILES if the source is newer than
 its corresponding binary, or the file preceding it was
 recompiled."
-  (with-compilation-unit ()
-    (let ((needs-recompile nil))
-      (dolist (source-pathname files)
-        (let ((binary-pathname (binary-pathname source-pathname
-                                                fasl-directory)))
-          (handler-case
-              (progn
-                (when (or needs-recompile
-                          (not (probe-file binary-pathname))
-                          (file-newer-p source-pathname binary-pathname))
-                  ;; need a to recompile source-pathname, so we'll
-                  ;; need to recompile everything after this too.
-                  (setq needs-recompile t)
-                  (ensure-directories-exist binary-pathname)
-                  (compile-file source-pathname :output-file binary-pathname
-                                :print nil
-                                :verbose t))
-                (load binary-pathname :verbose t))
-            ;; Fail as early as possible
-            (serious-condition (c)
-              (handle-loadtime-error c binary-pathname))))))))
+  (let ((needs-recompile nil))
+    (dolist (source-pathname files)
+      (let ((binary-pathname (binary-pathname source-pathname
+                                              fasl-directory)))
+        (handler-case
+            (progn
+              (when (or needs-recompile
+                        (not (probe-file binary-pathname))
+                        (file-newer-p source-pathname binary-pathname))
+                ;; need a to recompile source-pathname, so we'll
+                ;; need to recompile everything after this too.
+                (setq needs-recompile t)
+                (ensure-directories-exist binary-pathname)
+                (compile-file source-pathname :output-file binary-pathname
+                              :print nil
+                              :verbose t))
+              (load binary-pathname :verbose t))
+          ;; Fail as early as possible
+          (serious-condition (c)
+            (handle-loadtime-error c binary-pathname)))))))
 
 #+(or cormanlisp ecl)
 (defun compile-files-if-needed-serially (files fasl-directory)