[slime-cvs] CVS slime

[CVS User trittweiler]

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

Modified Files:
	ChangeLog slime.el 
Log Message:
	* slime.el (slime-compute-region-for-font-lock): Fix typo.


--- /project/slime/cvsroot/slime/ChangeLog	2009/05/13 18:51:26	1.1748
+++ /project/slime/cvsroot/slime/ChangeLog	2009/05/14 13:57:10	1.1749
@@ -1,4 +1,8 @@
-2009-05-12  Tobias C. Rittweiler  <tcr at freebits.de>
+2009-05-14  Tobias C. Rittweiler  <tcr at freebits.de>
+
+	* slime.el (slime-compute-region-for-font-lock): Fix typo.
+
+2009-05-13  Tobias C. Rittweiler  <tcr at freebits.de>
 
 	* slime.el (slime-search-suppressed-forms): On errors, we have to
 	continue the search, otherwise there's a chance that we miss
--- /project/slime/cvsroot/slime/slime.el	2009/05/13 18:51:26	1.1168
+++ /project/slime/cvsroot/slime/slime.el	2009/05/14 13:57:10	1.1169
@@ -809,12 +809,12 @@
 %s
 --------------------------------------------------------------
 "
-        (buffer-name)
-        (line-number-at-pos)
-        (current-column)
-        (point)
-        (apply #'format message args)
-        (with-output-to-string (backtrace))))
+   (buffer-name)
+   (line-number-at-pos)
+   (current-column)
+   (point)
+   (apply #'format message args)
+   (with-output-to-string (backtrace))))
 
 ;; Interface
 (defun slime-set-truncate-lines ()
@@ -6781,6 +6781,7 @@
             (list start end))))))
 
 (defun slime-search-backward-reader-conditional ()
+  "Search for a directly preceding reader conditional."
   (save-excursion
     (save-match-data 
       (and (search-backward-regexp slime-reader-conditionals-regexp
@@ -6825,13 +6826,13 @@
         ;; when we're at the toplevel!), otherwise fontification
         ;; wouldn't know the whole function definition may be
         ;; suppressed.
-        (cond ((plusp (nth 0 (slime-current-parser-state)))
-               (setq beg (first (slime-region-for-extended-tlf-at-point))))
-              ((setq beg (or (search-backward-reader-conditional)
-                             orig-beg))))
+        (if (plusp (nth 0 (slime-current-parser-state)))
+            (setq beg (first (slime-region-for-extended-tlf-at-point)))
+            (setq beg (or (slime-search-backward-reader-conditional)
+                          orig-beg)))
         (goto-char end)
         (when (or (plusp (nth 0 (slime-current-parser-state)))
-                  (search-backward-reader-conditional))
+                  (slime-search-backward-reader-conditional))
           (setq end (second (slime-region-for-tlf-at-point))))
         (values (or (/= beg orig-beg) (/= end orig-end)) beg end))
     (error   ; unbalanced parentheses: cannot determine beginning/end of tlf.