[slime-cvs] CVS slime

[crhodes]

Update of /project/slime/cvsroot/slime
In directory clnet:/tmp/cvs-serv28576

Modified Files:
	ChangeLog slime.el 
Log Message:
Handle multiple reader conditionals on the same line for font-lock.


--- /project/slime/cvsroot/slime/ChangeLog	2007/02/26 09:56:06	1.1076
+++ /project/slime/cvsroot/slime/ChangeLog	2007/03/14 09:49:00	1.1077
@@ -1,3 +1,8 @@
+2007-03-14  Christophe Rhodes  <csr21 at cantab.net>
+
+	* slime.el (slime-search-suppressed-forms): handle multiple
+	conditionals on the same line.
+
 2007-02-26  Nikodemus Siivola <nikodemus at random-state.net>
 
 	* swank.lisp (inspect-for-emacs): Add support for inspecting
--- /project/slime/cvsroot/slime/slime.el	2007/02/25 15:59:34	1.766
+++ /project/slime/cvsroot/slime/slime.el	2007/03/14 09:49:00	1.767
@@ -9744,7 +9744,7 @@
   "Find reader conditionalized forms where the test is false."
   (when (and slime-highlight-suppressed-forms
              (slime-connected-p)
-	     (re-search-forward "^\\([^;\n]*[ \t(]\\)?#[-+]" limit t))
+	     (re-search-forward "^\\([^;\n]*?[ \t(]\\)?#[-+]" limit t))
     (ignore-errors
       (let* ((start (- (point) 2))
              (char (char-before))
@@ -9754,7 +9754,8 @@
           (if (or (and (eq char ?+) (not val))
                   (and (eq char ?-) val))
               (progn 
-                (forward-sexp)
+                (forward-sexp) (backward-sexp)
+                (slime-forward-sexp)
                 (assert (<= (point) limit))
                 (let ((md (match-data)))
                   (fill md nil)