[slime-cvs] CVS update: slime/ChangeLog slime/swank-sbcl.lisp

[Marco Baringer]

Update of /project/slime/cvsroot/slime
In directory common-lisp.net:/tmp/cvs-serv1678

Modified Files:
	ChangeLog swank-sbcl.lisp 
Log Message:

Date: Tue Jul 26 16:59:45 2005
Author: mbaringer

Index: slime/ChangeLog
diff -u slime/ChangeLog:1.725 slime/ChangeLog:1.726
--- slime/ChangeLog:1.725	Sun Jul 24 17:30:46 2005
+++ slime/ChangeLog	Tue Jul 26 16:59:45 2005
@@ -1,3 +1,9 @@
+2005-07-26  Zach Beane  <xach at xach.com>
+
+	* swank-sbcl.lisp (swank-compile-string): Revert to old string
+	compilation behavior to fix compiler note annotations. Code from
+	Juho Snellman.
+
 2005-07-24  Tom Pierce <tlpierce at gmail.com>
 
 	* swank.lisp (format-iso8601-time): New functions. Properly


Index: slime/swank-sbcl.lisp
diff -u slime/swank-sbcl.lisp:1.137 slime/swank-sbcl.lisp:1.138
--- slime/swank-sbcl.lisp:1.137	Tue Jul  5 22:30:59 2005
+++ slime/swank-sbcl.lisp	Tue Jul 26 16:59:45 2005
@@ -304,7 +304,8 @@
          ;; Compiling from a buffer
          (let ((position (+ *buffer-offset*
                             (source-path-string-position
-                             source-path *buffer-substring*))))
+                             (cons 0 (nthcdr 2 source-path))
+                             *buffer-substring*))))
            (make-location (list :buffer *buffer-name*)
                           (list :position position))))
         ((and (pathnamep file) (null *buffer-name*))
@@ -465,8 +466,12 @@
                                 (list :emacs-buffer buffer 
                                       :emacs-string string
                                       :emacs-position position))
-          (with-input-from-string (s string)
-            (load s))))))
+        #+nil
+        (with-input-from-string (stream string)
+          (load stream))
+        (funcall (compile nil
+                          `(lambda ()
+                            ,(read-from-string string))))))))
 
 ;;;; Definitions