Quoting fixes

[gnus] / lisp / spam.el

diff --git a/lisp/spam.el b/lisp/spam.el
index 49fc504..4ebd8a9 100644 (file)
--- a/lisp/spam.el
+++ b/lisp/spam.el
@@ -1,25 +1,25 @@
 ;;; spam.el --- Identifying spam
 ;;; spam.el --- Identifying spam

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

 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>

-;; Keywords: network
+;; Maintainer: Ted Zlatanov <tzz@lifelogs.com>
+;; Keywords: network, spam, mail, bogofilter, BBDB, dspam, dig, whitelist, blacklist, gmane, hashcash, spamassassin, bsfilter, ifile, stat, crm114, spamoracle

 
 ;; 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., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.

 
 ;;; Commentary:
 
 
 ;;; Commentary:
 


@@ -32,64 +32,81 @@
 
 ;;; Several TODO items are marked as such
 
 
 ;;; Several TODO items are marked as such
 

-;; TODO: spam scores, detection of spam in newsgroups, cross-server splitting,
-;; remote processing, training through files
+;; TODO: cross-server splitting, remote processing, training through files

 
 ;;; Code:
 
 
 ;;; Code:
 

+;;{{{ compilation directives and autoloads/requires
+

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

+(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 '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
 
 ;; autoload spam-report

-(eval-and-compile
-  (autoload 'spam-report-gmane "spam-report")
-  (autoload 'spam-report-resend "spam-report"))
+(autoload 'spam-report-gmane "spam-report")
+(autoload 'spam-report-gmane-spam "spam-report")
+(autoload 'spam-report-gmane-ham "spam-report")
+(autoload 'spam-report-resend "spam-report")

 
 ;; autoload gnus-registry
 
 ;; 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.
+;;}}}
+
+;;{{{ Main parameters.
+(defvar spam-backends nil
+  "List of spam.el backends with all the pertinent data.
+Populated by `spam-install-backend-super'.")

 
 (defgroup spam nil
 
 (defgroup spam nil

-  "Spam configuration.")
+  "Spam configuration."
+  :version "22.1"
+  :group 'mail
+  :group 'news)
+
+(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
+a group through group/topic parameters overrides this mechanism."
+  :type '(choice
+          (const
+           :tag "Move spam out of all groups and ham out of spam groups"
+           default)
+          (const
+           :tag "Move spam out of all groups and ham out of all groups"
+           move-all)
+          (const
+           :tag "Never move spam or ham out of any groups"
+           move-none))
+  :group 'spam)

 
 (defcustom spam-directory (nnheader-concat gnus-directory "spam/")
   "Directory for spam whitelists and blacklists."
   :type 'directory
   :group 'spam)
 
 
 (defcustom spam-directory (nnheader-concat gnus-directory "spam/")
   "Directory for spam whitelists and blacklists."
   :type 'directory
   :group 'spam)
 

-(defcustom spam-move-spam-nonspam-groups-only t
-  "Whether spam should be moved in non-spam groups only.
-When t, only ham and unclassified groups will have their spam moved
-to the spam-process-destination.  When nil, spam will also be moved from
-spam groups."
-  :type 'boolean
-  :group 'spam)
-
-(defcustom spam-process-ham-in-nonham-groups nil
-  "Whether ham should be processed in non-ham groups."
+(defcustom spam-mark-new-messages-in-spam-group-as-spam t
+  "Whether new messages in a spam group should get the spam-mark."

   :type 'boolean
   :type 'boolean

+  ;; :version "22.1" ;; Gnus 5.10.8 / No Gnus 0.3

   :group 'spam)
 
 (defcustom spam-log-to-registry nil
   :group 'spam)
 
 (defcustom spam-log-to-registry nil


@@ -104,13 +121,7 @@ spam groups."
 
 (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."
-  :type 'boolean
-  :group 'spam)
-
-(defcustom spam-process-ham-in-spam-groups nil
-  "Whether ham should be processed in spam groups."
+Do not set this if you use `spam-split' in a fancy split method."

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


@@ -124,7 +135,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


@@ -139,7 +150,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)


@@ -159,7 +170,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
   :group 'spam)
 
   :type 'boolean
   :group 'spam)
 


@@ -276,27 +287,33 @@ them."
   :type 'boolean
   :group 'spam)
 
   :type 'boolean
   :group 'spam)
 

+(defcustom spam-use-crm114 nil
+  "Whether the CRM114 Mailfilter should be used by `spam-split'."
+  :type 'boolean
+  :group 'spam)
+

 (defcustom spam-install-hooks (or
 (defcustom spam-install-hooks (or

-                              spam-use-dig
-                              spam-use-gmane-xref
-                              spam-use-blacklist
-                              spam-use-whitelist
-                              spam-use-whitelist-exclusive
-                              spam-use-blackholes
-                              spam-use-hashcash
-                              spam-use-regex-headers
-                              spam-use-regex-body
-                              spam-use-bogofilter
-                              spam-use-bogofilter-headers
-                              spam-use-spamassassin
-                              spam-use-spamassassin-headers
-                              spam-use-bsfilter
-                              spam-use-bsfilter-headers
-                              spam-use-BBDB
-                              spam-use-BBDB-exclusive
-                              spam-use-ifile
-                              spam-use-stat
-                              spam-use-spamoracle)
+                               spam-use-dig
+                               spam-use-gmane-xref
+                               spam-use-blacklist
+                               spam-use-whitelist
+                               spam-use-whitelist-exclusive
+                               spam-use-blackholes
+                               spam-use-hashcash
+                               spam-use-regex-headers
+                               spam-use-regex-body
+                               spam-use-bogofilter
+                               spam-use-bogofilter-headers
+                               spam-use-spamassassin
+                               spam-use-spamassassin-headers
+                               spam-use-bsfilter
+                               spam-use-bsfilter-headers
+                               spam-use-BBDB
+                               spam-use-BBDB-exclusive
+                               spam-use-ifile
+                               spam-use-stat
+                               spam-use-spamoracle
+                               spam-use-crm114)

   "Whether the spam hooks should be installed.
 Default to t if one of the spam-use-* variables is set."
   :group 'spam
   "Whether the spam hooks should be installed.
 Default to t if one of the spam-use-* variables is set."
   :group 'spam


@@ -310,8 +327,8 @@ Default to t if one of the spam-use-* variables is set."
 ;;; TODO: deprecate this variable, it's confusing since it's a list of strings,
 ;;; not regular expressions
 (defcustom spam-junk-mailgroups (cons
 ;;; TODO: deprecate this variable, it's confusing since it's a list of strings,
 ;;; not regular expressions
 (defcustom spam-junk-mailgroups (cons

-                                spam-split-group
-                                '("mail.junk" "poste.pourriel"))
+                                 spam-split-group
+                                 '("mail.junk" "poste.pourriel"))

   "Mailgroups with spam contents.
 All unmarked article in such group receive the spam mark on group entry."
   :type '(repeat (string :tag "Group"))
   "Mailgroups with spam contents.
 All unmarked article in such group receive the spam mark on group entry."
   :type '(repeat (string :tag "Group"))


@@ -325,7 +342,7 @@ Only meaningful if you enable `spam-use-gmane-xref'."
   :group 'spam)
 
 (defcustom spam-blackhole-servers '("bl.spamcop.net" "relays.ordb.org"
   :group 'spam)
 
 (defcustom spam-blackhole-servers '("bl.spamcop.net" "relays.ordb.org"

-                                   "dev.null.dk" "relays.visi.com")
+                                    "dev.null.dk" "relays.visi.com")

   "List of blackhole servers.
 Only meaningful if you enable `spam-use-blackholes'."
   :type '(repeat (string :tag "Server"))
   "List of blackhole servers.
 Only meaningful if you enable `spam-use-blackholes'."
   :type '(repeat (string :tag "Server"))


@@ -334,11 +351,26 @@ Only meaningful if you enable `spam-use-blackholes'."
 (defcustom spam-blackhole-good-server-regex nil
   "String matching IP addresses that should not be checked in the blackholes.
 Only meaningful if you enable `spam-use-blackholes'."
 (defcustom spam-blackhole-good-server-regex nil
   "String matching IP addresses that should not be checked in the blackholes.
 Only meaningful if you enable `spam-use-blackholes'."

-  :type '(radio (const nil)
-               (regexp :format "%t: %v\n" :size 0))
+  :type '(radio (const nil) regexp)
+  :group 'spam)
+
+(defface spam
+  '((((class color) (type tty) (background dark))
+     (:foreground "gray80" :background "gray50"))
+    (((class color) (type tty) (background light))
+     (:foreground "gray50" :background "gray80"))
+    (((class color) (background dark))
+     (:foreground "ivory2"))
+    (((class color) (background light))
+     (:foreground "ivory4"))
+    (t :inverse-video t))
+  "Face for spam-marked articles."

   :group 'spam)
   :group 'spam)

+;; backward-compatibility alias
+(put 'spam-face 'face-alias 'spam)
+(put 'spam-face 'obsolete-face "22.1")

 
 

-(defcustom spam-face 'gnus-splash-face
+(defcustom spam-face 'spam

   "Face for spam-marked articles."
   :type 'face
   :group 'spam)
   "Face for spam-marked articles."
   :type 'face
   :group 'spam)


@@ -367,20 +399,32 @@ Only meaningful if you enable `spam-use-regex-body'."
   :type '(repeat (regexp :tag "Regular expression to match ham body"))
   :group 'spam)
 
   :type '(repeat (regexp :tag "Regular expression to match ham body"))
   :group 'spam)
 

+(defcustom spam-summary-score-preferred-header nil
+  "Preferred header to use for `spam-summary-score'."
+  :type '(choice :tag "Header name"
+          (symbol :tag "SpamAssassin etc" X-Spam-Status)
+          (symbol :tag "Bogofilter"       X-Bogosity)
+          (const  :tag "No preference, take best guess." nil))
+  :group 'spam)
+

 (defgroup spam-ifile nil
   "Spam ifile configuration."
   :group 'spam)
 
 (defgroup spam-ifile nil
   "Spam ifile configuration."
   :group 'spam)
 

-(defcustom spam-ifile-path (executable-find "ifile")
-  "File path of the ifile executable program."
+(make-obsolete-variable 'spam-ifile-path 'spam-ifile-program
+                        "Gnus 5.10.9 (Emacs 22.1)")
+(defcustom spam-ifile-program (executable-find "ifile")
+  "Name of the ifile program."

   :type '(choice (file :tag "Location of ifile")
   :type '(choice (file :tag "Location of ifile")

-                (const :tag "ifile is not installed"))
+                 (const :tag "ifile is not installed"))

   :group 'spam-ifile)
 
   :group 'spam-ifile)
 

-(defcustom spam-ifile-database-path nil
-  "File path of the ifile database."
+(make-obsolete-variable 'spam-ifile-database-path 'spam-ifile-database
+                        "Gnus 5.10.9 (Emacs 22.1)")
+(defcustom spam-ifile-database nil
+  "File name of the ifile database."

   :type '(choice (file :tag "Location of the ifile database")
   :type '(choice (file :tag "Location of the ifile database")

-                (const :tag "Use the default"))
+                 (const :tag "Use the default"))

   :group 'spam-ifile)
 
 (defcustom spam-ifile-spam-category "spam"
   :group 'spam-ifile)
 
 (defcustom spam-ifile-spam-category "spam"


@@ -392,7 +436,7 @@ Only meaningful if you enable `spam-use-regex-body'."
   "Name of the ham ifile category.
 If nil, the current group name will be used."
   :type '(choice (string :tag "Use a fixed category")
   "Name of the ham ifile category.
 If nil, the current group name will be used."
   :type '(choice (string :tag "Use a fixed category")

-                (const :tag "Use the current group name"))
+                 (const :tag "Use the current group name"))

   :group 'spam-ifile)
 
 (defcustom spam-ifile-all-categories nil
   :group 'spam-ifile)
 
 (defcustom spam-ifile-all-categories nil


@@ -406,12 +450,16 @@ your main source of newsgroup names."
   "Spam bogofilter configuration."
   :group 'spam)
 
   "Spam bogofilter configuration."
   :group 'spam)
 

-(defcustom spam-bogofilter-path (executable-find "bogofilter")
-  "File path of the Bogofilter executable program."
+(make-obsolete-variable 'spam-bogofilter-path 'spam-bogofilter-program
+                        "Gnus 5.10.9 (Emacs 22.1)")
+(defcustom spam-bogofilter-program (executable-find "bogofilter")
+  "Name of the Bogofilter program."

   :type '(choice (file :tag "Location of bogofilter")
   :type '(choice (file :tag "Location of bogofilter")

-                (const :tag "Bogofilter is not installed"))
+                 (const :tag "Bogofilter is not installed"))

   :group 'spam-bogofilter)
 
   :group 'spam-bogofilter)
 

+(defvar spam-bogofilter-valid 'unknown "Is the bogofilter version valid?")
+

 (defcustom spam-bogofilter-header "X-Bogosity"
   "The header that Bogofilter inserts in messages."
   :type 'string
 (defcustom spam-bogofilter-header "X-Bogosity"
   "The header that Bogofilter inserts in messages."
   :type 'string


@@ -443,20 +491,23 @@ your main source of newsgroup names."
   :group 'spam-bogofilter)
 
 (defcustom spam-bogofilter-database-directory nil
   :group 'spam-bogofilter)
 
 (defcustom spam-bogofilter-database-directory nil

-  "Directory path of the Bogofilter databases."
+  "Location of the Bogofilter database.
+When nil, use the default location."

   :type '(choice (directory
   :type '(choice (directory

-                 :tag "Location of the Bogofilter database directory")
-                (const :tag "Use the default"))
+                  :tag "Location of the Bogofilter database directory")
+                 (const :tag "Use the default"))

   :group 'spam-bogofilter)
 
 (defgroup spam-bsfilter nil
   "Spam bsfilter configuration."
   :group 'spam)
 
   :group 'spam-bogofilter)
 
 (defgroup spam-bsfilter nil
   "Spam bsfilter configuration."
   :group 'spam)
 

-(defcustom spam-bsfilter-path (executable-find "bsfilter")
-  "File path of the Bsfilter executable program."
+(make-obsolete-variable 'spam-bsfilter-path 'spam-bsfilter-program
+                        "Gnus 5.10.9 (Emacs 22.1)")
+(defcustom spam-bsfilter-program (executable-find "bsfilter")
+  "Name of the Bsfilter program."

   :type '(choice (file :tag "Location of bsfilter")
   :type '(choice (file :tag "Location of bsfilter")

-                (const :tag "Bsfilter is not installed"))
+                 (const :tag "Bsfilter is not installed"))

   :group 'spam-bsfilter)
 
 (defcustom spam-bsfilter-header "X-Spam-Flag"
   :group 'spam-bsfilter)
 
 (defcustom spam-bsfilter-header "X-Spam-Flag"


@@ -474,7 +525,7 @@ your main source of newsgroup names."
   :type 'string
   :group 'spam-bsfilter)
 
   :type 'string
   :group 'spam-bsfilter)
 

-(defcustom spam-bsfilter-ham-switch "--add-ham"
+(defcustom spam-bsfilter-ham-switch "--add-clean"

   "The switch that Bsfilter uses to register ham messages."
   :type 'string
   :group 'spam-bsfilter)
   "The switch that Bsfilter uses to register ham messages."
   :type 'string
   :group 'spam-bsfilter)


@@ -492,8 +543,8 @@ your main source of newsgroup names."
 (defcustom spam-bsfilter-database-directory nil
   "Directory path of the Bsfilter databases."
   :type '(choice (directory
 (defcustom spam-bsfilter-database-directory nil
   "Directory path of the Bsfilter databases."
   :type '(choice (directory

-                 :tag "Location of the Bsfilter database directory")
-                (const :tag "Use the default"))
+                  :tag "Location of the Bsfilter database directory")
+                 (const :tag "Use the default"))

   :group 'spam-bsfilter)
 
 (defgroup spam-spamoracle nil
   :group 'spam-bsfilter)
 
 (defgroup spam-spamoracle nil


@@ -504,25 +555,27 @@ your main source of newsgroup names."
   "Location of spamoracle database file.
 When nil, use the default spamoracle database."
   :type '(choice (directory :tag "Location of spamoracle database file.")
   "Location of spamoracle database file.
 When nil, use the default spamoracle database."
   :type '(choice (directory :tag "Location of spamoracle database file.")

-                (const :tag "Use the default"))
+                 (const :tag "Use the default"))

   :group 'spam-spamoracle)
 
 (defcustom spam-spamoracle-binary (executable-find "spamoracle")
   "Location of the spamoracle binary."
   :type '(choice (directory :tag "Location of the spamoracle binary")
   :group 'spam-spamoracle)
 
 (defcustom spam-spamoracle-binary (executable-find "spamoracle")
   "Location of the spamoracle binary."
   :type '(choice (directory :tag "Location of the spamoracle binary")

-                (const :tag "Use the default"))
+                 (const :tag "Use the default"))

   :group 'spam-spamoracle)
 
 (defgroup spam-spamassassin nil
   "Spam SpamAssassin configuration."
   :group 'spam)
 
   :group 'spam-spamoracle)
 
 (defgroup spam-spamassassin nil
   "Spam SpamAssassin configuration."
   :group 'spam)
 

-(defcustom spam-spamassassin-path (executable-find "spamassassin")
-  "File path of the spamassassin executable program.
+(make-obsolete-variable 'spam-spamassassin-path
+  'spam-spamassassin-program "Gnus 5.10.9 (Emacs 22.1)")
+(defcustom spam-assassin-program (executable-find "spamassassin")
+  "Name of the spamassassin program.

 Hint: set this to \"spamc\" if you have spamd running.  See the spamc and
 spamd man pages for more information on these programs."
   :type '(choice (file :tag "Location of spamc")
 Hint: set this to \"spamc\" if you have spamd running.  See the spamc and
 spamd man pages for more information on these programs."
   :type '(choice (file :tag "Location of spamc")

-                (const :tag "spamassassin is not installed"))
+                 (const :tag "spamassassin is not installed"))

   :group 'spam-spamassassin)
 
 (defcustom spam-spamassassin-arguments ()
   :group 'spam-spamassassin)
 
 (defcustom spam-spamassassin-arguments ()


@@ -547,10 +600,12 @@ identification"
   :type 'string
   :group 'spam-spamassassin)
 
   :type 'string
   :group 'spam-spamassassin)
 

-(defcustom spam-sa-learn-path (executable-find "sa-learn")
-  "File path of the sa-learn executable program."
+(make-obsolete-variable 'spam-sa-learn-path 'spam-sa-learn-program
+                        "Gnus 5.10.9 (Emacs 22.1)")
+(defcustom spam-sa-learn-program (executable-find "sa-learn")
+  "Name of the sa-learn program."

   :type '(choice (file :tag "Location of spamassassin")
   :type '(choice (file :tag "Location of spamassassin")

-                (const :tag "spamassassin is not installed"))
+                 (const :tag "spamassassin is not installed"))

   :group 'spam-spamassassin)
 
 (defcustom spam-sa-learn-rebuild t
   :group 'spam-spamassassin)
 
 (defcustom spam-sa-learn-rebuild t


@@ -563,20 +618,67 @@ order for SpamAssassin to recognize the new registered spam."
   :group 'spam-spamassassin)
 
 (defcustom spam-sa-learn-spam-switch "--spam"
   :group 'spam-spamassassin)
 
 (defcustom spam-sa-learn-spam-switch "--spam"

-  "The switch that sa-learn uses to register spam messages"
+  "The switch that sa-learn uses to register spam messages."

   :type 'string
   :group 'spam-spamassassin)
 
 (defcustom spam-sa-learn-ham-switch "--ham"
   :type 'string
   :group 'spam-spamassassin)
 
 (defcustom spam-sa-learn-ham-switch "--ham"

-  "The switch that sa-learn uses to register ham messages"
+  "The switch that sa-learn uses to register ham messages."

   :type 'string
   :group 'spam-spamassassin)
 
 (defcustom spam-sa-learn-unregister-switch "--forget"
   :type 'string
   :group 'spam-spamassassin)
 
 (defcustom spam-sa-learn-unregister-switch "--forget"

-  "The switch that sa-learn uses to unregister messages messages"
+  "The switch that sa-learn uses to unregister messages messages."

   :type 'string
   :group 'spam-spamassassin)
 
   :type 'string
   :group 'spam-spamassassin)
 

+(defgroup spam-crm114 nil
+  "Spam CRM114 Mailfilter configuration."
+  :group 'spam)
+
+(defcustom spam-crm114-program (executable-find "mailfilter.crm")
+  "File path of the CRM114 Mailfilter executable program."
+  :type '(choice (file :tag "Location of CRM114 Mailfilter")
+         (const :tag "CRM114 Mailfilter is not installed"))
+  :group 'spam-crm114)
+
+(defcustom spam-crm114-header "X-CRM114-Status"
+  "The header that CRM114 Mailfilter inserts in messages."
+  :type 'string
+  :group 'spam-crm114)
+
+(defcustom spam-crm114-spam-switch "--learnspam"
+  "The switch that CRM114 Mailfilter uses to register spam messages."
+  :type 'string
+  :group 'spam-crm114)
+
+(defcustom spam-crm114-ham-switch "--learnnonspam"
+  "The switch that CRM114 Mailfilter uses to register ham messages."
+  :type 'string
+  :group 'spam-crm114)
+
+(defcustom spam-crm114-spam-strong-switch "--unlearn"
+  "The switch that CRM114 Mailfilter uses to unregister ham messages."
+  :type 'string
+  :group 'spam-crm114)
+
+(defcustom spam-crm114-ham-strong-switch "--unlearn"
+  "The switch that CRM114 Mailfilter uses to unregister spam messages."
+  :type 'string
+  :group 'spam-crm114)
+
+(defcustom spam-crm114-positive-spam-header "^SPAM"
+  "The regex on `spam-crm114-header' for positive spam identification."
+  :type 'regexp
+  :group 'spam-crm114)
+
+(defcustom spam-crm114-database-directory nil
+  "Directory path of the CRM114 Mailfilter databases."
+  :type '(choice (directory
+          :tag "Location of the CRM114 Mailfilter database directory")
+         (const :tag "Use the default"))