[slime-cvs] CVS slime/contrib

[CVS User trittweiler]

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

Modified Files:
	ChangeLog slime-fontifying-fu.el 
Log Message:
	* slime-fontifying-fu.el (slime-search-for-suppressed-forms):
	Shadow SBCL-specific #!+, #!- conditionals correctly.
	(slime-compute-region-for-font-lock): Fix small thinko.


--- /project/slime/cvsroot/slime/contrib/ChangeLog	2009/05/16 13:12:03	1.211
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2009/05/17 16:23:30	1.212
@@ -1,3 +1,9 @@
+2009-05-17  Tobias C. Rittweiler  <tcr at freebits.de>
+
+	* slime-fontifying-fu.el (slime-search-for-suppressed-forms):
+	Shadow SBCL-specific #!+, #!- conditionals correctly.
+	(slime-compute-region-for-font-lock): Fix small thinko.
+
 2009-05-16  Tobias C. Rittweiler  <tcr at freebits.de>
 
 	* slime-fontifying-fu.el (slime-beginning-of-tlf): Make sure to
--- /project/slime/cvsroot/slime/contrib/slime-fontifying-fu.el	2009/05/16 13:12:04	1.5
+++ /project/slime/cvsroot/slime/contrib/slime-fontifying-fu.el	2009/05/17 16:23:30	1.6
@@ -37,7 +37,7 @@
           (or (nth 3 state)             ; inside string?
               (nth 4 state)))           ; inside comment?
         (slime-search-suppressed-forms-internal limit)
-      (let* ((start (- (point) 2))
+      (let* ((start (match-beginning 0))
              (char (char-before))
              (e (read (current-buffer)))
              (val (slime-eval-feature-expression e)))
@@ -131,7 +131,7 @@
           (multiple-value-setq (changedp font-lock-beg font-lock-end)
             (slime-compute-region-for-font-lock font-lock-beg font-lock-end))
           changedp)
-      (error 
+      (error
        (slime-bug 
         (concat "Caught error when trying to extend the region for fontification.\n"
                 "The error was: %S\n"
@@ -158,8 +158,9 @@
     (goto-char beg)
     (inline (slime-beginning-of-tlf))
     (assert (not (plusp (nth 0 (slime-current-parser-state)))))
-    (setq beg (or (slime-search-directly-preceding-reader-conditional)
-                  (point)))
+    (setq beg (let ((pt (point))) 
+                (or (slime-search-directly-preceding-reader-conditional)
+                    pt)))
     (goto-char end)
     (when (search-backward-regexp slime-reader-conditionals-regexp beg t)
       ;; Nested reader conditionals, yuck!