Synch to Gnus 200312012116.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 25a93b3..57c75fb 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2003-12-01  Teodor Zlatanov  <tzz@lifelogs.com>
+
+       * spam.el (spam-check-bogofilter): check the bogofilter headers
+       AFTER the save-excursion scope is over.  From Adrian Lanz
+       <lanz@fowi.ethz.ch>.
+       (spam-fetch-field-message-id-fast): doc fix
+
 2003-12-01  Simon Josefsson  <jas@extundo.com>
 
        * gnus-agent.el (gnus-agent-expire-days): Doc fix.

diff --git a/lisp/spam.el b/lisp/spam.el
index 85273b5..57638a7 100644 (file)
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -778,7 +778,7 @@ spam-use-* variable.")
     nil))
 
 (defun spam-fetch-field-message-id-fast (article)
-  "Fetch the `subject' field quickly, using the internal
+  "Fetch the `Message-ID' field quickly, using the internal
   gnus-data-list function"
   (if (and (numberp article)
           (assoc article (gnus-data-list nil)))
@@ -1536,8 +1536,8 @@ REMOVE not nil, remove the ADDRESSES."
                 (point-min) (point-max) 
                 spam-bogofilter-path
                 nil temp-buffer-name nil
-                (if db `("-d" ,db "-v") `("-v")))
-         (setq return (spam-check-bogofilter-headers score)))))
+                (if db `("-d" ,db "-v") `("-v"))))
+       (setq return (spam-check-bogofilter-headers score))))
     return))
 
 (defun spam-bogofilter-register-with-bogofilter (articles