Mercurial > emacs
comparison lisp/gnus/spam.el @ 90375:e6bf73e43cf4
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-49
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 164-184)
- Update from CVS
- Merge from gnus--rel--5.10
- Update from CVS: man/mh-e.texi (Folders): Various edits.
- Update from erc--emacs--0
* gnus--rel--5.10 (patch 62-70)
- Merge from emacs--devo--0
- Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 28 Mar 2006 23:08:20 +0000 |
parents | 17473f7e626b |
children | 21f28d10d73a |
comparison
equal
deleted
inserted
replaced
90374:cf65b3d033bb | 90375:e6bf73e43cf4 |
---|---|
96 :group 'spam) | 96 :group 'spam) |
97 | 97 |
98 (defcustom spam-process-ham-in-nonham-groups nil | 98 (defcustom spam-process-ham-in-nonham-groups nil |
99 "Whether ham should be processed in non-ham groups." | 99 "Whether ham should be processed in non-ham groups." |
100 :type 'boolean | 100 :type 'boolean |
101 :group 'spam) | |
102 | |
103 (defcustom spam-mark-new-messages-in-spam-group-as-spam t | |
104 "Whether new messages in a spam group should get the spam-mark." | |
105 :type 'boolean | |
106 ;; :version "22.1" ;; Gnus 5.10.8 / No Gnus 0.3 | |
101 :group 'spam) | 107 :group 'spam) |
102 | 108 |
103 (defcustom spam-log-to-registry nil | 109 (defcustom spam-log-to-registry nil |
104 "Whether spam/ham processing should be logged in the registry." | 110 "Whether spam/ham processing should be logged in the registry." |
105 :type 'boolean | 111 :type 'boolean |
674 | 680 |
675 (defun spam-mark-junk-as-spam-routine () | 681 (defun spam-mark-junk-as-spam-routine () |
676 ;; check the global list of group names spam-junk-mailgroups and the | 682 ;; check the global list of group names spam-junk-mailgroups and the |
677 ;; group parameters | 683 ;; group parameters |
678 (when (spam-group-spam-contents-p gnus-newsgroup-name) | 684 (when (spam-group-spam-contents-p gnus-newsgroup-name) |
679 (gnus-message 5 "Marking %s articles as spam" | 685 (gnus-message 6 "Marking %s articles as spam" |
680 (if spam-mark-only-unseen-as-spam | 686 (if spam-mark-only-unseen-as-spam |
681 "unseen" | 687 "unseen" |
682 "unread")) | 688 "unread")) |
683 (let ((articles (if spam-mark-only-unseen-as-spam | 689 (let ((articles (if spam-mark-only-unseen-as-spam |
684 gnus-newsgroup-unseen | 690 gnus-newsgroup-unseen |
685 gnus-newsgroup-unreads))) | 691 gnus-newsgroup-unreads))) |
686 (dolist (article articles) | 692 (if spam-mark-new-messages-in-spam-group-as-spam |
687 (gnus-summary-mark-article article gnus-spam-mark))))) | 693 (dolist (article articles) |
694 (gnus-summary-mark-article article gnus-spam-mark)) | |
695 (gnus-message 9 "Did not mark new messages as spam."))))) | |
688 | 696 |
689 (defun spam-mark-spam-as-expired-and-move-routine (&rest groups) | 697 (defun spam-mark-spam-as-expired-and-move-routine (&rest groups) |
690 (if (and (car-safe groups) (listp (car-safe groups))) | 698 (if (and (car-safe groups) (listp (car-safe groups))) |
691 (apply 'spam-mark-spam-as-expired-and-move-routine (car groups)) | 699 (apply 'spam-mark-spam-as-expired-and-move-routine (car groups)) |
692 (gnus-summary-kill-process-mark) | 700 (gnus-summary-kill-process-mark) |
730 (let ((todo (spam-list-articles gnus-newsgroup-articles 'ham)) | 738 (let ((todo (spam-list-articles gnus-newsgroup-articles 'ham)) |
731 (backend-supports-deletions | 739 (backend-supports-deletions |
732 (gnus-check-backend-function | 740 (gnus-check-backend-function |
733 'request-move-article gnus-newsgroup-name)) | 741 'request-move-article gnus-newsgroup-name)) |
734 (respool-method (gnus-find-method-for-group gnus-newsgroup-name)) | 742 (respool-method (gnus-find-method-for-group gnus-newsgroup-name)) |
735 article mark todo deletep respool) | 743 article mark deletep respool) |
736 | 744 |
737 (when (member 'respool groups) | 745 (when (member 'respool groups) |
738 (setq respool t) ; boolean for later | 746 (setq respool t) ; boolean for later |
739 (setq groups '("fake"))) ; when respooling, groups are dynamic so fake it | 747 (setq groups '("fake"))) ; when respooling, groups are dynamic so fake it |
740 | 748 |