[slime-cvs] CVS slime

[CVS User sboukarev]

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

Modified Files:
	ChangeLog swank-ecl.lisp 
Log Message:
* swank-ecl.lisp (source-location): Don't do
(setq file (tmpfile-to-buffer file)) in a COND condition,
otherwise next cond clause will get null file.
Apply translate-logical-pathname to pathnames.


--- /project/slime/cvsroot/slime/ChangeLog	2010/03/05 17:45:34	1.2018
+++ /project/slime/cvsroot/slime/ChangeLog	2010/03/07 07:40:46	1.2019
@@ -1,3 +1,10 @@
+2010-03-07  Stas Boukarev  <stassats at gmail.com>
+
+	* swank-ecl.lisp (source-location): Don't do
+	(setq file (tmpfile-to-buffer file)) in a COND condition,
+	otherwise next cond clause will get null file.
+	Apply translate-logical-pathname to pathnames.
+
 2010-03-05  Helmut Eller  <heller at common-lisp.net>
 
 	Remove some unused stuff.
--- /project/slime/cvsroot/slime/swank-ecl.lisp	2010/03/05 16:11:40	1.60
+++ /project/slime/cvsroot/slime/swank-ecl.lisp	2010/03/07 07:40:46	1.61
@@ -597,12 +597,12 @@
       (multiple-value-bind (file pos) (ext:compiled-function-file object)
         (cond ((not file)
                (return-from source-location nil))
-              ((setq file (tmpfile-to-buffer file))
-               (make-buffer-location file pos))
+              ((tmpfile-to-buffer file)
+               (make-buffer-location (tmpfile-to-buffer file) pos))
               (t
                (assert (probe-file file))
                (assert (not (minusp pos)))
-               (make-file-location file pos)))))
+               (make-file-location (translate-logical-pathname file) pos)))))
      (method
       ;; FIXME: This will always return NIL at the moment; ECL does not
       ;; store debug information for methods yet.