[slime-cvs] CVS slime

[CVS User trittweiler]

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

Modified Files:
	ChangeLog swank-sbcl.lisp 
Log Message:
	* swank-sbcl.lisp (compiler-note-location): Add missing return-from.


--- /project/slime/cvsroot/slime/ChangeLog	2010/01/05 21:17:52	1.1959
+++ /project/slime/cvsroot/slime/ChangeLog	2010/01/05 21:20:38	1.1960
@@ -1,5 +1,9 @@
 2010-01-05  Tobias C. Rittweiler <tcr at freebits.de>
 
+	* swank-sbcl.lisp (compiler-note-location): Add missing return-from.
+
+2010-01-05  Tobias C. Rittweiler <tcr at freebits.de>
+
 	* slime.el (compile-defun [test]): Add two cases.
 
 2010-01-05  Cecil Westerhof  <Cecil at decebal.nl>
--- /project/slime/cvsroot/slime/swank-sbcl.lisp	2010/01/03 15:58:29	1.265
+++ /project/slime/cvsroot/slime/swank-sbcl.lisp	2010/01/05 21:20:38	1.266
@@ -457,7 +457,8 @@
 
 (defun compiler-note-location (condition context)
   (flet ((bailout ()
-           (list :error "No error location available")))
+           (return-from compiler-note-location
+             (make-error-location "No error location available"))))
     (cond (context
            (locate-compiler-note
             (sb-c::compiler-error-context-file-name context)
@@ -483,7 +484,10 @@
           (t (bailout)))))
 
 (defun compiling-from-buffer-p (filename)
-  (and (not (eq filename :lisp)) *buffer-name*))
+  (and *buffer-name*
+       ;; The following is to trigger COMPILING-FROM-GENERATED-CODE-P
+       ;; in LOCATE-COMPILER-NOTE.
+       (not (eq filename :lisp))))
 
 (defun compiling-from-file-p (filename)
   (and (pathnamep filename) (null *buffer-name*)))