From 5691e67e76651527754347bf2eaa2fe6ed7b09ed Mon Sep 17 00:00:00 2001 From: yamaoka Date: Sun, 20 Apr 2003 06:02:43 +0000 Subject: [PATCH] Synch to Oort Gnus 200304192118. --- lisp/ChangeLog | 12 ++++++++++++ lisp/gnus-sum.el | 6 +++++- lisp/spam.el | 24 +++++++++++++++++------- 3 files changed, 34 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e1a03f0..04b4437 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,19 @@ +2003-04-19 Jesper Harder + + * gnus-sum.el (gnus-summary-delete-article): Improve docstring. + +2003-04-19 Teodor Zlatanov + + * spam.el (spam-move-spam-nonspam-groups-only): dumb typo fix + 2003-04-18 Teodor Zlatanov * spam.el (spam-split): allow a particular check as a parameter, e.g. (: spam-split 'spam-use-bogofilter) + (spam-mark-only-unseen-as-spam): new parameter, see doc + (spam-mark-junk-as-spam-routine): use + spam-mark-only-unseen-as-spam, simplify routine to take advantage + of gnus-newsgroup-unread as well as gnus-newsgroup-unseen 2003-04-17 Teodor Zlatanov diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index efc4d81..162d7a3 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -9337,9 +9337,13 @@ deleted forever, right now." This command actually deletes articles. This is not a marking command. The article will disappear forever from your life, never to return. + If N is negative, delete backwards. If N is nil and articles have been marked with the process mark, -delete these instead." +delete these instead. + +If `gnus-novice-user' is non-nil you will be asked for +confirmation before the articles are deleted." (interactive "P") (unless (gnus-check-backend-function 'request-expire-articles gnus-newsgroup-name) diff --git a/lisp/spam.el b/lisp/spam.el index 2240641..2bc099e 100644 --- a/lisp/spam.el +++ b/lisp/spam.el @@ -75,6 +75,14 @@ spam groups." :type 'boolean :group 'spam) +(defcustom spam-mark-only-unseen-as-spam t + "Whether only unseen articles should be marked as spam in spam +groups. When nil, all unread articles in a spam group are marked as +spam. Set this if you want to leave an article unread in a spam group +without losing it to the automatic spam-marking process." + :type 'boolean + :group 'spam) + (defcustom spam-mark-ham-unread-before-move-from-spam-group nil "Whether ham should be marked unread before it's moved out of a spam group according to ham-process-destination. This variable is an @@ -449,13 +457,15 @@ your main source of newsgroup names." ;; check the global list of group names spam-junk-mailgroups and the ;; group parameters (when (spam-group-spam-contents-p gnus-newsgroup-name) - (gnus-message 5 "Marking unread articles as spam") - (let ((articles gnus-newsgroup-articles) - article) - (while articles - (setq article (pop articles)) - (when (eq (gnus-summary-article-mark article) gnus-unread-mark) - (gnus-summary-mark-article article gnus-spam-mark)))))) + (gnus-message 5 "Marking %s articles as spam" + (if spam-mark-only-unseen-as-spam + "unseen" + "unread")) + (let ((articles (if spam-mark-only-unseen-as-spam + gnus-newsgroup-unseen + gnus-newsgroup-unreads))) + (dolist (article articles) + (gnus-summary-mark-article article gnus-spam-mark))))) (defun spam-mark-spam-as-expired-and-move-routine (&optional group) (gnus-summary-kill-process-mark) -- 1.7.10.4