From 6e719e3b8ded612ed52bea66846b13a1f96a78b3 Mon Sep 17 00:00:00 2001 From: Teodor Zlatanov Date: Fri, 14 May 2004 19:41:07 +0000 Subject: [PATCH] (spam-summary-prepare-exit): only produce "marking spam as expired without moving it" message when there are spam messages left --- lisp/ChangeLog | 6 ++++++ lisp/spam.el | 7 +++++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 05fdcf4f0..a6f9b6a0e 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2004-05-14 Teodor Zlatanov + + * 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 * nntp.el (nntp-request-set-mark, nntp-request-update-info): Call diff --git a/lisp/spam.el b/lisp/spam.el index f3d0c115a..7577a7100 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) -- 2.25.1