From: yamaoka <yamaoka>
Date: Tue, 25 May 2004 22:00:02 +0000 (+0000)
Subject: Synch to No Gnus 200405251815.
X-Git-Tag: t-gnus-6_17_4-quimby-~898
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fb0a7938bf9d53568c3123f3d284de0eac63b6e5;p=elisp%2Fgnus.git-

Synch to No Gnus 200405251815.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0167689..b359dac 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,43 @@
+2004-05-25  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* gnus-sum.el (gnus-summary-delete-article): invoke hook with
+	correct data (tiny change).  From Anand Mitra <mitramc@yahoo.com>.
+
 2004-05-24  Teodor Zlatanov  <tzz@lifelogs.com>
 
+	* spam.el (spam-list-of-processors): use nil for nonexistent processors
+	(spam-group-processor-p): fixed function so it works properly
+	(spam-group-processor-multiple-p)
+	(spam-group-spam-processor-report-gmane-p)
+	(spam-group-spam-processor-report-resend-p)
+	(spam-group-spam-processor-bogofilter-p)
+	(spam-group-spam-processor-blacklist-p)
+	(spam-group-spam-processor-ifile-p)
+	(spam-group-ham-processor-ifile-p)
+	(spam-group-spam-processor-spamoracle-p)
+	(spam-group-spam-processor-crm114-p)
+	(spam-group-ham-processor-bogofilter-p)
+	(spam-group-spam-processor-stat-p)
+	(spam-group-ham-processor-stat-p)
+	(spam-group-ham-processor-whitelist-p)
+	(spam-group-ham-processor-BBDB-p)
+	(spam-group-ham-processor-spamoracle-p)
+	(spam-group-ham-processor-copy-p): functions removed with some
+	prejudice against unneeded code
+	(spam-report-articles-resend)
+	(spam-report-resend-register-routine): allow the group/topic
+	spam-resend-to value to override spam-report-resend-to
+	(spam-summary-prepare-exit): invoke spam-group-processor-p
+	properly now
+
+	* spam-report.el (spam-report-resend-to, spam-report-resend):
+	start with resend-to set to nil, and then ask the user if
+	necessary.  From Daniel Pittman <daniel@rimspace.net>.
+
+	* gnus.el (spam-resend-to): new group/topic parameter
+	(spam-process): move the OBSOLETE processors to the end of the
+	choices.
+
 	* spam-report.el (spam-report-resend): spam-report-resend takes a
 	list of articles, not separate article numbers.  From Daniel
 	Pittman <daniel@rimspace.net>.
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index fa7dc57..d7573f9 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -9542,10 +9542,10 @@ confirmation before the articles are deleted."
 	(unless (memq (car articles) not-deleted)
 	  (gnus-summary-mark-article (car articles) gnus-canceled-mark))
 	(let* ((article (car articles))
-	       (id (mail-header-id (gnus-data-header
-				    (assoc article (gnus-data-list nil))))))
+	       (ghead  (gnus-data-header
+				    (assoc article (gnus-data-list nil)))))
 	  (run-hook-with-args 'gnus-summary-article-delete-hook
-			      'delete id gnus-newsgroup-name nil
+			      'delete ghead gnus-newsgroup-name nil
 			      nil))
 	(setq articles (cdr articles)))
       (when not-deleted