From: yamaoka <yamaoka>
Date: Wed, 10 Dec 2003 00:55:51 +0000 (+0000)
Subject: Synch to Gnus 200312100048.
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=eefb23f742cf6a6dbbbcce540c509940296f971d;p=elisp%2Fgnus.git-

Synch to Gnus 200312100048.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cf4f527..e4aea4f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2003-12-10  Simon Josefsson  <jas@extundo.com>
+
+	* pgg-parse.el (pgg-decode-packets): Rewrite to handle corrupt
+	input.
+	(pgg-decode-armor-region): Don't parse packet if decoding fail.
+
+2003-12-09  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* spam.el (spam-check-bogofilter): run in the correct buffer.
+	From lorentey@elte.hu (L,Bu(Brentey K,Ba(Broly).
+	(spam-bogofilter-database-directory): correct customization
+	group.  From Xavier Maillard <zedek@gnu-rox.org>.
+
 2003-12-09  Per Abrahamsen  <abraham@dina.kvl.dk>
 
 	* nnmail.el (nnmail-lazy, nnmail-split-fancy): New widgets.
diff --git a/lisp/spam.el b/lisp/spam.el
index cc13931..483fef3 100644
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -371,7 +371,7 @@ your main source of newsgroup names."
   :type '(choice (directory 
 		  :tag "Location of the Bogofilter database directory")
 		 (const :tag "Use the default"))
-  :group 'spam-ifile)
+  :group 'spam-bogofilter)
 
 (defgroup spam-spamoracle nil
   "Spam spamoracle configuration."
@@ -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