CVS slime

[CVS User heller]

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

Modified Files:
	ChangeLog swank-sbcl.lisp 
Log Message:
* swank-sbcl.lisp (swank-compile-string): Load the fasl file even
if there were warnings. Just like the other backends do.

--- /project/slime/cvsroot/slime/ChangeLog	2013/11/10 08:11:44	1.2411
+++ /project/slime/cvsroot/slime/ChangeLog	2013/11/17 07:59:04	1.2412
@@ -1,3 +1,8 @@
+2013-11-17  Helmut Eller  <heller at common-lisp.net>
+
+	* swank-sbcl.lisp (swank-compile-string): Load the fasl file even
+	if there were warnings. Just like the other backends do.
+
 2013-11-10  Helmut Eller  <heller at common-lisp.net>
 
 	* slime.el (slime-delete-package): New command.
--- /project/slime/cvsroot/slime/swank-sbcl.lisp	2013/11/01 14:42:09	1.330
+++ /project/slime/cvsroot/slime/swank-sbcl.lisp	2013/11/17 07:59:04	1.331
@@ -676,7 +676,9 @@
         (*buffer-substring* string)
         (*buffer-tmpfile* (temp-file-name)))
     (labels ((load-it (filename)
-               (when filename (load filename)))
+               (cond (*trap-load-time-warnings*
+                      (with-compilation-hooks () (load filename)))
+                     (t (load filename))))
              (cf ()
                (with-compiler-policy policy
                  (with-compilation-unit
@@ -686,20 +688,17 @@
                                           :emacs-position position)
                       :source-namestring filename
                       :allow-other-keys t)
-                   (compile-file *buffer-tmpfile* :external-format :utf-8))))
-             (compile-it (cont)
-               (with-compilation-hooks ()
-                 (multiple-value-bind (output-file warningsp failurep) (cf)
-                   (declare (ignore warningsp))
-                   (unless failurep
-                     (funcall cont output-file))))))
+                   (compile-file *buffer-tmpfile* :external-format :utf-8)))))
       (with-open-file (s *buffer-tmpfile* :direction :output :if-exists :error
                          :external-format :utf-8)
         (write-string string s))
       (unwind-protect
-           (if *trap-load-time-warnings*
-               (compile-it #'load-it)
-               (load-it (compile-it #'identity)))
+           (multiple-value-bind (output-file warningsp failurep)
+               (with-compilation-hooks () (cf))
+             (declare (ignore warningsp))
+             (when output-file
+               (load-it output-file))
+             (not failurep))
         (ignore-errors
           (delete-file *buffer-tmpfile*)
           (delete-file (compile-file-pathname *buffer-tmpfile*)))))))