From e5ab2b48c63f436bb8222caa5e6aa63df093d1f2 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Sat, 15 May 2004 11:41:23 +0000
Subject: [PATCH] Synch to No Gnus 200405141948.

---
 lisp/ChangeLog   |   10 ++++++++++
 lisp/gnus-dup.el |    3 ++-
 lisp/spam.el     |    7 +++++--
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 05fdcf4..ec3cee1 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2004-05-14  Teodor Zlatanov  <tzz@lifelogs.com>
+
+	* gnus-dup.el (gnus-dup-unsuppress-article): don't assume the mail
+	header is not nil (tiny change).  From Nelson Ferreira
+	<nelson.ferreira@verizon.net>.
+
+	* spam.el (spam-summary-prepare-exit): only produce "marking spam
+	as expired without moving it" message when there are spam
+	messages left
+
 2004-05-14  Kai Grossjohann  <kgrossjo@eu.uu.net>
 
 	* nntp.el (nntp-request-set-mark, nntp-request-update-info): Call
diff --git a/lisp/gnus-dup.el b/lisp/gnus-dup.el
index a2b5544..a385d0a 100644
--- a/lisp/gnus-dup.el
+++ b/lisp/gnus-dup.el
@@ -154,7 +154,8 @@ seen in the same session."
 
 (defun gnus-dup-unsuppress-article (article)
   "Stop suppression of ARTICLE."
-  (let ((id (mail-header-id (gnus-data-header (gnus-data-find article)))))
+  (let* ((header (gnus-data-header (gnus-data-find article)))
+	 (id     (when header (mail-header-id header))))
     (when id
       (setq gnus-dup-list-dirty t)
       (setq gnus-dup-list (delete id gnus-dup-list))
diff --git a/lisp/spam.el b/lisp/spam.el
index 25521b4..39a6748 100644
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -869,8 +869,11 @@ Will not return a nil score."
 
     ;; now we redo spam-mark-spam-as-expired-and-move-routine to only
     ;; expire spam, in case the above did not expire them
-    (gnus-message 6 "Marking spam as expired without moving it")
-    (spam-mark-spam-as-expired-and-move-routine nil)
+    (when (< 0 (spam-list-articles
+		gnus-newsgroup-articles
+		'spam))
+      (gnus-message 6 "Marking spam as expired without moving it")
+      (spam-mark-spam-as-expired-and-move-routine nil))
 
     (when (or (spam-group-ham-contents-p gnus-newsgroup-name)
 	      (and (spam-group-spam-contents-p gnus-newsgroup-name)
-- 
1.7.10.4