[slime-cvs] CVS slime/contrib

[CVS User trittweiler]

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

Modified Files:
	ChangeLog slime-fontifying-fu.el 
Log Message:
	* slime.el (slime-bug): Deleted.

	* slime-fontifying-fu.el (slime-search-suppressed-forms-internal):
	Wrap form in `ignore-errors' again. People have been guinea pigs
	long enough. Suppression of reader-conditionalized forms seems to
	work pretty reliably now.


--- /project/slime/cvsroot/slime/contrib/ChangeLog	2009/10/31 22:13:55	1.266
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2009/10/31 22:41:04	1.267
@@ -1,5 +1,12 @@
 2009-10-31  Tobias C. Rittweiler  <tcr at freebits.de>
 
+	* slime-fontifying-fu.el (slime-search-suppressed-forms-internal):
+	Wrap form in `ignore-errors' again. People have been guinea pigs
+	long enough. Suppression of reader-conditionalized forms seems to
+	work pretty reliably now.
+
+2009-10-31  Tobias C. Rittweiler  <tcr at freebits.de>
+
 	* slime-autodoc.el, swank-arglists.lisp: Large parts were
 	rewritten. Autodoc is now able to highlight &key parameters, and
 	parameters in nested arglists.
--- /project/slime/cvsroot/slime/contrib/slime-fontifying-fu.el	2009/10/10 07:58:20	1.15
+++ /project/slime/cvsroot/slime/contrib/slime-fontifying-fu.el	2009/10/31 22:41:04	1.16
@@ -43,16 +43,14 @@
           (when (<= (point) limit)
             (if (or (and (eq char ?+) (not val))
                     (and (eq char ?-) val))
-                (progn
+                ;; If `slime-extend-region-for-font-lock' did not
+                ;; fully extend the region, the assertion below may
+                ;; fail. This should only happen on XEmacs and older
+                ;; versions of GNU Emacs.
+                (ignore-errors
                   (forward-sexp) (backward-sexp)
                   ;; Try to suppress as far as possible.
-                  (ignore-errors (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.
+                  (slime-forward-sexp)
                   (assert (<= (point) limit))
                   (let ((md (match-data nil slime-search-suppressed-forms-match-data)))
                     (setf (first md) start)
@@ -84,10 +82,7 @@
            (setq result 'retry)) 
           (error
            (setq result nil)
-           ;; If this reports `(cl-assertion-failed (<= (point) limit))',
-           ;; the actual culprit is `slime-extend-region-for-font-lock'
-           ;; which did not extend the region enough in this case.
-           (slime-bug 
+           (slime-display-warning
             (concat "Caught error during fontification while searching for forms\n"
                     "that are suppressed by reader-conditionals. The error was: %S.")
             condition))))
@@ -141,7 +136,7 @@
             (slime-compute-region-for-font-lock font-lock-beg font-lock-end))
           changedp)
       (error
-       (slime-bug 
+       (slime-display-warning
         (concat "Caught error when trying to extend the region for fontification.\n"
                 "The error was: %S\n"
                 "Further: font-lock-beg=%d, font-lock-end=%d.")