Mercurial > emacs
diff lisp/mail/rmail-spam-filter.el @ 90599:c358d0861b16
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 414-422)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 128-130)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-108
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 05 Sep 2006 02:54:22 +0000 |
parents | c5406394f567 27b1d7466c09 |
children | 02cf29720f31 |
line wrap: on
line diff
--- a/lisp/mail/rmail-spam-filter.el Thu Aug 31 07:43:01 2006 +0000 +++ b/lisp/mail/rmail-spam-filter.el Tue Sep 05 02:54:22 2006 +0000 @@ -134,12 +134,11 @@ :group 'rmail-spam-filter ) (defcustom rsf-min-region-to-spam-list 7 - "*User may highlight a region in an incomming message and use - the menubar to add this region to the spam definitions. This - variable specifies the minimum size of region that may be added - to spam list, to avoid accidentally adding a too short region - which would result in false positive identification of spam - messages." + "*Minimum size of region that you can add to the spam list. +This is a size limit on text that you can specify as +indicating a message is spam. The aim is to avoid +accidentally adding a too short region, which would result +in false positive identification of spam." :type 'integer :group 'rmail-spam-filter ) @@ -212,8 +211,8 @@ :group 'rmail-spam-filter) (defvar rsf-scanning-messages-now nil - "Non nil when rmail-spam-filter scans messages, -for interaction with `rsf-bbdb-auto-delete-spam-entries'") + "Non nil when `rmail-spam-filter' scans messages. +This is for interaction with `rsf-bbdb-auto-delete-spam-entries'.") ;; the advantage over the automatic filter definitions is the AND conjunction ;; of in-one-definition-elements @@ -596,8 +595,8 @@ (define-key rmail-mode-map "\C-cSt" 'rsf-add-subject-to-spam-list) (defun rsf-add-content-type-field () - "Maintain backward compatibility with previous versions of rmail-spam-filter. -The most recent version of rmai-spam-filter checks the contents + "Maintain backward compatibility for `rmail-spam-filter'. +The most recent version of `rmail-spam-filter' checks the contents field of the incoming mail to see if it spam. The format of `rsf-definitions-alist' has therefore changed. This function checks to see if old format is used, and if it is, it converts