[slime-cvs] CVS slime

[CVS User gcarncross]

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

Modified Files:
	ChangeLog swank-ecl.lisp 
Log Message:
2009-07-27  Geo Carncross  <geocar at gmail.com>

	* swank-ecl.lisp: Support for older ECL installs
	from patch by Mark Evenson


--- /project/slime/cvsroot/slime/ChangeLog	2009/07/26 10:18:29	1.1816
+++ /project/slime/cvsroot/slime/ChangeLog	2009/07/27 04:08:41	1.1817
@@ -1,3 +1,8 @@
+2009-07-27  Geo Carncross  <geocar at gmail.com>
+
+	* swank-ecl.lisp: Support for older ECL installs
+	from patch by Mark Evenson
+
 2009-07-26  Helmut Eller  <heller at common-lisp.net>
 
 	* slime.el (slime-maybe-show-compilation-log): New function.
--- /project/slime/cvsroot/slime/swank-ecl.lisp	2009/07/06 12:32:12	1.44
+++ /project/slime/cvsroot/slime/swank-ecl.lisp	2009/07/27 04:08:41	1.45
@@ -295,11 +295,16 @@
      (declare (ignore position))
      (if file (is-swank-source-p file)))))
 
+#+#.(swank-backend::with-symbol '+ECL-VERSION-NUMBER+ 'EXT)
 (defmacro find-ihs-top (x)
   (if (< ext:+ecl-version-number+ 90601)
       `(si::ihs-top ,x)
       '(si::ihs-top)))
 
+#-#.(swank-backend::with-symbol '+ECL-VERSION-NUMBER+ 'EXT)
+(defmacro find-ihs-top (x) 
+  `(si::ihs-top ,x))
+
 (defimplementation call-with-debugging-environment (debugger-loop-fn)
   (declare (type function debugger-loop-fn))
   (let* ((*tpl-commands* si::tpl-commands)
@@ -364,9 +369,12 @@
   (let ((functions '())
         (blocks '())
         (variables '()))
+    #+#.(swank-backend::with-symbol '+ECL-VERSION-NUMBER+ 'EXT)
     #.(if (< ext:+ecl-version-number+ 90601)
         '(setf frame (second frame))
         '(setf frame (si::decode-ihs-env (second frame))))
+    #-#.(swank-backend::with-symbol '+ECL-VERSION-NUMBER+ 'EXT)
+    '(setf frame (second frame))
     (dolist (record frame)
       (let* ((record0 (car record))
 	     (record1 (cdr record)))
@@ -474,9 +482,13 @@
               `(:position ,pos)
               `(:snippet
                 ,(with-open-file (s file)
+
+                                 #+#.(swank-backend::with-symbol '+ECL-VERSION-NUMBER+ 'EXT)
                                  (if (< ext:+ecl-version-number+ 90601)
                                      (skip-toplevel-forms pos s)
                                      (file-position s pos))
+                                 #-#.(swank-backend::with-symbol '+ECL-VERSION-NUMBER+ 'EXT)
+                                 (skip-toplevel-forms pos s)
                                  (skip-comments-and-whitespace s)
                                  (read-snippet s))))))))
    `(:error (format nil "Source definition of ~S not found" obj))))