[slime-cvs] CVS slime

[CVS User trittweiler]

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

Modified Files:
	slime.el ChangeLog 
Log Message:
	* slime.el (slime-search-suppressed-forms-internal): Not properly
	factored out by earlier changeset.


--- /project/slime/cvsroot/slime/slime.el	2009/05/08 16:14:10	1.1159
+++ /project/slime/cvsroot/slime/slime.el	2009/05/08 18:11:14	1.1160
@@ -6687,36 +6687,36 @@
   :group 'slime-mode-faces)
 
 (defun slime-search-suppressed-forms-internal (limit)
-  (let* ((start (- (point) 2))
-         (char (char-before))
-         (e (read (current-buffer)))
-         (val (slime-eval-feature-conditional e)))
-    (when (<= (point) limit)
-      (if (or (and (eq char ?+) (not val))
-              (and (eq char ?-) val))
-          (progn
-            (forward-sexp) (backward-sexp)
-            (slime-forward-sexp)
-            ;; There was an `ignore-errors' form around all this
-            ;; because the following assertion was triggered
-            ;; regularly (resulting in the "non-deterministic"
-            ;; behaviour mentioned in the comment further below.)
-            ;; With extending the region properly, this assertion
-            ;; would truly mean a bug now.
-            (assert (<= (point) limit))
-            (let ((md (match-data)))
-              (fill md nil)
-              (setf (first md) start)
-              (setf (second md) (point))
-              (set-match-data md)
-              t))
-          (slime-search-suppressed-forms-internal limit)))))
+  (when (re-search-forward "^\\([^;\n]*?[ \t(]\\)?#[-+]" limit t)
+    (let* ((start (- (point) 2))
+           (char (char-before))
+           (e (read (current-buffer)))
+           (val (slime-eval-feature-conditional e)))
+      (when (<= (point) limit)
+        (if (or (and (eq char ?+) (not val))
+                (and (eq char ?-) val))
+            (progn
+              (forward-sexp) (backward-sexp)
+              (slime-forward-sexp)
+              ;; There was an `ignore-errors' form around all this
+              ;; because the following assertion was triggered
+              ;; regularly (resulting in the "non-deterministic"
+              ;; behaviour mentioned in the comment further below.)
+              ;; With extending the region properly, this assertion
+              ;; would truly mean a bug now.
+              (assert (<= (point) limit))
+              (let ((md (match-data)))
+                (fill md nil)
+                (setf (first md) start)
+                (setf (second md) (point))
+                (set-match-data md)
+                t))
+            (slime-search-suppressed-forms-internal limit))))))
 
 (defun slime-search-suppressed-forms (limit)
   "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))
+             (slime-connected-p))
     (condition-case condition
         (slime-search-suppressed-forms-internal limit)
       (invalid-read-syntax nil)         ; ignore e.g. #+#.foo
--- /project/slime/cvsroot/slime/ChangeLog	2009/05/08 17:56:06	1.1737
+++ /project/slime/cvsroot/slime/ChangeLog	2009/05/08 18:11:14	1.1738
@@ -1,5 +1,10 @@
 2009-05-08  Tobias C. Rittweiler  <tcr at freebits.de>
 
+	* slime.el (slime-search-suppressed-forms-internal): Not properly
+	factored out by earlier changeset.
+
+2009-05-08  Tobias C. Rittweiler  <tcr at freebits.de>
+
 	* swank.lisp (read-from-minibuffer-in-emacs): New.
 	([struct] istate): Add METADATA-PLIST slot.
 	(ensure-istate-metadata): New. To attach arbitrary metadata to an