;;; mh-junk.el --- MH-E interface to anti-spam measures
-;; Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
;; Author: Satyaki Das <satyaki@theforce.stanford.edu>,
;; Bill Wohler <wohler@newt.com>
;; This file is part of GNU Emacs.
-;; GNU Emacs is free software; you can redistribute it and/or modify
+;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
-;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-;; Boston, MA 02110-1301, USA.
+;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
To use SpamAssassin, add the following recipes to
\".procmailrc\":
+ PATH=$PATH:/usr/bin/mh
MAILDIR=$HOME/`mhparam Path`
# Fight spam with SpamAssassin.
(let ((current-folder mh-current-folder)
(msg-file (mh-msg-filename msg mh-current-folder))
(sender))
- (save-excursion
- (message "Reporting message %d..." msg)
- (mh-truncate-log-buffer)
- (call-process mh-spamassassin-executable msg-file mh-log-buffer nil
+ (message "Reporting message %d..." msg)
+ (mh-truncate-log-buffer)
+ ;; Put call-process output in log buffer if we are saving it
+ ;; (this happens if mh-junk-background is t).
+ (with-current-buffer mh-log-buffer
+ (call-process mh-spamassassin-executable msg-file mh-junk-background nil
;;"--report" "--remove-from-whitelist"
"-r" "-R") ; spamassassin V2.20
- (when mh-sa-learn-executable
- (message "Recategorizing this message as spam...")
- (call-process mh-sa-learn-executable msg-file mh-log-buffer nil
- "--single" "--spam" "--local" "--no-rebuild"))
- (message "Blacklisting message %d..." msg)
- (set-buffer (get-buffer-create mh-temp-buffer))
+ (when mh-sa-learn-executable
+ (message "Recategorizing message %d as spam..." msg)
+ (mh-truncate-log-buffer)
+ (call-process mh-sa-learn-executable msg-file mh-junk-background nil
+ "--single" "--spam" "--local" "--no-rebuild")))
+ (message "Blacklisting sender of message %d..." msg)
+ (with-current-buffer (get-buffer-create mh-temp-buffer)
(erase-buffer)
(call-process (expand-file-name mh-scan-prog mh-progs)
- nil mh-junk-background nil
- (format "%s" msg) current-folder
+ nil t nil
+ (format "%d" msg) current-folder
"-format" "%<(mymbox{from})%|%(addr{from})%>")
(goto-char (point-min))
(if (search-forward-regexp "^\\(.+\\)$" nil t)
(progn
(setq sender (match-string 0))
(mh-spamassassin-add-rule "blacklist_from" sender)
- (message "Blacklisting message %d...done" msg))
- (message "Blacklisting message %d...not done (from my address)" msg)))))
+ (message "Blacklisting sender of message %d...done" msg))
+ (message "Blacklisting sender of message %d...not done (from my address)" msg)))))
;;;###mh-autoload
(defun mh-spamassassin-whitelist (msg)
(let ((msg-file (mh-msg-filename msg mh-current-folder))
(show-buffer (get-buffer mh-show-buffer))
from)
- (save-excursion
- (set-buffer (get-buffer-create mh-temp-buffer))
+ (with-current-buffer (get-buffer-create mh-temp-buffer)
(erase-buffer)
- (message "Removing spamassassin markup from message...")
- (call-process mh-spamassassin-executable msg-file mh-temp-buffer nil
+ (message "Removing spamassassin markup from message %d..." msg)
+ (call-process mh-spamassassin-executable msg-file t nil
;; "--remove-markup"
"-d") ; spamassassin V2.20
(if show-buffer
(kill-buffer show-buffer))
(write-file msg-file)
(when mh-sa-learn-executable
- (message "Recategorizing this message as ham...")
- (call-process mh-sa-learn-executable msg-file mh-temp-buffer nil
- "--single" "--ham" "--local --no-rebuild"))
- (message "Whitelisting message %d..." msg)
+ (message "Recategorizing message %d as ham..." msg)
+ (mh-truncate-log-buffer)
+ ;; Put call-process output in log buffer if we are saving it
+ ;; (this happens if mh-junk-background is t).
+ (with-current-buffer mh-log-buffer
+ (call-process mh-sa-learn-executable msg-file mh-junk-background nil
+ "--single" "--ham" "--local" "--no-rebuild")))
+ (message "Whitelisting sender of message %d..." msg)
(setq from
(car (mh-funcall-if-exists
ietf-drums-parse-address (mh-get-header-field "From:"))))
(kill-buffer nil)
(unless (or (null from) (equal from ""))
(mh-spamassassin-add-rule "whitelist_from" from))
- (message "Whitelisting message %d...done" msg))))
+ (message "Whitelisting sender of message %d...done" msg))))
(defun mh-spamassassin-add-rule (rule body)
"Add a new rule to \"~/.spamassassin/user_prefs\".
To use bogofilter, add the following recipes to \".procmailrc\":
+ PATH=$PATH:/usr/bin/mh
MAILDIR=$HOME/`mhparam Path`
# Fight spam with bogofilter.
(unless mh-bogofilter-executable
(error "Unable to find the bogofilter executable"))
(let ((msg-file (mh-msg-filename msg mh-current-folder)))
- (call-process mh-bogofilter-executable msg-file mh-junk-background
- nil "-s")))
+ (mh-truncate-log-buffer)
+ ;; Put call-process output in log buffer if we are saving it
+ ;; (this happens if mh-junk-background is t).
+ (with-current-buffer mh-log-buffer
+ (call-process mh-bogofilter-executable msg-file mh-junk-background
+ nil "-s"))))
;;;###mh-autoload
(defun mh-bogofilter-whitelist (msg)
(unless mh-bogofilter-executable
(error "Unable to find the bogofilter executable"))
(let ((msg-file (mh-msg-filename msg mh-current-folder)))
- (call-process mh-bogofilter-executable msg-file mh-junk-background
- nil "-n")))
+ (mh-truncate-log-buffer)
+ ;; Put call-process output in log buffer if we are saving it
+ ;; (this happens if mh-junk-background is t).
+ (with-current-buffer mh-log-buffer
+ (call-process mh-bogofilter-executable msg-file mh-junk-background
+ nil "-n"))))
\f
To use SpamProbe, add the following recipes to \".procmailrc\":
+ PATH=$PATH:/usr/bin/mh
MAILDIR=$HOME/`mhparam Path`
# Fight spam with SpamProbe.
(unless mh-spamprobe-executable
(error "Unable to find the spamprobe executable"))
(let ((msg-file (mh-msg-filename msg mh-current-folder)))
- (call-process mh-spamprobe-executable msg-file mh-junk-background
- nil "spam")))
+ (mh-truncate-log-buffer)
+ ;; Put call-process output in log buffer if we are saving it
+ ;; (this happens if mh-junk-background is t).
+ (with-current-buffer mh-log-buffer
+ (call-process mh-spamprobe-executable msg-file mh-junk-background
+ nil "spam"))))
;;;###mh-autoload
(defun mh-spamprobe-whitelist (msg)
(unless mh-spamprobe-executable
(error "Unable to find the spamprobe executable"))
(let ((msg-file (mh-msg-filename msg mh-current-folder)))
- (call-process mh-spamprobe-executable msg-file mh-junk-background
- nil "good")))
+ (mh-truncate-log-buffer)
+ ;; Put call-process output in log buffer if we are saving it
+ ;; (this happens if mh-junk-background is t).
+ (with-current-buffer mh-log-buffer
+ (call-process mh-spamprobe-executable msg-file mh-junk-background
+ nil "good"))))
(provide 'mh-junk)