[slime-cvs] CVS slime

[CVS User nsiivola]

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

Modified Files:
	ChangeLog swank-sbcl.lisp 
Log Message:
sbcl: fix lisp-source-location

--- /project/slime/cvsroot/slime/ChangeLog	2012/04/24 11:12:14	1.2320
+++ /project/slime/cvsroot/slime/ChangeLog	2012/04/27 14:57:58	1.2321
@@ -1,3 +1,8 @@
+2012-04-27  Nikodemus Siivola  <nikodemus at random-state.net>
+
+	* swank-sbcl.lisp (lisp-source-location): How hard can it be to
+	get this right? (3-legged IF, FFS!)
+
 2012-04-24  Douglas Crosher <dcrosher at common-lisp.net>
 
 	* swank-scl.lisp (create-socket): correct variable name typo.
--- /project/slime/cvsroot/slime/swank-sbcl.lisp	2012/04/20 12:45:28	1.308
+++ /project/slime/cvsroot/slime/swank-sbcl.lisp	2012/04/27 14:57:59	1.309
@@ -1148,8 +1148,8 @@
   (let ((source (prin1-to-string
                  (sb-debug::code-location-source-form code-location 100)))
         (condition (swank-value '*swank-debugger-condition*)))
-    (if (typep condition 'sb-impl::step-form-condition)
-        (and (search "SB-IMPL::WITH-STEPPING-ENABLED" source
+    (if (and (typep condition 'sb-impl::step-form-condition)
+             (search "SB-IMPL::WITH-STEPPING-ENABLED" source
                      :test #'char-equal)
              (search "SB-IMPL::STEP-FINISHED" source :test #'char-equal))
         ;; The initial form is utterly uninteresting -- and almost