* gnus.texi (Key Index): Change encoding to utf-8.

[gnus] / lisp / spam.el

diff --git a/lisp/spam.el b/lisp/spam.el
index 26c0f5b..c3be15a 100644 (file)
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -1,6 +1,6 @@
 ;;; spam.el --- Identifying spam
 
 ;;; spam.el --- Identifying spam
 

-;; Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2002-2012  Free Software Foundation, Inc.

 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Maintainer: Ted Zlatanov <tzz@lifelogs.com>
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Maintainer: Ted Zlatanov <tzz@lifelogs.com>


@@ -8,20 +8,18 @@
 
 ;; This file is part of GNU Emacs.
 
 
 ;; This file is part of GNU Emacs.
 

-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify

 ;; it under the terms of the GNU General Public License as published by
 ;; it under the terms of the GNU General Public License as published by

-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.

 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of

-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License
 ;; GNU General Public License for more details.
 
 ;; You should have received a copy of the GNU General Public License

-;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.

 
 ;;; Commentary:
 
 
 ;;; Commentary:
 


@@ -40,24 +38,26 @@
 
 ;;{{{ compilation directives and autoloads/requires
 
 
 ;;{{{ compilation directives and autoloads/requires
 

+;; For Emacs <22.2 and XEmacs.
+(eval-and-compile
+  (unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
+

 (eval-when-compile (require 'cl))
 (eval-when-compile (require 'cl))

-(eval-when-compile (require 'spam-report))
-(eval-when-compile (require 'hashcash))
-(eval-when-compile (require 'ietf-drums))

 
 

+(require 'message)              ;for the message-fetch-field functions

 (require 'gnus-sum)
 (require 'gnus-sum)

-
-(require 'gnus-uu)                     ; because of key prefix issues
+(require 'gnus-uu)                      ; because of key prefix issues

 ;;; for the definitions of group content classification and spam processors
 (require 'gnus)
 ;;; for the definitions of group content classification and spam processors
 (require 'gnus)

-(require 'message)             ;for the message-fetch-field functions
+
+(eval-when-compile (require 'spam-report))
+(eval-when-compile (require 'hashcash))

 
 ;; for nnimap-split-download-body-default
 (eval-when-compile (require 'nnimap))
 
 ;; autoload query-dig
 
 ;; for nnimap-split-download-body-default
 (eval-when-compile (require 'nnimap))
 
 ;; autoload query-dig

-(eval-and-compile
-  (autoload 'query-dig "dig"))
+(autoload 'query-dig "dig")

 
 ;; autoload spam-report
 (eval-and-compile
 
 ;; autoload spam-report
 (eval-and-compile


@@ -67,22 +67,20 @@
   (autoload 'spam-report-resend "spam-report"))
 
 ;; autoload gnus-registry
   (autoload 'spam-report-resend "spam-report"))
 
 ;; autoload gnus-registry

-(eval-and-compile
-  (autoload 'gnus-registry-group-count "gnus-registry")
-  (autoload 'gnus-registry-add-group "gnus-registry")
-  (autoload 'gnus-registry-store-extra-entry "gnus-registry")
-  (autoload 'gnus-registry-fetch-extra "gnus-registry"))
+(autoload 'gnus-registry-group-count "gnus-registry")
+(autoload 'gnus-registry-get-id-key "gnus-registry")
+(autoload 'gnus-registry-set-id-key "gnus-registry")
+(autoload 'gnus-registry-handle-action "gnus-registry")

 
 

-;; autoload query-dns
-(eval-and-compile
-  (autoload 'query-dns "dns"))
+;; autoload dns-query
+(autoload 'dns-query "dns")

 
 ;;}}}
 
 ;;{{{ Main parameters.
 (defvar spam-backends nil
   "List of spam.el backends with all the pertinent data.
 
 ;;}}}
 
 ;;{{{ Main parameters.
 (defvar spam-backends nil
   "List of spam.el backends with all the pertinent data.

-Populated by spam-install-backend-super.")
+Populated by `spam-install-backend-super'.")

 
 (defgroup spam nil
   "Spam configuration."
 
 (defgroup spam nil
   "Spam configuration."


@@ -92,14 +90,18 @@ Populated by spam-install-backend-super.")
 
 (defcustom spam-summary-exit-behavior 'default
   "Exit behavior at the time of summary exit.
 
 (defcustom spam-summary-exit-behavior 'default
   "Exit behavior at the time of summary exit.

-Note that setting the spam-use-move or spam-use-copy backends on
+Note that setting the `spam-use-move' or `spam-use-copy' backends on

 a group through group/topic parameters overrides this mechanism."
 a group through group/topic parameters overrides this mechanism."

-  :type '(choice (const 'default :tag 
-                       "Move spam out of all groups.  Move ham out of spam groups.")
-                (const 'move-all :tag 
-                       "Move spam out of all groups.  Move ham out of all groups.")
-                (const 'move-none :tag 
-                       "Never move spam or ham out of any groups."))
+  :type '(choice
+          (const
+           'default
+           :tag "Move spam out of all groups and ham out of spam groups.")
+          (const
+           'move-all
+           :tag "Move spam out of all groups and ham out of all groups.")
+          (const
+           'move-none
+           :tag "Never move spam or ham out of any groups."))

   :group 'spam)
 
 (defcustom spam-directory (nnheader-concat gnus-directory "spam/")
   :group 'spam)
 
 (defcustom spam-directory (nnheader-concat gnus-directory "spam/")


@@ -125,8 +127,7 @@ a group through group/topic parameters overrides this mechanism."
 
 (defcustom spam-split-symbolic-return-positive nil
   "Whether `spam-split' should ALWAYS work with symbols or group names.
 
 (defcustom spam-split-symbolic-return-positive nil
   "Whether `spam-split' should ALWAYS work with symbols or group names.

-Do not set this if you use `spam-split' in a fancy split
-  method."
+Do not set this if you use `spam-split' in a fancy split method."

   :type 'boolean
   :group 'spam)
 
   :type 'boolean
   :group 'spam)
 


@@ -140,7 +141,7 @@ without losing it to the automatic spam-marking process."
 
 (defcustom spam-mark-ham-unread-before-move-from-spam-group nil
   "Whether ham should be marked unread before it's moved.
 
 (defcustom spam-mark-ham-unread-before-move-from-spam-group nil
   "Whether ham should be marked unread before it's moved.

-The article is moved out of a spam group according to ham-process-destination.
+The article is moved out of a spam group according to `ham-process-destination'.

 This variable is an official entry in the international Longest Variable Name
 Competition."
   :type 'boolean
 This variable is an official entry in the international Longest Variable Name
 Competition."
   :type 'boolean


@@ -155,7 +156,7 @@ last rule in your split configuration."
   :group 'spam)
 
 (defcustom spam-autodetect-recheck-messages nil
   :group 'spam)
 
 (defcustom spam-autodetect-recheck-messages nil

-  "Should spam.el recheck all meessages when autodetecting?
+  "Should spam.el recheck all messages when autodetecting?

 Normally this is nil, so only unseen messages will be checked."
   :type 'boolean
   :group 'spam)
 Normally this is nil, so only unseen messages will be checked."
   :type 'boolean
   :group 'spam)


@@ -175,7 +176,7 @@ The regular expression is matched against the address."
   :group 'spam)
 
 (defcustom spam-use-dig t
   :group 'spam)
 
 (defcustom spam-use-dig t

-  "Whether `query-dig' should be used instead of `query-dns'."
+  "Whether `query-dig' should be used instead of `dns-query'."

   :type 'boolean