Synch to No Gnus 200411291903.

[elisp/gnus.git-] / lisp / spam.el

diff --git a/lisp/spam.el b/lisp/spam.el
index ea8c0d8..07084b7 100644 (file)
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -1315,6 +1315,10 @@ addition to the set values for the group."
   (unless gnus-group-is-exiting-without-update-p
     (gnus-message 6 "Exiting summary buffer and applying spam rules")
 
+    ;; before we begin, remove any article limits
+    (ignore-errors
+      (gnus-summary-pop-limit t))
+
     ;; first of all, unregister any articles that are no longer ham or spam
     ;; we have to iterate over the processors, or else we'll be too slow
     (dolist (classification (spam-classifications))
@@ -2023,7 +2027,6 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
 (eval-when-compile
   (autoload 'bbdb-buffer "bbdb")
   (autoload 'bbdb-create-internal "bbdb")
-  (autoload 'bbdb-records "bbdb")
   (autoload 'bbdb-search-simple "bbdb"))
 
 (eval-and-compile
@@ -2032,6 +2035,9 @@ See the Info node `(gnus)Fancy Mail Splitting' for more details."
              (require 'bbdb)
              (require 'bbdb-com))
          (file-error
+          ;; `bbdb-records' should not be bound as an autoload function
+          ;; before loading bbdb because of `bbdb-hashtable-size'.
+          (defalias 'bbdb-records 'ignore)
           (defalias 'spam-BBDB-register-routine 'ignore)
           (defalias 'spam-enter-ham-BBDB 'ignore)
           nil))