[slime-cvs] CVS slime

[CVS User heller]

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

Modified Files:
	ChangeLog swank-openmcl.lisp 
Log Message:
* swank-openmcl.lisp (frame-source-location-for-emacs)
(pc-source-location): Fall back to the source-note of the function
if there is no source-note for a pc offset.

--- /project/slime/cvsroot/slime/ChangeLog	2009/01/01 14:48:13	1.1617
+++ /project/slime/cvsroot/slime/ChangeLog	2009/01/01 14:48:22	1.1618
@@ -1,5 +1,11 @@
 2009-01-01  Helmut Eller  <heller at common-lisp.net>
 
+	* swank-openmcl.lisp (frame-source-location-for-emacs)
+	(pc-source-location): Fall back to the source-note of the function
+	if there is no source-note for a pc offset.
+
+2009-01-01  Helmut Eller  <heller at common-lisp.net>
+
 	For buffers without filename, map the name of the tempfile back to
 	the buffer name.
 
--- /project/slime/cvsroot/slime/swank-openmcl.lisp	2009/01/01 14:48:13	1.151
+++ /project/slime/cvsroot/slime/swank-openmcl.lisp	2009/01/01 14:48:22	1.152
@@ -725,7 +725,8 @@
 
   (defun pc-source-location (function pc)
     (source-note-to-source-location
-     (ccl:find-source-note-at-pc function pc)
+     (or (ccl:find-source-note-at-pc function pc)
+         (ccl:function-source-note function))
      (lambda ()
        (format nil "No source note at PC: ~A:#x~x" function pc))))
 
@@ -789,7 +790,9 @@
        (declare (ignore p context))
        (when (and (= frame-number index) lfun)
          (return-from frame-source-location-for-emacs
-           (pc-source-location lfun pc)))))))
+           (if pc
+               (pc-source-location lfun pc)
+               (function-source-location lfun))))))))
 
 (defimplementation eval-in-frame (form index)
   (block eval-in-frame