Synch with Oort Gnus.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 27e7430..5e8a133 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2002-10-08  Kai Gro\e,A_\e(Bjohann  <Kai.Grossjohann@CS.Uni-Dortmund.DE>
+
+       * gnus-agent.el (gnus-agent-fetch-selected-article): Bind
+       gnus-agent-current-history.
+
 2002-10-06  Simon Josefsson  <jas@extundo.com>
 
        * imap.el (imap-parse-status): Don't use read to read token.

diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el
index df30949..9c43a2d 100644 (file)
--- a/lisp/gnus-agent.el
+++ b/lisp/gnus-agent.el
@@ -802,9 +802,11 @@ This can be added to `gnus-select-article-hook' or
 `gnus-mark-article-hook'."
   (let ((gnus-command-method gnus-current-select-method))
     (when (and gnus-plugged (gnus-agent-method-p gnus-command-method))
-      (gnus-agent-fetch-articles
-       gnus-newsgroup-name
-       (list gnus-current-article)))))
+      (let ((gnus-agent-current-history
+            (gnus-agent-history-buffer)))
+       (gnus-agent-fetch-articles
+        gnus-newsgroup-name
+        (list gnus-current-article))))))
 
 ;;;
 ;;; Internal functions

diff --git a/lisp/spam.el b/lisp/spam.el
index 1e6bc45..4dc3098 100644 (file)
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -39,6 +39,10 @@
 (require 'dns)
 (require 'message)
 
+;; BBDB autoloads
+(autoload 'bbdb-search "bbdb-com")
+(autoload 'bbdb-records "bbdb-com")
+
 ;;; Main parameters.
 
 (defvar spam-use-blacklist t
@@ -261,8 +265,6 @@ The regular expression is matched against the address.")
   (if (spam-from-listed-p spam-whitelist-cache) nil spam-split-group))
 
 ;;; copied from code by Alexander Kotelnikov <sacha@giotto.sj.ru>
-;; FIXME: assumes that bbdb.el is loaded
-;; FIXME: broken right now, if the "from" field can't be retrieved
 (defun spam-check-bbdb ()
   "We want messages from people who are in the BBDB not to be split to spam"
   (let ((who (message-fetch-field "from")))