[slime-cvs] CVS slime

[CVS User heller]

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

Modified Files:
	ChangeLog swank-cmucl.lisp 
Log Message:
* swank-cmucl.lisp (parse-gdb-line-info): Try working dir first.

--- /project/slime/cvsroot/slime/ChangeLog	2010/05/27 14:47:48	1.2096
+++ /project/slime/cvsroot/slime/ChangeLog	2010/05/27 14:47:55	1.2097
@@ -1,5 +1,9 @@
 2010-05-26  Helmut Eller  <heller at common-lisp.net>
 
+	* swank-cmucl.lisp (parse-gdb-line-info): Try working dir first.
+
+2010-05-26  Helmut Eller  <heller at common-lisp.net>
+
 	* slime.el (slime-defun-if-undefined): Renamed from
 	slime-DEFUN-if-undefined. No need to yell.
 
--- /project/slime/cvsroot/slime/swank-cmucl.lisp	2010/05/06 06:18:32	1.223
+++ /project/slime/cvsroot/slime/swank-cmucl.lisp	2010/05/27 14:47:56	1.224
@@ -1941,13 +1941,12 @@
       (cond ((equal w1 "Line")
              (let ((line (read-word)))
                (assert (equal (read-word) "of"))
-               (let ((file (read-word)))
-                 (make-location (list :file 
-                                      (unix-truename 
-                                       (merge-pathnames 
-                                        (read-from-string file)
-                                        (format nil "~a/lisp/"
-                                                (unix-truename "target:")))))
+               (let* ((file (read-from-string (read-word)))
+                      (pathname
+                       (or (probe-file file)
+                           (probe-file (format nil "target:lisp/~a" file))
+                           file)))
+                 (make-location (list :file (unix-truename pathname))
                                 (list :line (parse-integer line))))))
             (t 
              `(:error ,string))))))