2004-09-04 13:13:48 +00:00
|
|
|
;;; spam.el --- Identifying spam
|
2005-08-06 19:51:42 +00:00
|
|
|
|
2008-01-07 01:26:07 +00:00
|
|
|
;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
|
2007-10-28 09:18:39 +00:00
|
|
|
;; Maintainer: Ted Zlatanov <tzz@lifelogs.com>
|
|
|
|
;; Keywords: network, spam, mail, bogofilter, BBDB, dspam, dig, whitelist, blacklist, gmane, hashcash, spamassassin, bsfilter, ifile, stat, crm114, spamoracle
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
|
|
;; 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
|
2007-07-25 04:24:43 +00:00
|
|
|
;; the Free Software Foundation; either version 3, or (at your option)
|
2004-09-04 13:13:48 +00:00
|
|
|
;; 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
|
|
|
|
;; 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
|
|
|
|
;; along with GNU Emacs; see the file COPYING. If not, write to the
|
2005-07-04 17:55:18 +00:00
|
|
|
;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
|
|
;; Boston, MA 02110-1301, USA.
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
;;; This module addresses a few aspects of spam control under Gnus. Page
|
|
|
|
;;; breaks are used for grouping declarations and documentation relating to
|
|
|
|
;;; each particular aspect.
|
|
|
|
|
|
|
|
;;; The integration with Gnus is not yet complete. See various `FIXME'
|
|
|
|
;;; comments, below, for supplementary explanations or discussions.
|
|
|
|
|
|
|
|
;;; Several TODO items are marked as such
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;; TODO: cross-server splitting, remote processing, training through files
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;;{{{ compilation directives and autoloads/requires
|
|
|
|
|
2007-12-11 05:20:26 +00:00
|
|
|
;; For Emacs < 22.2.
|
|
|
|
(eval-and-compile
|
|
|
|
(unless (fboundp 'declare-function) (defmacro declare-function (&rest r))))
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(eval-when-compile (require 'cl))
|
|
|
|
|
2007-12-11 05:20:26 +00:00
|
|
|
(require 'message) ;for the message-fetch-field functions
|
2004-09-04 13:13:48 +00:00
|
|
|
(require 'gnus-sum)
|
|
|
|
(require 'gnus-uu) ; because of key prefix issues
|
|
|
|
;;; for the definitions of group content classification and spam processors
|
|
|
|
(require 'gnus)
|
2007-12-11 05:20:26 +00:00
|
|
|
|
|
|
|
(eval-when-compile (require 'spam-report))
|
|
|
|
(eval-when-compile (require 'hashcash))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
;; for nnimap-split-download-body-default
|
|
|
|
(eval-when-compile (require 'nnimap))
|
|
|
|
|
|
|
|
;; autoload query-dig
|
|
|
|
(eval-and-compile
|
|
|
|
(autoload 'query-dig "dig"))
|
|
|
|
|
|
|
|
;; autoload spam-report
|
|
|
|
(eval-and-compile
|
2007-10-28 09:18:39 +00:00
|
|
|
(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"))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
;; 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 query-dns
|
|
|
|
(eval-and-compile
|
|
|
|
(autoload 'query-dns "dns"))
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;;}}}
|
|
|
|
|
|
|
|
;;{{{ Main parameters.
|
|
|
|
(defvar spam-backends nil
|
|
|
|
"List of spam.el backends with all the pertinent data.
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
Populated by `spam-install-backend-super'.")
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(defgroup spam nil
|
2004-11-04 10:07:27 +00:00
|
|
|
"Spam configuration."
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-324
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 70)
- Update from CVS
2005-05-17 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/canlock.el (canlock): Change the parent group to news.
* lisp/gnus/deuglify.el (gnus-outlook-deuglify): Add :group.
* lisp/gnus/dig.el (dig): Add :group.
* lisp/gnus/gnus-art.el (gnus-inhibit-mime-unbuttonizing): Add :group.
* lisp/gnus/gnus-cite.el (gnus-cite-attribution-face): Add :group.
(gnus-cite-face-1, gnus-cite-face-2, gnus-cite-face-3): Ditto.
(gnus-cite-face-4, gnus-cite-face-5, gnus-cite-face-6): Ditto.
(gnus-cite-face-7, gnus-cite-face-8, gnus-cite-face-9): Ditto.
(gnus-cite-face-10, gnus-cite-face-11): Ditto.
* lisp/gnus/gnus-diary.el (gnus-diary): Add :group.
* lisp/gnus/gnus.el (gnus-group-news-1-face): Add :group.
(gnus-group-news-1-empty-face): Ditto.
(gnus-group-news-2-face, gnus-group-news-2-empty-face): Ditto.
(gnus-group-news-3-face, gnus-group-news-3-empty-face): Ditto.
(gnus-group-news-4-face, gnus-group-news-4-empty-face): Ditto.
(gnus-group-news-5-face, gnus-group-news-5-empty-face): Ditto.
(gnus-group-news-6-face, gnus-group-news-6-empty-face): Ditto.
(gnus-group-news-low-face, gnus-group-news-low-empty-face): Ditto.
(gnus-group-mail-1-face, gnus-group-mail-1-empty-face): Ditto.
(gnus-group-mail-2-face, gnus-group-mail-2-empty-face): Ditto.
(gnus-group-mail-3-face, gnus-group-mail-3-empty-face): Ditto.
(gnus-group-mail-low-face, gnus-group-mail-low-empty-face): Ditto.
(gnus-summary-selected-face, gnus-summary-cancelled-face): Ditto.
(gnus-summary-high-ticked-face): Ditto.
(gnus-summary-low-ticked-face): Ditto.
(gnus-summary-normal-ticked-face): Ditto.
(gnus-summary-high-ancient-face): Ditto.
(gnus-summary-low-ancient-face): Ditto.
(gnus-summary-normal-ancient-face): Ditto.
(gnus-summary-high-undownloaded-face): Ditto.
(gnus-summary-low-undownloaded-face): Ditto.
(gnus-summary-normal-undownloaded-face): Ditto.
(gnus-summary-high-unread-face): Ditto.
(gnus-summary-low-unread-face): Ditto.
(gnus-summary-normal-unread-face): Ditto.
(gnus-summary-high-read-face, gnus-summary-low-read-face): Diito
(gnus-summary-normal-read-face, gnus-splash-face): Ditto.
* lisp/gnus/message.el (message-minibuffer-local-map): Add :group.
* lisp/gnus/sieve-manage.el (sieve-manage-log): Add :group.
(sieve-manage-default-user): Diito.
(sieve-manage-server-eol, sieve-manage-client-eol): Ditto.
(sieve-manage-streams, sieve-manage-stream-alist): Ditto.
(sieve-manage-authenticators): Ditto.
(sieve-manage-authenticator-alist): Ditto
(sieve-manage-default-port): Ditto.
* lisp/gnus/sieve-mode.el (sieve-control-commands-face): Add :group.
(sieve-action-commands-face): Ditto.
(sieve-test-commands-face): Ditto.
(sieve-tagged-arguments-face): Ditto.
* lisp/gnus/smime.el (smime): Add :group.
* lisp/gnus/spam-report.el (spam-report): Add :group.
* lisp/gnus/spam.el (spam, spam-face): Add :group.
2005-05-26 15:03:29 +00:00
|
|
|
:version "22.1"
|
|
|
|
:group 'mail
|
|
|
|
:group 'news)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(defcustom spam-summary-exit-behavior 'default
|
|
|
|
"Exit behavior at the time of summary exit.
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
Note that setting the `spam-use-move' or `spam-use-copy' backends on
|
2007-10-28 09:18:39 +00:00
|
|
|
a group through group/topic parameters overrides this mechanism."
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
:type '(choice (const 'default :tag
|
2007-10-28 09:18:39 +00:00
|
|
|
"Move spam out of all groups. Move ham out of spam groups.")
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(const 'move-all :tag
|
2007-10-28 09:18:39 +00:00
|
|
|
"Move spam out of all groups. Move ham out of all groups.")
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(const 'move-none :tag
|
2007-10-28 09:18:39 +00:00
|
|
|
"Never move spam or ham out of any groups."))
|
|
|
|
:group 'spam)
|
|
|
|
|
2004-10-18 22:23:44 +00:00
|
|
|
(defcustom spam-directory (nnheader-concat gnus-directory "spam/")
|
2004-09-04 13:13:48 +00:00
|
|
|
"Directory for spam whitelists and blacklists."
|
|
|
|
:type 'directory
|
|
|
|
:group 'spam)
|
|
|
|
|
2006-03-21 20:37:02 +00:00
|
|
|
(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
|
|
|
|
;; :version "22.1" ;; Gnus 5.10.8 / No Gnus 0.3
|
|
|
|
:group 'spam)
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defcustom spam-log-to-registry nil
|
|
|
|
"Whether spam/ham processing should be logged in the registry."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(defcustom spam-split-symbolic-return nil
|
|
|
|
"Whether `spam-split' should work with symbols or group names."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(defcustom spam-split-symbolic-return-positive nil
|
|
|
|
"Whether `spam-split' should ALWAYS work with symbols or group names.
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
Do not set this if you use `spam-split' in a fancy split method."
|
2004-09-04 13:13:48 +00:00
|
|
|
: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.
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
The article is moved out of a spam group according to `ham-process-destination'.
|
2004-09-04 13:13:48 +00:00
|
|
|
This variable is an official entry in the international Longest Variable Name
|
|
|
|
Competition."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(defcustom spam-disable-spam-split-during-ham-respool nil
|
2007-10-28 09:18:39 +00:00
|
|
|
"Whether `spam-split' should be ignored while resplitting ham.
|
|
|
|
This is useful to prevent ham from ending up in the same spam
|
|
|
|
group after the resplit. Don't set this to t if you have `spam-split' as the
|
2004-09-04 13:13:48 +00:00
|
|
|
last rule in your split configuration."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(defcustom spam-autodetect-recheck-messages nil
|
|
|
|
"Should spam.el recheck all meessages when autodetecting?
|
|
|
|
Normally this is nil, so only unseen messages will be checked."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(defcustom spam-whitelist (expand-file-name "whitelist" spam-directory)
|
|
|
|
"The location of the whitelist.
|
|
|
|
The file format is one regular expression per line.
|
|
|
|
The regular expression is matched against the address."
|
|
|
|
:type 'file
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(defcustom spam-blacklist (expand-file-name "blacklist" spam-directory)
|
|
|
|
"The location of the blacklist.
|
|
|
|
The file format is one regular expression per line.
|
|
|
|
The regular expression is matched against the address."
|
|
|
|
:type 'file
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(defcustom spam-use-dig t
|
|
|
|
"Whether `query-dig' should be used instead of `query-dns'."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'spam)
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(defcustom spam-use-gmane-xref nil
|
|
|
|
"Whether the Gmane spam xref should be used by `spam-split'."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'spam)
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defcustom spam-use-blacklist nil
|
|
|
|
"Whether the blacklist should be used by `spam-split'."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(defcustom spam-blacklist-ignored-regexes nil
|
|
|
|
"Regular expressions that the blacklist should ignore."
|
|
|
|
:type '(repeat (regexp :tag "Regular expression to ignore when blacklisting"))
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(defcustom spam-use-whitelist nil
|
|
|
|
"Whether the whitelist should be used by `spam-split'."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(defcustom spam-use-whitelist-exclusive nil
|
|
|
|
"Whether whitelist-exclusive should be used by `spam-split'.
|
|
|
|
Exclusive whitelisting means that all messages from senders not in the whitelist
|
|
|
|
are considered spam."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(defcustom spam-use-blackholes nil
|
|
|
|
"Whether blackholes should be used by `spam-split'."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(defcustom spam-use-hashcash nil
|
|
|
|
"Whether hashcash payments should be detected by `spam-split'."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(defcustom spam-use-regex-headers nil
|
|
|
|
"Whether a header regular expression match should be used by `spam-split'.
|
|
|
|
Also see the variables `spam-regex-headers-spam' and `spam-regex-headers-ham'."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(defcustom spam-use-regex-body nil
|
|
|
|
"Whether a body regular expression match should be used by `spam-split'.
|
|
|
|
Also see the variables `spam-regex-body-spam' and `spam-regex-body-ham'."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(defcustom spam-use-bogofilter-headers nil
|
|
|
|
"Whether bogofilter headers should be used by `spam-split'.
|
|
|
|
Enable this if you pre-process messages with Bogofilter BEFORE Gnus sees them."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(defcustom spam-use-bogofilter nil
|
|
|
|
"Whether bogofilter should be invoked by `spam-split'.
|
|
|
|
Enable this if you want Gnus to invoke Bogofilter on new messages."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'spam)
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(defcustom spam-use-bsfilter-headers nil
|
|
|
|
"Whether bsfilter headers should be used by `spam-split'.
|
|
|
|
Enable this if you pre-process messages with Bsfilter BEFORE Gnus sees them."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(defcustom spam-use-bsfilter nil
|
|
|
|
"Whether bsfilter should be invoked by `spam-split'.
|
|
|
|
Enable this if you want Gnus to invoke Bsfilter on new messages."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'spam)
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defcustom spam-use-BBDB nil
|
|
|
|
"Whether BBDB should be used by `spam-split'."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(defcustom spam-use-BBDB-exclusive nil
|
|
|
|
"Whether BBDB-exclusive should be used by `spam-split'.
|
|
|
|
Exclusive BBDB means that all messages from senders not in the BBDB are
|
|
|
|
considered spam."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(defcustom spam-use-ifile nil
|
|
|
|
"Whether ifile should be used by `spam-split'."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(defcustom spam-use-stat nil
|
|
|
|
"Whether `spam-stat' should be used by `spam-split'."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(defcustom spam-use-spamoracle nil
|
|
|
|
"Whether spamoracle should be used by `spam-split'."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'spam)
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(defcustom spam-use-spamassassin nil
|
|
|
|
"Whether spamassassin should be invoked by `spam-split'.
|
|
|
|
Enable this if you want Gnus to invoke SpamAssassin on new messages."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(defcustom spam-use-spamassassin-headers nil
|
|
|
|
"Whether spamassassin headers should be checked by `spam-split'.
|
|
|
|
Enable this if you pre-process messages with SpamAssassin BEFORE Gnus sees
|
|
|
|
them."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(defcustom spam-use-crm114 nil
|
|
|
|
"Whether the CRM114 Mailfilter should be used by `spam-split'."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'spam)
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defcustom spam-install-hooks (or
|
|
|
|
spam-use-dig
|
2007-10-28 09:18:39 +00:00
|
|
|
spam-use-gmane-xref
|
2004-09-04 13:13:48 +00:00
|
|
|
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
|
2007-10-28 09:18:39 +00:00
|
|
|
spam-use-bogofilter-headers
|
|
|
|
spam-use-spamassassin
|
|
|
|
spam-use-spamassassin-headers
|
|
|
|
spam-use-bsfilter
|
|
|
|
spam-use-bsfilter-headers
|
2004-09-04 13:13:48 +00:00
|
|
|
spam-use-BBDB
|
|
|
|
spam-use-BBDB-exclusive
|
|
|
|
spam-use-ifile
|
|
|
|
spam-use-stat
|
2007-10-28 09:18:39 +00:00
|
|
|
spam-use-spamoracle
|
|
|
|
spam-use-crm114)
|
2004-09-04 13:13:48 +00:00
|
|
|
"Whether the spam hooks should be installed.
|
|
|
|
Default to t if one of the spam-use-* variables is set."
|
|
|
|
:group 'spam
|
|
|
|
:type 'boolean)
|
|
|
|
|
|
|
|
(defcustom spam-split-group "spam"
|
|
|
|
"Group name where incoming spam should be put by `spam-split'."
|
|
|
|
:type 'string
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
;;; 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"))
|
|
|
|
"Mailgroups with spam contents.
|
|
|
|
All unmarked article in such group receive the spam mark on group entry."
|
|
|
|
:type '(repeat (string :tag "Group"))
|
|
|
|
:group 'spam)
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
|
|
|
|
(defcustom spam-gmane-xref-spam-group "gmane.spam.detected"
|
|
|
|
"The group where spam xrefs can be found on Gmane.
|
|
|
|
Only meaningful if you enable `spam-use-gmane-xref'."
|
|
|
|
:type 'string
|
|
|
|
:group 'spam)
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defcustom spam-blackhole-servers '("bl.spamcop.net" "relays.ordb.org"
|
|
|
|
"dev.null.dk" "relays.visi.com")
|
2007-10-28 09:18:39 +00:00
|
|
|
"List of blackhole servers.
|
|
|
|
Only meaningful if you enable `spam-use-blackholes'."
|
2004-09-04 13:13:48 +00:00
|
|
|
:type '(repeat (string :tag "Server"))
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(defcustom spam-blackhole-good-server-regex nil
|
2007-10-28 09:18:39 +00:00
|
|
|
"String matching IP addresses that should not be checked in the blackholes.
|
|
|
|
Only meaningful if you enable `spam-use-blackholes'."
|
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-716
Merge from gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-74
Update from CVS
2004-12-02 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/message.el (message-forward-make-body-mml): Remove headers
according to message-forward-ignored-headers if a message is
decoded.
2004-12-02 Romain Francoise <romain@orebokech.com>
* lisp/gnus/message.el (message-forward-make-body-plain): Always remove
headers according to message-forward-ignored-headers.
2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/lpath.el: Remove bbdb-create-internal, bbdb-records,
spam-BBDB-register-routine and spam-enter-ham-BBDB.
* lisp/gnus/nnrss.el (nnrss-string-as-multibyte): Redefine it as a macro in
order to silence the byte compiler.
* lisp/gnus/pop3.el (pop3-md5): Define it before being used.
* lisp/gnus/spam.el: Fix the way to silence the byte compiler, which
complained about bbdb-buffer, bbdb-create-internal,
bbdb-search-simple, mail-check-payment, spam-BBDB-register-routine,
spam-enter-ham-BBDB, spam-stat-buffer-change-to-non-spam,
spam-stat-buffer-change-to-spam, spam-stat-buffer-is-non-spam,
spam-stat-buffer-is-spam, spam-stat-load,
spam-stat-register-ham-routine, spam-stat-register-spam-routine,
spam-stat-save and spam-stat-split-fancy.
2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/canlock.el (canlock-password): Remove `:size 0' or `:size 1'
which may confuse users.
(canlock-password-for-verify): Ditto.
* lisp/gnus/deuglify.el (gnus-outlook-deuglify-unwrap-stop-chars): Ditto.
* lisp/gnus/gnus-art.el (gnus-emphasis-alist): Ditto.
* lisp/gnus/gnus-registry.el (gnus-registry-max-entries): Ditto.
* lisp/gnus/gnus-score.el (gnus-adaptive-word-length-limit): Ditto.
* lisp/gnus/gnus-start.el (gnus-save-killed-list): Ditto.
* lisp/gnus/gnus-sum.el (gnus-thread-hide-subtree): Ditto.
(gnus-sum-thread-tree-root): Ditto.
(gnus-sum-thread-tree-false-root): Ditto.
(gnus-sum-thread-tree-single-indent): Ditto.
* lisp/gnus/message.el (message-courtesy-message): Ditto.
(message-archive-note): Ditto.
(message-subscribed-address-file): Ditto.
(message-user-fqdn): Ditto.
* lisp/gnus/spam-report.el (spam-report-gmane-regex): Ditto.
* lisp/gnus/spam.el (spam-blackhole-good-server-regex): Ditto.
2004-11-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/message.el (message-forbidden-properties): Fixed typo in doc
string.
2004-11-25 Lars Magne Ingebrigtsen <larsi@gnus.org>
* lisp/gnus/message.el (message-strip-forbidden-properties): Bind
buffer-read-only (etc) to nil.
2004-11-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-util.el (gnus-replace-in-string): Added doc string.
* lisp/gnus/nnmail.el (nnmail-split-header-length-limit): Increase to 2048
to avoid problems when splitting mails with many recipients.
2004-11-23 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/rfc2047.el (rfc2047-header-encoding-alist): Add In-Reply-To to
address-mime. Suggested by ARISAWA Akihiro <ari@mbf.ocn.ne.jp>.
2004-11-22 Marek Martin <marek.martin@mum.pri.ee> (tiny change)
* lisp/gnus/nnfolder.el (nnfolder-request-create-group): Save current buffer.
2004-11-22 Reiner Steib <Reiner.Steib@gmx.de>
* man/message.texi (Various Message Variables): Mention that all mail
file variables are derived from `message-directory'.
* man/gnus.texi (Splitting Mail): Clarify bogus group.
2004-11-16 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Filtering Spam Using The Spam ELisp Package):
2004-12-07 21:56:42 +00:00
|
|
|
:type '(radio (const nil) regexp)
|
2004-09-04 13:13:48 +00:00
|
|
|
:group 'spam)
|
|
|
|
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-425
Remove "-face" suffix from gnus faces
2005-06-16 Miles Bader <miles@gnu.org>
* lisp/gnus/spam.el (spam): Remove "-face" suffix from face name.
(spam-face): New backward-compatibility alias for renamed face.
(spam-face, spam-initialize): Use renamed spam face.
* lisp/gnus/message.el (message-header-to, message-header-cc)
(message-header-subject, message-header-newsgroups)
(message-header-other, message-header-name)
(message-header-xheader, message-separator, message-cited-text)
(message-mml): Remove "-face" suffix from face names.
(message-header-to-face, message-header-cc-face)
(message-header-subject-face, message-header-newsgroups-face)
(message-header-other-face, message-header-name-face)
(message-header-xheader-face, message-separator-face)
(message-cited-text-face, message-mml-face):
New backward-compatibility aliases for renamed faces.
(message-font-lock-keywords): Use renamed message faces.
* lisp/gnus/sieve-mode.el (sieve-control-commands, sieve-action-commands)
(sieve-test-commands, sieve-tagged-arguments):
Remove "-face" suffix from face names.
(sieve-control-commands-face, sieve-action-commands-face)
(sieve-test-commands-face, sieve-tagged-arguments-face):
New backward-compatibility aliases for renamed faces.
(sieve-control-commands-face, sieve-action-commands-face)
(sieve-test-commands-face, sieve-tagged-arguments-face):
Use renamed sieve faces.
* lisp/gnus/gnus.el (gnus-group-news-1, gnus-group-news-1-empty)
(gnus-group-news-2, gnus-group-news-2-empty, gnus-group-news-3)
(gnus-group-news-3-empty, gnus-group-news-4)
(gnus-group-news-4-empty, gnus-group-news-5)
(gnus-group-news-5-empty, gnus-group-news-6)
(gnus-group-news-6-empty, gnus-group-news-low)
(gnus-group-news-low-empty, gnus-group-mail-1)
(gnus-group-mail-1-empty, gnus-group-mail-2)
(gnus-group-mail-2-empty, gnus-group-mail-3)
(gnus-group-mail-3-empty, gnus-group-mail-low)
(gnus-group-mail-low-empty, gnus-summary-selected)
(gnus-summary-cancelled, gnus-summary-high-ticked)
(gnus-summary-low-ticked, gnus-summary-normal-ticked)
(gnus-summary-high-ancient, gnus-summary-low-ancient)
(gnus-summary-normal-ancient, gnus-summary-high-undownloaded)
(gnus-summary-low-undownloaded)
(gnus-summary-normal-undownloaded, gnus-summary-high-unread)
(gnus-summary-low-unread, gnus-summary-normal-unread)
(gnus-summary-high-read, gnus-summary-low-read)
(gnus-summary-normal-read, gnus-splash):
Remove "-face" suffix from face names.
(gnus-group-news-1-face, gnus-group-news-1-empty-face)
(gnus-group-news-2-face, gnus-group-news-2-empty-face)
(gnus-group-news-3-face, gnus-group-news-3-empty-face)
(gnus-group-news-4-face, gnus-group-news-4-empty-face)
(gnus-group-news-5-face, gnus-group-news-5-empty-face)
(gnus-group-news-6-face, gnus-group-news-6-empty-face)
(gnus-group-news-low-face, gnus-group-news-low-empty-face)
(gnus-group-mail-1-face, gnus-group-mail-1-empty-face)
(gnus-group-mail-2-face, gnus-group-mail-2-empty-face)
(gnus-group-mail-3-face, gnus-group-mail-3-empty-face)
(gnus-group-mail-low-face, gnus-group-mail-low-empty-face)
(gnus-summary-selected-face, gnus-summary-cancelled-face)
(gnus-summary-high-ticked-face, gnus-summary-low-ticked-face)
(gnus-summary-normal-ticked-face)
(gnus-summary-high-ancient-face, gnus-summary-low-ancient-face)
(gnus-summary-normal-ancient-face)
(gnus-summary-high-undownloaded-face)
(gnus-summary-low-undownloaded-face)
(gnus-summary-normal-undownloaded-face)
(gnus-summary-high-unread-face, gnus-summary-low-unread-face)
(gnus-summary-normal-unread-face, gnus-summary-high-read-face)
(gnus-summary-low-read-face, gnus-summary-normal-read-face)
(gnus-splash-face):
New backward-compatibility aliases for renamed faces.
(gnus-group-startup-message): Use renamed gnus faces.
* lisp/gnus/gnus-srvr.el (gnus-server-agent, gnus-server-opened)
(gnus-server-closed, gnus-server-denied, gnus-server-offline)
(gnus-server-agent): Remove "-face" suffix from face names.
(gnus-server-agent-face, gnus-server-opened-face)
(gnus-server-closed-face, gnus-server-denied-face)
(gnus-server-offline-face):
New backward-compatibility aliases for renamed faces.
(gnus-server-agent-face, gnus-server-opened-face)
(gnus-server-closed-face, gnus-server-denied-face)
(gnus-server-offline-face): Use renamed gnus faces.
* lisp/gnus/gnus-picon.el (gnus-picon-xbm, gnus-picon):
Remove "-face" suffix from face names.
(gnus-picon-xbm-face, gnus-picon-face):
New backward-compatibility aliases for renamed faces.
* lisp/gnus/gnus-cite.el (gnus-cite-attribution, gnus-cite-1, gnus-cite-2)
(gnus-cite-3, gnus-cite-4, gnus-cite-5, gnus-cite-6)
(gnus-cite-7, gnus-cite-8, gnus-cite-9, gnus-cite-10)
(gnus-cite-11): Remove "-face" suffix from face names.
(gnus-cite-attribution-face, gnus-cite-face-1, gnus-cite-face-2)
(gnus-cite-face-3, gnus-cite-face-4, gnus-cite-face-5)
(gnus-cite-face-6, gnus-cite-face-7, gnus-cite-face-8)
(gnus-cite-face-9, gnus-cite-face-10, gnus-cite-face-11):
New backward-compatibility aliases for renamed faces.
(gnus-cite-attribution-face, gnus-cite-face-list)
(gnus-article-boring-faces): Use renamed gnus faces.
* lisp/gnus/gnus-art.el (gnus-signature, gnus-header-from)
(gnus-header-subject, gnus-header-newsgroups, gnus-header-name)
(gnus-header-content): Remove "-face" suffix from face names.
(gnus-signature-face, gnus-header-from-face)
(gnus-header-subject-face, gnus-header-newsgroups-face)
(gnus-header-name-face, gnus-header-content-face):
New backward-compatibility aliases for renamed faces.
(gnus-signature-face, gnus-header-face-alist): Use renamed gnus faces.
* lisp/gnus/gnus-sum.el (gnus-summary-selected-face)
(gnus-summary-highlight): Use renamed gnus faces.
* lisp/gnus/gnus-group.el (gnus-group-highlight): Likewise.
2005-06-16 03:48:20 +00:00
|
|
|
(defface spam
|
2005-01-07 06:16:20 +00:00
|
|
|
'((((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))
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-324
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 70)
- Update from CVS
2005-05-17 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/canlock.el (canlock): Change the parent group to news.
* lisp/gnus/deuglify.el (gnus-outlook-deuglify): Add :group.
* lisp/gnus/dig.el (dig): Add :group.
* lisp/gnus/gnus-art.el (gnus-inhibit-mime-unbuttonizing): Add :group.
* lisp/gnus/gnus-cite.el (gnus-cite-attribution-face): Add :group.
(gnus-cite-face-1, gnus-cite-face-2, gnus-cite-face-3): Ditto.
(gnus-cite-face-4, gnus-cite-face-5, gnus-cite-face-6): Ditto.
(gnus-cite-face-7, gnus-cite-face-8, gnus-cite-face-9): Ditto.
(gnus-cite-face-10, gnus-cite-face-11): Ditto.
* lisp/gnus/gnus-diary.el (gnus-diary): Add :group.
* lisp/gnus/gnus.el (gnus-group-news-1-face): Add :group.
(gnus-group-news-1-empty-face): Ditto.
(gnus-group-news-2-face, gnus-group-news-2-empty-face): Ditto.
(gnus-group-news-3-face, gnus-group-news-3-empty-face): Ditto.
(gnus-group-news-4-face, gnus-group-news-4-empty-face): Ditto.
(gnus-group-news-5-face, gnus-group-news-5-empty-face): Ditto.
(gnus-group-news-6-face, gnus-group-news-6-empty-face): Ditto.
(gnus-group-news-low-face, gnus-group-news-low-empty-face): Ditto.
(gnus-group-mail-1-face, gnus-group-mail-1-empty-face): Ditto.
(gnus-group-mail-2-face, gnus-group-mail-2-empty-face): Ditto.
(gnus-group-mail-3-face, gnus-group-mail-3-empty-face): Ditto.
(gnus-group-mail-low-face, gnus-group-mail-low-empty-face): Ditto.
(gnus-summary-selected-face, gnus-summary-cancelled-face): Ditto.
(gnus-summary-high-ticked-face): Ditto.
(gnus-summary-low-ticked-face): Ditto.
(gnus-summary-normal-ticked-face): Ditto.
(gnus-summary-high-ancient-face): Ditto.
(gnus-summary-low-ancient-face): Ditto.
(gnus-summary-normal-ancient-face): Ditto.
(gnus-summary-high-undownloaded-face): Ditto.
(gnus-summary-low-undownloaded-face): Ditto.
(gnus-summary-normal-undownloaded-face): Ditto.
(gnus-summary-high-unread-face): Ditto.
(gnus-summary-low-unread-face): Ditto.
(gnus-summary-normal-unread-face): Ditto.
(gnus-summary-high-read-face, gnus-summary-low-read-face): Diito
(gnus-summary-normal-read-face, gnus-splash-face): Ditto.
* lisp/gnus/message.el (message-minibuffer-local-map): Add :group.
* lisp/gnus/sieve-manage.el (sieve-manage-log): Add :group.
(sieve-manage-default-user): Diito.
(sieve-manage-server-eol, sieve-manage-client-eol): Ditto.
(sieve-manage-streams, sieve-manage-stream-alist): Ditto.
(sieve-manage-authenticators): Ditto.
(sieve-manage-authenticator-alist): Ditto
(sieve-manage-default-port): Ditto.
* lisp/gnus/sieve-mode.el (sieve-control-commands-face): Add :group.
(sieve-action-commands-face): Ditto.
(sieve-test-commands-face): Ditto.
(sieve-tagged-arguments-face): Ditto.
* lisp/gnus/smime.el (smime): Add :group.
* lisp/gnus/spam-report.el (spam-report): Add :group.
* lisp/gnus/spam.el (spam, spam-face): Add :group.
2005-05-26 15:03:29 +00:00
|
|
|
"Face for spam-marked articles."
|
|
|
|
:group 'spam)
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-425
Remove "-face" suffix from gnus faces
2005-06-16 Miles Bader <miles@gnu.org>
* lisp/gnus/spam.el (spam): Remove "-face" suffix from face name.
(spam-face): New backward-compatibility alias for renamed face.
(spam-face, spam-initialize): Use renamed spam face.
* lisp/gnus/message.el (message-header-to, message-header-cc)
(message-header-subject, message-header-newsgroups)
(message-header-other, message-header-name)
(message-header-xheader, message-separator, message-cited-text)
(message-mml): Remove "-face" suffix from face names.
(message-header-to-face, message-header-cc-face)
(message-header-subject-face, message-header-newsgroups-face)
(message-header-other-face, message-header-name-face)
(message-header-xheader-face, message-separator-face)
(message-cited-text-face, message-mml-face):
New backward-compatibility aliases for renamed faces.
(message-font-lock-keywords): Use renamed message faces.
* lisp/gnus/sieve-mode.el (sieve-control-commands, sieve-action-commands)
(sieve-test-commands, sieve-tagged-arguments):
Remove "-face" suffix from face names.
(sieve-control-commands-face, sieve-action-commands-face)
(sieve-test-commands-face, sieve-tagged-arguments-face):
New backward-compatibility aliases for renamed faces.
(sieve-control-commands-face, sieve-action-commands-face)
(sieve-test-commands-face, sieve-tagged-arguments-face):
Use renamed sieve faces.
* lisp/gnus/gnus.el (gnus-group-news-1, gnus-group-news-1-empty)
(gnus-group-news-2, gnus-group-news-2-empty, gnus-group-news-3)
(gnus-group-news-3-empty, gnus-group-news-4)
(gnus-group-news-4-empty, gnus-group-news-5)
(gnus-group-news-5-empty, gnus-group-news-6)
(gnus-group-news-6-empty, gnus-group-news-low)
(gnus-group-news-low-empty, gnus-group-mail-1)
(gnus-group-mail-1-empty, gnus-group-mail-2)
(gnus-group-mail-2-empty, gnus-group-mail-3)
(gnus-group-mail-3-empty, gnus-group-mail-low)
(gnus-group-mail-low-empty, gnus-summary-selected)
(gnus-summary-cancelled, gnus-summary-high-ticked)
(gnus-summary-low-ticked, gnus-summary-normal-ticked)
(gnus-summary-high-ancient, gnus-summary-low-ancient)
(gnus-summary-normal-ancient, gnus-summary-high-undownloaded)
(gnus-summary-low-undownloaded)
(gnus-summary-normal-undownloaded, gnus-summary-high-unread)
(gnus-summary-low-unread, gnus-summary-normal-unread)
(gnus-summary-high-read, gnus-summary-low-read)
(gnus-summary-normal-read, gnus-splash):
Remove "-face" suffix from face names.
(gnus-group-news-1-face, gnus-group-news-1-empty-face)
(gnus-group-news-2-face, gnus-group-news-2-empty-face)
(gnus-group-news-3-face, gnus-group-news-3-empty-face)
(gnus-group-news-4-face, gnus-group-news-4-empty-face)
(gnus-group-news-5-face, gnus-group-news-5-empty-face)
(gnus-group-news-6-face, gnus-group-news-6-empty-face)
(gnus-group-news-low-face, gnus-group-news-low-empty-face)
(gnus-group-mail-1-face, gnus-group-mail-1-empty-face)
(gnus-group-mail-2-face, gnus-group-mail-2-empty-face)
(gnus-group-mail-3-face, gnus-group-mail-3-empty-face)
(gnus-group-mail-low-face, gnus-group-mail-low-empty-face)
(gnus-summary-selected-face, gnus-summary-cancelled-face)
(gnus-summary-high-ticked-face, gnus-summary-low-ticked-face)
(gnus-summary-normal-ticked-face)
(gnus-summary-high-ancient-face, gnus-summary-low-ancient-face)
(gnus-summary-normal-ancient-face)
(gnus-summary-high-undownloaded-face)
(gnus-summary-low-undownloaded-face)
(gnus-summary-normal-undownloaded-face)
(gnus-summary-high-unread-face, gnus-summary-low-unread-face)
(gnus-summary-normal-unread-face, gnus-summary-high-read-face)
(gnus-summary-low-read-face, gnus-summary-normal-read-face)
(gnus-splash-face):
New backward-compatibility aliases for renamed faces.
(gnus-group-startup-message): Use renamed gnus faces.
* lisp/gnus/gnus-srvr.el (gnus-server-agent, gnus-server-opened)
(gnus-server-closed, gnus-server-denied, gnus-server-offline)
(gnus-server-agent): Remove "-face" suffix from face names.
(gnus-server-agent-face, gnus-server-opened-face)
(gnus-server-closed-face, gnus-server-denied-face)
(gnus-server-offline-face):
New backward-compatibility aliases for renamed faces.
(gnus-server-agent-face, gnus-server-opened-face)
(gnus-server-closed-face, gnus-server-denied-face)
(gnus-server-offline-face): Use renamed gnus faces.
* lisp/gnus/gnus-picon.el (gnus-picon-xbm, gnus-picon):
Remove "-face" suffix from face names.
(gnus-picon-xbm-face, gnus-picon-face):
New backward-compatibility aliases for renamed faces.
* lisp/gnus/gnus-cite.el (gnus-cite-attribution, gnus-cite-1, gnus-cite-2)
(gnus-cite-3, gnus-cite-4, gnus-cite-5, gnus-cite-6)
(gnus-cite-7, gnus-cite-8, gnus-cite-9, gnus-cite-10)
(gnus-cite-11): Remove "-face" suffix from face names.
(gnus-cite-attribution-face, gnus-cite-face-1, gnus-cite-face-2)
(gnus-cite-face-3, gnus-cite-face-4, gnus-cite-face-5)
(gnus-cite-face-6, gnus-cite-face-7, gnus-cite-face-8)
(gnus-cite-face-9, gnus-cite-face-10, gnus-cite-face-11):
New backward-compatibility aliases for renamed faces.
(gnus-cite-attribution-face, gnus-cite-face-list)
(gnus-article-boring-faces): Use renamed gnus faces.
* lisp/gnus/gnus-art.el (gnus-signature, gnus-header-from)
(gnus-header-subject, gnus-header-newsgroups, gnus-header-name)
(gnus-header-content): Remove "-face" suffix from face names.
(gnus-signature-face, gnus-header-from-face)
(gnus-header-subject-face, gnus-header-newsgroups-face)
(gnus-header-name-face, gnus-header-content-face):
New backward-compatibility aliases for renamed faces.
(gnus-signature-face, gnus-header-face-alist): Use renamed gnus faces.
* lisp/gnus/gnus-sum.el (gnus-summary-selected-face)
(gnus-summary-highlight): Use renamed gnus faces.
* lisp/gnus/gnus-group.el (gnus-group-highlight): Likewise.
2005-06-16 03:48:20 +00:00
|
|
|
;; backward-compatibility alias
|
|
|
|
(put 'spam-face 'face-alias 'spam)
|
2005-01-07 06:16:20 +00:00
|
|
|
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-425
Remove "-face" suffix from gnus faces
2005-06-16 Miles Bader <miles@gnu.org>
* lisp/gnus/spam.el (spam): Remove "-face" suffix from face name.
(spam-face): New backward-compatibility alias for renamed face.
(spam-face, spam-initialize): Use renamed spam face.
* lisp/gnus/message.el (message-header-to, message-header-cc)
(message-header-subject, message-header-newsgroups)
(message-header-other, message-header-name)
(message-header-xheader, message-separator, message-cited-text)
(message-mml): Remove "-face" suffix from face names.
(message-header-to-face, message-header-cc-face)
(message-header-subject-face, message-header-newsgroups-face)
(message-header-other-face, message-header-name-face)
(message-header-xheader-face, message-separator-face)
(message-cited-text-face, message-mml-face):
New backward-compatibility aliases for renamed faces.
(message-font-lock-keywords): Use renamed message faces.
* lisp/gnus/sieve-mode.el (sieve-control-commands, sieve-action-commands)
(sieve-test-commands, sieve-tagged-arguments):
Remove "-face" suffix from face names.
(sieve-control-commands-face, sieve-action-commands-face)
(sieve-test-commands-face, sieve-tagged-arguments-face):
New backward-compatibility aliases for renamed faces.
(sieve-control-commands-face, sieve-action-commands-face)
(sieve-test-commands-face, sieve-tagged-arguments-face):
Use renamed sieve faces.
* lisp/gnus/gnus.el (gnus-group-news-1, gnus-group-news-1-empty)
(gnus-group-news-2, gnus-group-news-2-empty, gnus-group-news-3)
(gnus-group-news-3-empty, gnus-group-news-4)
(gnus-group-news-4-empty, gnus-group-news-5)
(gnus-group-news-5-empty, gnus-group-news-6)
(gnus-group-news-6-empty, gnus-group-news-low)
(gnus-group-news-low-empty, gnus-group-mail-1)
(gnus-group-mail-1-empty, gnus-group-mail-2)
(gnus-group-mail-2-empty, gnus-group-mail-3)
(gnus-group-mail-3-empty, gnus-group-mail-low)
(gnus-group-mail-low-empty, gnus-summary-selected)
(gnus-summary-cancelled, gnus-summary-high-ticked)
(gnus-summary-low-ticked, gnus-summary-normal-ticked)
(gnus-summary-high-ancient, gnus-summary-low-ancient)
(gnus-summary-normal-ancient, gnus-summary-high-undownloaded)
(gnus-summary-low-undownloaded)
(gnus-summary-normal-undownloaded, gnus-summary-high-unread)
(gnus-summary-low-unread, gnus-summary-normal-unread)
(gnus-summary-high-read, gnus-summary-low-read)
(gnus-summary-normal-read, gnus-splash):
Remove "-face" suffix from face names.
(gnus-group-news-1-face, gnus-group-news-1-empty-face)
(gnus-group-news-2-face, gnus-group-news-2-empty-face)
(gnus-group-news-3-face, gnus-group-news-3-empty-face)
(gnus-group-news-4-face, gnus-group-news-4-empty-face)
(gnus-group-news-5-face, gnus-group-news-5-empty-face)
(gnus-group-news-6-face, gnus-group-news-6-empty-face)
(gnus-group-news-low-face, gnus-group-news-low-empty-face)
(gnus-group-mail-1-face, gnus-group-mail-1-empty-face)
(gnus-group-mail-2-face, gnus-group-mail-2-empty-face)
(gnus-group-mail-3-face, gnus-group-mail-3-empty-face)
(gnus-group-mail-low-face, gnus-group-mail-low-empty-face)
(gnus-summary-selected-face, gnus-summary-cancelled-face)
(gnus-summary-high-ticked-face, gnus-summary-low-ticked-face)
(gnus-summary-normal-ticked-face)
(gnus-summary-high-ancient-face, gnus-summary-low-ancient-face)
(gnus-summary-normal-ancient-face)
(gnus-summary-high-undownloaded-face)
(gnus-summary-low-undownloaded-face)
(gnus-summary-normal-undownloaded-face)
(gnus-summary-high-unread-face, gnus-summary-low-unread-face)
(gnus-summary-normal-unread-face, gnus-summary-high-read-face)
(gnus-summary-low-read-face, gnus-summary-normal-read-face)
(gnus-splash-face):
New backward-compatibility aliases for renamed faces.
(gnus-group-startup-message): Use renamed gnus faces.
* lisp/gnus/gnus-srvr.el (gnus-server-agent, gnus-server-opened)
(gnus-server-closed, gnus-server-denied, gnus-server-offline)
(gnus-server-agent): Remove "-face" suffix from face names.
(gnus-server-agent-face, gnus-server-opened-face)
(gnus-server-closed-face, gnus-server-denied-face)
(gnus-server-offline-face):
New backward-compatibility aliases for renamed faces.
(gnus-server-agent-face, gnus-server-opened-face)
(gnus-server-closed-face, gnus-server-denied-face)
(gnus-server-offline-face): Use renamed gnus faces.
* lisp/gnus/gnus-picon.el (gnus-picon-xbm, gnus-picon):
Remove "-face" suffix from face names.
(gnus-picon-xbm-face, gnus-picon-face):
New backward-compatibility aliases for renamed faces.
* lisp/gnus/gnus-cite.el (gnus-cite-attribution, gnus-cite-1, gnus-cite-2)
(gnus-cite-3, gnus-cite-4, gnus-cite-5, gnus-cite-6)
(gnus-cite-7, gnus-cite-8, gnus-cite-9, gnus-cite-10)
(gnus-cite-11): Remove "-face" suffix from face names.
(gnus-cite-attribution-face, gnus-cite-face-1, gnus-cite-face-2)
(gnus-cite-face-3, gnus-cite-face-4, gnus-cite-face-5)
(gnus-cite-face-6, gnus-cite-face-7, gnus-cite-face-8)
(gnus-cite-face-9, gnus-cite-face-10, gnus-cite-face-11):
New backward-compatibility aliases for renamed faces.
(gnus-cite-attribution-face, gnus-cite-face-list)
(gnus-article-boring-faces): Use renamed gnus faces.
* lisp/gnus/gnus-art.el (gnus-signature, gnus-header-from)
(gnus-header-subject, gnus-header-newsgroups, gnus-header-name)
(gnus-header-content): Remove "-face" suffix from face names.
(gnus-signature-face, gnus-header-from-face)
(gnus-header-subject-face, gnus-header-newsgroups-face)
(gnus-header-name-face, gnus-header-content-face):
New backward-compatibility aliases for renamed faces.
(gnus-signature-face, gnus-header-face-alist): Use renamed gnus faces.
* lisp/gnus/gnus-sum.el (gnus-summary-selected-face)
(gnus-summary-highlight): Use renamed gnus faces.
* lisp/gnus/gnus-group.el (gnus-group-highlight): Likewise.
2005-06-16 03:48:20 +00:00
|
|
|
(defcustom spam-face 'spam
|
2004-09-04 13:13:48 +00:00
|
|
|
"Face for spam-marked articles."
|
|
|
|
:type 'face
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(defcustom spam-regex-headers-spam '("^X-Spam-Flag: YES")
|
2007-10-28 09:18:39 +00:00
|
|
|
"Regular expression for positive header spam matches.
|
|
|
|
Only meaningful if you enable `spam-use-regex-headers'."
|
2004-09-04 13:13:48 +00:00
|
|
|
:type '(repeat (regexp :tag "Regular expression to match spam header"))
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(defcustom spam-regex-headers-ham '("^X-Spam-Flag: NO")
|
2007-10-28 09:18:39 +00:00
|
|
|
"Regular expression for positive header ham matches.
|
|
|
|
Only meaningful if you enable `spam-use-regex-headers'."
|
2004-09-04 13:13:48 +00:00
|
|
|
:type '(repeat (regexp :tag "Regular expression to match ham header"))
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(defcustom spam-regex-body-spam '()
|
2007-10-28 09:18:39 +00:00
|
|
|
"Regular expression for positive body spam matches.
|
|
|
|
Only meaningful if you enable `spam-use-regex-body'."
|
2004-09-04 13:13:48 +00:00
|
|
|
:type '(repeat (regexp :tag "Regular expression to match spam body"))
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(defcustom spam-regex-body-ham '()
|
2007-10-28 09:18:39 +00:00
|
|
|
"Regular expression for positive body ham matches.
|
|
|
|
Only meaningful if you enable `spam-use-regex-body'."
|
2004-09-04 13:13:48 +00:00
|
|
|
:type '(repeat (regexp :tag "Regular expression to match ham body"))
|
|
|
|
:group 'spam)
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(defcustom spam-summary-score-preferred-header nil
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
"Preferred header to use for `spam-summary-score'."
|
2007-10-28 09:18:39 +00:00
|
|
|
: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)
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defgroup spam-ifile nil
|
|
|
|
"Spam ifile configuration."
|
|
|
|
:group 'spam)
|
|
|
|
|
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 179-183)
- Update from CVS
2006-12-25 Daiki Ueno <ueno@unixuser.org>
* lisp/pgg-def.el (pgg-passphrase-coding-system): Default to nil instead of
locale-coding-system.
* lisp/pgg-gpg.el (pgg-gpg-process-region): Encode passphrase with eol-type
LF.
2006-12-29 Jouni K. Sepp,Ad(Bnen <jks@iki.fi>
* lisp/gnus/nnimap.el (nnimap-expunge-search-string): Mention
nnimap-search-uids-not-since-is-evil in docstring.
2006-12-28 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/spam.el: Revert to make-obsolete-variable because
define-obsolete-variable-alias is not supported in Emacs 21.
2006-12-28 Daiki Ueno <ueno@unixuser.org>
* lisp/gnus/gnus-sum.el (gnus-summary-next-article): Make sure we are in the
summary buffer.
2006-12-27 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/spam.el (spam-ifile-path, spam-ifile-database-path)
(spam-bogofilter-path): Use define-obsolete-variable-alias instead of
make-obsolete-variable.
2006-12-26 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/message.el (message-make-fqdn): Fix comment.
(message-bogus-system-names): Add ".local".
* lisp/gnus/spam.el (spam-ifile-path, spam-ifile-program)
(spam-ifile-database-path, spam-ifile-database)
(spam-bogofilter-path, spam-bogofilter-program): Rename variables.
Don't use "path" inappropriately.
(spam-spamoracle-database, spam-get-ifile-database-parameter): Fix doc
strings.
(spam-check-ifile, spam-ifile-register-with-ifile)
(spam-check-bogofilter, spam-bogofilter-register-with-bogofilter): Use
new variable names.
* lisp/gnus/gnus-art.el (gnus-treat-display-x-face, gnus-treat-display-face)
(gnus-treat-display-smileys): Simplify using
gnus-image-type-available-p.
* lisp/gnus/gnus-ems.el (gnus-image-type-available-p): Use display-images-p if
available.
2006-12-22 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/nnrss.el (nnrss-fetch): Replace buffer's contents with the decoded
one after turning on the buffer's multibyteness instead of decoding
them directly in the unibyte buffer that causes unexpected conversion
in Emacs 23 (unicode).
2006-12-29 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Customizing Articles): Add index entries for all
gnus-treat-* variables.
2006-12-29 Jouni K. Sepp,Ad(Bnen <jks@iki.fi>
* man/gnus.texi (IMAP): Fix incorrect explanation of
nnimap-search-uids-not-since-is-evil in documentation for
nnimap-expunge-search-string.
2006-12-27 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (ifile spam filtering): Rename spam-ifile-database-path to
spam-ifile-database.
2006-12-26 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Spam Package Configuration Examples): Don't encourage to
rebind C-s.
2006-12-26 Jouni K. Sepp,Ad(Bnen <jks@iki.fi>
* man/gnus.texi (Group Parameters, Group Maintenance, Topic Commands)
(Mail Group Commands, Expiring Mail, IMAP): Add index entries for
"expiring mail".
(IMAP): Document nnimap-search-uids-not-since-is-evil and
nnimap-nov-is-evil.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-576
2006-12-30 15:34:42 +00:00
|
|
|
(make-obsolete-variable 'spam-ifile-path 'spam-ifile-program)
|
|
|
|
;; "22.1" ;; Gnus 5.10.9
|
|
|
|
(defcustom spam-ifile-program (executable-find "ifile")
|
|
|
|
"Name of the ifile program."
|
2004-09-04 13:13:48 +00:00
|
|
|
:type '(choice (file :tag "Location of ifile")
|
|
|
|
(const :tag "ifile is not installed"))
|
|
|
|
:group 'spam-ifile)
|
|
|
|
|
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 179-183)
- Update from CVS
2006-12-25 Daiki Ueno <ueno@unixuser.org>
* lisp/pgg-def.el (pgg-passphrase-coding-system): Default to nil instead of
locale-coding-system.
* lisp/pgg-gpg.el (pgg-gpg-process-region): Encode passphrase with eol-type
LF.
2006-12-29 Jouni K. Sepp,Ad(Bnen <jks@iki.fi>
* lisp/gnus/nnimap.el (nnimap-expunge-search-string): Mention
nnimap-search-uids-not-since-is-evil in docstring.
2006-12-28 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/spam.el: Revert to make-obsolete-variable because
define-obsolete-variable-alias is not supported in Emacs 21.
2006-12-28 Daiki Ueno <ueno@unixuser.org>
* lisp/gnus/gnus-sum.el (gnus-summary-next-article): Make sure we are in the
summary buffer.
2006-12-27 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/spam.el (spam-ifile-path, spam-ifile-database-path)
(spam-bogofilter-path): Use define-obsolete-variable-alias instead of
make-obsolete-variable.
2006-12-26 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/message.el (message-make-fqdn): Fix comment.
(message-bogus-system-names): Add ".local".
* lisp/gnus/spam.el (spam-ifile-path, spam-ifile-program)
(spam-ifile-database-path, spam-ifile-database)
(spam-bogofilter-path, spam-bogofilter-program): Rename variables.
Don't use "path" inappropriately.
(spam-spamoracle-database, spam-get-ifile-database-parameter): Fix doc
strings.
(spam-check-ifile, spam-ifile-register-with-ifile)
(spam-check-bogofilter, spam-bogofilter-register-with-bogofilter): Use
new variable names.
* lisp/gnus/gnus-art.el (gnus-treat-display-x-face, gnus-treat-display-face)
(gnus-treat-display-smileys): Simplify using
gnus-image-type-available-p.
* lisp/gnus/gnus-ems.el (gnus-image-type-available-p): Use display-images-p if
available.
2006-12-22 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/nnrss.el (nnrss-fetch): Replace buffer's contents with the decoded
one after turning on the buffer's multibyteness instead of decoding
them directly in the unibyte buffer that causes unexpected conversion
in Emacs 23 (unicode).
2006-12-29 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Customizing Articles): Add index entries for all
gnus-treat-* variables.
2006-12-29 Jouni K. Sepp,Ad(Bnen <jks@iki.fi>
* man/gnus.texi (IMAP): Fix incorrect explanation of
nnimap-search-uids-not-since-is-evil in documentation for
nnimap-expunge-search-string.
2006-12-27 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (ifile spam filtering): Rename spam-ifile-database-path to
spam-ifile-database.
2006-12-26 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Spam Package Configuration Examples): Don't encourage to
rebind C-s.
2006-12-26 Jouni K. Sepp,Ad(Bnen <jks@iki.fi>
* man/gnus.texi (Group Parameters, Group Maintenance, Topic Commands)
(Mail Group Commands, Expiring Mail, IMAP): Add index entries for
"expiring mail".
(IMAP): Document nnimap-search-uids-not-since-is-evil and
nnimap-nov-is-evil.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-576
2006-12-30 15:34:42 +00:00
|
|
|
(make-obsolete-variable 'spam-ifile-database-path 'spam-ifile-database)
|
|
|
|
;; "22.1" ;; Gnus 5.10.9
|
|
|
|
(defcustom spam-ifile-database nil
|
|
|
|
"File name of the ifile database."
|
2004-09-04 13:13:48 +00:00
|
|
|
:type '(choice (file :tag "Location of the ifile database")
|
|
|
|
(const :tag "Use the default"))
|
|
|
|
:group 'spam-ifile)
|
|
|
|
|
|
|
|
(defcustom spam-ifile-spam-category "spam"
|
|
|
|
"Name of the spam ifile category."
|
|
|
|
:type 'string
|
|
|
|
:group 'spam-ifile)
|
|
|
|
|
|
|
|
(defcustom spam-ifile-ham-category nil
|
|
|
|
"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"))
|
|
|
|
:group 'spam-ifile)
|
|
|
|
|
|
|
|
(defcustom spam-ifile-all-categories nil
|
|
|
|
"Whether the ifile check will return all categories, or just spam.
|
|
|
|
Set this to t if you want to use the `spam-split' invocation of ifile as
|
|
|
|
your main source of newsgroup names."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'spam-ifile)
|
|
|
|
|
|
|
|
(defgroup spam-bogofilter nil
|
|
|
|
"Spam bogofilter configuration."
|
|
|
|
:group 'spam)
|
|
|
|
|
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 179-183)
- Update from CVS
2006-12-25 Daiki Ueno <ueno@unixuser.org>
* lisp/pgg-def.el (pgg-passphrase-coding-system): Default to nil instead of
locale-coding-system.
* lisp/pgg-gpg.el (pgg-gpg-process-region): Encode passphrase with eol-type
LF.
2006-12-29 Jouni K. Sepp,Ad(Bnen <jks@iki.fi>
* lisp/gnus/nnimap.el (nnimap-expunge-search-string): Mention
nnimap-search-uids-not-since-is-evil in docstring.
2006-12-28 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/spam.el: Revert to make-obsolete-variable because
define-obsolete-variable-alias is not supported in Emacs 21.
2006-12-28 Daiki Ueno <ueno@unixuser.org>
* lisp/gnus/gnus-sum.el (gnus-summary-next-article): Make sure we are in the
summary buffer.
2006-12-27 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/spam.el (spam-ifile-path, spam-ifile-database-path)
(spam-bogofilter-path): Use define-obsolete-variable-alias instead of
make-obsolete-variable.
2006-12-26 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/message.el (message-make-fqdn): Fix comment.
(message-bogus-system-names): Add ".local".
* lisp/gnus/spam.el (spam-ifile-path, spam-ifile-program)
(spam-ifile-database-path, spam-ifile-database)
(spam-bogofilter-path, spam-bogofilter-program): Rename variables.
Don't use "path" inappropriately.
(spam-spamoracle-database, spam-get-ifile-database-parameter): Fix doc
strings.
(spam-check-ifile, spam-ifile-register-with-ifile)
(spam-check-bogofilter, spam-bogofilter-register-with-bogofilter): Use
new variable names.
* lisp/gnus/gnus-art.el (gnus-treat-display-x-face, gnus-treat-display-face)
(gnus-treat-display-smileys): Simplify using
gnus-image-type-available-p.
* lisp/gnus/gnus-ems.el (gnus-image-type-available-p): Use display-images-p if
available.
2006-12-22 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/nnrss.el (nnrss-fetch): Replace buffer's contents with the decoded
one after turning on the buffer's multibyteness instead of decoding
them directly in the unibyte buffer that causes unexpected conversion
in Emacs 23 (unicode).
2006-12-29 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Customizing Articles): Add index entries for all
gnus-treat-* variables.
2006-12-29 Jouni K. Sepp,Ad(Bnen <jks@iki.fi>
* man/gnus.texi (IMAP): Fix incorrect explanation of
nnimap-search-uids-not-since-is-evil in documentation for
nnimap-expunge-search-string.
2006-12-27 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (ifile spam filtering): Rename spam-ifile-database-path to
spam-ifile-database.
2006-12-26 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Spam Package Configuration Examples): Don't encourage to
rebind C-s.
2006-12-26 Jouni K. Sepp,Ad(Bnen <jks@iki.fi>
* man/gnus.texi (Group Parameters, Group Maintenance, Topic Commands)
(Mail Group Commands, Expiring Mail, IMAP): Add index entries for
"expiring mail".
(IMAP): Document nnimap-search-uids-not-since-is-evil and
nnimap-nov-is-evil.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-576
2006-12-30 15:34:42 +00:00
|
|
|
(make-obsolete-variable 'spam-bogofilter-path 'spam-bogofilter-program)
|
|
|
|
;; "22.1" ;; Gnus 5.10.9
|
|
|
|
(defcustom spam-bogofilter-program (executable-find "bogofilter")
|
|
|
|
"Name of the Bogofilter program."
|
2004-09-04 13:13:48 +00:00
|
|
|
:type '(choice (file :tag "Location of bogofilter")
|
|
|
|
(const :tag "Bogofilter is not installed"))
|
|
|
|
:group 'spam-bogofilter)
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(defvar spam-bogofilter-valid 'unknown "Is the bogofilter version valid?")
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defcustom spam-bogofilter-header "X-Bogosity"
|
|
|
|
"The header that Bogofilter inserts in messages."
|
|
|
|
:type 'string
|
|
|
|
:group 'spam-bogofilter)
|
|
|
|
|
|
|
|
(defcustom spam-bogofilter-spam-switch "-s"
|
|
|
|
"The switch that Bogofilter uses to register spam messages."
|
|
|
|
:type 'string
|
|
|
|
:group 'spam-bogofilter)
|
|
|
|
|
|
|
|
(defcustom spam-bogofilter-ham-switch "-n"
|
|
|
|
"The switch that Bogofilter uses to register ham messages."
|
|
|
|
:type 'string
|
|
|
|
:group 'spam-bogofilter)
|
|
|
|
|
|
|
|
(defcustom spam-bogofilter-spam-strong-switch "-S"
|
|
|
|
"The switch that Bogofilter uses to unregister ham messages."
|
|
|
|
:type 'string
|
|
|
|
:group 'spam-bogofilter)
|
|
|
|
|
|
|
|
(defcustom spam-bogofilter-ham-strong-switch "-N"
|
|
|
|
"The switch that Bogofilter uses to unregister spam messages."
|
|
|
|
:type 'string
|
|
|
|
:group 'spam-bogofilter)
|
|
|
|
|
|
|
|
(defcustom spam-bogofilter-bogosity-positive-spam-header "^\\(Yes\\|Spam\\)"
|
|
|
|
"The regex on `spam-bogofilter-header' for positive spam identification."
|
|
|
|
:type 'regexp
|
|
|
|
:group 'spam-bogofilter)
|
|
|
|
|
|
|
|
(defcustom spam-bogofilter-database-directory nil
|
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 179-183)
- Update from CVS
2006-12-25 Daiki Ueno <ueno@unixuser.org>
* lisp/pgg-def.el (pgg-passphrase-coding-system): Default to nil instead of
locale-coding-system.
* lisp/pgg-gpg.el (pgg-gpg-process-region): Encode passphrase with eol-type
LF.
2006-12-29 Jouni K. Sepp,Ad(Bnen <jks@iki.fi>
* lisp/gnus/nnimap.el (nnimap-expunge-search-string): Mention
nnimap-search-uids-not-since-is-evil in docstring.
2006-12-28 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/spam.el: Revert to make-obsolete-variable because
define-obsolete-variable-alias is not supported in Emacs 21.
2006-12-28 Daiki Ueno <ueno@unixuser.org>
* lisp/gnus/gnus-sum.el (gnus-summary-next-article): Make sure we are in the
summary buffer.
2006-12-27 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/spam.el (spam-ifile-path, spam-ifile-database-path)
(spam-bogofilter-path): Use define-obsolete-variable-alias instead of
make-obsolete-variable.
2006-12-26 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/message.el (message-make-fqdn): Fix comment.
(message-bogus-system-names): Add ".local".
* lisp/gnus/spam.el (spam-ifile-path, spam-ifile-program)
(spam-ifile-database-path, spam-ifile-database)
(spam-bogofilter-path, spam-bogofilter-program): Rename variables.
Don't use "path" inappropriately.
(spam-spamoracle-database, spam-get-ifile-database-parameter): Fix doc
strings.
(spam-check-ifile, spam-ifile-register-with-ifile)
(spam-check-bogofilter, spam-bogofilter-register-with-bogofilter): Use
new variable names.
* lisp/gnus/gnus-art.el (gnus-treat-display-x-face, gnus-treat-display-face)
(gnus-treat-display-smileys): Simplify using
gnus-image-type-available-p.
* lisp/gnus/gnus-ems.el (gnus-image-type-available-p): Use display-images-p if
available.
2006-12-22 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/nnrss.el (nnrss-fetch): Replace buffer's contents with the decoded
one after turning on the buffer's multibyteness instead of decoding
them directly in the unibyte buffer that causes unexpected conversion
in Emacs 23 (unicode).
2006-12-29 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Customizing Articles): Add index entries for all
gnus-treat-* variables.
2006-12-29 Jouni K. Sepp,Ad(Bnen <jks@iki.fi>
* man/gnus.texi (IMAP): Fix incorrect explanation of
nnimap-search-uids-not-since-is-evil in documentation for
nnimap-expunge-search-string.
2006-12-27 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (ifile spam filtering): Rename spam-ifile-database-path to
spam-ifile-database.
2006-12-26 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Spam Package Configuration Examples): Don't encourage to
rebind C-s.
2006-12-26 Jouni K. Sepp,Ad(Bnen <jks@iki.fi>
* man/gnus.texi (Group Parameters, Group Maintenance, Topic Commands)
(Mail Group Commands, Expiring Mail, IMAP): Add index entries for
"expiring mail".
(IMAP): Document nnimap-search-uids-not-since-is-evil and
nnimap-nov-is-evil.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-576
2006-12-30 15:34:42 +00:00
|
|
|
"Location of the Bogofilter database.
|
|
|
|
When nil, use the default location."
|
2004-09-04 13:13:48 +00:00
|
|
|
:type '(choice (directory
|
|
|
|
:tag "Location of the Bogofilter database directory")
|
|
|
|
(const :tag "Use the default"))
|
|
|
|
:group 'spam-bogofilter)
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(defgroup spam-bsfilter nil
|
|
|
|
"Spam bsfilter configuration."
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(make-obsolete-variable 'spam-bsfilter-path 'spam-bsfilter-program)
|
|
|
|
;; "22.1" ;; Gnus 5.10.9
|
|
|
|
(defcustom spam-bsfilter-program (executable-find "bsfilter")
|
|
|
|
"Name of the Bsfilter program."
|
|
|
|
:type '(choice (file :tag "Location of bsfilter")
|
|
|
|
(const :tag "Bsfilter is not installed"))
|
|
|
|
:group 'spam-bsfilter)
|
|
|
|
|
|
|
|
(defcustom spam-bsfilter-header "X-Spam-Flag"
|
|
|
|
"The header inserted by Bsfilter to flag spam."
|
|
|
|
:type 'string
|
|
|
|
:group 'spam-bsfilter)
|
|
|
|
|
|
|
|
(defcustom spam-bsfilter-probability-header "X-Spam-Probability"
|
|
|
|
"The header that Bsfilter inserts in messages."
|
|
|
|
:type 'string
|
|
|
|
:group 'spam-bsfilter)
|
|
|
|
|
|
|
|
(defcustom spam-bsfilter-spam-switch "--add-spam"
|
|
|
|
"The switch that Bsfilter uses to register spam messages."
|
|
|
|
:type 'string
|
|
|
|
:group 'spam-bsfilter)
|
|
|
|
|
|
|
|
(defcustom spam-bsfilter-ham-switch "--add-clean"
|
|
|
|
"The switch that Bsfilter uses to register ham messages."
|
|
|
|
:type 'string
|
|
|
|
:group 'spam-bsfilter)
|
|
|
|
|
|
|
|
(defcustom spam-bsfilter-spam-strong-switch "--sub-spam"
|
|
|
|
"The switch that Bsfilter uses to unregister ham messages."
|
|
|
|
:type 'string
|
|
|
|
:group 'spam-bsfilter)
|
|
|
|
|
|
|
|
(defcustom spam-bsfilter-ham-strong-switch "--sub-clean"
|
|
|
|
"The switch that Bsfilter uses to unregister spam messages."
|
|
|
|
:type 'string
|
|
|
|
:group 'spam-bsfilter)
|
|
|
|
|
|
|
|
(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"))
|
|
|
|
:group 'spam-bsfilter)
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defgroup spam-spamoracle nil
|
|
|
|
"Spam spamoracle configuration."
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(defcustom spam-spamoracle-database nil
|
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 179-183)
- Update from CVS
2006-12-25 Daiki Ueno <ueno@unixuser.org>
* lisp/pgg-def.el (pgg-passphrase-coding-system): Default to nil instead of
locale-coding-system.
* lisp/pgg-gpg.el (pgg-gpg-process-region): Encode passphrase with eol-type
LF.
2006-12-29 Jouni K. Sepp,Ad(Bnen <jks@iki.fi>
* lisp/gnus/nnimap.el (nnimap-expunge-search-string): Mention
nnimap-search-uids-not-since-is-evil in docstring.
2006-12-28 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/spam.el: Revert to make-obsolete-variable because
define-obsolete-variable-alias is not supported in Emacs 21.
2006-12-28 Daiki Ueno <ueno@unixuser.org>
* lisp/gnus/gnus-sum.el (gnus-summary-next-article): Make sure we are in the
summary buffer.
2006-12-27 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/spam.el (spam-ifile-path, spam-ifile-database-path)
(spam-bogofilter-path): Use define-obsolete-variable-alias instead of
make-obsolete-variable.
2006-12-26 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/message.el (message-make-fqdn): Fix comment.
(message-bogus-system-names): Add ".local".
* lisp/gnus/spam.el (spam-ifile-path, spam-ifile-program)
(spam-ifile-database-path, spam-ifile-database)
(spam-bogofilter-path, spam-bogofilter-program): Rename variables.
Don't use "path" inappropriately.
(spam-spamoracle-database, spam-get-ifile-database-parameter): Fix doc
strings.
(spam-check-ifile, spam-ifile-register-with-ifile)
(spam-check-bogofilter, spam-bogofilter-register-with-bogofilter): Use
new variable names.
* lisp/gnus/gnus-art.el (gnus-treat-display-x-face, gnus-treat-display-face)
(gnus-treat-display-smileys): Simplify using
gnus-image-type-available-p.
* lisp/gnus/gnus-ems.el (gnus-image-type-available-p): Use display-images-p if
available.
2006-12-22 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/nnrss.el (nnrss-fetch): Replace buffer's contents with the decoded
one after turning on the buffer's multibyteness instead of decoding
them directly in the unibyte buffer that causes unexpected conversion
in Emacs 23 (unicode).
2006-12-29 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Customizing Articles): Add index entries for all
gnus-treat-* variables.
2006-12-29 Jouni K. Sepp,Ad(Bnen <jks@iki.fi>
* man/gnus.texi (IMAP): Fix incorrect explanation of
nnimap-search-uids-not-since-is-evil in documentation for
nnimap-expunge-search-string.
2006-12-27 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (ifile spam filtering): Rename spam-ifile-database-path to
spam-ifile-database.
2006-12-26 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Spam Package Configuration Examples): Don't encourage to
rebind C-s.
2006-12-26 Jouni K. Sepp,Ad(Bnen <jks@iki.fi>
* man/gnus.texi (Group Parameters, Group Maintenance, Topic Commands)
(Mail Group Commands, Expiring Mail, IMAP): Add index entries for
"expiring mail".
(IMAP): Document nnimap-search-uids-not-since-is-evil and
nnimap-nov-is-evil.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-576
2006-12-30 15:34:42 +00:00
|
|
|
"Location of spamoracle database file.
|
|
|
|
When nil, use the default spamoracle database."
|
2004-09-04 13:13:48 +00:00
|
|
|
:type '(choice (directory :tag "Location of spamoracle database file.")
|
|
|
|
(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")
|
|
|
|
(const :tag "Use the default"))
|
|
|
|
:group 'spam-spamoracle)
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(defgroup spam-spamassassin nil
|
|
|
|
"Spam SpamAssassin configuration."
|
|
|
|
:group 'spam)
|
|
|
|
|
|
|
|
(make-obsolete-variable 'spam-spamassassin-path
|
|
|
|
'spam-spamassassin-program) ;; "22.1" ;; Gnus 5.10.9
|
|
|
|
(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")
|
|
|
|
(const :tag "spamassassin is not installed"))
|
|
|
|
:group 'spam-spamassassin)
|
|
|
|
|
|
|
|
(defcustom spam-spamassassin-arguments ()
|
|
|
|
"Arguments to pass to the spamassassin executable.
|
|
|
|
This must be a list. For example, `(\"-C\" \"configfile\")'."
|
|
|
|
:type '(restricted-sexp :match-alternatives (listp))
|
|
|
|
:group 'spam-spamassassin)
|
|
|
|
|
|
|
|
(defcustom spam-spamassassin-spam-flag-header "X-Spam-Flag"
|
|
|
|
"The header inserted by SpamAssassin to flag spam."
|
|
|
|
:type 'string
|
|
|
|
:group 'spam-spamassassin)
|
|
|
|
|
|
|
|
(defcustom spam-spamassassin-positive-spam-flag-header "YES"
|
|
|
|
"The regex on `spam-spamassassin-spam-flag-header' for positive spam
|
|
|
|
identification"
|
|
|
|
:type 'string
|
|
|
|
:group 'spam-spamassassin)
|
|
|
|
|
|
|
|
(defcustom spam-spamassassin-spam-status-header "X-Spam-Status"
|
|
|
|
"The header inserted by SpamAssassin, giving extended scoring information"
|
|
|
|
:type 'string
|
|
|
|
:group 'spam-spamassassin)
|
|
|
|
|
|
|
|
(make-obsolete-variable 'spam-sa-learn-path 'spam-sa-learn-program)
|
|
|
|
;; "22.1" ;; Gnus 5.10.9
|
|
|
|
(defcustom spam-sa-learn-program (executable-find "sa-learn")
|
|
|
|
"Name of the sa-learn program."
|
|
|
|
:type '(choice (file :tag "Location of spamassassin")
|
|
|
|
(const :tag "spamassassin is not installed"))
|
|
|
|
:group 'spam-spamassassin)
|
|
|
|
|
|
|
|
(defcustom spam-sa-learn-rebuild t
|
|
|
|
"Whether sa-learn should rebuild the database every time it is called
|
|
|
|
Enable this if you want sa-learn to rebuild the database automatically. Doing
|
|
|
|
this will slightly increase the running time of the spam registration process.
|
|
|
|
If you choose not to do this, you will have to run \"sa-learn --rebuild\" in
|
|
|
|
order for SpamAssassin to recognize the new registered spam."
|
|
|
|
:type 'boolean
|
|
|
|
:group 'spam-spamassassin)
|
|
|
|
|
|
|
|
(defcustom spam-sa-learn-spam-switch "--spam"
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
"The switch that sa-learn uses to register spam messages."
|
2007-10-28 09:18:39 +00:00
|
|
|
:type 'string
|
|
|
|
:group 'spam-spamassassin)
|
|
|
|
|
|
|
|
(defcustom spam-sa-learn-ham-switch "--ham"
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
"The switch that sa-learn uses to register ham messages."
|
2007-10-28 09:18:39 +00:00
|
|
|
:type 'string
|
|
|
|
:group 'spam-spamassassin)
|
|
|
|
|
|
|
|
(defcustom spam-sa-learn-unregister-switch "--forget"
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
"The switch that sa-learn uses to unregister messages messages."
|
2007-10-28 09:18:39 +00:00
|
|
|
: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 "--UNKNOWN"
|
|
|
|
"The switch that CRM114 Mailfilter uses to unregister ham messages."
|
|
|
|
:type 'string
|
|
|
|
:group 'spam-crm114)
|
|
|
|
|
|
|
|
(defcustom spam-crm114-ham-strong-switch "--UNKNOWN"
|
|
|
|
"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"))
|
|
|
|
:group 'spam-crm114)
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
;;; Key bindings for spam control.
|
|
|
|
|
|
|
|
(gnus-define-keys gnus-summary-mode-map
|
2007-10-28 09:18:39 +00:00
|
|
|
"St" spam-generic-score
|
2004-09-04 13:13:48 +00:00
|
|
|
"Sx" gnus-summary-mark-as-spam
|
2007-10-28 09:18:39 +00:00
|
|
|
"Mst" spam-generic-score
|
2004-09-04 13:13:48 +00:00
|
|
|
"Msx" gnus-summary-mark-as-spam
|
|
|
|
"\M-d" gnus-summary-mark-as-spam)
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(defvar spam-cache-lookups t
|
|
|
|
"Whether spam.el will try to cache lookups using `spam-caches'.")
|
2004-09-04 13:13:48 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(defvar spam-caches (make-hash-table
|
|
|
|
:size 10
|
|
|
|
:test 'equal)
|
|
|
|
"Cache of spam detection entries.")
|
|
|
|
|
|
|
|
(defvar spam-old-articles nil
|
|
|
|
"List of old ham and spam articles, generated when a group is entered.")
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(defvar spam-split-disabled nil
|
|
|
|
"If non-nil, `spam-split' is disabled, and always returns nil.")
|
|
|
|
|
|
|
|
(defvar spam-split-last-successful-check nil
|
2007-10-28 09:18:39 +00:00
|
|
|
"Internal variable.
|
|
|
|
`spam-split' will set this to nil or a spam-use-XYZ check if it
|
|
|
|
finds ham or spam.")
|
|
|
|
|
|
|
|
;; internal variables for backends
|
|
|
|
;; TODO: find a way to create these on the fly in spam-install-backend-super
|
|
|
|
(defvar spam-use-copy nil)
|
|
|
|
(defvar spam-use-move nil)
|
|
|
|
(defvar spam-use-gmane nil)
|
|
|
|
(defvar spam-use-resend nil)
|
|
|
|
|
|
|
|
;;}}}
|
|
|
|
|
|
|
|
;;{{{ convenience functions
|
|
|
|
|
|
|
|
(defun spam-clear-cache (symbol)
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
"Clear the `spam-caches' entry for a check."
|
2007-10-28 09:18:39 +00:00
|
|
|
(remhash symbol spam-caches))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(defun spam-xor (a b)
|
2007-10-28 09:18:39 +00:00
|
|
|
"Logical A xor B."
|
2004-09-04 13:13:48 +00:00
|
|
|
(and (or a b) (not (and a b))))
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(defun spam-set-difference (list1 list2)
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
"Return a set difference of LIST1 and LIST2.
|
2007-10-28 09:18:39 +00:00
|
|
|
When either list is nil, the other is returned."
|
|
|
|
(if (and list1 list2)
|
|
|
|
;; we have two non-nil lists
|
|
|
|
(progn
|
|
|
|
(dolist (item (append list1 list2))
|
|
|
|
(when (and (memq item list1) (memq item list2))
|
|
|
|
(setq list1 (delq item list1))
|
|
|
|
(setq list2 (delq item list2))))
|
|
|
|
(append list1 list2))
|
|
|
|
;; if either of the lists was nil, return the other one
|
|
|
|
(if list1 list1 list2)))
|
|
|
|
|
2006-01-19 21:42:22 +00:00
|
|
|
(defun spam-group-ham-mark-p (group mark &optional spam)
|
2007-10-28 09:18:39 +00:00
|
|
|
"Checks if MARK is considered a ham mark in GROUP."
|
2006-01-19 21:42:22 +00:00
|
|
|
(when (stringp group)
|
|
|
|
(let* ((marks (spam-group-ham-marks group spam))
|
|
|
|
(marks (if (symbolp mark)
|
|
|
|
marks
|
|
|
|
(mapcar 'symbol-value marks))))
|
|
|
|
(memq mark marks))))
|
|
|
|
|
|
|
|
(defun spam-group-spam-mark-p (group mark)
|
2007-10-28 09:18:39 +00:00
|
|
|
"Checks if MARK is considered a spam mark in GROUP."
|
2006-01-19 21:42:22 +00:00
|
|
|
(spam-group-ham-mark-p group mark t))
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defun spam-group-ham-marks (group &optional spam)
|
2007-10-28 09:18:39 +00:00
|
|
|
"In GROUP, get all the ham marks."
|
2004-09-04 13:13:48 +00:00
|
|
|
(when (stringp group)
|
2006-01-19 21:42:22 +00:00
|
|
|
(let* ((marks (if spam
|
|
|
|
(gnus-parameter-spam-marks group)
|
|
|
|
(gnus-parameter-ham-marks group)))
|
|
|
|
(marks (car marks))
|
|
|
|
(marks (if (listp (car marks)) (car marks) marks)))
|
|
|
|
marks)))
|
|
|
|
|
|
|
|
(defun spam-group-spam-marks (group)
|
2007-10-28 09:18:39 +00:00
|
|
|
"In GROUP, get all the spam marks."
|
2006-01-19 21:42:22 +00:00
|
|
|
(spam-group-ham-marks group t))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(defun spam-group-spam-contents-p (group)
|
2007-10-28 09:18:39 +00:00
|
|
|
"Is GROUP a spam group?"
|
|
|
|
(if (and (stringp group) (< 0 (length group)))
|
2004-09-04 13:13:48 +00:00
|
|
|
(or (member group spam-junk-mailgroups)
|
|
|
|
(memq 'gnus-group-spam-classification-spam
|
|
|
|
(gnus-parameter-spam-contents group)))
|
|
|
|
nil))
|
|
|
|
|
|
|
|
(defun spam-group-ham-contents-p (group)
|
2007-10-28 09:18:39 +00:00
|
|
|
"Is GROUP a ham group?"
|
2004-09-04 13:13:48 +00:00
|
|
|
(if (stringp group)
|
|
|
|
(memq 'gnus-group-spam-classification-ham
|
|
|
|
(gnus-parameter-spam-contents group))
|
|
|
|
nil))
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(defun spam-classifications ()
|
|
|
|
"Return list of valid classifications"
|
|
|
|
'(spam ham))
|
|
|
|
|
|
|
|
(defun spam-classification-valid-p (classification)
|
|
|
|
"Is CLASSIFICATION a valid spam/ham classification?"
|
|
|
|
(memq classification (spam-classifications)))
|
|
|
|
|
|
|
|
(defun spam-backend-properties ()
|
|
|
|
"Return list of valid classifications."
|
|
|
|
'(statistical mover check hrf srf huf suf))
|
|
|
|
|
|
|
|
(defun spam-backend-property-valid-p (property)
|
|
|
|
"Is PROPERTY a valid backend property?"
|
|
|
|
(memq property (spam-backend-properties)))
|
|
|
|
|
|
|
|
(defun spam-backend-function-type-valid-p (type)
|
|
|
|
(or (eq type 'registration)
|
|
|
|
(eq type 'unregistration)))
|
|
|
|
|
|
|
|
(defun spam-process-type-valid-p (process-type)
|
|
|
|
(or (eq process-type 'incoming)
|
|
|
|
(eq process-type 'process)))
|
|
|
|
|
|
|
|
(defun spam-list-articles (articles classification)
|
|
|
|
(let ((mark-check (if (eq classification 'spam)
|
|
|
|
'spam-group-spam-mark-p
|
|
|
|
'spam-group-ham-mark-p))
|
|
|
|
alist mark-cache-yes mark-cache-no)
|
|
|
|
(dolist (article articles)
|
|
|
|
(let ((mark (gnus-summary-article-mark article)))
|
|
|
|
(unless (or (memq mark mark-cache-yes)
|
|
|
|
(memq mark mark-cache-no))
|
|
|
|
(if (funcall mark-check
|
|
|
|
gnus-newsgroup-name
|
|
|
|
mark)
|
|
|
|
(push mark mark-cache-yes)
|
|
|
|
(push mark mark-cache-no)))
|
|
|
|
(when (memq mark mark-cache-yes)
|
|
|
|
(push article alist))))
|
|
|
|
alist))
|
|
|
|
|
|
|
|
;;}}}
|
|
|
|
|
|
|
|
;;{{{ backend installation functions and procedures
|
|
|
|
|
|
|
|
(defun spam-install-backend-super (backend &rest properties)
|
|
|
|
"Install BACKEND for spam.el.
|
|
|
|
Accepts incoming CHECK, ham registration function HRF, spam
|
|
|
|
registration function SRF, ham unregistration function HUF, spam
|
|
|
|
unregistration function SUF, and an indication whether the
|
|
|
|
backend is STATISTICAL."
|
|
|
|
(setq spam-backends (add-to-list 'spam-backends backend))
|
|
|
|
(while properties
|
|
|
|
(let ((property (pop properties))
|
|
|
|
(value (pop properties)))
|
|
|
|
(if (spam-backend-property-valid-p property)
|
|
|
|
(put backend property value)
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(gnus-error
|
|
|
|
5
|
2007-10-28 09:18:39 +00:00
|
|
|
"spam-install-backend-super got an invalid property %s"
|
|
|
|
property)))))
|
|
|
|
|
|
|
|
(defun spam-backend-list (&optional type)
|
|
|
|
"Return a list of all the backend symbols, constrained by TYPE.
|
|
|
|
When TYPE is 'non-mover, only non-mover backends are returned.
|
|
|
|
When TYPE is 'mover, only mover backends are returned."
|
|
|
|
(let (list)
|
|
|
|
(dolist (backend spam-backends)
|
|
|
|
(when (or
|
|
|
|
(null type) ;either no type was requested
|
|
|
|
;; or the type is 'mover and the backend is a mover
|
|
|
|
(and
|
|
|
|
(eq type 'mover)
|
|
|
|
(spam-backend-mover-p backend))
|
|
|
|
;; or the type is 'non-mover and the backend is not a mover
|
|
|
|
(and
|
|
|
|
(eq type 'non-mover)
|
|
|
|
(not (spam-backend-mover-p backend))))
|
|
|
|
(push backend list)))
|
|
|
|
list))
|
|
|
|
|
|
|
|
(defun spam-backend-check (backend)
|
|
|
|
"Get the check function for BACKEND.
|
|
|
|
Each individual check may return nil, t, or a mailgroup name.
|
|
|
|
The value nil means that the check does not yield a decision, and
|
|
|
|
so, that further checks are needed. The value t means that the
|
|
|
|
message is definitely not spam, and that further spam checks
|
|
|
|
should be inhibited. Otherwise, a mailgroup name or the symbol
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
'spam (depending on `spam-split-symbolic-return') is returned where
|
2007-10-28 09:18:39 +00:00
|
|
|
the mail should go, and further checks are also inhibited. The
|
|
|
|
usual mailgroup name is the value of `spam-split-group', meaning
|
|
|
|
that the message is definitely a spam."
|
|
|
|
(get backend 'check))
|
|
|
|
|
|
|
|
(defun spam-backend-valid-p (backend)
|
|
|
|
"Is BACKEND valid?"
|
|
|
|
(member backend (spam-backend-list)))
|
|
|
|
|
|
|
|
(defun spam-backend-info (backend)
|
|
|
|
"Return information about BACKEND."
|
|
|
|
(if (spam-backend-valid-p backend)
|
|
|
|
(let (info)
|
|
|
|
(setq info (format "Backend %s has the following properties:\n"
|
|
|
|
backend))
|
|
|
|
(dolist (property (spam-backend-properties))
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(setq info (format "%s%s=%s\n"
|
2007-10-28 09:18:39 +00:00
|
|
|
info
|
|
|
|
property
|
|
|
|
(get backend property))))
|
|
|
|
info)
|
|
|
|
(gnus-error 5 "spam-backend-info was asked about an invalid backend %s"
|
|
|
|
backend)))
|
|
|
|
|
|
|
|
(defun spam-backend-function (backend classification type)
|
|
|
|
"Get the BACKEND function for CLASSIFICATION and TYPE.
|
|
|
|
TYPE is 'registration or 'unregistration.
|
|
|
|
CLASSIFICATION is 'ham or 'spam."
|
|
|
|
(if (and
|
|
|
|
(spam-classification-valid-p classification)
|
|
|
|
(spam-backend-function-type-valid-p type))
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(let ((retrieval
|
|
|
|
(intern
|
2007-10-28 09:18:39 +00:00
|
|
|
(format "spam-backend-%s-%s-function"
|
|
|
|
classification
|
|
|
|
type))))
|
|
|
|
(funcall retrieval backend))
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(gnus-error
|
2007-10-28 09:18:39 +00:00
|
|
|
5
|
|
|
|
"%s was passed invalid backend %s, classification %s, or type %s"
|
|
|
|
"spam-backend-function"
|
|
|
|
backend
|
|
|
|
classification
|
|
|
|
type)))
|
|
|
|
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(defun spam-backend-article-list-property (classification
|
2007-10-28 09:18:39 +00:00
|
|
|
&optional unregister)
|
|
|
|
"Property name of article list with CLASSIFICATION and UNREGISTER."
|
|
|
|
(let* ((r (if unregister "unregister" "register"))
|
|
|
|
(prop (format "%s-%s" classification r)))
|
|
|
|
prop))
|
|
|
|
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(defun spam-backend-get-article-todo-list (backend
|
|
|
|
classification
|
2007-10-28 09:18:39 +00:00
|
|
|
&optional unregister)
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
"Get the articles to be processed for BACKEND and CLASSIFICATION.
|
2007-10-28 09:18:39 +00:00
|
|
|
With UNREGISTER, get articles to be unregistered.
|
|
|
|
This is a temporary storage function - nothing here persists."
|
|
|
|
(get
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
backend
|
2007-10-28 09:18:39 +00:00
|
|
|
(intern (spam-backend-article-list-property classification unregister))))
|
|
|
|
|
|
|
|
(defun spam-backend-put-article-todo-list (backend classification list &optional unregister)
|
|
|
|
"Set the LIST of articles to be processed for BACKEND and CLASSIFICATION.
|
|
|
|
With UNREGISTER, set articles to be unregistered.
|
|
|
|
This is a temporary storage function - nothing here persists."
|
|
|
|
(put
|
|
|
|
backend
|
|
|
|
(intern (spam-backend-article-list-property classification unregister))
|
|
|
|
list))
|
|
|
|
|
|
|
|
(defun spam-backend-ham-registration-function (backend)
|
|
|
|
"Get the ham registration function for BACKEND."
|
|
|
|
(get backend 'hrf))
|
|
|
|
|
|
|
|
(defun spam-backend-spam-registration-function (backend)
|
|
|
|
"Get the spam registration function for BACKEND."
|
|
|
|
(get backend 'srf))
|
|
|
|
|
|
|
|
(defun spam-backend-ham-unregistration-function (backend)
|
|
|
|
"Get the ham unregistration function for BACKEND."
|
|
|
|
(get backend 'huf))
|
|
|
|
|
|
|
|
(defun spam-backend-spam-unregistration-function (backend)
|
|
|
|
"Get the spam unregistration function for BACKEND."
|
|
|
|
(get backend 'suf))
|
|
|
|
|
|
|
|
(defun spam-backend-statistical-p (backend)
|
|
|
|
"Is BACKEND statistical?"
|
|
|
|
(get backend 'statistical))
|
|
|
|
|
|
|
|
(defun spam-backend-mover-p (backend)
|
|
|
|
"Is BACKEND a mover?"
|
|
|
|
(get backend 'mover))
|
|
|
|
|
|
|
|
(defun spam-install-backend-alias (backend alias)
|
|
|
|
"Add ALIAS to an existing BACKEND.
|
|
|
|
The previous backend settings for ALIAS are erased."
|
|
|
|
|
|
|
|
;; install alias with no properties at first
|
|
|
|
(spam-install-backend-super alias)
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(dolist (property (spam-backend-properties))
|
|
|
|
(put alias property (get backend property))))
|
|
|
|
|
|
|
|
(defun spam-install-checkonly-backend (backend check)
|
|
|
|
"Install a BACKEND than can only CHECK for spam."
|
|
|
|
(spam-install-backend-super backend 'check check))
|
|
|
|
|
|
|
|
(defun spam-install-mover-backend (backend hrf srf huf suf)
|
|
|
|
"Install a BACKEND than can move articles at summary exit.
|
|
|
|
Accepts ham registration function HRF, spam registration function
|
|
|
|
SRF, ham unregistration function HUF, spam unregistration
|
|
|
|
function SUF. The backend has no incoming check and can't be
|
|
|
|
statistical."
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(spam-install-backend-super
|
|
|
|
backend
|
2007-10-28 09:18:39 +00:00
|
|
|
'hrf hrf 'srf srf 'huf huf 'suf suf 'mover t))
|
|
|
|
|
|
|
|
(defun spam-install-nocheck-backend (backend hrf srf huf suf)
|
|
|
|
"Install a BACKEND than has no check.
|
|
|
|
Accepts ham registration function HRF, spam registration function
|
|
|
|
SRF, ham unregistration function HUF, spam unregistration
|
|
|
|
function SUF. The backend has no incoming check and can't be
|
|
|
|
statistical (it could be, but in practice that doesn't happen)."
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(spam-install-backend-super
|
2007-10-28 09:18:39 +00:00
|
|
|
backend
|
|
|
|
'hrf hrf 'srf srf 'huf huf 'suf suf))
|
|
|
|
|
|
|
|
(defun spam-install-backend (backend check hrf srf huf suf)
|
|
|
|
"Install a BACKEND.
|
|
|
|
Accepts incoming CHECK, ham registration function HRF, spam
|
|
|
|
registration function SRF, ham unregistration function HUF, spam
|
|
|
|
unregistration function SUF. The backend won't be
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
statistical (use `spam-install-statistical-backend' for that)."
|
|
|
|
(spam-install-backend-super
|
2007-10-28 09:18:39 +00:00
|
|
|
backend
|
|
|
|
'check check 'hrf hrf 'srf srf 'huf huf 'suf suf))
|
|
|
|
|
|
|
|
(defun spam-install-statistical-backend (backend check hrf srf huf suf)
|
|
|
|
"Install a BACKEND.
|
|
|
|
Accepts incoming CHECK, ham registration function HRF, spam
|
|
|
|
registration function SRF, ham unregistration function HUF, spam
|
|
|
|
unregistration function SUF. The backend will be
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
statistical (use `spam-install-backend' for non-statistical
|
2007-10-28 09:18:39 +00:00
|
|
|
backends)."
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(spam-install-backend-super
|
2007-10-28 09:18:39 +00:00
|
|
|
backend
|
|
|
|
'check check 'statistical t 'hrf hrf 'srf srf 'huf huf 'suf suf))
|
|
|
|
|
|
|
|
(defun spam-install-statistical-checkonly-backend (backend check)
|
|
|
|
"Install a statistical BACKEND than can only CHECK for spam."
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(spam-install-backend-super
|
2007-10-28 09:18:39 +00:00
|
|
|
backend
|
|
|
|
'check check 'statistical t))
|
|
|
|
|
|
|
|
;;}}}
|
|
|
|
|
|
|
|
;;{{{ backend installations
|
|
|
|
(spam-install-checkonly-backend 'spam-use-blackholes
|
|
|
|
'spam-check-blackholes)
|
|
|
|
|
|
|
|
(spam-install-checkonly-backend 'spam-use-hashcash
|
|
|
|
'spam-check-hashcash)
|
|
|
|
|
|
|
|
(spam-install-checkonly-backend 'spam-use-spamassassin-headers
|
|
|
|
'spam-check-spamassassin-headers)
|
|
|
|
|
|
|
|
(spam-install-checkonly-backend 'spam-use-bogofilter-headers
|
|
|
|
'spam-check-bogofilter-headers)
|
|
|
|
|
|
|
|
(spam-install-checkonly-backend 'spam-use-bsfilter-headers
|
|
|
|
'spam-check-bsfilter-headers)
|
|
|
|
|
|
|
|
(spam-install-checkonly-backend 'spam-use-gmane-xref
|
|
|
|
'spam-check-gmane-xref)
|
|
|
|
|
|
|
|
(spam-install-checkonly-backend 'spam-use-regex-headers
|
|
|
|
'spam-check-regex-headers)
|
|
|
|
|
|
|
|
(spam-install-statistical-checkonly-backend 'spam-use-regex-body
|
|
|
|
'spam-check-regex-body)
|
|
|
|
|
|
|
|
;; TODO: NOTE: spam-use-ham-copy is now obsolete, use (ham spam-use-copy) instead
|
|
|
|
(spam-install-mover-backend 'spam-use-move
|
|
|
|
'spam-move-ham-routine
|
|
|
|
'spam-move-spam-routine
|
|
|
|
nil
|
|
|
|
nil)
|
|
|
|
|
|
|
|
(spam-install-nocheck-backend 'spam-use-copy
|
|
|
|
'spam-copy-ham-routine
|
|
|
|
'spam-copy-spam-routine
|
|
|
|
nil
|
|
|
|
nil)
|
|
|
|
|
|
|
|
(spam-install-nocheck-backend 'spam-use-gmane
|
|
|
|
'spam-report-gmane-unregister-routine
|
|
|
|
'spam-report-gmane-register-routine
|
|
|
|
'spam-report-gmane-register-routine
|
|
|
|
'spam-report-gmane-unregister-routine)
|
|
|
|
|
|
|
|
(spam-install-nocheck-backend 'spam-use-resend
|
|
|
|
'spam-report-resend-register-ham-routine
|
|
|
|
'spam-report-resend-register-routine
|
|
|
|
nil
|
|
|
|
nil)
|
|
|
|
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(spam-install-backend 'spam-use-BBDB
|
2007-10-28 09:18:39 +00:00
|
|
|
'spam-check-BBDB
|
|
|
|
'spam-BBDB-register-routine
|
|
|
|
nil
|
|
|
|
'spam-BBDB-unregister-routine
|
|
|
|
nil)
|
|
|
|
|
|
|
|
(spam-install-backend-alias 'spam-use-BBDB 'spam-use-BBDB-exclusive)
|
|
|
|
|
|
|
|
(spam-install-backend 'spam-use-blacklist
|
|
|
|
'spam-check-blacklist
|
|
|
|
nil
|
|
|
|
'spam-blacklist-register-routine
|
|
|
|
nil
|
|
|
|
'spam-blacklist-unregister-routine)
|
|
|
|
|
|
|
|
(spam-install-backend 'spam-use-whitelist
|
|
|
|
'spam-check-whitelist
|
|
|
|
'spam-whitelist-register-routine
|
|
|
|
nil
|
|
|
|
'spam-whitelist-unregister-routine
|
|
|
|
nil)
|
|
|
|
|
|
|
|
(spam-install-statistical-backend 'spam-use-ifile
|
|
|
|
'spam-check-ifile
|
|
|
|
'spam-ifile-register-ham-routine
|
|
|
|
'spam-ifile-register-spam-routine
|
|
|
|
'spam-ifile-unregister-ham-routine
|
|
|
|
'spam-ifile-unregister-spam-routine)
|
|
|
|
|
|
|
|
(spam-install-statistical-backend 'spam-use-spamoracle
|
|
|
|
'spam-check-spamoracle
|
|
|
|
'spam-spamoracle-learn-ham
|
|
|
|
'spam-spamoracle-learn-spam
|
|
|
|
'spam-spamoracle-unlearn-ham
|
|
|
|
'spam-spamoracle-unlearn-spam)
|
|
|
|
|
|
|
|
(spam-install-statistical-backend 'spam-use-stat
|
|
|
|
'spam-check-stat
|
|
|
|
'spam-stat-register-ham-routine
|
|
|
|
'spam-stat-register-spam-routine
|
|
|
|
'spam-stat-unregister-ham-routine
|
|
|
|
'spam-stat-unregister-spam-routine)
|
|
|
|
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(spam-install-statistical-backend 'spam-use-spamassassin
|
2007-10-28 09:18:39 +00:00
|
|
|
'spam-check-spamassassin
|
|
|
|
'spam-spamassassin-register-ham-routine
|
|
|
|
'spam-spamassassin-register-spam-routine
|
|
|
|
'spam-spamassassin-unregister-ham-routine
|
|
|
|
'spam-spamassassin-unregister-spam-routine)
|
|
|
|
|
|
|
|
(spam-install-statistical-backend 'spam-use-bogofilter
|
|
|
|
'spam-check-bogofilter
|
|
|
|
'spam-bogofilter-register-ham-routine
|
|
|
|
'spam-bogofilter-register-spam-routine
|
|
|
|
'spam-bogofilter-unregister-ham-routine
|
|
|
|
'spam-bogofilter-unregister-spam-routine)
|
|
|
|
|
|
|
|
(spam-install-statistical-backend 'spam-use-bsfilter
|
|
|
|
'spam-check-bsfilter
|
|
|
|
'spam-bsfilter-register-ham-routine
|
|
|
|
'spam-bsfilter-register-spam-routine
|
|
|
|
'spam-bsfilter-unregister-ham-routine
|
|
|
|
'spam-bsfilter-unregister-spam-routine)
|
|
|
|
|
|
|
|
(spam-install-statistical-backend 'spam-use-crm114
|
|
|
|
'spam-check-crm114
|
|
|
|
'spam-crm114-register-ham-routine
|
|
|
|
'spam-crm114-register-spam-routine
|
|
|
|
;; does CRM114 Mailfilter support unregistration?
|
|
|
|
nil
|
|
|
|
nil)
|
|
|
|
|
|
|
|
;;}}}
|
|
|
|
|
|
|
|
;;{{{ scoring and summary formatting
|
|
|
|
(defun spam-necessary-extra-headers ()
|
|
|
|
"Return the extra headers spam.el thinks are necessary."
|
|
|
|
(let (list)
|
|
|
|
(when (or spam-use-spamassassin
|
|
|
|
spam-use-spamassassin-headers
|
|
|
|
spam-use-regex-headers)
|
|
|
|
(push 'X-Spam-Status list))
|
|
|
|
(when (or spam-use-bogofilter
|
|
|
|
spam-use-regex-headers)
|
|
|
|
(push 'X-Bogosity list))
|
|
|
|
(when (or spam-use-crm114
|
|
|
|
spam-use-regex-headers)
|
|
|
|
(push 'X-CRM114-Status list))
|
|
|
|
list))
|
|
|
|
|
|
|
|
(defun spam-user-format-function-S (headers)
|
|
|
|
(when headers
|
|
|
|
(format "%3.2f"
|
|
|
|
(spam-summary-score headers spam-summary-score-preferred-header))))
|
|
|
|
|
|
|
|
(defun spam-article-sort-by-spam-status (h1 h2)
|
|
|
|
"Sort articles by score."
|
|
|
|
(let (result)
|
|
|
|
(dolist (header (spam-necessary-extra-headers))
|
|
|
|
(let ((s1 (spam-summary-score h1 header))
|
|
|
|
(s2 (spam-summary-score h2 header)))
|
|
|
|
(unless (= s1 s2)
|
|
|
|
(setq result (< s1 s2))
|
|
|
|
(return))))
|
|
|
|
result))
|
|
|
|
|
|
|
|
(defvar spam-spamassassin-score-regexp
|
|
|
|
".*\\b\\(?:score\\|hits\\)=\\(-?[0-9.]+\\)"
|
|
|
|
"Regexp matching SpamAssassin score header.
|
|
|
|
The first group must match the number.")
|
|
|
|
|
|
|
|
(defun spam-extra-header-to-number (header headers)
|
|
|
|
"Transform an extra HEADER to a number, using list of HEADERS.
|
|
|
|
Note this has to be fast."
|
|
|
|
(let ((header-content (gnus-extra-header header headers)))
|
|
|
|
(if header-content
|
|
|
|
(cond
|
|
|
|
((eq header 'X-Spam-Status)
|
|
|
|
(string-to-number (gnus-replace-in-string
|
|
|
|
header-content
|
|
|
|
spam-spamassassin-score-regexp
|
|
|
|
"\\1")))
|
|
|
|
;; for CRM checking, it's probably faster to just do the string match
|
|
|
|
((string-match "( pR: \\([0-9.-]+\\)" header-content)
|
|
|
|
(- (string-to-number (match-string 1 header-content))))
|
|
|
|
((eq header 'X-Bogosity)
|
|
|
|
(string-to-number (gnus-replace-in-string
|
|
|
|
(gnus-replace-in-string
|
|
|
|
header-content
|
|
|
|
".*spamicity=" "")
|
|
|
|
",.*" "")))
|
|
|
|
(t nil))
|
|
|
|
nil)))
|
|
|
|
|
|
|
|
(defun spam-summary-score (headers &optional specific-header)
|
|
|
|
"Score an article for the summary buffer, as fast as possible.
|
|
|
|
With SPECIFIC-HEADER, returns only that header's score.
|
|
|
|
Will not return a nil score."
|
|
|
|
(let (score)
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(dolist (header
|
2007-10-28 09:18:39 +00:00
|
|
|
(if specific-header
|
|
|
|
(list specific-header)
|
|
|
|
(spam-necessary-extra-headers)))
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(setq score
|
2007-10-28 09:18:39 +00:00
|
|
|
(spam-extra-header-to-number header headers))
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(when score
|
2007-10-28 09:18:39 +00:00
|
|
|
(return)))
|
|
|
|
(or score 0)))
|
|
|
|
|
|
|
|
(defun spam-generic-score (&optional recheck)
|
|
|
|
"Invoke whatever scoring method we can."
|
|
|
|
(interactive "P")
|
|
|
|
(cond
|
|
|
|
((or spam-use-spamassassin spam-use-spamassassin-headers)
|
|
|
|
(spam-spamassassin-score recheck))
|
|
|
|
((or spam-use-bsfilter spam-use-bsfilter-headers)
|
|
|
|
(spam-bsfilter-score recheck))
|
|
|
|
(spam-use-crm114
|
|
|
|
(spam-crm114-score))
|
|
|
|
(t (spam-bogofilter-score recheck))))
|
|
|
|
;;}}}
|
|
|
|
|
|
|
|
;;{{{ set up widening, processor checks
|
|
|
|
|
|
|
|
;;; set up IMAP widening if it's necessary
|
|
|
|
(defun spam-setup-widening ()
|
|
|
|
(when (spam-widening-needed-p)
|
|
|
|
(setq nnimap-split-download-body-default t)))
|
|
|
|
|
|
|
|
(defun spam-widening-needed-p (&optional force-symbols)
|
|
|
|
(let (found)
|
|
|
|
(dolist (backend (spam-backend-list))
|
|
|
|
(when (and (spam-backend-statistical-p backend)
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(or (symbol-value backend)
|
2007-10-28 09:18:39 +00:00
|
|
|
(memq backend force-symbols)))
|
|
|
|
(setq found backend)))
|
|
|
|
found))
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defvar spam-list-of-processors
|
2007-10-28 09:18:39 +00:00
|
|
|
;; note the nil processors are not defined in gnus.el
|
|
|
|
'((gnus-group-spam-exit-processor-bogofilter spam spam-use-bogofilter)
|
|
|
|
(gnus-group-spam-exit-processor-bsfilter spam spam-use-bsfilter)
|
2004-09-04 13:13:48 +00:00
|
|
|
(gnus-group-spam-exit-processor-blacklist spam spam-use-blacklist)
|
|
|
|
(gnus-group-spam-exit-processor-ifile spam spam-use-ifile)
|
|
|
|
(gnus-group-spam-exit-processor-stat spam spam-use-stat)
|
|
|
|
(gnus-group-spam-exit-processor-spamoracle spam spam-use-spamoracle)
|
2007-10-28 09:18:39 +00:00
|
|
|
(gnus-group-spam-exit-processor-spamassassin spam spam-use-spamassassin)
|
|
|
|
(gnus-group-spam-exit-processor-report-gmane spam spam-use-gmane) ;; Buggy?
|
2004-09-04 13:13:48 +00:00
|
|
|
(gnus-group-ham-exit-processor-ifile ham spam-use-ifile)
|
|
|
|
(gnus-group-ham-exit-processor-bogofilter ham spam-use-bogofilter)
|
2007-10-28 09:18:39 +00:00
|
|
|
(gnus-group-ham-exit-processor-bsfilter ham spam-use-bsfilter)
|
2004-09-04 13:13:48 +00:00
|
|
|
(gnus-group-ham-exit-processor-stat ham spam-use-stat)
|
|
|
|
(gnus-group-ham-exit-processor-whitelist ham spam-use-whitelist)
|
|
|
|
(gnus-group-ham-exit-processor-BBDB ham spam-use-BBDB)
|
|
|
|
(gnus-group-ham-exit-processor-copy ham spam-use-ham-copy)
|
2007-10-28 09:18:39 +00:00
|
|
|
(gnus-group-ham-exit-processor-spamassassin ham spam-use-spamassassin)
|
2004-09-04 13:13:48 +00:00
|
|
|
(gnus-group-ham-exit-processor-spamoracle ham spam-use-spamoracle))
|
2007-10-28 09:18:39 +00:00
|
|
|
"The OBSOLETE `spam-list-of-processors' list.
|
|
|
|
This list contains pairs associating the obsolete ham/spam exit
|
|
|
|
processor variables with a classification and a spam-use-*
|
|
|
|
variable. When the processor variable is nil, just the
|
|
|
|
classification and spam-use-* check variable are used. This is
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
superseded by the new spam backend code, so it's only consulted
|
2007-10-28 09:18:39 +00:00
|
|
|
for backwards compatibility.")
|
|
|
|
|
|
|
|
(defun spam-group-processor-p (group backend &optional classification)
|
|
|
|
"Checks if GROUP has a BACKEND with CLASSIFICATION registered.
|
|
|
|
Also accepts the obsolete processors, which can be found in
|
|
|
|
gnus.el and in spam-list-of-processors. In the case of mover
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
backends, checks the setting of `spam-summary-exit-behavior' in
|
2007-10-28 09:18:39 +00:00
|
|
|
addition to the set values for the group."
|
2004-09-04 13:13:48 +00:00
|
|
|
(if (and (stringp group)
|
2007-10-28 09:18:39 +00:00
|
|
|
(symbolp backend))
|
|
|
|
(let ((old-style (assq backend spam-list-of-processors))
|
|
|
|
(parameters (nth 0 (gnus-parameter-spam-process group)))
|
|
|
|
found)
|
|
|
|
(if old-style ; old-style processor
|
|
|
|
(spam-group-processor-p group (nth 2 old-style) (nth 1 old-style))
|
|
|
|
;; now search for the parameter
|
|
|
|
(dolist (parameter parameters)
|
|
|
|
(when (and (null found)
|
|
|
|
(listp parameter)
|
|
|
|
(eq classification (nth 0 parameter))
|
|
|
|
(eq backend (nth 1 parameter)))
|
|
|
|
(setq found t)))
|
|
|
|
|
|
|
|
;; now, if the parameter was not found, do the
|
|
|
|
;; spam-summary-exit-behavior-logic for mover backends
|
|
|
|
(unless found
|
|
|
|
(when (spam-backend-mover-p backend)
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(setq
|
2007-10-28 09:18:39 +00:00
|
|
|
found
|
|
|
|
(cond
|
|
|
|
((eq spam-summary-exit-behavior 'move-all) t)
|
|
|
|
((eq spam-summary-exit-behavior 'move-none) nil)
|
|
|
|
((eq spam-summary-exit-behavior 'default)
|
|
|
|
(or (eq classification 'spam) ;move spam out of all groups
|
|
|
|
;; move ham out of spam groups
|
|
|
|
(and (eq classification 'ham)
|
|
|
|
(spam-group-spam-contents-p group))))
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(t (gnus-error 5 "Unknown spam-summary-exit-behavior: %s"
|
2007-10-28 09:18:39 +00:00
|
|
|
spam-summary-exit-behavior))))))
|
|
|
|
|
|
|
|
found))
|
2004-09-04 13:13:48 +00:00
|
|
|
nil))
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;;}}}
|
2004-09-04 13:13:48 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;;{{{ Summary entry and exit processing.
|
2004-09-04 13:13:48 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(defun spam-mark-junk-as-spam-routine ()
|
|
|
|
;; 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 6 "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)))
|
|
|
|
(if spam-mark-new-messages-in-spam-group-as-spam
|
|
|
|
(dolist (article articles)
|
|
|
|
(gnus-summary-mark-article article gnus-spam-mark))
|
|
|
|
(gnus-message 9 "Did not mark new messages as spam.")))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(defun spam-summary-prepare ()
|
2007-10-28 09:18:39 +00:00
|
|
|
(setq spam-old-articles
|
|
|
|
(list (cons 'ham (spam-list-articles gnus-newsgroup-articles 'ham))
|
|
|
|
(cons 'spam (spam-list-articles gnus-newsgroup-articles 'spam))))
|
2004-09-04 13:13:48 +00:00
|
|
|
(spam-mark-junk-as-spam-routine))
|
|
|
|
|
|
|
|
;; The spam processors are invoked for any group, spam or ham or neither
|
|
|
|
(defun spam-summary-prepare-exit ()
|
|
|
|
(unless gnus-group-is-exiting-without-update-p
|
|
|
|
(gnus-message 6 "Exiting summary buffer and applying spam rules")
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;; before we begin, remove any article limits
|
|
|
|
; (ignore-errors
|
|
|
|
; (gnus-summary-pop-limit t))
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
;; first of all, unregister any articles that are no longer ham or spam
|
|
|
|
;; we have to iterate over the processors, or else we'll be too slow
|
2007-10-28 09:18:39 +00:00
|
|
|
(dolist (classification (spam-classifications))
|
|
|
|
(let* ((old-articles (cdr-safe (assq classification spam-old-articles)))
|
2004-09-04 13:13:48 +00:00
|
|
|
(new-articles (spam-list-articles
|
|
|
|
gnus-newsgroup-articles
|
|
|
|
classification))
|
2007-10-28 09:18:39 +00:00
|
|
|
(changed-articles (spam-set-difference new-articles old-articles)))
|
2004-09-04 13:13:48 +00:00
|
|
|
;; now that we have the changed articles, we go through the processors
|
2007-10-28 09:18:39 +00:00
|
|
|
(dolist (backend (spam-backend-list))
|
|
|
|
(let (unregister-list)
|
2004-09-04 13:13:48 +00:00
|
|
|
(dolist (article changed-articles)
|
|
|
|
(let ((id (spam-fetch-field-message-id-fast article)))
|
|
|
|
(when (spam-log-unregistration-needed-p
|
2007-10-28 09:18:39 +00:00
|
|
|
id 'process classification backend)
|
2004-09-04 13:13:48 +00:00
|
|
|
(push article unregister-list))))
|
|
|
|
;; call spam-register-routine with specific articles to unregister,
|
|
|
|
;; when there are articles to unregister and the check is enabled
|
2007-10-28 09:18:39 +00:00
|
|
|
(when (and unregister-list (symbol-value backend))
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(spam-backend-put-article-todo-list backend
|
|
|
|
classification
|
2007-10-28 09:18:39 +00:00
|
|
|
unregister-list
|
|
|
|
t))))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;; do the non-moving backends first, then the moving ones
|
|
|
|
(dolist (backend-type '(non-mover mover))
|
|
|
|
(dolist (classification (spam-classifications))
|
|
|
|
(dolist (backend (spam-backend-list backend-type))
|
|
|
|
(when (spam-group-processor-p
|
|
|
|
gnus-newsgroup-name
|
|
|
|
backend
|
|
|
|
classification)
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(spam-backend-put-article-todo-list backend
|
2007-10-28 09:18:39 +00:00
|
|
|
classification
|
|
|
|
(spam-list-articles
|
|
|
|
gnus-newsgroup-articles
|
|
|
|
classification))))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(spam-resolve-registrations-routine) ; do the registrations now
|
|
|
|
|
|
|
|
;; we mark all the leftover spam articles as expired at the end
|
|
|
|
(dolist (article (spam-list-articles
|
|
|
|
gnus-newsgroup-articles
|
|
|
|
'spam))
|
|
|
|
(gnus-summary-mark-article article gnus-expirable-mark)))
|
|
|
|
|
|
|
|
(setq spam-old-articles nil))
|
|
|
|
|
|
|
|
;;}}}
|
2004-09-04 13:13:48 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;;{{{ spam-use-move and spam-use-copy backend support functions
|
2004-09-04 13:13:48 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(defun spam-copy-or-move-routine (copy groups articles classification)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(when (and (car-safe groups) (listp (car-safe groups)))
|
|
|
|
(setq groups (pop groups)))
|
|
|
|
|
|
|
|
(unless (listp groups)
|
|
|
|
(setq groups (list groups)))
|
|
|
|
|
|
|
|
;; remove the current process mark
|
2004-09-04 13:13:48 +00:00
|
|
|
(gnus-summary-kill-process-mark)
|
2007-10-28 09:18:39 +00:00
|
|
|
|
|
|
|
(let ((backend-supports-deletions
|
2004-09-04 13:13:48 +00:00
|
|
|
(gnus-check-backend-function
|
|
|
|
'request-move-article gnus-newsgroup-name))
|
|
|
|
(respool-method (gnus-find-method-for-group gnus-newsgroup-name))
|
2006-03-21 20:37:02 +00:00
|
|
|
article mark deletep respool)
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(when (member 'respool groups)
|
|
|
|
(setq respool t) ; boolean for later
|
|
|
|
(setq groups '("fake"))) ; when respooling, groups are dynamic so fake it
|
|
|
|
|
|
|
|
;; now do the actual move
|
|
|
|
(dolist (group groups)
|
2007-10-28 09:18:39 +00:00
|
|
|
(when (and articles (stringp group))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;; first, mark the article with the process mark and, if needed,
|
|
|
|
;; the unread or expired mark (for ham and spam respectively)
|
|
|
|
(dolist (article articles)
|
|
|
|
(when (and (eq classification 'ham)
|
|
|
|
spam-mark-ham-unread-before-move-from-spam-group)
|
|
|
|
(gnus-message 9 "Marking ham article %d unread before move"
|
|
|
|
article)
|
|
|
|
(gnus-summary-mark-article article gnus-unread-mark))
|
|
|
|
(when (and (eq classification 'spam)
|
|
|
|
(not copy))
|
|
|
|
(gnus-message 9 "Marking spam article %d expirable before move"
|
|
|
|
article)
|
|
|
|
(gnus-summary-mark-article article gnus-expirable-mark))
|
|
|
|
(gnus-summary-set-process-mark article)
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(if respool ; respooling is with a "fake" group
|
|
|
|
(let ((spam-split-disabled
|
|
|
|
(or spam-split-disabled
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(and (eq classification 'ham)
|
2007-10-28 09:18:39 +00:00
|
|
|
spam-disable-spam-split-during-ham-respool))))
|
|
|
|
(gnus-message 9 "Respooling article %d with method %s"
|
|
|
|
article respool-method)
|
|
|
|
(gnus-summary-respool-article nil respool-method))
|
|
|
|
(if (or (not backend-supports-deletions) ; else, we are not respooling
|
|
|
|
(> (length groups) 1))
|
|
|
|
(progn ; if copying, copy and set deletep
|
|
|
|
(gnus-message 9 "Copying article %d to group %s"
|
|
|
|
article group)
|
|
|
|
(gnus-summary-copy-article nil group)
|
|
|
|
(setq deletep t))
|
|
|
|
(gnus-message 9 "Moving article %d to group %s"
|
|
|
|
article group)
|
|
|
|
(gnus-summary-move-article nil group))))) ; else move articles
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;; now delete the articles, unless a) copy is t, and there was a copy done
|
|
|
|
;; b) a move was done to a single group
|
|
|
|
;; c) backend-supports-deletions is nil
|
|
|
|
(unless copy
|
|
|
|
(when (and deletep backend-supports-deletions)
|
|
|
|
(dolist (article articles)
|
|
|
|
(gnus-summary-set-process-mark article)
|
|
|
|
(gnus-message 9 "Deleting article %d" article))
|
|
|
|
(when articles
|
|
|
|
(let ((gnus-novice-user nil)) ; don't ask me if I'm sure
|
|
|
|
(gnus-summary-delete-article nil)))))
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(gnus-summary-yank-process-mark)
|
|
|
|
(length articles))))
|
|
|
|
|
|
|
|
(defun spam-copy-spam-routine (articles)
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(spam-copy-or-move-routine
|
|
|
|
t
|
2007-10-28 09:18:39 +00:00
|
|
|
(gnus-parameter-spam-process-destination gnus-newsgroup-name)
|
|
|
|
articles
|
|
|
|
'spam))
|
|
|
|
|
|
|
|
(defun spam-move-spam-routine (articles)
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(spam-copy-or-move-routine
|
2007-10-28 09:18:39 +00:00
|
|
|
nil
|
|
|
|
(gnus-parameter-spam-process-destination gnus-newsgroup-name)
|
|
|
|
articles
|
|
|
|
'spam))
|
|
|
|
|
|
|
|
(defun spam-copy-ham-routine (articles)
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(spam-copy-or-move-routine
|
|
|
|
t
|
2007-10-28 09:18:39 +00:00
|
|
|
(gnus-parameter-ham-process-destination gnus-newsgroup-name)
|
|
|
|
articles
|
|
|
|
'ham))
|
|
|
|
|
|
|
|
(defun spam-move-ham-routine (articles)
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(spam-copy-or-move-routine
|
2007-10-28 09:18:39 +00:00
|
|
|
nil
|
|
|
|
(gnus-parameter-ham-process-destination gnus-newsgroup-name)
|
|
|
|
articles
|
|
|
|
'ham))
|
|
|
|
|
|
|
|
;;}}}
|
|
|
|
|
|
|
|
;;{{{ article and field retrieval code
|
2004-09-04 13:13:48 +00:00
|
|
|
(defun spam-get-article-as-string (article)
|
2007-10-28 09:18:39 +00:00
|
|
|
(when (numberp article)
|
|
|
|
(with-temp-buffer
|
|
|
|
(gnus-request-article-this-buffer
|
|
|
|
article
|
|
|
|
gnus-newsgroup-name)
|
|
|
|
(buffer-string))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
;; disabled for now
|
|
|
|
;; (defun spam-get-article-as-filename (article)
|
|
|
|
;; (let ((article-filename))
|
|
|
|
;; (when (numberp article)
|
|
|
|
;; (nnml-possibly-change-directory
|
|
|
|
;; (gnus-group-real-name gnus-newsgroup-name))
|
|
|
|
;; (setq article-filename (expand-file-name
|
|
|
|
;; (int-to-string article) nnml-current-directory)))
|
|
|
|
;; (if (file-exists-p article-filename)
|
|
|
|
;; article-filename
|
|
|
|
;; nil)))
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(defun spam-fetch-field-fast (article field &optional prepared-data-header)
|
|
|
|
"Fetch a FIELD for ARTICLE quickly, using the internal gnus-data-list function.
|
|
|
|
When PREPARED-DATA-HEADER is given, don't look in the Gnus data.
|
|
|
|
When FIELD is 'number, ARTICLE can be any number (since we want
|
|
|
|
to find it out)."
|
|
|
|
(when (numberp article)
|
|
|
|
(let* ((data-header (or prepared-data-header
|
|
|
|
(spam-fetch-article-header article))))
|
|
|
|
(if (arrayp data-header)
|
|
|
|
(cond
|
|
|
|
((equal field 'number)
|
|
|
|
(mail-header-number data-header))
|
|
|
|
((equal field 'from)
|
|
|
|
(mail-header-from data-header))
|
|
|
|
((equal field 'message-id)
|
|
|
|
(mail-header-message-id data-header))
|
|
|
|
((equal field 'subject)
|
|
|
|
(mail-header-subject data-header))
|
|
|
|
((equal field 'references)
|
|
|
|
(mail-header-references data-header))
|
|
|
|
((equal field 'date)
|
|
|
|
(mail-header-date data-header))
|
|
|
|
((equal field 'xref)
|
|
|
|
(mail-header-xref data-header))
|
|
|
|
((equal field 'extra)
|
|
|
|
(mail-header-extra data-header))
|
|
|
|
(t
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(gnus-error
|
|
|
|
5
|
|
|
|
"spam-fetch-field-fast: unknown field %s requested"
|
2007-10-28 09:18:39 +00:00
|
|
|
field)
|
|
|
|
nil))
|
|
|
|
(gnus-message 6 "Article %d has a nil data header" article)))))
|
|
|
|
|
|
|
|
(defun spam-fetch-field-from-fast (article &optional prepared-data-header)
|
|
|
|
(spam-fetch-field-fast article 'from prepared-data-header))
|
|
|
|
|
|
|
|
(defun spam-fetch-field-subject-fast (article &optional prepared-data-header)
|
|
|
|
(spam-fetch-field-fast article 'subject prepared-data-header))
|
|
|
|
|
|
|
|
(defun spam-fetch-field-message-id-fast (article &optional prepared-data-header)
|
|
|
|
(spam-fetch-field-fast article 'message-id prepared-data-header))
|
|
|
|
|
|
|
|
(defun spam-generate-fake-headers (article)
|
|
|
|
(let ((dh (spam-fetch-article-header article)))
|
|
|
|
(if dh
|
|
|
|
(concat
|
|
|
|
(format
|
|
|
|
;; 80-character limit makes for strange constructs
|
|
|
|
(concat "From: %s\nSubject: %s\nMessage-ID: %s\n"
|
|
|
|
"Date: %s\nReferences: %s\nXref: %s\n")
|
|
|
|
(spam-fetch-field-fast article 'from dh)
|
|
|
|
(spam-fetch-field-fast article 'subject dh)
|
|
|
|
(spam-fetch-field-fast article 'message-id dh)
|
|
|
|
(spam-fetch-field-fast article 'date dh)
|
|
|
|
(spam-fetch-field-fast article 'references dh)
|
|
|
|
(spam-fetch-field-fast article 'xref dh))
|
|
|
|
(when (spam-fetch-field-fast article 'extra dh)
|
|
|
|
(format "%s\n" (spam-fetch-field-fast article 'extra dh))))
|
|
|
|
(gnus-message
|
|
|
|
5
|
|
|
|
"spam-generate-fake-headers: article %d didn't have a valid header"
|
|
|
|
article))))
|
|
|
|
|
|
|
|
(defun spam-fetch-article-header (article)
|
|
|
|
(save-excursion
|
|
|
|
(set-buffer gnus-summary-buffer)
|
|
|
|
(gnus-read-header article)
|
|
|
|
(nth 3 (assq article gnus-newsgroup-data))))
|
|
|
|
;;}}}
|
|
|
|
|
|
|
|
;;{{{ Spam determination.
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(defun spam-split (&rest specific-checks)
|
|
|
|
"Split this message into the `spam' group if it is spam.
|
|
|
|
This function can be used as an entry in the variable `nnmail-split-fancy',
|
|
|
|
for example like this: (: spam-split). It can take checks as
|
|
|
|
parameters. A string as a parameter will set the
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
`spam-split-group' to that string.
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
See the Info node `(gnus)Fancy Mail Splitting' for more details."
|
|
|
|
(interactive)
|
|
|
|
(setq spam-split-last-successful-check nil)
|
|
|
|
(unless spam-split-disabled
|
|
|
|
(let ((spam-split-group-choice spam-split-group))
|
|
|
|
(dolist (check specific-checks)
|
|
|
|
(when (stringp check)
|
|
|
|
(setq spam-split-group-choice check)
|
|
|
|
(setq specific-checks (delq check specific-checks))))
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(let ((spam-split-group spam-split-group-choice)
|
|
|
|
(widening-needed-check (spam-widening-needed-p specific-checks)))
|
2004-09-04 13:13:48 +00:00
|
|
|
(save-excursion
|
|
|
|
(save-restriction
|
2007-10-28 09:18:39 +00:00
|
|
|
(when widening-needed-check
|
|
|
|
(widen)
|
|
|
|
(gnus-message 8 "spam-split: widening the buffer (%s requires it)"
|
|
|
|
widening-needed-check))
|
|
|
|
(let ((backends (spam-backend-list))
|
2004-09-04 13:13:48 +00:00
|
|
|
decision)
|
2007-10-28 09:18:39 +00:00
|
|
|
(while (and backends (not decision))
|
|
|
|
(let* ((backend (pop backends))
|
|
|
|
(check-function (spam-backend-check backend))
|
|
|
|
(spam-split-group (if spam-split-symbolic-return
|
|
|
|
'spam
|
|
|
|
spam-split-group)))
|
|
|
|
(when (or
|
|
|
|
;; either, given specific checks, this is one of them
|
|
|
|
(memq backend specific-checks)
|
|
|
|
;; or, given no specific checks, spam-use-CHECK is set
|
|
|
|
(and (null specific-checks) (symbol-value backend)))
|
|
|
|
(gnus-message 6 "spam-split: calling the %s function"
|
|
|
|
check-function)
|
|
|
|
(setq decision (funcall check-function))
|
2004-09-04 13:13:48 +00:00
|
|
|
;; if we got a decision at all, save the current check
|
|
|
|
(when decision
|
2007-10-28 09:18:39 +00:00
|
|
|
(setq spam-split-last-successful-check backend))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(when (eq decision 'spam)
|
2007-10-28 09:18:39 +00:00
|
|
|
(unless spam-split-symbolic-return
|
2004-09-04 13:13:48 +00:00
|
|
|
(gnus-error
|
|
|
|
5
|
|
|
|
(format "spam-split got %s but %s is nil"
|
2007-10-28 09:18:39 +00:00
|
|
|
decision
|
|
|
|
spam-split-symbolic-return)))))))
|
2004-09-04 13:13:48 +00:00
|
|
|
(if (eq decision t)
|
|
|
|
(if spam-split-symbolic-return-positive 'ham nil)
|
|
|
|
decision))))))))
|
|
|
|
|
|
|
|
(defun spam-find-spam ()
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
"Detect spam in the current newsgroup using `spam-split'."
|
2004-09-04 13:13:48 +00:00
|
|
|
(interactive)
|
|
|
|
|
|
|
|
(let* ((group gnus-newsgroup-name)
|
|
|
|
(autodetect (gnus-parameter-spam-autodetect group))
|
|
|
|
(methods (gnus-parameter-spam-autodetect-methods group))
|
2007-10-28 09:18:39 +00:00
|
|
|
(first-method (nth 0 methods))
|
|
|
|
(articles (if spam-autodetect-recheck-messages
|
|
|
|
gnus-newsgroup-articles
|
|
|
|
gnus-newsgroup-unseen))
|
|
|
|
article-cannot-be-faked)
|
|
|
|
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(dolist (backend methods)
|
|
|
|
(when (spam-backend-statistical-p backend)
|
|
|
|
(setq article-cannot-be-faked t)
|
|
|
|
(return)))
|
|
|
|
|
|
|
|
(when (memq 'default methods)
|
|
|
|
(setq article-cannot-be-faked t))
|
|
|
|
|
|
|
|
(when (and autodetect
|
|
|
|
(not (equal first-method 'none)))
|
|
|
|
(mapcar
|
|
|
|
(lambda (article)
|
|
|
|
(let ((id (spam-fetch-field-message-id-fast article))
|
|
|
|
(subject (spam-fetch-field-subject-fast article))
|
|
|
|
(sender (spam-fetch-field-from-fast article))
|
|
|
|
registry-lookup)
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(unless id
|
|
|
|
(gnus-message 6 "Article %d has no message ID!" article))
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(when (and id spam-log-to-registry)
|
|
|
|
(setq registry-lookup (spam-log-registration-type id 'incoming))
|
|
|
|
(when registry-lookup
|
|
|
|
(gnus-message
|
|
|
|
9
|
|
|
|
"spam-find-spam: message %s was already registered incoming"
|
|
|
|
id)))
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(let* ((spam-split-symbolic-return t)
|
|
|
|
(spam-split-symbolic-return-positive t)
|
2007-10-28 09:18:39 +00:00
|
|
|
(fake-headers (spam-generate-fake-headers article))
|
2004-09-04 13:13:48 +00:00
|
|
|
(split-return
|
2007-10-28 09:18:39 +00:00
|
|
|
(or registry-lookup
|
|
|
|
(with-temp-buffer
|
|
|
|
(if article-cannot-be-faked
|
|
|
|
(gnus-request-article-this-buffer
|
|
|
|
article
|
|
|
|
group)
|
|
|
|
;; else, we fake the article
|
|
|
|
(when fake-headers (insert fake-headers)))
|
|
|
|
(if (or (null first-method)
|
|
|
|
(equal first-method 'default))
|
|
|
|
(spam-split)
|
|
|
|
(apply 'spam-split methods))))))
|
2004-09-04 13:13:48 +00:00
|
|
|
(if (equal split-return 'spam)
|
|
|
|
(gnus-summary-mark-article article gnus-spam-mark))
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(when (and id split-return spam-log-to-registry)
|
2004-09-04 13:13:48 +00:00
|
|
|
(when (zerop (gnus-registry-group-count id))
|
|
|
|
(gnus-registry-add-group
|
|
|
|
id group subject sender))
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(unless registry-lookup
|
|
|
|
(spam-log-processing-to-registry
|
|
|
|
id
|
|
|
|
'incoming
|
|
|
|
split-return
|
|
|
|
spam-split-last-successful-check
|
|
|
|
group))))))
|
|
|
|
articles))))
|
|
|
|
|
|
|
|
;;}}}
|
|
|
|
|
|
|
|
;;{{{ registration/unregistration functions
|
|
|
|
|
|
|
|
(defun spam-resolve-registrations-routine ()
|
|
|
|
"Go through the backends and register or unregister articles as needed."
|
|
|
|
(dolist (backend-type '(non-mover mover))
|
|
|
|
(dolist (classification (spam-classifications))
|
|
|
|
(dolist (backend (spam-backend-list backend-type))
|
|
|
|
(let ((rlist (spam-backend-get-article-todo-list
|
|
|
|
backend classification))
|
|
|
|
(ulist (spam-backend-get-article-todo-list
|
|
|
|
backend classification t))
|
|
|
|
(delcount 0))
|
|
|
|
|
|
|
|
;; clear the old lists right away
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(spam-backend-put-article-todo-list backend
|
2007-10-28 09:18:39 +00:00
|
|
|
classification
|
|
|
|
nil
|
|
|
|
nil)
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(spam-backend-put-article-todo-list backend
|
2007-10-28 09:18:39 +00:00
|
|
|
classification
|
|
|
|
nil
|
|
|
|
t)
|
|
|
|
|
|
|
|
;; eliminate duplicates
|
|
|
|
(dolist (article (copy-sequence ulist))
|
|
|
|
(when (memq article rlist)
|
|
|
|
(incf delcount)
|
|
|
|
(setq rlist (delq article rlist))
|
|
|
|
(setq ulist (delq article ulist))))
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(unless (zerop delcount)
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(gnus-message
|
|
|
|
9
|
2007-10-28 09:18:39 +00:00
|
|
|
"%d messages were saved the trouble of unregistering and then registering"
|
|
|
|
delcount))
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;; unregister articles
|
|
|
|
(unless (zerop (length ulist))
|
|
|
|
(let ((num (spam-unregister-routine classification backend ulist)))
|
|
|
|
(when (> num 0)
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(gnus-message
|
2007-10-28 09:18:39 +00:00
|
|
|
6
|
|
|
|
"%d %s messages were unregistered by backend %s."
|
|
|
|
num
|
|
|
|
classification
|
|
|
|
backend))))
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;; register articles
|
|
|
|
(unless (zerop (length rlist))
|
|
|
|
(let ((num (spam-register-routine classification backend rlist)))
|
|
|
|
(when (> num 0)
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(gnus-message
|
2007-10-28 09:18:39 +00:00
|
|
|
6
|
|
|
|
"%d %s messages were registered by backend %s."
|
|
|
|
num
|
|
|
|
classification
|
|
|
|
backend)))))))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(defun spam-unregister-routine (classification
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
backend
|
2007-10-28 09:18:39 +00:00
|
|
|
specific-articles)
|
|
|
|
(spam-register-routine classification backend specific-articles t))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(defun spam-register-routine (classification
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
backend
|
2007-10-28 09:18:39 +00:00
|
|
|
specific-articles
|
|
|
|
&optional unregister)
|
2004-09-04 13:13:48 +00:00
|
|
|
(when (and (spam-classification-valid-p classification)
|
2007-10-28 09:18:39 +00:00
|
|
|
(spam-backend-valid-p backend))
|
2004-09-04 13:13:48 +00:00
|
|
|
(let* ((register-function
|
2007-10-28 09:18:39 +00:00
|
|
|
(spam-backend-function backend classification 'registration))
|
2004-09-04 13:13:48 +00:00
|
|
|
(unregister-function
|
2007-10-28 09:18:39 +00:00
|
|
|
(spam-backend-function backend classification 'unregistration))
|
2004-09-04 13:13:48 +00:00
|
|
|
(run-function (if unregister
|
|
|
|
unregister-function
|
|
|
|
register-function))
|
|
|
|
(log-function (if unregister
|
|
|
|
'spam-log-undo-registration
|
|
|
|
'spam-log-processing-to-registry))
|
|
|
|
article articles)
|
|
|
|
|
|
|
|
(when run-function
|
|
|
|
;; make list of articles, using specific-articles if given
|
|
|
|
(setq articles (or specific-articles
|
|
|
|
(spam-list-articles
|
|
|
|
gnus-newsgroup-articles
|
|
|
|
classification)))
|
|
|
|
;; process them
|
2007-10-28 09:18:39 +00:00
|
|
|
(when (> (length articles) 0)
|
|
|
|
(gnus-message 5 "%s %d %s articles as %s using backend %s"
|
|
|
|
(if unregister "Unregistering" "Registering")
|
|
|
|
(length articles)
|
|
|
|
(if specific-articles "specific" "")
|
|
|
|
classification
|
|
|
|
backend)
|
|
|
|
(funcall run-function articles)
|
|
|
|
;; now log all the registrations (or undo them, depending on
|
|
|
|
;; unregister)
|
|
|
|
(dolist (article articles)
|
|
|
|
(funcall log-function
|
|
|
|
(spam-fetch-field-message-id-fast article)
|
|
|
|
'process
|
|
|
|
classification
|
|
|
|
backend
|
|
|
|
gnus-newsgroup-name))))
|
|
|
|
;; return the number of articles processed
|
|
|
|
(length articles))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
;;; log a ham- or spam-processor invocation to the registry
|
2007-10-28 09:18:39 +00:00
|
|
|
(defun spam-log-processing-to-registry (id type classification backend group)
|
2004-09-04 13:13:48 +00:00
|
|
|
(when spam-log-to-registry
|
|
|
|
(if (and (stringp id)
|
|
|
|
(stringp group)
|
|
|
|
(spam-process-type-valid-p type)
|
|
|
|
(spam-classification-valid-p classification)
|
2007-10-28 09:18:39 +00:00
|
|
|
(spam-backend-valid-p backend))
|
2004-09-04 13:13:48 +00:00
|
|
|
(let ((cell-list (cdr-safe (gnus-registry-fetch-extra id type)))
|
2007-10-28 09:18:39 +00:00
|
|
|
(cell (list classification backend group)))
|
2004-09-04 13:13:48 +00:00
|
|
|
(push cell cell-list)
|
|
|
|
(gnus-registry-store-extra-entry
|
|
|
|
id
|
|
|
|
type
|
|
|
|
cell-list))
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(gnus-error
|
|
|
|
7
|
|
|
|
(format "%s call with bad ID, type, classification, spam-backend, or group"
|
|
|
|
"spam-log-processing-to-registry")))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
;;; check if a ham- or spam-processor registration has been done
|
|
|
|
(defun spam-log-registered-p (id type)
|
|
|
|
(when spam-log-to-registry
|
|
|
|
(if (and (stringp id)
|
|
|
|
(spam-process-type-valid-p type))
|
|
|
|
(cdr-safe (gnus-registry-fetch-extra id type))
|
|
|
|
(progn
|
2007-10-28 09:18:39 +00:00
|
|
|
(gnus-error
|
|
|
|
7
|
|
|
|
(format "%s called with bad ID, type, classification, or spam-backend"
|
|
|
|
"spam-log-registered-p"))
|
2004-09-04 13:13:48 +00:00
|
|
|
nil))))
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;;; check what a ham- or spam-processor registration says
|
|
|
|
;;; returns nil if conflicting registrations are found
|
|
|
|
(defun spam-log-registration-type (id type)
|
|
|
|
(let ((count 0)
|
|
|
|
decision)
|
|
|
|
(dolist (reg (spam-log-registered-p id type))
|
|
|
|
(let ((classification (nth 0 reg)))
|
|
|
|
(when (spam-classification-valid-p classification)
|
|
|
|
(when (and decision
|
|
|
|
(not (eq classification decision)))
|
|
|
|
(setq count (+ 1 count)))
|
|
|
|
(setq decision classification))))
|
|
|
|
(if (< 0 count)
|
|
|
|
nil
|
|
|
|
decision)))
|
|
|
|
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
;;; check if a ham- or spam-processor registration needs to be undone
|
2007-10-28 09:18:39 +00:00
|
|
|
(defun spam-log-unregistration-needed-p (id type classification backend)
|
2004-09-04 13:13:48 +00:00
|
|
|
(when spam-log-to-registry
|
|
|
|
(if (and (stringp id)
|
|
|
|
(spam-process-type-valid-p type)
|
|
|
|
(spam-classification-valid-p classification)
|
2007-10-28 09:18:39 +00:00
|
|
|
(spam-backend-valid-p backend))
|
2004-09-04 13:13:48 +00:00
|
|
|
(let ((cell-list (cdr-safe (gnus-registry-fetch-extra id type)))
|
|
|
|
found)
|
|
|
|
(dolist (cell cell-list)
|
|
|
|
(unless found
|
|
|
|
(when (and (eq classification (nth 0 cell))
|
2007-10-28 09:18:39 +00:00
|
|
|
(eq backend (nth 1 cell)))
|
2004-09-04 13:13:48 +00:00
|
|
|
(setq found t))))
|
|
|
|
found)
|
|
|
|
(progn
|
2007-10-28 09:18:39 +00:00
|
|
|
(gnus-error
|
|
|
|
7
|
|
|
|
(format "%s called with bad ID, type, classification, or spam-backend"
|
|
|
|
"spam-log-unregistration-needed-p"))
|
2004-09-04 13:13:48 +00:00
|
|
|
nil))))
|
|
|
|
|
|
|
|
|
|
|
|
;;; undo a ham- or spam-processor registration (the group is not used)
|
2007-10-28 09:18:39 +00:00
|
|
|
(defun spam-log-undo-registration (id type classification backend &optional group)
|
2004-09-04 13:13:48 +00:00
|
|
|
(when (and spam-log-to-registry
|
2007-10-28 09:18:39 +00:00
|
|
|
(spam-log-unregistration-needed-p id type classification backend))
|
2004-09-04 13:13:48 +00:00
|
|
|
(if (and (stringp id)
|
|
|
|
(spam-process-type-valid-p type)
|
|
|
|
(spam-classification-valid-p classification)
|
2007-10-28 09:18:39 +00:00
|
|
|
(spam-backend-valid-p backend))
|
2004-09-04 13:13:48 +00:00
|
|
|
(let ((cell-list (cdr-safe (gnus-registry-fetch-extra id type)))
|
|
|
|
new-cell-list found)
|
|
|
|
(dolist (cell cell-list)
|
|
|
|
(unless (and (eq classification (nth 0 cell))
|
2007-10-28 09:18:39 +00:00
|
|
|
(eq backend (nth 1 cell)))
|
2004-09-04 13:13:48 +00:00
|
|
|
(push cell new-cell-list)))
|
|
|
|
(gnus-registry-store-extra-entry
|
|
|
|
id
|
|
|
|
type
|
|
|
|
new-cell-list))
|
|
|
|
(progn
|
2007-10-28 09:18:39 +00:00
|
|
|
(gnus-error 7 (format "%s call with bad ID, type, spam-backend, or group"
|
|
|
|
"spam-log-undo-registration"))
|
2004-09-04 13:13:48 +00:00
|
|
|
nil))))
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;;}}}
|
|
|
|
|
|
|
|
;;{{{ backend functions
|
2004-09-04 13:13:48 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;;{{{ Gmane xrefs
|
|
|
|
(defun spam-check-gmane-xref ()
|
|
|
|
(let ((header (or
|
|
|
|
(message-fetch-field "Xref")
|
|
|
|
(message-fetch-field "Newsgroups"))))
|
|
|
|
(when header ; return nil when no header
|
|
|
|
(when (string-match spam-gmane-xref-spam-group
|
|
|
|
header)
|
|
|
|
spam-split-group))))
|
|
|
|
|
|
|
|
;;}}}
|
|
|
|
|
|
|
|
;;{{{ Regex body
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(defun spam-check-regex-body ()
|
|
|
|
(let ((spam-regex-headers-ham spam-regex-body-ham)
|
|
|
|
(spam-regex-headers-spam spam-regex-body-spam))
|
|
|
|
(spam-check-regex-headers t)))
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;;}}}
|
|
|
|
|
|
|
|
;;{{{ Regex headers
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(defun spam-check-regex-headers (&optional body)
|
|
|
|
(let ((type (if body "body" "header"))
|
|
|
|
ret found)
|
|
|
|
(dolist (h-regex spam-regex-headers-ham)
|
|
|
|
(unless found
|
|
|
|
(goto-char (point-min))
|
|
|
|
(when (re-search-forward h-regex nil t)
|
|
|
|
(message "Ham regex %s search positive." type)
|
|
|
|
(setq found t))))
|
|
|
|
(dolist (s-regex spam-regex-headers-spam)
|
|
|
|
(unless found
|
|
|
|
(goto-char (point-min))
|
|
|
|
(when (re-search-forward s-regex nil t)
|
|
|
|
(message "Spam regex %s search positive." type)
|
|
|
|
(setq found t)
|
|
|
|
(setq ret spam-split-group))))
|
|
|
|
ret))
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;;}}}
|
|
|
|
|
|
|
|
;;{{{ Blackholes.
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(defun spam-reverse-ip-string (ip)
|
|
|
|
(when (stringp ip)
|
|
|
|
(mapconcat 'identity
|
|
|
|
(nreverse (split-string ip "\\."))
|
|
|
|
".")))
|
|
|
|
|
|
|
|
(defun spam-check-blackholes ()
|
|
|
|
"Check the Received headers for blackholed relays."
|
2007-10-28 09:18:39 +00:00
|
|
|
(let ((headers (message-fetch-field "received"))
|
2004-09-04 13:13:48 +00:00
|
|
|
ips matches)
|
|
|
|
(when headers
|
|
|
|
(with-temp-buffer
|
|
|
|
(insert headers)
|
|
|
|
(goto-char (point-min))
|
2007-10-28 09:18:39 +00:00
|
|
|
(gnus-message 6 "Checking headers for relay addresses")
|
2004-09-04 13:13:48 +00:00
|
|
|
(while (re-search-forward
|
|
|
|
"\\([0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+\\)" nil t)
|
|
|
|
(gnus-message 9 "Blackhole search found host IP %s." (match-string 1))
|
|
|
|
(push (spam-reverse-ip-string (match-string 1))
|
|
|
|
ips)))
|
|
|
|
(dolist (server spam-blackhole-servers)
|
|
|
|
(dolist (ip ips)
|
|
|
|
(unless (and spam-blackhole-good-server-regex
|
|
|
|
;; match the good-server-regex against the reversed (again) IP string
|
|
|
|
(string-match
|
|
|
|
spam-blackhole-good-server-regex
|
|
|
|
(spam-reverse-ip-string ip)))
|
|
|
|
(unless matches
|
|
|
|
(let ((query-string (concat ip "." server)))
|
|
|
|
(if spam-use-dig
|
|
|
|
(let ((query-result (query-dig query-string)))
|
|
|
|
(when query-result
|
2007-10-28 09:18:39 +00:00
|
|
|
(gnus-message 6 "(DIG): positive blackhole check '%s'"
|
2004-09-04 13:13:48 +00:00
|
|
|
query-result)
|
|
|
|
(push (list ip server query-result)
|
|
|
|
matches)))
|
|
|
|
;; else, if not using dig.el
|
|
|
|
(when (query-dns query-string)
|
2007-10-28 09:18:39 +00:00
|
|
|
(gnus-message 6 "positive blackhole check")
|
2004-09-04 13:13:48 +00:00
|
|
|
(push (list ip server (query-dns query-string 'TXT))
|
|
|
|
matches)))))))))
|
|
|
|
(when matches
|
|
|
|
spam-split-group)))
|
2007-10-28 09:18:39 +00:00
|
|
|
;;}}}
|
2004-09-04 13:13:48 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;;{{{ Hashcash.
|
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-716
Merge from gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-74
Update from CVS
2004-12-02 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/message.el (message-forward-make-body-mml): Remove headers
according to message-forward-ignored-headers if a message is
decoded.
2004-12-02 Romain Francoise <romain@orebokech.com>
* lisp/gnus/message.el (message-forward-make-body-plain): Always remove
headers according to message-forward-ignored-headers.
2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/lpath.el: Remove bbdb-create-internal, bbdb-records,
spam-BBDB-register-routine and spam-enter-ham-BBDB.
* lisp/gnus/nnrss.el (nnrss-string-as-multibyte): Redefine it as a macro in
order to silence the byte compiler.
* lisp/gnus/pop3.el (pop3-md5): Define it before being used.
* lisp/gnus/spam.el: Fix the way to silence the byte compiler, which
complained about bbdb-buffer, bbdb-create-internal,
bbdb-search-simple, mail-check-payment, spam-BBDB-register-routine,
spam-enter-ham-BBDB, spam-stat-buffer-change-to-non-spam,
spam-stat-buffer-change-to-spam, spam-stat-buffer-is-non-spam,
spam-stat-buffer-is-spam, spam-stat-load,
spam-stat-register-ham-routine, spam-stat-register-spam-routine,
spam-stat-save and spam-stat-split-fancy.
2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/canlock.el (canlock-password): Remove `:size 0' or `:size 1'
which may confuse users.
(canlock-password-for-verify): Ditto.
* lisp/gnus/deuglify.el (gnus-outlook-deuglify-unwrap-stop-chars): Ditto.
* lisp/gnus/gnus-art.el (gnus-emphasis-alist): Ditto.
* lisp/gnus/gnus-registry.el (gnus-registry-max-entries): Ditto.
* lisp/gnus/gnus-score.el (gnus-adaptive-word-length-limit): Ditto.
* lisp/gnus/gnus-start.el (gnus-save-killed-list): Ditto.
* lisp/gnus/gnus-sum.el (gnus-thread-hide-subtree): Ditto.
(gnus-sum-thread-tree-root): Ditto.
(gnus-sum-thread-tree-false-root): Ditto.
(gnus-sum-thread-tree-single-indent): Ditto.
* lisp/gnus/message.el (message-courtesy-message): Ditto.
(message-archive-note): Ditto.
(message-subscribed-address-file): Ditto.
(message-user-fqdn): Ditto.
* lisp/gnus/spam-report.el (spam-report-gmane-regex): Ditto.
* lisp/gnus/spam.el (spam-blackhole-good-server-regex): Ditto.
2004-11-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/message.el (message-forbidden-properties): Fixed typo in doc
string.
2004-11-25 Lars Magne Ingebrigtsen <larsi@gnus.org>
* lisp/gnus/message.el (message-strip-forbidden-properties): Bind
buffer-read-only (etc) to nil.
2004-11-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-util.el (gnus-replace-in-string): Added doc string.
* lisp/gnus/nnmail.el (nnmail-split-header-length-limit): Increase to 2048
to avoid problems when splitting mails with many recipients.
2004-11-23 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/rfc2047.el (rfc2047-header-encoding-alist): Add In-Reply-To to
address-mime. Suggested by ARISAWA Akihiro <ari@mbf.ocn.ne.jp>.
2004-11-22 Marek Martin <marek.martin@mum.pri.ee> (tiny change)
* lisp/gnus/nnfolder.el (nnfolder-request-create-group): Save current buffer.
2004-11-22 Reiner Steib <Reiner.Steib@gmx.de>
* man/message.texi (Various Message Variables): Mention that all mail
file variables are derived from `message-directory'.
* man/gnus.texi (Splitting Mail): Clarify bogus group.
2004-11-16 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Filtering Spam Using The Spam ELisp Package):
2004-12-07 21:56:42 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(defun spam-check-hashcash ()
|
|
|
|
"Check the headers for hashcash payments."
|
|
|
|
(ignore-errors (mail-check-payment))) ;mail-check-payment returns a boolean
|
2004-09-04 13:13:48 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;;}}}
|
2004-09-04 13:13:48 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;;{{{ BBDB
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
;;; original idea for spam-check-BBDB from Alexander Kotelnikov
|
|
|
|
;;; <sacha@giotto.sj.ru>
|
|
|
|
|
|
|
|
;; all this is done inside a condition-case to trap errors
|
|
|
|
|
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-716
Merge from gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-74
Update from CVS
2004-12-02 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/message.el (message-forward-make-body-mml): Remove headers
according to message-forward-ignored-headers if a message is
decoded.
2004-12-02 Romain Francoise <romain@orebokech.com>
* lisp/gnus/message.el (message-forward-make-body-plain): Always remove
headers according to message-forward-ignored-headers.
2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/lpath.el: Remove bbdb-create-internal, bbdb-records,
spam-BBDB-register-routine and spam-enter-ham-BBDB.
* lisp/gnus/nnrss.el (nnrss-string-as-multibyte): Redefine it as a macro in
order to silence the byte compiler.
* lisp/gnus/pop3.el (pop3-md5): Define it before being used.
* lisp/gnus/spam.el: Fix the way to silence the byte compiler, which
complained about bbdb-buffer, bbdb-create-internal,
bbdb-search-simple, mail-check-payment, spam-BBDB-register-routine,
spam-enter-ham-BBDB, spam-stat-buffer-change-to-non-spam,
spam-stat-buffer-change-to-spam, spam-stat-buffer-is-non-spam,
spam-stat-buffer-is-spam, spam-stat-load,
spam-stat-register-ham-routine, spam-stat-register-spam-routine,
spam-stat-save and spam-stat-split-fancy.
2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/canlock.el (canlock-password): Remove `:size 0' or `:size 1'
which may confuse users.
(canlock-password-for-verify): Ditto.
* lisp/gnus/deuglify.el (gnus-outlook-deuglify-unwrap-stop-chars): Ditto.
* lisp/gnus/gnus-art.el (gnus-emphasis-alist): Ditto.
* lisp/gnus/gnus-registry.el (gnus-registry-max-entries): Ditto.
* lisp/gnus/gnus-score.el (gnus-adaptive-word-length-limit): Ditto.
* lisp/gnus/gnus-start.el (gnus-save-killed-list): Ditto.
* lisp/gnus/gnus-sum.el (gnus-thread-hide-subtree): Ditto.
(gnus-sum-thread-tree-root): Ditto.
(gnus-sum-thread-tree-false-root): Ditto.
(gnus-sum-thread-tree-single-indent): Ditto.
* lisp/gnus/message.el (message-courtesy-message): Ditto.
(message-archive-note): Ditto.
(message-subscribed-address-file): Ditto.
(message-user-fqdn): Ditto.
* lisp/gnus/spam-report.el (spam-report-gmane-regex): Ditto.
* lisp/gnus/spam.el (spam-blackhole-good-server-regex): Ditto.
2004-11-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/message.el (message-forbidden-properties): Fixed typo in doc
string.
2004-11-25 Lars Magne Ingebrigtsen <larsi@gnus.org>
* lisp/gnus/message.el (message-strip-forbidden-properties): Bind
buffer-read-only (etc) to nil.
2004-11-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-util.el (gnus-replace-in-string): Added doc string.
* lisp/gnus/nnmail.el (nnmail-split-header-length-limit): Increase to 2048
to avoid problems when splitting mails with many recipients.
2004-11-23 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/rfc2047.el (rfc2047-header-encoding-alist): Add In-Reply-To to
address-mime. Suggested by ARISAWA Akihiro <ari@mbf.ocn.ne.jp>.
2004-11-22 Marek Martin <marek.martin@mum.pri.ee> (tiny change)
* lisp/gnus/nnfolder.el (nnfolder-request-create-group): Save current buffer.
2004-11-22 Reiner Steib <Reiner.Steib@gmx.de>
* man/message.texi (Various Message Variables): Mention that all mail
file variables are derived from `message-directory'.
* man/gnus.texi (Splitting Mail): Clarify bogus group.
2004-11-16 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Filtering Spam Using The Spam ELisp Package):
2004-12-07 21:56:42 +00:00
|
|
|
(eval-when-compile
|
|
|
|
(autoload 'bbdb-buffer "bbdb")
|
|
|
|
(autoload 'bbdb-create-internal "bbdb")
|
|
|
|
(autoload 'bbdb-search-simple "bbdb"))
|
|
|
|
|
2007-12-11 05:20:26 +00:00
|
|
|
;; Autoloaded in message, which we require.
|
|
|
|
(declare-function gnus-extract-address-components "gnus-util" (from))
|
|
|
|
|
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-716
Merge from gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-74
Update from CVS
2004-12-02 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/message.el (message-forward-make-body-mml): Remove headers
according to message-forward-ignored-headers if a message is
decoded.
2004-12-02 Romain Francoise <romain@orebokech.com>
* lisp/gnus/message.el (message-forward-make-body-plain): Always remove
headers according to message-forward-ignored-headers.
2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/lpath.el: Remove bbdb-create-internal, bbdb-records,
spam-BBDB-register-routine and spam-enter-ham-BBDB.
* lisp/gnus/nnrss.el (nnrss-string-as-multibyte): Redefine it as a macro in
order to silence the byte compiler.
* lisp/gnus/pop3.el (pop3-md5): Define it before being used.
* lisp/gnus/spam.el: Fix the way to silence the byte compiler, which
complained about bbdb-buffer, bbdb-create-internal,
bbdb-search-simple, mail-check-payment, spam-BBDB-register-routine,
spam-enter-ham-BBDB, spam-stat-buffer-change-to-non-spam,
spam-stat-buffer-change-to-spam, spam-stat-buffer-is-non-spam,
spam-stat-buffer-is-spam, spam-stat-load,
spam-stat-register-ham-routine, spam-stat-register-spam-routine,
spam-stat-save and spam-stat-split-fancy.
2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/canlock.el (canlock-password): Remove `:size 0' or `:size 1'
which may confuse users.
(canlock-password-for-verify): Ditto.
* lisp/gnus/deuglify.el (gnus-outlook-deuglify-unwrap-stop-chars): Ditto.
* lisp/gnus/gnus-art.el (gnus-emphasis-alist): Ditto.
* lisp/gnus/gnus-registry.el (gnus-registry-max-entries): Ditto.
* lisp/gnus/gnus-score.el (gnus-adaptive-word-length-limit): Ditto.
* lisp/gnus/gnus-start.el (gnus-save-killed-list): Ditto.
* lisp/gnus/gnus-sum.el (gnus-thread-hide-subtree): Ditto.
(gnus-sum-thread-tree-root): Ditto.
(gnus-sum-thread-tree-false-root): Ditto.
(gnus-sum-thread-tree-single-indent): Ditto.
* lisp/gnus/message.el (message-courtesy-message): Ditto.
(message-archive-note): Ditto.
(message-subscribed-address-file): Ditto.
(message-user-fqdn): Ditto.
* lisp/gnus/spam-report.el (spam-report-gmane-regex): Ditto.
* lisp/gnus/spam.el (spam-blackhole-good-server-regex): Ditto.
2004-11-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/message.el (message-forbidden-properties): Fixed typo in doc
string.
2004-11-25 Lars Magne Ingebrigtsen <larsi@gnus.org>
* lisp/gnus/message.el (message-strip-forbidden-properties): Bind
buffer-read-only (etc) to nil.
2004-11-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-util.el (gnus-replace-in-string): Added doc string.
* lisp/gnus/nnmail.el (nnmail-split-header-length-limit): Increase to 2048
to avoid problems when splitting mails with many recipients.
2004-11-23 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/rfc2047.el (rfc2047-header-encoding-alist): Add In-Reply-To to
address-mime. Suggested by ARISAWA Akihiro <ari@mbf.ocn.ne.jp>.
2004-11-22 Marek Martin <marek.martin@mum.pri.ee> (tiny change)
* lisp/gnus/nnfolder.el (nnfolder-request-create-group): Save current buffer.
2004-11-22 Reiner Steib <Reiner.Steib@gmx.de>
* man/message.texi (Various Message Variables): Mention that all mail
file variables are derived from `message-directory'.
* man/gnus.texi (Splitting Mail): Clarify bogus group.
2004-11-16 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Filtering Spam Using The Spam ELisp Package):
2004-12-07 21:56:42 +00:00
|
|
|
(eval-and-compile
|
|
|
|
(when (condition-case nil
|
|
|
|
(progn
|
|
|
|
(require 'bbdb)
|
|
|
|
(require 'bbdb-com))
|
|
|
|
(file-error
|
2007-10-28 09:18:39 +00:00
|
|
|
;; `bbdb-records' should not be bound as an autoload function
|
|
|
|
;; before loading bbdb because of `bbdb-hashtable-size'.
|
|
|
|
(defalias 'bbdb-records 'ignore)
|
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-716
Merge from gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-74
Update from CVS
2004-12-02 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/message.el (message-forward-make-body-mml): Remove headers
according to message-forward-ignored-headers if a message is
decoded.
2004-12-02 Romain Francoise <romain@orebokech.com>
* lisp/gnus/message.el (message-forward-make-body-plain): Always remove
headers according to message-forward-ignored-headers.
2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/lpath.el: Remove bbdb-create-internal, bbdb-records,
spam-BBDB-register-routine and spam-enter-ham-BBDB.
* lisp/gnus/nnrss.el (nnrss-string-as-multibyte): Redefine it as a macro in
order to silence the byte compiler.
* lisp/gnus/pop3.el (pop3-md5): Define it before being used.
* lisp/gnus/spam.el: Fix the way to silence the byte compiler, which
complained about bbdb-buffer, bbdb-create-internal,
bbdb-search-simple, mail-check-payment, spam-BBDB-register-routine,
spam-enter-ham-BBDB, spam-stat-buffer-change-to-non-spam,
spam-stat-buffer-change-to-spam, spam-stat-buffer-is-non-spam,
spam-stat-buffer-is-spam, spam-stat-load,
spam-stat-register-ham-routine, spam-stat-register-spam-routine,
spam-stat-save and spam-stat-split-fancy.
2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/canlock.el (canlock-password): Remove `:size 0' or `:size 1'
which may confuse users.
(canlock-password-for-verify): Ditto.
* lisp/gnus/deuglify.el (gnus-outlook-deuglify-unwrap-stop-chars): Ditto.
* lisp/gnus/gnus-art.el (gnus-emphasis-alist): Ditto.
* lisp/gnus/gnus-registry.el (gnus-registry-max-entries): Ditto.
* lisp/gnus/gnus-score.el (gnus-adaptive-word-length-limit): Ditto.
* lisp/gnus/gnus-start.el (gnus-save-killed-list): Ditto.
* lisp/gnus/gnus-sum.el (gnus-thread-hide-subtree): Ditto.
(gnus-sum-thread-tree-root): Ditto.
(gnus-sum-thread-tree-false-root): Ditto.
(gnus-sum-thread-tree-single-indent): Ditto.
* lisp/gnus/message.el (message-courtesy-message): Ditto.
(message-archive-note): Ditto.
(message-subscribed-address-file): Ditto.
(message-user-fqdn): Ditto.
* lisp/gnus/spam-report.el (spam-report-gmane-regex): Ditto.
* lisp/gnus/spam.el (spam-blackhole-good-server-regex): Ditto.
2004-11-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/message.el (message-forbidden-properties): Fixed typo in doc
string.
2004-11-25 Lars Magne Ingebrigtsen <larsi@gnus.org>
* lisp/gnus/message.el (message-strip-forbidden-properties): Bind
buffer-read-only (etc) to nil.
2004-11-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-util.el (gnus-replace-in-string): Added doc string.
* lisp/gnus/nnmail.el (nnmail-split-header-length-limit): Increase to 2048
to avoid problems when splitting mails with many recipients.
2004-11-23 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/rfc2047.el (rfc2047-header-encoding-alist): Add In-Reply-To to
address-mime. Suggested by ARISAWA Akihiro <ari@mbf.ocn.ne.jp>.
2004-11-22 Marek Martin <marek.martin@mum.pri.ee> (tiny change)
* lisp/gnus/nnfolder.el (nnfolder-request-create-group): Save current buffer.
2004-11-22 Reiner Steib <Reiner.Steib@gmx.de>
* man/message.texi (Various Message Variables): Mention that all mail
file variables are derived from `message-directory'.
* man/gnus.texi (Splitting Mail): Clarify bogus group.
2004-11-16 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Filtering Spam Using The Spam ELisp Package):
2004-12-07 21:56:42 +00:00
|
|
|
(defalias 'spam-BBDB-register-routine 'ignore)
|
|
|
|
(defalias 'spam-enter-ham-BBDB 'ignore)
|
|
|
|
nil))
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;; when the BBDB changes, we want to clear out our cache
|
|
|
|
(defun spam-clear-cache-BBDB (&rest immaterial)
|
|
|
|
(spam-clear-cache 'spam-use-BBDB))
|
|
|
|
|
|
|
|
(add-hook 'bbdb-change-hook 'spam-clear-cache-BBDB)
|
|
|
|
|
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-716
Merge from gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-74
Update from CVS
2004-12-02 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/message.el (message-forward-make-body-mml): Remove headers
according to message-forward-ignored-headers if a message is
decoded.
2004-12-02 Romain Francoise <romain@orebokech.com>
* lisp/gnus/message.el (message-forward-make-body-plain): Always remove
headers according to message-forward-ignored-headers.
2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/lpath.el: Remove bbdb-create-internal, bbdb-records,
spam-BBDB-register-routine and spam-enter-ham-BBDB.
* lisp/gnus/nnrss.el (nnrss-string-as-multibyte): Redefine it as a macro in
order to silence the byte compiler.
* lisp/gnus/pop3.el (pop3-md5): Define it before being used.
* lisp/gnus/spam.el: Fix the way to silence the byte compiler, which
complained about bbdb-buffer, bbdb-create-internal,
bbdb-search-simple, mail-check-payment, spam-BBDB-register-routine,
spam-enter-ham-BBDB, spam-stat-buffer-change-to-non-spam,
spam-stat-buffer-change-to-spam, spam-stat-buffer-is-non-spam,
spam-stat-buffer-is-spam, spam-stat-load,
spam-stat-register-ham-routine, spam-stat-register-spam-routine,
spam-stat-save and spam-stat-split-fancy.
2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/canlock.el (canlock-password): Remove `:size 0' or `:size 1'
which may confuse users.
(canlock-password-for-verify): Ditto.
* lisp/gnus/deuglify.el (gnus-outlook-deuglify-unwrap-stop-chars): Ditto.
* lisp/gnus/gnus-art.el (gnus-emphasis-alist): Ditto.
* lisp/gnus/gnus-registry.el (gnus-registry-max-entries): Ditto.
* lisp/gnus/gnus-score.el (gnus-adaptive-word-length-limit): Ditto.
* lisp/gnus/gnus-start.el (gnus-save-killed-list): Ditto.
* lisp/gnus/gnus-sum.el (gnus-thread-hide-subtree): Ditto.
(gnus-sum-thread-tree-root): Ditto.
(gnus-sum-thread-tree-false-root): Ditto.
(gnus-sum-thread-tree-single-indent): Ditto.
* lisp/gnus/message.el (message-courtesy-message): Ditto.
(message-archive-note): Ditto.
(message-subscribed-address-file): Ditto.
(message-user-fqdn): Ditto.
* lisp/gnus/spam-report.el (spam-report-gmane-regex): Ditto.
* lisp/gnus/spam.el (spam-blackhole-good-server-regex): Ditto.
2004-11-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/message.el (message-forbidden-properties): Fixed typo in doc
string.
2004-11-25 Lars Magne Ingebrigtsen <larsi@gnus.org>
* lisp/gnus/message.el (message-strip-forbidden-properties): Bind
buffer-read-only (etc) to nil.
2004-11-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-util.el (gnus-replace-in-string): Added doc string.
* lisp/gnus/nnmail.el (nnmail-split-header-length-limit): Increase to 2048
to avoid problems when splitting mails with many recipients.
2004-11-23 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/rfc2047.el (rfc2047-header-encoding-alist): Add In-Reply-To to
address-mime. Suggested by ARISAWA Akihiro <ari@mbf.ocn.ne.jp>.
2004-11-22 Marek Martin <marek.martin@mum.pri.ee> (tiny change)
* lisp/gnus/nnfolder.el (nnfolder-request-create-group): Save current buffer.
2004-11-22 Reiner Steib <Reiner.Steib@gmx.de>
* man/message.texi (Various Message Variables): Mention that all mail
file variables are derived from `message-directory'.
* man/gnus.texi (Splitting Mail): Clarify bogus group.
2004-11-16 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Filtering Spam Using The Spam ELisp Package):
2004-12-07 21:56:42 +00:00
|
|
|
(defun spam-enter-ham-BBDB (addresses &optional remove)
|
|
|
|
"Enter an address into the BBDB; implies ham (non-spam) sender"
|
|
|
|
(dolist (from addresses)
|
|
|
|
(when (stringp from)
|
|
|
|
(let* ((parsed-address (gnus-extract-address-components from))
|
|
|
|
(name (or (nth 0 parsed-address) "Ham Sender"))
|
|
|
|
(remove-function (if remove
|
|
|
|
'bbdb-delete-record-internal
|
|
|
|
'ignore))
|
|
|
|
(net-address (nth 1 parsed-address))
|
|
|
|
(record (and net-address
|
|
|
|
(bbdb-search-simple nil net-address))))
|
|
|
|
(when net-address
|
2007-10-28 09:18:39 +00:00
|
|
|
(gnus-message 6 "%s address %s %s BBDB"
|
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-716
Merge from gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-74
Update from CVS
2004-12-02 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/message.el (message-forward-make-body-mml): Remove headers
according to message-forward-ignored-headers if a message is
decoded.
2004-12-02 Romain Francoise <romain@orebokech.com>
* lisp/gnus/message.el (message-forward-make-body-plain): Always remove
headers according to message-forward-ignored-headers.
2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/lpath.el: Remove bbdb-create-internal, bbdb-records,
spam-BBDB-register-routine and spam-enter-ham-BBDB.
* lisp/gnus/nnrss.el (nnrss-string-as-multibyte): Redefine it as a macro in
order to silence the byte compiler.
* lisp/gnus/pop3.el (pop3-md5): Define it before being used.
* lisp/gnus/spam.el: Fix the way to silence the byte compiler, which
complained about bbdb-buffer, bbdb-create-internal,
bbdb-search-simple, mail-check-payment, spam-BBDB-register-routine,
spam-enter-ham-BBDB, spam-stat-buffer-change-to-non-spam,
spam-stat-buffer-change-to-spam, spam-stat-buffer-is-non-spam,
spam-stat-buffer-is-spam, spam-stat-load,
spam-stat-register-ham-routine, spam-stat-register-spam-routine,
spam-stat-save and spam-stat-split-fancy.
2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/canlock.el (canlock-password): Remove `:size 0' or `:size 1'
which may confuse users.
(canlock-password-for-verify): Ditto.
* lisp/gnus/deuglify.el (gnus-outlook-deuglify-unwrap-stop-chars): Ditto.
* lisp/gnus/gnus-art.el (gnus-emphasis-alist): Ditto.
* lisp/gnus/gnus-registry.el (gnus-registry-max-entries): Ditto.
* lisp/gnus/gnus-score.el (gnus-adaptive-word-length-limit): Ditto.
* lisp/gnus/gnus-start.el (gnus-save-killed-list): Ditto.
* lisp/gnus/gnus-sum.el (gnus-thread-hide-subtree): Ditto.
(gnus-sum-thread-tree-root): Ditto.
(gnus-sum-thread-tree-false-root): Ditto.
(gnus-sum-thread-tree-single-indent): Ditto.
* lisp/gnus/message.el (message-courtesy-message): Ditto.
(message-archive-note): Ditto.
(message-subscribed-address-file): Ditto.
(message-user-fqdn): Ditto.
* lisp/gnus/spam-report.el (spam-report-gmane-regex): Ditto.
* lisp/gnus/spam.el (spam-blackhole-good-server-regex): Ditto.
2004-11-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/message.el (message-forbidden-properties): Fixed typo in doc
string.
2004-11-25 Lars Magne Ingebrigtsen <larsi@gnus.org>
* lisp/gnus/message.el (message-strip-forbidden-properties): Bind
buffer-read-only (etc) to nil.
2004-11-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-util.el (gnus-replace-in-string): Added doc string.
* lisp/gnus/nnmail.el (nnmail-split-header-length-limit): Increase to 2048
to avoid problems when splitting mails with many recipients.
2004-11-23 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/rfc2047.el (rfc2047-header-encoding-alist): Add In-Reply-To to
address-mime. Suggested by ARISAWA Akihiro <ari@mbf.ocn.ne.jp>.
2004-11-22 Marek Martin <marek.martin@mum.pri.ee> (tiny change)
* lisp/gnus/nnfolder.el (nnfolder-request-create-group): Save current buffer.
2004-11-22 Reiner Steib <Reiner.Steib@gmx.de>
* man/message.texi (Various Message Variables): Mention that all mail
file variables are derived from `message-directory'.
* man/gnus.texi (Splitting Mail): Clarify bogus group.
2004-11-16 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Filtering Spam Using The Spam ELisp Package):
2004-12-07 21:56:42 +00:00
|
|
|
(if remove "Deleting" "Adding")
|
|
|
|
from
|
|
|
|
(if remove "from" "to"))
|
|
|
|
(if record
|
|
|
|
(funcall remove-function record)
|
|
|
|
(bbdb-create-internal name nil net-address nil nil
|
|
|
|
"ham sender added by spam.el")))))))
|
|
|
|
|
|
|
|
(defun spam-BBDB-register-routine (articles &optional unregister)
|
|
|
|
(let (addresses)
|
|
|
|
(dolist (article articles)
|
|
|
|
(when (stringp (spam-fetch-field-from-fast article))
|
|
|
|
(push (spam-fetch-field-from-fast article) addresses)))
|
|
|
|
;; now do the register/unregister action
|
|
|
|
(spam-enter-ham-BBDB addresses unregister)))
|
|
|
|
|
|
|
|
(defun spam-BBDB-unregister-routine (articles)
|
|
|
|
(spam-BBDB-register-routine articles t))
|
|
|
|
|
|
|
|
(defun spam-check-BBDB ()
|
|
|
|
"Mail from people in the BBDB is classified as ham or non-spam"
|
2007-10-28 09:18:39 +00:00
|
|
|
(let ((who (message-fetch-field "from"))
|
|
|
|
bbdb-cache bbdb-hashtable)
|
|
|
|
(when spam-cache-lookups
|
|
|
|
(setq bbdb-cache (gethash 'spam-use-BBDB spam-caches))
|
|
|
|
(unless bbdb-cache
|
|
|
|
(setq bbdb-cache (make-vector 17 0)) ; a good starting hash value
|
|
|
|
;; this is based on the expanded (bbdb-hashtable) macro
|
|
|
|
;; without the debugging support
|
|
|
|
(with-current-buffer (bbdb-buffer)
|
|
|
|
(save-excursion
|
|
|
|
(save-window-excursion
|
|
|
|
(bbdb-records nil t)
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(mapatoms
|
2007-10-28 09:18:39 +00:00
|
|
|
(lambda (symbol)
|
|
|
|
(intern (downcase (symbol-name symbol)) bbdb-cache))
|
|
|
|
bbdb-hashtable))))
|
|
|
|
(puthash 'spam-use-BBDB bbdb-cache spam-caches)))
|
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-716
Merge from gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-74
Update from CVS
2004-12-02 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/message.el (message-forward-make-body-mml): Remove headers
according to message-forward-ignored-headers if a message is
decoded.
2004-12-02 Romain Francoise <romain@orebokech.com>
* lisp/gnus/message.el (message-forward-make-body-plain): Always remove
headers according to message-forward-ignored-headers.
2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/lpath.el: Remove bbdb-create-internal, bbdb-records,
spam-BBDB-register-routine and spam-enter-ham-BBDB.
* lisp/gnus/nnrss.el (nnrss-string-as-multibyte): Redefine it as a macro in
order to silence the byte compiler.
* lisp/gnus/pop3.el (pop3-md5): Define it before being used.
* lisp/gnus/spam.el: Fix the way to silence the byte compiler, which
complained about bbdb-buffer, bbdb-create-internal,
bbdb-search-simple, mail-check-payment, spam-BBDB-register-routine,
spam-enter-ham-BBDB, spam-stat-buffer-change-to-non-spam,
spam-stat-buffer-change-to-spam, spam-stat-buffer-is-non-spam,
spam-stat-buffer-is-spam, spam-stat-load,
spam-stat-register-ham-routine, spam-stat-register-spam-routine,
spam-stat-save and spam-stat-split-fancy.
2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/canlock.el (canlock-password): Remove `:size 0' or `:size 1'
which may confuse users.
(canlock-password-for-verify): Ditto.
* lisp/gnus/deuglify.el (gnus-outlook-deuglify-unwrap-stop-chars): Ditto.
* lisp/gnus/gnus-art.el (gnus-emphasis-alist): Ditto.
* lisp/gnus/gnus-registry.el (gnus-registry-max-entries): Ditto.
* lisp/gnus/gnus-score.el (gnus-adaptive-word-length-limit): Ditto.
* lisp/gnus/gnus-start.el (gnus-save-killed-list): Ditto.
* lisp/gnus/gnus-sum.el (gnus-thread-hide-subtree): Ditto.
(gnus-sum-thread-tree-root): Ditto.
(gnus-sum-thread-tree-false-root): Ditto.
(gnus-sum-thread-tree-single-indent): Ditto.
* lisp/gnus/message.el (message-courtesy-message): Ditto.
(message-archive-note): Ditto.
(message-subscribed-address-file): Ditto.
(message-user-fqdn): Ditto.
* lisp/gnus/spam-report.el (spam-report-gmane-regex): Ditto.
* lisp/gnus/spam.el (spam-blackhole-good-server-regex): Ditto.
2004-11-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/message.el (message-forbidden-properties): Fixed typo in doc
string.
2004-11-25 Lars Magne Ingebrigtsen <larsi@gnus.org>
* lisp/gnus/message.el (message-strip-forbidden-properties): Bind
buffer-read-only (etc) to nil.
2004-11-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-util.el (gnus-replace-in-string): Added doc string.
* lisp/gnus/nnmail.el (nnmail-split-header-length-limit): Increase to 2048
to avoid problems when splitting mails with many recipients.
2004-11-23 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/rfc2047.el (rfc2047-header-encoding-alist): Add In-Reply-To to
address-mime. Suggested by ARISAWA Akihiro <ari@mbf.ocn.ne.jp>.
2004-11-22 Marek Martin <marek.martin@mum.pri.ee> (tiny change)
* lisp/gnus/nnfolder.el (nnfolder-request-create-group): Save current buffer.
2004-11-22 Reiner Steib <Reiner.Steib@gmx.de>
* man/message.texi (Various Message Variables): Mention that all mail
file variables are derived from `message-directory'.
* man/gnus.texi (Splitting Mail): Clarify bogus group.
2004-11-16 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Filtering Spam Using The Spam ELisp Package):
2004-12-07 21:56:42 +00:00
|
|
|
(when who
|
|
|
|
(setq who (nth 1 (gnus-extract-address-components who)))
|
2007-10-28 09:18:39 +00:00
|
|
|
(if
|
|
|
|
(if spam-cache-lookups
|
|
|
|
(intern-soft (downcase who) bbdb-cache)
|
|
|
|
(bbdb-search-simple nil who))
|
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-716
Merge from gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-74
Update from CVS
2004-12-02 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/message.el (message-forward-make-body-mml): Remove headers
according to message-forward-ignored-headers if a message is
decoded.
2004-12-02 Romain Francoise <romain@orebokech.com>
* lisp/gnus/message.el (message-forward-make-body-plain): Always remove
headers according to message-forward-ignored-headers.
2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/lpath.el: Remove bbdb-create-internal, bbdb-records,
spam-BBDB-register-routine and spam-enter-ham-BBDB.
* lisp/gnus/nnrss.el (nnrss-string-as-multibyte): Redefine it as a macro in
order to silence the byte compiler.
* lisp/gnus/pop3.el (pop3-md5): Define it before being used.
* lisp/gnus/spam.el: Fix the way to silence the byte compiler, which
complained about bbdb-buffer, bbdb-create-internal,
bbdb-search-simple, mail-check-payment, spam-BBDB-register-routine,
spam-enter-ham-BBDB, spam-stat-buffer-change-to-non-spam,
spam-stat-buffer-change-to-spam, spam-stat-buffer-is-non-spam,
spam-stat-buffer-is-spam, spam-stat-load,
spam-stat-register-ham-routine, spam-stat-register-spam-routine,
spam-stat-save and spam-stat-split-fancy.
2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/canlock.el (canlock-password): Remove `:size 0' or `:size 1'
which may confuse users.
(canlock-password-for-verify): Ditto.
* lisp/gnus/deuglify.el (gnus-outlook-deuglify-unwrap-stop-chars): Ditto.
* lisp/gnus/gnus-art.el (gnus-emphasis-alist): Ditto.
* lisp/gnus/gnus-registry.el (gnus-registry-max-entries): Ditto.
* lisp/gnus/gnus-score.el (gnus-adaptive-word-length-limit): Ditto.
* lisp/gnus/gnus-start.el (gnus-save-killed-list): Ditto.
* lisp/gnus/gnus-sum.el (gnus-thread-hide-subtree): Ditto.
(gnus-sum-thread-tree-root): Ditto.
(gnus-sum-thread-tree-false-root): Ditto.
(gnus-sum-thread-tree-single-indent): Ditto.
* lisp/gnus/message.el (message-courtesy-message): Ditto.
(message-archive-note): Ditto.
(message-subscribed-address-file): Ditto.
(message-user-fqdn): Ditto.
* lisp/gnus/spam-report.el (spam-report-gmane-regex): Ditto.
* lisp/gnus/spam.el (spam-blackhole-good-server-regex): Ditto.
2004-11-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/message.el (message-forbidden-properties): Fixed typo in doc
string.
2004-11-25 Lars Magne Ingebrigtsen <larsi@gnus.org>
* lisp/gnus/message.el (message-strip-forbidden-properties): Bind
buffer-read-only (etc) to nil.
2004-11-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-util.el (gnus-replace-in-string): Added doc string.
* lisp/gnus/nnmail.el (nnmail-split-header-length-limit): Increase to 2048
to avoid problems when splitting mails with many recipients.
2004-11-23 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/rfc2047.el (rfc2047-header-encoding-alist): Add In-Reply-To to
address-mime. Suggested by ARISAWA Akihiro <ari@mbf.ocn.ne.jp>.
2004-11-22 Marek Martin <marek.martin@mum.pri.ee> (tiny change)
* lisp/gnus/nnfolder.el (nnfolder-request-create-group): Save current buffer.
2004-11-22 Reiner Steib <Reiner.Steib@gmx.de>
* man/message.texi (Various Message Variables): Mention that all mail
file variables are derived from `message-directory'.
* man/gnus.texi (Splitting Mail): Clarify bogus group.
2004-11-16 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Filtering Spam Using The Spam ELisp Package):
2004-12-07 21:56:42 +00:00
|
|
|
t
|
|
|
|
(if spam-use-BBDB-exclusive
|
|
|
|
spam-split-group
|
|
|
|
nil)))))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;;}}}
|
|
|
|
|
|
|
|
;;{{{ ifile
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
;;; check the ifile backend; return nil if the mail was NOT classified
|
|
|
|
;;; as spam
|
|
|
|
|
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 179-183)
- Update from CVS
2006-12-25 Daiki Ueno <ueno@unixuser.org>
* lisp/pgg-def.el (pgg-passphrase-coding-system): Default to nil instead of
locale-coding-system.
* lisp/pgg-gpg.el (pgg-gpg-process-region): Encode passphrase with eol-type
LF.
2006-12-29 Jouni K. Sepp,Ad(Bnen <jks@iki.fi>
* lisp/gnus/nnimap.el (nnimap-expunge-search-string): Mention
nnimap-search-uids-not-since-is-evil in docstring.
2006-12-28 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/spam.el: Revert to make-obsolete-variable because
define-obsolete-variable-alias is not supported in Emacs 21.
2006-12-28 Daiki Ueno <ueno@unixuser.org>
* lisp/gnus/gnus-sum.el (gnus-summary-next-article): Make sure we are in the
summary buffer.
2006-12-27 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/spam.el (spam-ifile-path, spam-ifile-database-path)
(spam-bogofilter-path): Use define-obsolete-variable-alias instead of
make-obsolete-variable.
2006-12-26 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/message.el (message-make-fqdn): Fix comment.
(message-bogus-system-names): Add ".local".
* lisp/gnus/spam.el (spam-ifile-path, spam-ifile-program)
(spam-ifile-database-path, spam-ifile-database)
(spam-bogofilter-path, spam-bogofilter-program): Rename variables.
Don't use "path" inappropriately.
(spam-spamoracle-database, spam-get-ifile-database-parameter): Fix doc
strings.
(spam-check-ifile, spam-ifile-register-with-ifile)
(spam-check-bogofilter, spam-bogofilter-register-with-bogofilter): Use
new variable names.
* lisp/gnus/gnus-art.el (gnus-treat-display-x-face, gnus-treat-display-face)
(gnus-treat-display-smileys): Simplify using
gnus-image-type-available-p.
* lisp/gnus/gnus-ems.el (gnus-image-type-available-p): Use display-images-p if
available.
2006-12-22 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/nnrss.el (nnrss-fetch): Replace buffer's contents with the decoded
one after turning on the buffer's multibyteness instead of decoding
them directly in the unibyte buffer that causes unexpected conversion
in Emacs 23 (unicode).
2006-12-29 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Customizing Articles): Add index entries for all
gnus-treat-* variables.
2006-12-29 Jouni K. Sepp,Ad(Bnen <jks@iki.fi>
* man/gnus.texi (IMAP): Fix incorrect explanation of
nnimap-search-uids-not-since-is-evil in documentation for
nnimap-expunge-search-string.
2006-12-27 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (ifile spam filtering): Rename spam-ifile-database-path to
spam-ifile-database.
2006-12-26 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Spam Package Configuration Examples): Don't encourage to
rebind C-s.
2006-12-26 Jouni K. Sepp,Ad(Bnen <jks@iki.fi>
* man/gnus.texi (Group Parameters, Group Maintenance, Topic Commands)
(Mail Group Commands, Expiring Mail, IMAP): Add index entries for
"expiring mail".
(IMAP): Document nnimap-search-uids-not-since-is-evil and
nnimap-nov-is-evil.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-576
2006-12-30 15:34:42 +00:00
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defun spam-get-ifile-database-parameter ()
|
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 179-183)
- Update from CVS
2006-12-25 Daiki Ueno <ueno@unixuser.org>
* lisp/pgg-def.el (pgg-passphrase-coding-system): Default to nil instead of
locale-coding-system.
* lisp/pgg-gpg.el (pgg-gpg-process-region): Encode passphrase with eol-type
LF.
2006-12-29 Jouni K. Sepp,Ad(Bnen <jks@iki.fi>
* lisp/gnus/nnimap.el (nnimap-expunge-search-string): Mention
nnimap-search-uids-not-since-is-evil in docstring.
2006-12-28 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/spam.el: Revert to make-obsolete-variable because
define-obsolete-variable-alias is not supported in Emacs 21.
2006-12-28 Daiki Ueno <ueno@unixuser.org>
* lisp/gnus/gnus-sum.el (gnus-summary-next-article): Make sure we are in the
summary buffer.
2006-12-27 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/spam.el (spam-ifile-path, spam-ifile-database-path)
(spam-bogofilter-path): Use define-obsolete-variable-alias instead of
make-obsolete-variable.
2006-12-26 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/message.el (message-make-fqdn): Fix comment.
(message-bogus-system-names): Add ".local".
* lisp/gnus/spam.el (spam-ifile-path, spam-ifile-program)
(spam-ifile-database-path, spam-ifile-database)
(spam-bogofilter-path, spam-bogofilter-program): Rename variables.
Don't use "path" inappropriately.
(spam-spamoracle-database, spam-get-ifile-database-parameter): Fix doc
strings.
(spam-check-ifile, spam-ifile-register-with-ifile)
(spam-check-bogofilter, spam-bogofilter-register-with-bogofilter): Use
new variable names.
* lisp/gnus/gnus-art.el (gnus-treat-display-x-face, gnus-treat-display-face)
(gnus-treat-display-smileys): Simplify using
gnus-image-type-available-p.
* lisp/gnus/gnus-ems.el (gnus-image-type-available-p): Use display-images-p if
available.
2006-12-22 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/nnrss.el (nnrss-fetch): Replace buffer's contents with the decoded
one after turning on the buffer's multibyteness instead of decoding
them directly in the unibyte buffer that causes unexpected conversion
in Emacs 23 (unicode).
2006-12-29 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Customizing Articles): Add index entries for all
gnus-treat-* variables.
2006-12-29 Jouni K. Sepp,Ad(Bnen <jks@iki.fi>
* man/gnus.texi (IMAP): Fix incorrect explanation of
nnimap-search-uids-not-since-is-evil in documentation for
nnimap-expunge-search-string.
2006-12-27 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (ifile spam filtering): Rename spam-ifile-database-path to
spam-ifile-database.
2006-12-26 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Spam Package Configuration Examples): Don't encourage to
rebind C-s.
2006-12-26 Jouni K. Sepp,Ad(Bnen <jks@iki.fi>
* man/gnus.texi (Group Parameters, Group Maintenance, Topic Commands)
(Mail Group Commands, Expiring Mail, IMAP): Add index entries for
"expiring mail".
(IMAP): Document nnimap-search-uids-not-since-is-evil and
nnimap-nov-is-evil.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-576
2006-12-30 15:34:42 +00:00
|
|
|
"Return the command-line parameter for ifile's database.
|
|
|
|
See `spam-ifile-database'."
|
|
|
|
(if spam-ifile-database
|
|
|
|
(format "--db-file=%s" spam-ifile-database)
|
2004-09-04 13:13:48 +00:00
|
|
|
nil))
|
|
|
|
|
|
|
|
(defun spam-check-ifile ()
|
|
|
|
"Check the ifile backend for the classification of this message."
|
|
|
|
(let ((article-buffer-name (buffer-name))
|
|
|
|
category return)
|
|
|
|
(with-temp-buffer
|
|
|
|
(let ((temp-buffer-name (buffer-name))
|
|
|
|
(db-param (spam-get-ifile-database-parameter)))
|
|
|
|
(save-excursion
|
|
|
|
(set-buffer article-buffer-name)
|
|
|
|
(apply 'call-process-region
|
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 179-183)
- Update from CVS
2006-12-25 Daiki Ueno <ueno@unixuser.org>
* lisp/pgg-def.el (pgg-passphrase-coding-system): Default to nil instead of
locale-coding-system.
* lisp/pgg-gpg.el (pgg-gpg-process-region): Encode passphrase with eol-type
LF.
2006-12-29 Jouni K. Sepp,Ad(Bnen <jks@iki.fi>
* lisp/gnus/nnimap.el (nnimap-expunge-search-string): Mention
nnimap-search-uids-not-since-is-evil in docstring.
2006-12-28 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/spam.el: Revert to make-obsolete-variable because
define-obsolete-variable-alias is not supported in Emacs 21.
2006-12-28 Daiki Ueno <ueno@unixuser.org>
* lisp/gnus/gnus-sum.el (gnus-summary-next-article): Make sure we are in the
summary buffer.
2006-12-27 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/spam.el (spam-ifile-path, spam-ifile-database-path)
(spam-bogofilter-path): Use define-obsolete-variable-alias instead of
make-obsolete-variable.
2006-12-26 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/message.el (message-make-fqdn): Fix comment.
(message-bogus-system-names): Add ".local".
* lisp/gnus/spam.el (spam-ifile-path, spam-ifile-program)
(spam-ifile-database-path, spam-ifile-database)
(spam-bogofilter-path, spam-bogofilter-program): Rename variables.
Don't use "path" inappropriately.
(spam-spamoracle-database, spam-get-ifile-database-parameter): Fix doc
strings.
(spam-check-ifile, spam-ifile-register-with-ifile)
(spam-check-bogofilter, spam-bogofilter-register-with-bogofilter): Use
new variable names.
* lisp/gnus/gnus-art.el (gnus-treat-display-x-face, gnus-treat-display-face)
(gnus-treat-display-smileys): Simplify using
gnus-image-type-available-p.
* lisp/gnus/gnus-ems.el (gnus-image-type-available-p): Use display-images-p if
available.
2006-12-22 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/nnrss.el (nnrss-fetch): Replace buffer's contents with the decoded
one after turning on the buffer's multibyteness instead of decoding
them directly in the unibyte buffer that causes unexpected conversion
in Emacs 23 (unicode).
2006-12-29 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Customizing Articles): Add index entries for all
gnus-treat-* variables.
2006-12-29 Jouni K. Sepp,Ad(Bnen <jks@iki.fi>
* man/gnus.texi (IMAP): Fix incorrect explanation of
nnimap-search-uids-not-since-is-evil in documentation for
nnimap-expunge-search-string.
2006-12-27 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (ifile spam filtering): Rename spam-ifile-database-path to
spam-ifile-database.
2006-12-26 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Spam Package Configuration Examples): Don't encourage to
rebind C-s.
2006-12-26 Jouni K. Sepp,Ad(Bnen <jks@iki.fi>
* man/gnus.texi (Group Parameters, Group Maintenance, Topic Commands)
(Mail Group Commands, Expiring Mail, IMAP): Add index entries for
"expiring mail".
(IMAP): Document nnimap-search-uids-not-since-is-evil and
nnimap-nov-is-evil.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-576
2006-12-30 15:34:42 +00:00
|
|
|
(point-min) (point-max) spam-ifile-program
|
2004-09-04 13:13:48 +00:00
|
|
|
nil temp-buffer-name nil "-c"
|
|
|
|
(if db-param `(,db-param "-q") `("-q"))))
|
|
|
|
;; check the return now (we're back in the temp buffer)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(if (not (eobp))
|
2007-10-28 09:18:39 +00:00
|
|
|
(setq category (buffer-substring (point) (point-at-eol))))
|
2004-09-04 13:13:48 +00:00
|
|
|
(when (not (zerop (length category))) ; we need a category here
|
|
|
|
(if spam-ifile-all-categories
|
|
|
|
(setq return category)
|
|
|
|
;; else, if spam-ifile-all-categories is not set...
|
|
|
|
(when (string-equal spam-ifile-spam-category category)
|
|
|
|
(setq return spam-split-group)))))) ; note return is nil otherwise
|
|
|
|
return))
|
|
|
|
|
|
|
|
(defun spam-ifile-register-with-ifile (articles category &optional unregister)
|
|
|
|
"Register an article, given as a string, with a category.
|
|
|
|
Uses `gnus-newsgroup-name' if category is nil (for ham registration)."
|
|
|
|
(let ((category (or category gnus-newsgroup-name))
|
|
|
|
(add-or-delete-option (if unregister "-d" "-i"))
|
|
|
|
(db (spam-get-ifile-database-parameter))
|
|
|
|
parameters)
|
|
|
|
(with-temp-buffer
|
|
|
|
(dolist (article articles)
|
|
|
|
(let ((article-string (spam-get-article-as-string article)))
|
|
|
|
(when (stringp article-string)
|
|
|
|
(insert article-string))))
|
|
|
|
(apply 'call-process-region
|
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 179-183)
- Update from CVS
2006-12-25 Daiki Ueno <ueno@unixuser.org>
* lisp/pgg-def.el (pgg-passphrase-coding-system): Default to nil instead of
locale-coding-system.
* lisp/pgg-gpg.el (pgg-gpg-process-region): Encode passphrase with eol-type
LF.
2006-12-29 Jouni K. Sepp,Ad(Bnen <jks@iki.fi>
* lisp/gnus/nnimap.el (nnimap-expunge-search-string): Mention
nnimap-search-uids-not-since-is-evil in docstring.
2006-12-28 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/spam.el: Revert to make-obsolete-variable because
define-obsolete-variable-alias is not supported in Emacs 21.
2006-12-28 Daiki Ueno <ueno@unixuser.org>
* lisp/gnus/gnus-sum.el (gnus-summary-next-article): Make sure we are in the
summary buffer.
2006-12-27 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/spam.el (spam-ifile-path, spam-ifile-database-path)
(spam-bogofilter-path): Use define-obsolete-variable-alias instead of
make-obsolete-variable.
2006-12-26 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/message.el (message-make-fqdn): Fix comment.
(message-bogus-system-names): Add ".local".
* lisp/gnus/spam.el (spam-ifile-path, spam-ifile-program)
(spam-ifile-database-path, spam-ifile-database)
(spam-bogofilter-path, spam-bogofilter-program): Rename variables.
Don't use "path" inappropriately.
(spam-spamoracle-database, spam-get-ifile-database-parameter): Fix doc
strings.
(spam-check-ifile, spam-ifile-register-with-ifile)
(spam-check-bogofilter, spam-bogofilter-register-with-bogofilter): Use
new variable names.
* lisp/gnus/gnus-art.el (gnus-treat-display-x-face, gnus-treat-display-face)
(gnus-treat-display-smileys): Simplify using
gnus-image-type-available-p.
* lisp/gnus/gnus-ems.el (gnus-image-type-available-p): Use display-images-p if
available.
2006-12-22 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/nnrss.el (nnrss-fetch): Replace buffer's contents with the decoded
one after turning on the buffer's multibyteness instead of decoding
them directly in the unibyte buffer that causes unexpected conversion
in Emacs 23 (unicode).
2006-12-29 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Customizing Articles): Add index entries for all
gnus-treat-* variables.
2006-12-29 Jouni K. Sepp,Ad(Bnen <jks@iki.fi>
* man/gnus.texi (IMAP): Fix incorrect explanation of
nnimap-search-uids-not-since-is-evil in documentation for
nnimap-expunge-search-string.
2006-12-27 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (ifile spam filtering): Rename spam-ifile-database-path to
spam-ifile-database.
2006-12-26 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Spam Package Configuration Examples): Don't encourage to
rebind C-s.
2006-12-26 Jouni K. Sepp,Ad(Bnen <jks@iki.fi>
* man/gnus.texi (Group Parameters, Group Maintenance, Topic Commands)
(Mail Group Commands, Expiring Mail, IMAP): Add index entries for
"expiring mail".
(IMAP): Document nnimap-search-uids-not-since-is-evil and
nnimap-nov-is-evil.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-576
2006-12-30 15:34:42 +00:00
|
|
|
(point-min) (point-max) spam-ifile-program
|
2004-09-04 13:13:48 +00:00
|
|
|
nil nil nil
|
|
|
|
add-or-delete-option category
|
|
|
|
(if db `(,db "-h") `("-h"))))))
|
|
|
|
|
|
|
|
(defun spam-ifile-register-spam-routine (articles &optional unregister)
|
|
|
|
(spam-ifile-register-with-ifile articles spam-ifile-spam-category unregister))
|
|
|
|
|
|
|
|
(defun spam-ifile-unregister-spam-routine (articles)
|
|
|
|
(spam-ifile-register-spam-routine articles t))
|
|
|
|
|
|
|
|
(defun spam-ifile-register-ham-routine (articles &optional unregister)
|
|
|
|
(spam-ifile-register-with-ifile articles spam-ifile-ham-category unregister))
|
|
|
|
|
|
|
|
(defun spam-ifile-unregister-ham-routine (articles)
|
|
|
|
(spam-ifile-register-ham-routine articles t))
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;;}}}
|
|
|
|
|
|
|
|
;;{{{ spam-stat
|
2004-09-04 13:13:48 +00:00
|
|
|
|
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-716
Merge from gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-74
Update from CVS
2004-12-02 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/message.el (message-forward-make-body-mml): Remove headers
according to message-forward-ignored-headers if a message is
decoded.
2004-12-02 Romain Francoise <romain@orebokech.com>
* lisp/gnus/message.el (message-forward-make-body-plain): Always remove
headers according to message-forward-ignored-headers.
2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/lpath.el: Remove bbdb-create-internal, bbdb-records,
spam-BBDB-register-routine and spam-enter-ham-BBDB.
* lisp/gnus/nnrss.el (nnrss-string-as-multibyte): Redefine it as a macro in
order to silence the byte compiler.
* lisp/gnus/pop3.el (pop3-md5): Define it before being used.
* lisp/gnus/spam.el: Fix the way to silence the byte compiler, which
complained about bbdb-buffer, bbdb-create-internal,
bbdb-search-simple, mail-check-payment, spam-BBDB-register-routine,
spam-enter-ham-BBDB, spam-stat-buffer-change-to-non-spam,
spam-stat-buffer-change-to-spam, spam-stat-buffer-is-non-spam,
spam-stat-buffer-is-spam, spam-stat-load,
spam-stat-register-ham-routine, spam-stat-register-spam-routine,
spam-stat-save and spam-stat-split-fancy.
2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/canlock.el (canlock-password): Remove `:size 0' or `:size 1'
which may confuse users.
(canlock-password-for-verify): Ditto.
* lisp/gnus/deuglify.el (gnus-outlook-deuglify-unwrap-stop-chars): Ditto.
* lisp/gnus/gnus-art.el (gnus-emphasis-alist): Ditto.
* lisp/gnus/gnus-registry.el (gnus-registry-max-entries): Ditto.
* lisp/gnus/gnus-score.el (gnus-adaptive-word-length-limit): Ditto.
* lisp/gnus/gnus-start.el (gnus-save-killed-list): Ditto.
* lisp/gnus/gnus-sum.el (gnus-thread-hide-subtree): Ditto.
(gnus-sum-thread-tree-root): Ditto.
(gnus-sum-thread-tree-false-root): Ditto.
(gnus-sum-thread-tree-single-indent): Ditto.
* lisp/gnus/message.el (message-courtesy-message): Ditto.
(message-archive-note): Ditto.
(message-subscribed-address-file): Ditto.
(message-user-fqdn): Ditto.
* lisp/gnus/spam-report.el (spam-report-gmane-regex): Ditto.
* lisp/gnus/spam.el (spam-blackhole-good-server-regex): Ditto.
2004-11-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/message.el (message-forbidden-properties): Fixed typo in doc
string.
2004-11-25 Lars Magne Ingebrigtsen <larsi@gnus.org>
* lisp/gnus/message.el (message-strip-forbidden-properties): Bind
buffer-read-only (etc) to nil.
2004-11-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-util.el (gnus-replace-in-string): Added doc string.
* lisp/gnus/nnmail.el (nnmail-split-header-length-limit): Increase to 2048
to avoid problems when splitting mails with many recipients.
2004-11-23 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/rfc2047.el (rfc2047-header-encoding-alist): Add In-Reply-To to
address-mime. Suggested by ARISAWA Akihiro <ari@mbf.ocn.ne.jp>.
2004-11-22 Marek Martin <marek.martin@mum.pri.ee> (tiny change)
* lisp/gnus/nnfolder.el (nnfolder-request-create-group): Save current buffer.
2004-11-22 Reiner Steib <Reiner.Steib@gmx.de>
* man/message.texi (Various Message Variables): Mention that all mail
file variables are derived from `message-directory'.
* man/gnus.texi (Splitting Mail): Clarify bogus group.
2004-11-16 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Filtering Spam Using The Spam ELisp Package):
2004-12-07 21:56:42 +00:00
|
|
|
(eval-when-compile
|
|
|
|
(autoload 'spam-stat-buffer-change-to-non-spam "spam-stat")
|
|
|
|
(autoload 'spam-stat-buffer-change-to-spam "spam-stat")
|
|
|
|
(autoload 'spam-stat-buffer-is-non-spam "spam-stat")
|
|
|
|
(autoload 'spam-stat-buffer-is-spam "spam-stat")
|
|
|
|
(autoload 'spam-stat-load "spam-stat")
|
|
|
|
(autoload 'spam-stat-save "spam-stat")
|
|
|
|
(autoload 'spam-stat-split-fancy "spam-stat"))
|
|
|
|
|
|
|
|
(eval-and-compile
|
|
|
|
(when (condition-case nil
|
|
|
|
(let ((spam-stat-install-hooks nil))
|
|
|
|
(require 'spam-stat))
|
|
|
|
(file-error
|
|
|
|
(defalias 'spam-stat-register-ham-routine 'ignore)
|
|
|
|
(defalias 'spam-stat-register-spam-routine 'ignore)
|
|
|
|
nil))
|
|
|
|
|
|
|
|
(defun spam-check-stat ()
|
|
|
|
"Check the spam-stat backend for the classification of this message"
|
2007-10-28 09:18:39 +00:00
|
|
|
(let ((spam-stat-split-fancy-spam-group spam-split-group) ; override
|
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-716
Merge from gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-74
Update from CVS
2004-12-02 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/message.el (message-forward-make-body-mml): Remove headers
according to message-forward-ignored-headers if a message is
decoded.
2004-12-02 Romain Francoise <romain@orebokech.com>
* lisp/gnus/message.el (message-forward-make-body-plain): Always remove
headers according to message-forward-ignored-headers.
2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/lpath.el: Remove bbdb-create-internal, bbdb-records,
spam-BBDB-register-routine and spam-enter-ham-BBDB.
* lisp/gnus/nnrss.el (nnrss-string-as-multibyte): Redefine it as a macro in
order to silence the byte compiler.
* lisp/gnus/pop3.el (pop3-md5): Define it before being used.
* lisp/gnus/spam.el: Fix the way to silence the byte compiler, which
complained about bbdb-buffer, bbdb-create-internal,
bbdb-search-simple, mail-check-payment, spam-BBDB-register-routine,
spam-enter-ham-BBDB, spam-stat-buffer-change-to-non-spam,
spam-stat-buffer-change-to-spam, spam-stat-buffer-is-non-spam,
spam-stat-buffer-is-spam, spam-stat-load,
spam-stat-register-ham-routine, spam-stat-register-spam-routine,
spam-stat-save and spam-stat-split-fancy.
2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/canlock.el (canlock-password): Remove `:size 0' or `:size 1'
which may confuse users.
(canlock-password-for-verify): Ditto.
* lisp/gnus/deuglify.el (gnus-outlook-deuglify-unwrap-stop-chars): Ditto.
* lisp/gnus/gnus-art.el (gnus-emphasis-alist): Ditto.
* lisp/gnus/gnus-registry.el (gnus-registry-max-entries): Ditto.
* lisp/gnus/gnus-score.el (gnus-adaptive-word-length-limit): Ditto.
* lisp/gnus/gnus-start.el (gnus-save-killed-list): Ditto.
* lisp/gnus/gnus-sum.el (gnus-thread-hide-subtree): Ditto.
(gnus-sum-thread-tree-root): Ditto.
(gnus-sum-thread-tree-false-root): Ditto.
(gnus-sum-thread-tree-single-indent): Ditto.
* lisp/gnus/message.el (message-courtesy-message): Ditto.
(message-archive-note): Ditto.
(message-subscribed-address-file): Ditto.
(message-user-fqdn): Ditto.
* lisp/gnus/spam-report.el (spam-report-gmane-regex): Ditto.
* lisp/gnus/spam.el (spam-blackhole-good-server-regex): Ditto.
2004-11-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/message.el (message-forbidden-properties): Fixed typo in doc
string.
2004-11-25 Lars Magne Ingebrigtsen <larsi@gnus.org>
* lisp/gnus/message.el (message-strip-forbidden-properties): Bind
buffer-read-only (etc) to nil.
2004-11-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-util.el (gnus-replace-in-string): Added doc string.
* lisp/gnus/nnmail.el (nnmail-split-header-length-limit): Increase to 2048
to avoid problems when splitting mails with many recipients.
2004-11-23 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/rfc2047.el (rfc2047-header-encoding-alist): Add In-Reply-To to
address-mime. Suggested by ARISAWA Akihiro <ari@mbf.ocn.ne.jp>.
2004-11-22 Marek Martin <marek.martin@mum.pri.ee> (tiny change)
* lisp/gnus/nnfolder.el (nnfolder-request-create-group): Save current buffer.
2004-11-22 Reiner Steib <Reiner.Steib@gmx.de>
* man/message.texi (Various Message Variables): Mention that all mail
file variables are derived from `message-directory'.
* man/gnus.texi (Splitting Mail): Clarify bogus group.
2004-11-16 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Filtering Spam Using The Spam ELisp Package):
2004-12-07 21:56:42 +00:00
|
|
|
(spam-stat-buffer (buffer-name)) ; stat the current buffer
|
|
|
|
category return)
|
|
|
|
(spam-stat-split-fancy)))
|
|
|
|
|
|
|
|
(defun spam-stat-register-spam-routine (articles &optional unregister)
|
|
|
|
(dolist (article articles)
|
|
|
|
(let ((article-string (spam-get-article-as-string article)))
|
|
|
|
(with-temp-buffer
|
|
|
|
(insert article-string)
|
|
|
|
(if unregister
|
|
|
|
(spam-stat-buffer-change-to-non-spam)
|
2004-09-04 13:13:48 +00:00
|
|
|
(spam-stat-buffer-is-spam))))))
|
|
|
|
|
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-716
Merge from gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-74
Update from CVS
2004-12-02 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/message.el (message-forward-make-body-mml): Remove headers
according to message-forward-ignored-headers if a message is
decoded.
2004-12-02 Romain Francoise <romain@orebokech.com>
* lisp/gnus/message.el (message-forward-make-body-plain): Always remove
headers according to message-forward-ignored-headers.
2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/lpath.el: Remove bbdb-create-internal, bbdb-records,
spam-BBDB-register-routine and spam-enter-ham-BBDB.
* lisp/gnus/nnrss.el (nnrss-string-as-multibyte): Redefine it as a macro in
order to silence the byte compiler.
* lisp/gnus/pop3.el (pop3-md5): Define it before being used.
* lisp/gnus/spam.el: Fix the way to silence the byte compiler, which
complained about bbdb-buffer, bbdb-create-internal,
bbdb-search-simple, mail-check-payment, spam-BBDB-register-routine,
spam-enter-ham-BBDB, spam-stat-buffer-change-to-non-spam,
spam-stat-buffer-change-to-spam, spam-stat-buffer-is-non-spam,
spam-stat-buffer-is-spam, spam-stat-load,
spam-stat-register-ham-routine, spam-stat-register-spam-routine,
spam-stat-save and spam-stat-split-fancy.
2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/canlock.el (canlock-password): Remove `:size 0' or `:size 1'
which may confuse users.
(canlock-password-for-verify): Ditto.
* lisp/gnus/deuglify.el (gnus-outlook-deuglify-unwrap-stop-chars): Ditto.
* lisp/gnus/gnus-art.el (gnus-emphasis-alist): Ditto.
* lisp/gnus/gnus-registry.el (gnus-registry-max-entries): Ditto.
* lisp/gnus/gnus-score.el (gnus-adaptive-word-length-limit): Ditto.
* lisp/gnus/gnus-start.el (gnus-save-killed-list): Ditto.
* lisp/gnus/gnus-sum.el (gnus-thread-hide-subtree): Ditto.
(gnus-sum-thread-tree-root): Ditto.
(gnus-sum-thread-tree-false-root): Ditto.
(gnus-sum-thread-tree-single-indent): Ditto.
* lisp/gnus/message.el (message-courtesy-message): Ditto.
(message-archive-note): Ditto.
(message-subscribed-address-file): Ditto.
(message-user-fqdn): Ditto.
* lisp/gnus/spam-report.el (spam-report-gmane-regex): Ditto.
* lisp/gnus/spam.el (spam-blackhole-good-server-regex): Ditto.
2004-11-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/message.el (message-forbidden-properties): Fixed typo in doc
string.
2004-11-25 Lars Magne Ingebrigtsen <larsi@gnus.org>
* lisp/gnus/message.el (message-strip-forbidden-properties): Bind
buffer-read-only (etc) to nil.
2004-11-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-util.el (gnus-replace-in-string): Added doc string.
* lisp/gnus/nnmail.el (nnmail-split-header-length-limit): Increase to 2048
to avoid problems when splitting mails with many recipients.
2004-11-23 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/rfc2047.el (rfc2047-header-encoding-alist): Add In-Reply-To to
address-mime. Suggested by ARISAWA Akihiro <ari@mbf.ocn.ne.jp>.
2004-11-22 Marek Martin <marek.martin@mum.pri.ee> (tiny change)
* lisp/gnus/nnfolder.el (nnfolder-request-create-group): Save current buffer.
2004-11-22 Reiner Steib <Reiner.Steib@gmx.de>
* man/message.texi (Various Message Variables): Mention that all mail
file variables are derived from `message-directory'.
* man/gnus.texi (Splitting Mail): Clarify bogus group.
2004-11-16 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Filtering Spam Using The Spam ELisp Package):
2004-12-07 21:56:42 +00:00
|
|
|
(defun spam-stat-unregister-spam-routine (articles)
|
|
|
|
(spam-stat-register-spam-routine articles t))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-716
Merge from gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-74
Update from CVS
2004-12-02 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/message.el (message-forward-make-body-mml): Remove headers
according to message-forward-ignored-headers if a message is
decoded.
2004-12-02 Romain Francoise <romain@orebokech.com>
* lisp/gnus/message.el (message-forward-make-body-plain): Always remove
headers according to message-forward-ignored-headers.
2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/lpath.el: Remove bbdb-create-internal, bbdb-records,
spam-BBDB-register-routine and spam-enter-ham-BBDB.
* lisp/gnus/nnrss.el (nnrss-string-as-multibyte): Redefine it as a macro in
order to silence the byte compiler.
* lisp/gnus/pop3.el (pop3-md5): Define it before being used.
* lisp/gnus/spam.el: Fix the way to silence the byte compiler, which
complained about bbdb-buffer, bbdb-create-internal,
bbdb-search-simple, mail-check-payment, spam-BBDB-register-routine,
spam-enter-ham-BBDB, spam-stat-buffer-change-to-non-spam,
spam-stat-buffer-change-to-spam, spam-stat-buffer-is-non-spam,
spam-stat-buffer-is-spam, spam-stat-load,
spam-stat-register-ham-routine, spam-stat-register-spam-routine,
spam-stat-save and spam-stat-split-fancy.
2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/canlock.el (canlock-password): Remove `:size 0' or `:size 1'
which may confuse users.
(canlock-password-for-verify): Ditto.
* lisp/gnus/deuglify.el (gnus-outlook-deuglify-unwrap-stop-chars): Ditto.
* lisp/gnus/gnus-art.el (gnus-emphasis-alist): Ditto.
* lisp/gnus/gnus-registry.el (gnus-registry-max-entries): Ditto.
* lisp/gnus/gnus-score.el (gnus-adaptive-word-length-limit): Ditto.
* lisp/gnus/gnus-start.el (gnus-save-killed-list): Ditto.
* lisp/gnus/gnus-sum.el (gnus-thread-hide-subtree): Ditto.
(gnus-sum-thread-tree-root): Ditto.
(gnus-sum-thread-tree-false-root): Ditto.
(gnus-sum-thread-tree-single-indent): Ditto.
* lisp/gnus/message.el (message-courtesy-message): Ditto.
(message-archive-note): Ditto.
(message-subscribed-address-file): Ditto.
(message-user-fqdn): Ditto.
* lisp/gnus/spam-report.el (spam-report-gmane-regex): Ditto.
* lisp/gnus/spam.el (spam-blackhole-good-server-regex): Ditto.
2004-11-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/message.el (message-forbidden-properties): Fixed typo in doc
string.
2004-11-25 Lars Magne Ingebrigtsen <larsi@gnus.org>
* lisp/gnus/message.el (message-strip-forbidden-properties): Bind
buffer-read-only (etc) to nil.
2004-11-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-util.el (gnus-replace-in-string): Added doc string.
* lisp/gnus/nnmail.el (nnmail-split-header-length-limit): Increase to 2048
to avoid problems when splitting mails with many recipients.
2004-11-23 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/rfc2047.el (rfc2047-header-encoding-alist): Add In-Reply-To to
address-mime. Suggested by ARISAWA Akihiro <ari@mbf.ocn.ne.jp>.
2004-11-22 Marek Martin <marek.martin@mum.pri.ee> (tiny change)
* lisp/gnus/nnfolder.el (nnfolder-request-create-group): Save current buffer.
2004-11-22 Reiner Steib <Reiner.Steib@gmx.de>
* man/message.texi (Various Message Variables): Mention that all mail
file variables are derived from `message-directory'.
* man/gnus.texi (Splitting Mail): Clarify bogus group.
2004-11-16 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Filtering Spam Using The Spam ELisp Package):
2004-12-07 21:56:42 +00:00
|
|
|
(defun spam-stat-register-ham-routine (articles &optional unregister)
|
|
|
|
(dolist (article articles)
|
|
|
|
(let ((article-string (spam-get-article-as-string article)))
|
|
|
|
(with-temp-buffer
|
|
|
|
(insert article-string)
|
|
|
|
(if unregister
|
|
|
|
(spam-stat-buffer-change-to-spam)
|
2004-09-04 13:13:48 +00:00
|
|
|
(spam-stat-buffer-is-non-spam))))))
|
|
|
|
|
Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-716
Merge from gnus--rel--5.10
Patches applied:
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-74
Update from CVS
2004-12-02 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/message.el (message-forward-make-body-mml): Remove headers
according to message-forward-ignored-headers if a message is
decoded.
2004-12-02 Romain Francoise <romain@orebokech.com>
* lisp/gnus/message.el (message-forward-make-body-plain): Always remove
headers according to message-forward-ignored-headers.
2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/lpath.el: Remove bbdb-create-internal, bbdb-records,
spam-BBDB-register-routine and spam-enter-ham-BBDB.
* lisp/gnus/nnrss.el (nnrss-string-as-multibyte): Redefine it as a macro in
order to silence the byte compiler.
* lisp/gnus/pop3.el (pop3-md5): Define it before being used.
* lisp/gnus/spam.el: Fix the way to silence the byte compiler, which
complained about bbdb-buffer, bbdb-create-internal,
bbdb-search-simple, mail-check-payment, spam-BBDB-register-routine,
spam-enter-ham-BBDB, spam-stat-buffer-change-to-non-spam,
spam-stat-buffer-change-to-spam, spam-stat-buffer-is-non-spam,
spam-stat-buffer-is-spam, spam-stat-load,
spam-stat-register-ham-routine, spam-stat-register-spam-routine,
spam-stat-save and spam-stat-split-fancy.
2004-11-26 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/canlock.el (canlock-password): Remove `:size 0' or `:size 1'
which may confuse users.
(canlock-password-for-verify): Ditto.
* lisp/gnus/deuglify.el (gnus-outlook-deuglify-unwrap-stop-chars): Ditto.
* lisp/gnus/gnus-art.el (gnus-emphasis-alist): Ditto.
* lisp/gnus/gnus-registry.el (gnus-registry-max-entries): Ditto.
* lisp/gnus/gnus-score.el (gnus-adaptive-word-length-limit): Ditto.
* lisp/gnus/gnus-start.el (gnus-save-killed-list): Ditto.
* lisp/gnus/gnus-sum.el (gnus-thread-hide-subtree): Ditto.
(gnus-sum-thread-tree-root): Ditto.
(gnus-sum-thread-tree-false-root): Ditto.
(gnus-sum-thread-tree-single-indent): Ditto.
* lisp/gnus/message.el (message-courtesy-message): Ditto.
(message-archive-note): Ditto.
(message-subscribed-address-file): Ditto.
(message-user-fqdn): Ditto.
* lisp/gnus/spam-report.el (spam-report-gmane-regex): Ditto.
* lisp/gnus/spam.el (spam-blackhole-good-server-regex): Ditto.
2004-11-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/message.el (message-forbidden-properties): Fixed typo in doc
string.
2004-11-25 Lars Magne Ingebrigtsen <larsi@gnus.org>
* lisp/gnus/message.el (message-strip-forbidden-properties): Bind
buffer-read-only (etc) to nil.
2004-11-25 Reiner Steib <Reiner.Steib@gmx.de>
* lisp/gnus/gnus-util.el (gnus-replace-in-string): Added doc string.
* lisp/gnus/nnmail.el (nnmail-split-header-length-limit): Increase to 2048
to avoid problems when splitting mails with many recipients.
2004-11-23 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/rfc2047.el (rfc2047-header-encoding-alist): Add In-Reply-To to
address-mime. Suggested by ARISAWA Akihiro <ari@mbf.ocn.ne.jp>.
2004-11-22 Marek Martin <marek.martin@mum.pri.ee> (tiny change)
* lisp/gnus/nnfolder.el (nnfolder-request-create-group): Save current buffer.
2004-11-22 Reiner Steib <Reiner.Steib@gmx.de>
* man/message.texi (Various Message Variables): Mention that all mail
file variables are derived from `message-directory'.
* man/gnus.texi (Splitting Mail): Clarify bogus group.
2004-11-16 Reiner Steib <Reiner.Steib@gmx.de>
* man/gnus.texi (Filtering Spam Using The Spam ELisp Package):
2004-12-07 21:56:42 +00:00
|
|
|
(defun spam-stat-unregister-ham-routine (articles)
|
|
|
|
(spam-stat-register-ham-routine articles t))
|
|
|
|
|
|
|
|
(defun spam-maybe-spam-stat-load ()
|
|
|
|
(when spam-use-stat (spam-stat-load)))
|
|
|
|
|
|
|
|
(defun spam-maybe-spam-stat-save ()
|
|
|
|
(when spam-use-stat (spam-stat-save)))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;;}}}
|
2004-09-04 13:13:48 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;;{{{ Blacklists and whitelists.
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(defvar spam-whitelist-cache nil)
|
|
|
|
(defvar spam-blacklist-cache nil)
|
|
|
|
|
|
|
|
(defun spam-kill-whole-line ()
|
|
|
|
(beginning-of-line)
|
|
|
|
(let ((kill-whole-line t))
|
|
|
|
(kill-line)))
|
|
|
|
|
|
|
|
;;; address can be a list, too
|
|
|
|
(defun spam-enter-whitelist (address &optional remove)
|
|
|
|
"Enter ADDRESS (list or single) into the whitelist.
|
|
|
|
With a non-nil REMOVE, remove them."
|
|
|
|
(interactive "sAddress: ")
|
|
|
|
(spam-enter-list address spam-whitelist remove)
|
2007-10-28 09:18:39 +00:00
|
|
|
(setq spam-whitelist-cache nil)
|
|
|
|
(spam-clear-cache 'spam-use-whitelist))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
;;; address can be a list, too
|
|
|
|
(defun spam-enter-blacklist (address &optional remove)
|
|
|
|
"Enter ADDRESS (list or single) into the blacklist.
|
|
|
|
With a non-nil REMOVE, remove them."
|
|
|
|
(interactive "sAddress: ")
|
|
|
|
(spam-enter-list address spam-blacklist remove)
|
2007-10-28 09:18:39 +00:00
|
|
|
(setq spam-blacklist-cache nil)
|
|
|
|
(spam-clear-cache 'spam-use-whitelist))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(defun spam-enter-list (addresses file &optional remove)
|
|
|
|
"Enter ADDRESSES into the given FILE.
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
Either the whitelist or the blacklist files can be used.
|
|
|
|
With a non-nil REMOVE, remove the ADDRESSES."
|
2004-09-04 13:13:48 +00:00
|
|
|
(if (stringp addresses)
|
|
|
|
(spam-enter-list (list addresses) file remove)
|
|
|
|
;; else, we have a list of addresses here
|
|
|
|
(unless (file-exists-p (file-name-directory file))
|
|
|
|
(make-directory (file-name-directory file) t))
|
|
|
|
(save-excursion
|
|
|
|
(set-buffer
|
|
|
|
(find-file-noselect file))
|
|
|
|
(dolist (a addresses)
|
|
|
|
(when (stringp a)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(if (re-search-forward (regexp-quote a) nil t)
|
|
|
|
;; found the address
|
|
|
|
(when remove
|
|
|
|
(spam-kill-whole-line))
|
|
|
|
;; else, the address was not found
|
|
|
|
(unless remove
|
|
|
|
(goto-char (point-max))
|
|
|
|
(unless (bobp)
|
|
|
|
(insert "\n"))
|
|
|
|
(insert a "\n")))))
|
|
|
|
(save-buffer))))
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(defun spam-filelist-build-cache (type)
|
|
|
|
(let ((cache (if (eq type 'spam-use-blacklist)
|
|
|
|
spam-blacklist-cache
|
|
|
|
spam-whitelist-cache))
|
|
|
|
parsed-cache)
|
|
|
|
(unless (gethash type spam-caches)
|
|
|
|
(while cache
|
|
|
|
(let ((address (pop cache)))
|
|
|
|
(unless (zerop (length address)) ; 0 for a nil address too
|
|
|
|
(setq address (regexp-quote address))
|
|
|
|
;; fix regexp-quote's treatment of user-intended regexes
|
|
|
|
(while (string-match "\\\\\\*" address)
|
|
|
|
(setq address (replace-match ".*" t t address))))
|
|
|
|
(push address parsed-cache)))
|
|
|
|
(puthash type parsed-cache spam-caches))))
|
|
|
|
|
|
|
|
(defun spam-filelist-check-cache (type from)
|
|
|
|
(when (stringp from)
|
|
|
|
(spam-filelist-build-cache type)
|
|
|
|
(let (found)
|
|
|
|
(dolist (address (gethash type spam-caches))
|
|
|
|
(when (and address (string-match address from))
|
|
|
|
(setq found t)
|
|
|
|
(return)))
|
|
|
|
found)))
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
;;; returns t if the sender is in the whitelist, nil or
|
|
|
|
;;; spam-split-group otherwise
|
|
|
|
(defun spam-check-whitelist ()
|
|
|
|
;; FIXME! Should it detect when file timestamps change?
|
2007-10-28 09:18:39 +00:00
|
|
|
(unless spam-whitelist-cache
|
|
|
|
(setq spam-whitelist-cache (spam-parse-list spam-whitelist)))
|
|
|
|
(if (spam-from-listed-p 'spam-use-whitelist)
|
|
|
|
t
|
|
|
|
(if spam-use-whitelist-exclusive
|
|
|
|
spam-split-group
|
|
|
|
nil)))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(defun spam-check-blacklist ()
|
|
|
|
;; FIXME! Should it detect when file timestamps change?
|
2007-10-28 09:18:39 +00:00
|
|
|
(unless spam-blacklist-cache
|
|
|
|
(setq spam-blacklist-cache (spam-parse-list spam-blacklist)))
|
|
|
|
(and (spam-from-listed-p 'spam-use-blacklist)
|
|
|
|
spam-split-group))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(defun spam-parse-list (file)
|
|
|
|
(when (file-readable-p file)
|
|
|
|
(let (contents address)
|
|
|
|
(with-temp-buffer
|
|
|
|
(insert-file-contents file)
|
|
|
|
(while (not (eobp))
|
2007-10-28 09:18:39 +00:00
|
|
|
(setq address (buffer-substring (point) (point-at-eol)))
|
2004-09-04 13:13:48 +00:00
|
|
|
(forward-line 1)
|
|
|
|
;; insert the e-mail address if detected, otherwise the raw data
|
|
|
|
(unless (zerop (length address))
|
|
|
|
(let ((pure-address (nth 1 (gnus-extract-address-components address))))
|
|
|
|
(push (or pure-address address) contents)))))
|
|
|
|
(nreverse contents))))
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(defun spam-from-listed-p (type)
|
|
|
|
(let ((from (message-fetch-field "from"))
|
2004-09-04 13:13:48 +00:00
|
|
|
found)
|
2007-10-28 09:18:39 +00:00
|
|
|
(spam-filelist-check-cache type from)))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(defun spam-filelist-register-routine (articles blacklist &optional unregister)
|
|
|
|
(let ((de-symbol (if blacklist 'spam-use-whitelist 'spam-use-blacklist))
|
|
|
|
(declassification (if blacklist 'ham 'spam))
|
|
|
|
(enter-function
|
|
|
|
(if blacklist 'spam-enter-blacklist 'spam-enter-whitelist))
|
|
|
|
(remove-function
|
|
|
|
(if blacklist 'spam-enter-whitelist 'spam-enter-blacklist))
|
2007-10-28 09:18:39 +00:00
|
|
|
from addresses unregister-list article-unregister-list)
|
2004-09-04 13:13:48 +00:00
|
|
|
(dolist (article articles)
|
|
|
|
(let ((from (spam-fetch-field-from-fast article))
|
|
|
|
(id (spam-fetch-field-message-id-fast article))
|
|
|
|
sender-ignored)
|
|
|
|
(when (stringp from)
|
|
|
|
(dolist (ignore-regex spam-blacklist-ignored-regexes)
|
|
|
|
(when (and (not sender-ignored)
|
|
|
|
(stringp ignore-regex)
|
|
|
|
(string-match ignore-regex from))
|
|
|
|
(setq sender-ignored t)))
|
|
|
|
;; remember the messages we need to unregister, unless remove is set
|
|
|
|
(when (and
|
|
|
|
(null unregister)
|
|
|
|
(spam-log-unregistration-needed-p
|
|
|
|
id 'process declassification de-symbol))
|
2007-10-28 09:18:39 +00:00
|
|
|
(push article article-unregister-list)
|
2004-09-04 13:13:48 +00:00
|
|
|
(push from unregister-list))
|
|
|
|
(unless sender-ignored
|
|
|
|
(push from addresses)))))
|
|
|
|
|
|
|
|
(if unregister
|
|
|
|
(funcall enter-function addresses t) ; unregister all these addresses
|
|
|
|
;; else, register normally and unregister what we need to
|
|
|
|
(funcall remove-function unregister-list t)
|
2007-10-28 09:18:39 +00:00
|
|
|
(dolist (article article-unregister-list)
|
2004-09-04 13:13:48 +00:00
|
|
|
(spam-log-undo-registration
|
|
|
|
(spam-fetch-field-message-id-fast article)
|
|
|
|
'process
|
|
|
|
declassification
|
|
|
|
de-symbol))
|
|
|
|
(funcall enter-function addresses nil))))
|
|
|
|
|
|
|
|
(defun spam-blacklist-unregister-routine (articles)
|
|
|
|
(spam-blacklist-register-routine articles t))
|
|
|
|
|
|
|
|
(defun spam-blacklist-register-routine (articles &optional unregister)
|
|
|
|
(spam-filelist-register-routine articles t unregister))
|
|
|
|
|
|
|
|
(defun spam-whitelist-unregister-routine (articles)
|
|
|
|
(spam-whitelist-register-routine articles t))
|
|
|
|
|
|
|
|
(defun spam-whitelist-register-routine (articles &optional unregister)
|
|
|
|
(spam-filelist-register-routine articles nil unregister))
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;;}}}
|
|
|
|
|
|
|
|
;;{{{ Spam-report glue (gmane and resend reporting)
|
2004-09-04 13:13:48 +00:00
|
|
|
(defun spam-report-gmane-register-routine (articles)
|
|
|
|
(when articles
|
2007-10-28 09:18:39 +00:00
|
|
|
(apply 'spam-report-gmane-spam articles)))
|
|
|
|
|
|
|
|
(defun spam-report-gmane-unregister-routine (articles)
|
|
|
|
(when articles
|
|
|
|
(apply 'spam-report-gmane-ham articles)))
|
|
|
|
|
|
|
|
(defun spam-report-resend-register-ham-routine (articles)
|
|
|
|
(spam-report-resend-register-routine articles t))
|
|
|
|
|
|
|
|
(defun spam-report-resend-register-routine (articles &optional ham)
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(let* ((resend-to-gp
|
2007-10-28 09:18:39 +00:00
|
|
|
(if ham
|
|
|
|
(gnus-parameter-ham-resend-to gnus-newsgroup-name)
|
|
|
|
(gnus-parameter-spam-resend-to gnus-newsgroup-name)))
|
|
|
|
(spam-report-resend-to (or (car-safe resend-to-gp)
|
|
|
|
spam-report-resend-to)))
|
|
|
|
(spam-report-resend articles ham)))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;;}}}
|
|
|
|
|
|
|
|
;;{{{ Bogofilter
|
2004-09-04 13:13:48 +00:00
|
|
|
(defun spam-check-bogofilter-headers (&optional score)
|
2007-10-28 09:18:39 +00:00
|
|
|
(let ((header (message-fetch-field spam-bogofilter-header)))
|
2004-09-04 13:13:48 +00:00
|
|
|
(when header ; return nil when no header
|
|
|
|
(if score ; scoring mode
|
|
|
|
(if (string-match "spamicity=\\([0-9.]+\\)" header)
|
|
|
|
(match-string 1 header)
|
|
|
|
"0")
|
|
|
|
;; spam detection mode
|
|
|
|
(when (string-match spam-bogofilter-bogosity-positive-spam-header
|
|
|
|
header)
|
|
|
|
spam-split-group)))))
|
|
|
|
|
|
|
|
;; return something sensible if the score can't be determined
|
2007-10-28 09:18:39 +00:00
|
|
|
(defun spam-bogofilter-score (&optional recheck)
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
"Get the Bogofilter spamicity score."
|
2007-10-28 09:18:39 +00:00
|
|
|
(interactive "P")
|
2004-09-04 13:13:48 +00:00
|
|
|
(save-window-excursion
|
|
|
|
(gnus-summary-show-article t)
|
|
|
|
(set-buffer gnus-article-buffer)
|
2007-10-28 09:18:39 +00:00
|
|
|
(let ((score (or (unless recheck
|
|
|
|
(spam-check-bogofilter-headers t))
|
2004-09-04 13:13:48 +00:00
|
|
|
(spam-check-bogofilter t))))
|
2007-10-28 09:18:39 +00:00
|
|
|
(gnus-summary-show-article)
|
2004-09-04 13:13:48 +00:00
|
|
|
(message "Spamicity score %s" score)
|
2007-10-28 09:18:39 +00:00
|
|
|
(or score "0"))))
|
|
|
|
|
|
|
|
(defun spam-verify-bogofilter ()
|
|
|
|
"Verify the Bogofilter version is sufficient."
|
|
|
|
(when (eq spam-bogofilter-valid 'unknown)
|
|
|
|
(setq spam-bogofilter-valid
|
|
|
|
(not (string-match "^bogofilter version 0\\.\\([0-9]\\|1[01]\\)\\."
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
(shell-command-to-string
|
2007-10-28 09:18:39 +00:00
|
|
|
(format "%s -V" spam-bogofilter-program))))))
|
|
|
|
spam-bogofilter-valid)
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(defun spam-check-bogofilter (&optional score)
|
2007-10-28 09:18:39 +00:00
|
|
|
"Check the Bogofilter backend for the classification of this message."
|
|
|
|
(if (spam-verify-bogofilter)
|
|
|
|
(let ((article-buffer-name (buffer-name))
|
|
|
|
(db spam-bogofilter-database-directory)
|
|
|
|
return)
|
|
|
|
(with-temp-buffer
|
|
|
|
(let ((temp-buffer-name (buffer-name)))
|
|
|
|
(save-excursion
|
|
|
|
(set-buffer article-buffer-name)
|
|
|
|
(apply 'call-process-region
|
|
|
|
(point-min) (point-max)
|
|
|
|
spam-bogofilter-program
|
|
|
|
nil temp-buffer-name nil
|
|
|
|
(if db `("-d" ,db "-v") `("-v"))))
|
|
|
|
(setq return (spam-check-bogofilter-headers score))))
|
2004-09-04 13:13:48 +00:00
|
|
|
return)
|
2007-10-28 09:18:39 +00:00
|
|
|
(gnus-error 5 "`spam.el' doesn't support obsolete bogofilter versions")))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(defun spam-bogofilter-register-with-bogofilter (articles
|
|
|
|
spam
|
|
|
|
&optional unregister)
|
|
|
|
"Register an article, given as a string, as spam or non-spam."
|
2007-10-28 09:18:39 +00:00
|
|
|
(if (spam-verify-bogofilter)
|
|
|
|
(dolist (article articles)
|
|
|
|
(let ((article-string (spam-get-article-as-string article))
|
|
|
|
(db spam-bogofilter-database-directory)
|
|
|
|
(switch (if unregister
|
|
|
|
(if spam
|
|
|
|
spam-bogofilter-spam-strong-switch
|
|
|
|
spam-bogofilter-ham-strong-switch)
|
|
|
|
(if spam
|
|
|
|
spam-bogofilter-spam-switch
|
|
|
|
spam-bogofilter-ham-switch))))
|
|
|
|
(when (stringp article-string)
|
|
|
|
(with-temp-buffer
|
|
|
|
(insert article-string)
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
(apply 'call-process-region
|
|
|
|
(point-min) (point-max)
|
|
|
|
spam-bogofilter-program
|
|
|
|
nil nil nil switch
|
|
|
|
(if db `("-d" ,db "-v") `("-v")))))))
|
|
|
|
(gnus-error 5 "`spam.el' doesn't support obsolete bogofilter versions")))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(defun spam-bogofilter-register-spam-routine (articles &optional unregister)
|
|
|
|
(spam-bogofilter-register-with-bogofilter articles t unregister))
|
|
|
|
|
|
|
|
(defun spam-bogofilter-unregister-spam-routine (articles)
|
|
|
|
(spam-bogofilter-register-spam-routine articles t))
|
|
|
|
|
|
|
|
(defun spam-bogofilter-register-ham-routine (articles &optional unregister)
|
|
|
|
(spam-bogofilter-register-with-bogofilter articles nil unregister))
|
|
|
|
|
|
|
|
(defun spam-bogofilter-unregister-ham-routine (articles)
|
|
|
|
(spam-bogofilter-register-ham-routine articles t))
|
|
|
|
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;;}}}
|
|
|
|
|
|
|
|
;;{{{ spamoracle
|
2004-09-04 13:13:48 +00:00
|
|
|
(defun spam-check-spamoracle ()
|
|
|
|
"Run spamoracle on an article to determine whether it's spam."
|
2007-10-28 09:18:39 +00:00
|
|
|
(let ((article-buffer-name (buffer-name)))
|
2004-09-04 13:13:48 +00:00
|
|
|
(with-temp-buffer
|
|
|
|
(let ((temp-buffer-name (buffer-name)))
|
|
|
|
(save-excursion
|
|
|
|
(set-buffer article-buffer-name)
|
|
|
|
(let ((status
|
|
|
|
(apply 'call-process-region
|
|
|
|
(point-min) (point-max)
|
|
|
|
spam-spamoracle-binary
|
|
|
|
nil temp-buffer-name nil
|
|
|
|
(if spam-spamoracle-database
|
|
|
|
`("-f" ,spam-spamoracle-database "mark")
|
|
|
|
'("mark")))))
|
|
|
|
(if (eq 0 status)
|
|
|
|
(progn
|
|
|
|
(set-buffer temp-buffer-name)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(when (re-search-forward "^X-Spam: yes;" nil t)
|
|
|
|
spam-split-group))
|
2004-09-29 06:35:14 +00:00
|
|
|
(error "Error running spamoracle: %s" status))))))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(defun spam-spamoracle-learn (articles article-is-spam-p &optional unregister)
|
|
|
|
"Run spamoracle in training mode."
|
|
|
|
(with-temp-buffer
|
|
|
|
(let ((temp-buffer-name (buffer-name)))
|
|
|
|
(save-excursion
|
|
|
|
(goto-char (point-min))
|
|
|
|
(dolist (article articles)
|
|
|
|
(insert (spam-get-article-as-string article)))
|
|
|
|
(let* ((arg (if (spam-xor unregister article-is-spam-p)
|
|
|
|
"-spam"
|
|
|
|
"-good"))
|
|
|
|
(status
|
|
|
|
(apply 'call-process-region
|
|
|
|
(point-min) (point-max)
|
|
|
|
spam-spamoracle-binary
|
|
|
|
nil temp-buffer-name nil
|
|
|
|
(if spam-spamoracle-database
|
|
|
|
`("-f" ,spam-spamoracle-database
|
|
|
|
"add" ,arg)
|
|
|
|
`("add" ,arg)))))
|
2004-09-29 06:35:14 +00:00
|
|
|
(unless (eq 0 status)
|
|
|
|
(error "Error running spamoracle: %s" status)))))))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(defun spam-spamoracle-learn-ham (articles &optional unregister)
|
|
|
|
(spam-spamoracle-learn articles nil unregister))
|
|
|
|
|
|
|
|
(defun spam-spamoracle-unlearn-ham (articles &optional unregister)
|
|
|
|
(spam-spamoracle-learn-ham articles t))
|
|
|
|
|
|
|
|
(defun spam-spamoracle-learn-spam (articles &optional unregister)
|
|
|
|
(spam-spamoracle-learn articles t unregister))
|
|
|
|
|
|
|
|
(defun spam-spamoracle-unlearn-spam (articles &optional unregister)
|
|
|
|
(spam-spamoracle-learn-spam articles t))
|
|
|
|
|
2007-10-28 09:18:39 +00:00
|
|
|
;;}}}
|
|
|
|
|
|
|
|
;;{{{ SpamAssassin
|
|
|
|
;;; based mostly on the bogofilter code
|
|
|
|
(defun spam-check-spamassassin-headers (&optional score)
|
|
|
|
"Check the SpamAssassin headers for the classification of this message."
|
|
|
|
(if score ; scoring mode
|
|
|
|
(let ((header (message-fetch-field spam-spamassassin-spam-status-header)))
|
|
|
|
(when header
|
|
|
|
(if (string-match spam-spamassassin-score-regexp header)
|
|
|
|
(match-string 1 header)
|
|
|
|
"0")))
|
|
|
|
;; spam detection mode
|
|
|
|
(let ((header (message-fetch-field spam-spamassassin-spam-flag-header)))
|
|
|
|
(when header ; return nil when no header
|
|
|
|
(when (string-match spam-spamassassin-positive-spam-flag-header
|
|
|
|
header)
|
|
|
|
spam-split-group)))))
|
|
|
|
|
|
|
|
(defun spam-check-spamassassin (&optional score)
|
|
|
|
"Check the SpamAssassin backend for the classification of this message."
|
|
|
|
(let ((article-buffer-name (buffer-name)))
|
|
|
|
(with-temp-buffer
|
|
|
|
(let ((temp-buffer-name (buffer-name)))
|
|
|
|
(save-excursion
|
|
|
|
(set-buffer article-buffer-name)
|
|
|
|
(apply 'call-process-region
|
|
|
|
(point-min) (point-max) spam-assassin-program
|
|
|
|
nil temp-buffer-name nil spam-spamassassin-arguments))
|
|
|
|
;; check the return now (we're back in the temp buffer)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(spam-check-spamassassin-headers score)))))
|
|
|
|
|
|
|
|
;; return something sensible if the score can't be determined
|
|
|
|
(defun spam-spamassassin-score (&optional recheck)
|
|
|
|
"Get the SpamAssassin score"
|
|
|
|
(interactive "P")
|
|
|
|
(save-window-excursion
|
|
|
|
(gnus-summary-show-article t)
|
|
|
|
(set-buffer gnus-article-buffer)
|
|
|
|
(let ((score (or (unless recheck
|
|
|
|
(spam-check-spamassassin-headers t))
|
|
|
|
(spam-check-spamassassin t))))
|
|
|
|
(gnus-summary-show-article)
|
|
|
|
(message "SpamAssassin score %s" score)
|
|
|
|
(or score "0"))))
|
|
|
|
|
|
|
|
(defun spam-spamassassin-register-with-sa-learn (articles spam
|
|
|
|
&optional unregister)
|
|
|
|
"Register articles with spamassassin's sa-learn as spam or non-spam."
|
|
|
|
(if articles
|
|
|
|
(let ((action (if unregister spam-sa-learn-unregister-switch
|
|
|
|
(if spam spam-sa-learn-spam-switch
|
|
|
|
spam-sa-learn-ham-switch)))
|
|
|
|
(summary-buffer-name (buffer-name)))
|
|
|
|
(with-temp-buffer
|
|
|
|
;; group the articles into mbox format
|
|
|
|
(dolist (article articles)
|
|
|
|
(let (article-string)
|
|
|
|
(save-excursion
|
|
|
|
(set-buffer summary-buffer-name)
|
|
|
|
(setq article-string (spam-get-article-as-string article)))
|
|
|
|
(when (stringp article-string)
|
|
|
|
(insert "From \n") ; mbox separator (sa-learn only checks the
|
|
|
|
; first five chars, so we can get away with
|
|
|
|
; a bogus line))
|
|
|
|
(insert article-string)
|
|
|
|
(insert "\n"))))
|
|
|
|
;; call sa-learn on all messages at the same time
|
|
|
|
(apply 'call-process-region
|
|
|
|
(point-min) (point-max)
|
|
|
|
spam-sa-learn-program
|
|
|
|
nil nil nil "--mbox"
|
|
|
|
(if spam-sa-learn-rebuild
|
|
|
|
(list action)
|
|
|
|
`("--no-rebuild" ,action)))))))
|
|
|
|
|
|
|
|
(defun spam-spamassassin-register-spam-routine (articles &optional unregister)
|
|
|
|
(spam-spamassassin-register-with-sa-learn articles t unregister))
|
|
|
|
|
|
|
|
(defun spam-spamassassin-register-ham-routine (articles &optional unregister)
|
|
|
|
(spam-spamassassin-register-with-sa-learn articles nil unregister))
|
|
|
|
|
|
|
|
(defun spam-spamassassin-unregister-spam-routine (articles)
|
|
|
|
(spam-spamassassin-register-with-sa-learn articles t t))
|
|
|
|
|
|
|
|
(defun spam-spamassassin-unregister-ham-routine (articles)
|
|
|
|
(spam-spamassassin-register-with-sa-learn articles nil t))
|
|
|
|
|
|
|
|
;;}}}
|
|
|
|
|
|
|
|
;;{{{ Bsfilter
|
|
|
|
;;; based mostly on the bogofilter code
|
|
|
|
(defun spam-check-bsfilter-headers (&optional score)
|
|
|
|
(if score
|
|
|
|
(or (nnmail-fetch-field spam-bsfilter-probability-header)
|
|
|
|
"0")
|
|
|
|
(let ((header (nnmail-fetch-field spam-bsfilter-header)))
|
|
|
|
(when header ; return nil when no header
|
|
|
|
(when (string-match "YES" header)
|
|
|
|
spam-split-group)))))
|
|
|
|
|
|
|
|
;; return something sensible if the score can't be determined
|
|
|
|
(defun spam-bsfilter-score (&optional recheck)
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
"Get the Bsfilter spamicity score."
|
2007-10-28 09:18:39 +00:00
|
|
|
(interactive "P")
|
|
|
|
(save-window-excursion
|
|
|
|
(gnus-summary-show-article t)
|
|
|
|
(set-buffer gnus-article-buffer)
|
|
|
|
(let ((score (or (unless recheck
|
|
|
|
(spam-check-bsfilter-headers t))
|
|
|
|
(spam-check-bsfilter t))))
|
|
|
|
(gnus-summary-show-article)
|
|
|
|
(message "Spamicity score %s" score)
|
|
|
|
(or score "0"))))
|
|
|
|
|
|
|
|
(defun spam-check-bsfilter (&optional score)
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
"Check the Bsfilter backend for the classification of this message."
|
2007-10-28 09:18:39 +00:00
|
|
|
(let ((article-buffer-name (buffer-name))
|
|
|
|
(dir spam-bsfilter-database-directory)
|
|
|
|
return)
|
|
|
|
(with-temp-buffer
|
|
|
|
(let ((temp-buffer-name (buffer-name)))
|
|
|
|
(save-excursion
|
|
|
|
(set-buffer article-buffer-name)
|
|
|
|
(apply 'call-process-region
|
|
|
|
(point-min) (point-max)
|
|
|
|
spam-bsfilter-program
|
|
|
|
nil temp-buffer-name nil
|
|
|
|
"--pipe"
|
|
|
|
"--insert-flag"
|
|
|
|
"--insert-probability"
|
|
|
|
(when dir
|
|
|
|
(list "--homedir" dir))))
|
|
|
|
(setq return (spam-check-bsfilter-headers score))))
|
|
|
|
return))
|
|
|
|
|
|
|
|
(defun spam-bsfilter-register-with-bsfilter (articles
|
|
|
|
spam
|
|
|
|
&optional unregister)
|
|
|
|
"Register an article, given as a string, as spam or non-spam."
|
|
|
|
(dolist (article articles)
|
|
|
|
(let ((article-string (spam-get-article-as-string article))
|
|
|
|
(switch (if unregister
|
|
|
|
(if spam
|
|
|
|
spam-bsfilter-spam-strong-switch
|
|
|
|
spam-bsfilter-ham-strong-switch)
|
|
|
|
(if spam
|
|
|
|
spam-bsfilter-spam-switch
|
|
|
|
spam-bsfilter-ham-switch))))
|
|
|
|
(when (stringp article-string)
|
|
|
|
(with-temp-buffer
|
|
|
|
(insert article-string)
|
|
|
|
(apply 'call-process-region
|
|
|
|
(point-min) (point-max)
|
|
|
|
spam-bsfilter-program
|
|
|
|
nil nil nil switch
|
|
|
|
"--update"
|
|
|
|
(when spam-bsfilter-database-directory
|
|
|
|
(list "--homedir"
|
|
|
|
spam-bsfilter-database-directory))))))))
|
|
|
|
|
|
|
|
(defun spam-bsfilter-register-spam-routine (articles &optional unregister)
|
|
|
|
(spam-bsfilter-register-with-bsfilter articles t unregister))
|
|
|
|
|
|
|
|
(defun spam-bsfilter-unregister-spam-routine (articles)
|
|
|
|
(spam-bsfilter-register-spam-routine articles t))
|
|
|
|
|
|
|
|
(defun spam-bsfilter-register-ham-routine (articles &optional unregister)
|
|
|
|
(spam-bsfilter-register-with-bsfilter articles nil unregister))
|
|
|
|
|
|
|
|
(defun spam-bsfilter-unregister-ham-routine (articles)
|
|
|
|
(spam-bsfilter-register-ham-routine articles t))
|
|
|
|
|
|
|
|
;;}}}
|
|
|
|
|
|
|
|
;;{{{ CRM114 Mailfilter
|
|
|
|
(defun spam-check-crm114-headers (&optional score)
|
|
|
|
(let ((header (message-fetch-field spam-crm114-header)))
|
|
|
|
(when header ; return nil when no header
|
|
|
|
(if score ; scoring mode
|
|
|
|
(if (string-match "( pR: \\([0-9.-]+\\)" header)
|
|
|
|
(match-string 1 header)
|
|
|
|
"0")
|
|
|
|
;; spam detection mode
|
|
|
|
(when (string-match spam-crm114-positive-spam-header
|
|
|
|
header)
|
|
|
|
spam-split-group)))))
|
|
|
|
|
|
|
|
;; return something sensible if the score can't be determined
|
|
|
|
(defun spam-crm114-score ()
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
"Get the CRM114 Mailfilter pR."
|
2007-10-28 09:18:39 +00:00
|
|
|
(interactive)
|
|
|
|
(save-window-excursion
|
|
|
|
(gnus-summary-show-article t)
|
|
|
|
(set-buffer gnus-article-buffer)
|
|
|
|
(let ((score (or (spam-check-crm114-headers t)
|
|
|
|
(spam-check-crm114 t))))
|
|
|
|
(gnus-summary-show-article)
|
|
|
|
(message "pR: %s" score)
|
|
|
|
(or score "0"))))
|
|
|
|
|
|
|
|
(defun spam-check-crm114 (&optional score)
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
"Check the CRM114 Mailfilter backend for the classification of this message."
|
2007-10-28 09:18:39 +00:00
|
|
|
(let ((article-buffer-name (buffer-name))
|
|
|
|
(db spam-crm114-database-directory)
|
|
|
|
return)
|
|
|
|
(with-temp-buffer
|
|
|
|
(let ((temp-buffer-name (buffer-name)))
|
|
|
|
(save-excursion
|
|
|
|
(set-buffer article-buffer-name)
|
|
|
|
(apply 'call-process-region
|
|
|
|
(point-min) (point-max)
|
|
|
|
spam-crm114-program
|
|
|
|
nil temp-buffer-name nil
|
|
|
|
(when db (list (concat "--fileprefix=" db)))))
|
|
|
|
(setq return (spam-check-crm114-headers score))))
|
|
|
|
return))
|
|
|
|
|
|
|
|
(defun spam-crm114-register-with-crm114 (articles
|
|
|
|
spam
|
|
|
|
&optional unregister)
|
|
|
|
"Register an article, given as a string, as spam or non-spam."
|
|
|
|
(dolist (article articles)
|
|
|
|
(let ((article-string (spam-get-article-as-string article))
|
|
|
|
(db spam-crm114-database-directory)
|
|
|
|
(switch (if unregister
|
|
|
|
(if spam
|
|
|
|
spam-crm114-spam-strong-switch
|
|
|
|
spam-crm114-ham-strong-switch)
|
|
|
|
(if spam
|
|
|
|
spam-crm114-spam-switch
|
|
|
|
spam-crm114-ham-switch))))
|
|
|
|
(when (stringp article-string)
|
|
|
|
(with-temp-buffer
|
|
|
|
(insert article-string)
|
|
|
|
|
|
|
|
(apply 'call-process-region
|
|
|
|
(point-min) (point-max)
|
|
|
|
spam-crm114-program
|
|
|
|
nil nil nil
|
|
|
|
(when db (list switch (concat "--fileprefix=" db)))))))))
|
|
|
|
|
|
|
|
(defun spam-crm114-register-spam-routine (articles &optional unregister)
|
|
|
|
(spam-crm114-register-with-crm114 articles t unregister))
|
|
|
|
|
|
|
|
(defun spam-crm114-unregister-spam-routine (articles)
|
|
|
|
(spam-crm114-register-spam-routine articles t))
|
|
|
|
|
|
|
|
(defun spam-crm114-register-ham-routine (articles &optional unregister)
|
|
|
|
(spam-crm114-register-with-crm114 articles nil unregister))
|
|
|
|
|
|
|
|
(defun spam-crm114-unregister-ham-routine (articles)
|
|
|
|
(spam-crm114-register-ham-routine articles t))
|
|
|
|
|
|
|
|
;;}}}
|
|
|
|
|
|
|
|
;;}}}
|
|
|
|
|
|
|
|
;;{{{ Hooks
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
;;;###autoload
|
2007-10-28 09:18:39 +00:00
|
|
|
(defun spam-initialize (&rest symbols)
|
|
|
|
"Install the spam.el hooks and do other initialization.
|
|
|
|
When SYMBOLS is given, set those variables to t. This is so you
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
can call `spam-initialize' before you set spam-use-* variables on
|
2007-10-28 09:18:39 +00:00
|
|
|
explicitly, and matters only if you need the extra headers
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
installed through `spam-necessary-extra-headers'."
|
2004-09-04 13:13:48 +00:00
|
|
|
(interactive)
|
2007-10-28 09:18:39 +00:00
|
|
|
|
|
|
|
(dolist (var symbols)
|
|
|
|
(set var t))
|
|
|
|
|
|
|
|
(dolist (header (spam-necessary-extra-headers))
|
|
|
|
(add-to-list 'nnmail-extra-headers header)
|
|
|
|
(add-to-list 'gnus-extra-headers header))
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(setq spam-install-hooks t)
|
Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-425
Remove "-face" suffix from gnus faces
2005-06-16 Miles Bader <miles@gnu.org>
* lisp/gnus/spam.el (spam): Remove "-face" suffix from face name.
(spam-face): New backward-compatibility alias for renamed face.
(spam-face, spam-initialize): Use renamed spam face.
* lisp/gnus/message.el (message-header-to, message-header-cc)
(message-header-subject, message-header-newsgroups)
(message-header-other, message-header-name)
(message-header-xheader, message-separator, message-cited-text)
(message-mml): Remove "-face" suffix from face names.
(message-header-to-face, message-header-cc-face)
(message-header-subject-face, message-header-newsgroups-face)
(message-header-other-face, message-header-name-face)
(message-header-xheader-face, message-separator-face)
(message-cited-text-face, message-mml-face):
New backward-compatibility aliases for renamed faces.
(message-font-lock-keywords): Use renamed message faces.
* lisp/gnus/sieve-mode.el (sieve-control-commands, sieve-action-commands)
(sieve-test-commands, sieve-tagged-arguments):
Remove "-face" suffix from face names.
(sieve-control-commands-face, sieve-action-commands-face)
(sieve-test-commands-face, sieve-tagged-arguments-face):
New backward-compatibility aliases for renamed faces.
(sieve-control-commands-face, sieve-action-commands-face)
(sieve-test-commands-face, sieve-tagged-arguments-face):
Use renamed sieve faces.
* lisp/gnus/gnus.el (gnus-group-news-1, gnus-group-news-1-empty)
(gnus-group-news-2, gnus-group-news-2-empty, gnus-group-news-3)
(gnus-group-news-3-empty, gnus-group-news-4)
(gnus-group-news-4-empty, gnus-group-news-5)
(gnus-group-news-5-empty, gnus-group-news-6)
(gnus-group-news-6-empty, gnus-group-news-low)
(gnus-group-news-low-empty, gnus-group-mail-1)
(gnus-group-mail-1-empty, gnus-group-mail-2)
(gnus-group-mail-2-empty, gnus-group-mail-3)
(gnus-group-mail-3-empty, gnus-group-mail-low)
(gnus-group-mail-low-empty, gnus-summary-selected)
(gnus-summary-cancelled, gnus-summary-high-ticked)
(gnus-summary-low-ticked, gnus-summary-normal-ticked)
(gnus-summary-high-ancient, gnus-summary-low-ancient)
(gnus-summary-normal-ancient, gnus-summary-high-undownloaded)
(gnus-summary-low-undownloaded)
(gnus-summary-normal-undownloaded, gnus-summary-high-unread)
(gnus-summary-low-unread, gnus-summary-normal-unread)
(gnus-summary-high-read, gnus-summary-low-read)
(gnus-summary-normal-read, gnus-splash):
Remove "-face" suffix from face names.
(gnus-group-news-1-face, gnus-group-news-1-empty-face)
(gnus-group-news-2-face, gnus-group-news-2-empty-face)
(gnus-group-news-3-face, gnus-group-news-3-empty-face)
(gnus-group-news-4-face, gnus-group-news-4-empty-face)
(gnus-group-news-5-face, gnus-group-news-5-empty-face)
(gnus-group-news-6-face, gnus-group-news-6-empty-face)
(gnus-group-news-low-face, gnus-group-news-low-empty-face)
(gnus-group-mail-1-face, gnus-group-mail-1-empty-face)
(gnus-group-mail-2-face, gnus-group-mail-2-empty-face)
(gnus-group-mail-3-face, gnus-group-mail-3-empty-face)
(gnus-group-mail-low-face, gnus-group-mail-low-empty-face)
(gnus-summary-selected-face, gnus-summary-cancelled-face)
(gnus-summary-high-ticked-face, gnus-summary-low-ticked-face)
(gnus-summary-normal-ticked-face)
(gnus-summary-high-ancient-face, gnus-summary-low-ancient-face)
(gnus-summary-normal-ancient-face)
(gnus-summary-high-undownloaded-face)
(gnus-summary-low-undownloaded-face)
(gnus-summary-normal-undownloaded-face)
(gnus-summary-high-unread-face, gnus-summary-low-unread-face)
(gnus-summary-normal-unread-face, gnus-summary-high-read-face)
(gnus-summary-low-read-face, gnus-summary-normal-read-face)
(gnus-splash-face):
New backward-compatibility aliases for renamed faces.
(gnus-group-startup-message): Use renamed gnus faces.
* lisp/gnus/gnus-srvr.el (gnus-server-agent, gnus-server-opened)
(gnus-server-closed, gnus-server-denied, gnus-server-offline)
(gnus-server-agent): Remove "-face" suffix from face names.
(gnus-server-agent-face, gnus-server-opened-face)
(gnus-server-closed-face, gnus-server-denied-face)
(gnus-server-offline-face):
New backward-compatibility aliases for renamed faces.
(gnus-server-agent-face, gnus-server-opened-face)
(gnus-server-closed-face, gnus-server-denied-face)
(gnus-server-offline-face): Use renamed gnus faces.
* lisp/gnus/gnus-picon.el (gnus-picon-xbm, gnus-picon):
Remove "-face" suffix from face names.
(gnus-picon-xbm-face, gnus-picon-face):
New backward-compatibility aliases for renamed faces.
* lisp/gnus/gnus-cite.el (gnus-cite-attribution, gnus-cite-1, gnus-cite-2)
(gnus-cite-3, gnus-cite-4, gnus-cite-5, gnus-cite-6)
(gnus-cite-7, gnus-cite-8, gnus-cite-9, gnus-cite-10)
(gnus-cite-11): Remove "-face" suffix from face names.
(gnus-cite-attribution-face, gnus-cite-face-1, gnus-cite-face-2)
(gnus-cite-face-3, gnus-cite-face-4, gnus-cite-face-5)
(gnus-cite-face-6, gnus-cite-face-7, gnus-cite-face-8)
(gnus-cite-face-9, gnus-cite-face-10, gnus-cite-face-11):
New backward-compatibility aliases for renamed faces.
(gnus-cite-attribution-face, gnus-cite-face-list)
(gnus-article-boring-faces): Use renamed gnus faces.
* lisp/gnus/gnus-art.el (gnus-signature, gnus-header-from)
(gnus-header-subject, gnus-header-newsgroups, gnus-header-name)
(gnus-header-content): Remove "-face" suffix from face names.
(gnus-signature-face, gnus-header-from-face)
(gnus-header-subject-face, gnus-header-newsgroups-face)
(gnus-header-name-face, gnus-header-content-face):
New backward-compatibility aliases for renamed faces.
(gnus-signature-face, gnus-header-face-alist): Use renamed gnus faces.
* lisp/gnus/gnus-sum.el (gnus-summary-selected-face)
(gnus-summary-highlight): Use renamed gnus faces.
* lisp/gnus/gnus-group.el (gnus-group-highlight): Likewise.
2005-06-16 03:48:20 +00:00
|
|
|
;; TODO: How do we redo this every time the `spam' face is customized?
|
|
|
|
(push '((eq mark gnus-spam-mark) . spam)
|
2004-09-04 13:13:48 +00:00
|
|
|
gnus-summary-highlight)
|
|
|
|
;; Add hooks for loading and saving the spam stats
|
|
|
|
(add-hook 'gnus-save-newsrc-hook 'spam-maybe-spam-stat-save)
|
|
|
|
(add-hook 'gnus-get-top-new-news-hook 'spam-maybe-spam-stat-load)
|
|
|
|
(add-hook 'gnus-startup-hook 'spam-maybe-spam-stat-load)
|
|
|
|
(add-hook 'gnus-summary-prepare-exit-hook 'spam-summary-prepare-exit)
|
|
|
|
(add-hook 'gnus-summary-prepare-hook 'spam-summary-prepare)
|
|
|
|
(add-hook 'gnus-get-new-news-hook 'spam-setup-widening)
|
2007-10-28 09:18:39 +00:00
|
|
|
(add-hook 'gnus-summary-prepared-hook 'spam-find-spam))
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(defun spam-unload-hook ()
|
(spam-find-spam, spam-enter-list): Doc fixes.
(spam-split-symbolic-return-positive): Reflow docstring.
(spam-backends, spam-summary-exit-behavior,
spam-mark-ham-unread-before-move-from-spam-group,
spam-summary-score-preferred-header, spam-sa-learn-spam-switch,
spam-sa-learn-ham-switch, spam-sa-learn-unregister-switch, spam-clear-cache,
spam-backend-check, spam-install-backend, spam-install-statistical-backend,
spam-list-of-processors, spam-group-processor-p, spam-split,
spam-bogofilter-score, spam-bsfilter-score, spam-check-bsfilter,
spam-crm114-score, spam-check-crm114, spam-initialize, spam-unload-hook):
Fix typos in docstrings.
2007-11-22 16:12:58 +00:00
|
|
|
"Uninstall the spam.el hooks."
|
2004-09-04 13:13:48 +00:00
|
|
|
(interactive)
|
|
|
|
(remove-hook 'gnus-save-newsrc-hook 'spam-maybe-spam-stat-save)
|
|
|
|
(remove-hook 'gnus-get-top-new-news-hook 'spam-maybe-spam-stat-load)
|
|
|
|
(remove-hook 'gnus-startup-hook 'spam-maybe-spam-stat-load)
|
|
|
|
(remove-hook 'gnus-summary-prepare-exit-hook 'spam-summary-prepare-exit)
|
|
|
|
(remove-hook 'gnus-summary-prepare-hook 'spam-summary-prepare)
|
|
|
|
(remove-hook 'gnus-get-new-news-hook 'spam-setup-widening)
|
|
|
|
(remove-hook 'gnus-summary-prepare-hook 'spam-find-spam))
|
|
|
|
|
2004-10-17 07:06:16 +00:00
|
|
|
(add-hook 'spam-unload-hook 'spam-unload-hook)
|
|
|
|
|
2004-09-04 13:13:48 +00:00
|
|
|
(when spam-install-hooks
|
|
|
|
(spam-initialize))
|
2007-10-28 09:18:39 +00:00
|
|
|
;;}}}
|
2004-09-04 13:13:48 +00:00
|
|
|
|
|
|
|
(provide 'spam)
|
|
|
|
|
|
|
|
;;; arch-tag: 07e6e0ca-ab0a-4412-b445-1f6c72a4f27f
|
|
|
|
;;; spam.el ends here
|