(gnus-score-headers): Fix handling of gnus-inhibit-slow-scoring.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f0a7619..3919b94 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2008-03-16  Reiner Steib  <Reiner.Steib@gmx.de>
 
+       * gnus-score.el (gnus-score-headers): Fix handling of
+       gnus-inhibit-slow-scoring.
+
        * gnus-art.el (gnus-article-browse-html-article): Fix type in doc
        string.
        (gnus-button-url-regexp): Improve handling of parenthesis.

diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el
index d79007b..7a4fb25 100644 (file)
--- a/lisp/gnus-score.el
+++ b/lisp/gnus-score.el
@@ -1552,20 +1552,20 @@ If FORMAT, also format the current score file."
                                      (lambda (score)
                                        (length (gnus-score-get header score)))
                                      scores)))
-               ;; Call the scoring function for this type of "header".
                (when (if (and gnus-inhibit-slow-scoring
-                              (if (and (stringp gnus-inhibit-slow-scoring)
+                              (or (eq gnus-inhibit-slow-scoring t)
+                                  (and (stringp gnus-inhibit-slow-scoring)
                                        ;; Always true here?
                                        ;; (stringp gnus-newsgroup-name)
-                                       (string-match gnus-inhibit-slow-scoring
-                                                     gnus-newsgroup-name))
-                                  t
-                                nil)
+                                       (string-match
+                                        gnus-inhibit-slow-scoring
+                                        gnus-newsgroup-name)))
                               (> 0 (nth 1 (assoc header gnus-header-index))))
                          (progn
                            (gnus-message
                             7 "Scoring on headers or body skipped.")
                            nil)
+                       ;; Call the scoring function for this type of "header".
                        (setq new (funcall (nth 2 entry) scores header
                                           now expire trace)))
                  (push new news))))