[slime-cvs] CVS slime/contrib

[CVS User trittweiler]

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

Modified Files:
	slime-fontifying-fu.el 
Log Message:
really fix


--- /project/slime/cvsroot/slime/contrib/slime-fontifying-fu.el	2009/06/11 08:14:58	1.9
+++ /project/slime/cvsroot/slime/contrib/slime-fontifying-fu.el	2009/06/11 12:30:07	1.10
@@ -165,12 +165,18 @@
                     pt)))
     (goto-char end)
     (inline (slime-beginning-of-tlf)) ; `#+foo (progn ..#+bar (.. _END_ ..)..)'
-    (when (search-backward-regexp slime-reader-conditionals-regexp beg t)
-      ;; Nested reader conditionals, yuck!
-      (while (when-let (pt (slime-search-directly-preceding-reader-conditional))
-               (goto-char pt)))
-      (ignore-errors (slime-forward-reader-conditional))
-      (setq end (max end (point))))
+    (let ((found? (search-backward-regexp slime-reader-conditionals-regexp beg t)))
+      (unless found?
+        ;; the toplevel form isn't suppressed as a whole, so try and
+        ;; see at the tentative end position.
+        (goto-char end)
+        (setq found? (search-backward-regexp slime-reader-conditionals-regexp beg t)))
+      (when found?
+        ;; Nested reader conditionals, yuck!
+        (while (when-let (pt (slime-search-directly-preceding-reader-conditional))
+                 (goto-char pt)))
+        (ignore-errors (slime-forward-reader-conditional))
+        (setq end (max end (point)))))
     (values (or (/= beg orig-beg) (/= end orig-end)) beg end)))