Mercurial > emacs
comparison lisp/mail/pmail.el @ 98048:dec575ec3687
(pmail-use-spam-filter): Remove un-needed variable declaration.
Doc fix for actual definition.
(pmail-get-new-mail): Call rmail-spam-filter rather than non-existent
pmail-spam-filter.
| author | Glenn Morris <rgm@gnu.org> |
|---|---|
| date | Sat, 06 Sep 2008 18:37:43 +0000 |
| parents | 72564311fb7b |
| children | c4cf87cdb0a4 |
comparison
equal
deleted
inserted
replaced
| 98047:68cd1155dcc3 | 98048:dec575ec3687 |
|---|---|
| 51 (defvar deleted-head) | 51 (defvar deleted-head) |
| 52 (defvar font-lock-fontified) | 52 (defvar font-lock-fontified) |
| 53 (defvar mail-abbrev-syntax-table) | 53 (defvar mail-abbrev-syntax-table) |
| 54 (defvar mail-abbrevs) | 54 (defvar mail-abbrevs) |
| 55 (defvar messages-head) | 55 (defvar messages-head) |
| 56 (defvar pmail-use-spam-filter) | |
| 57 (defvar rsf-beep) | 56 (defvar rsf-beep) |
| 58 (defvar rsf-sleep-after-message) | 57 (defvar rsf-sleep-after-message) |
| 59 (defvar total-messages) | 58 (defvar total-messages) |
| 60 (defvar tool-bar-map) | 59 (defvar tool-bar-map) |
| 61 | 60 |
| 797 ;; This variable is dynamically bound. The defvar is here to placate | 796 ;; This variable is dynamically bound. The defvar is here to placate |
| 798 ;; the byte compiler. | 797 ;; the byte compiler. |
| 799 | 798 |
| 800 (defvar pmail-enable-multibyte nil) | 799 (defvar pmail-enable-multibyte nil) |
| 801 | 800 |
| 802 ;; Avoid errors. | 801 ;; XXX rmail-spam-filter hasn't been tested at all with the mbox |
| 803 (defvar pmail-use-spam-filter nil) | 802 ;; branch. --enberg |
| 803 (defvar pmail-use-spam-filter nil | |
| 804 "*Non-nil to activate the rmail spam filter with pmail. | |
| 805 WARNING - this has not been tested at all with pmail.") | |
| 804 | 806 |
| 805 (defun pmail-require-mime-maybe () | 807 (defun pmail-require-mime-maybe () |
| 806 "Require `pmail-mime-feature' if that is non-nil. | 808 "Require `pmail-mime-feature' if that is non-nil. |
| 807 Signal an error and set `pmail-mime-feature' to nil if the feature | 809 Signal an error and set `pmail-mime-feature' to nil if the feature |
| 808 isn't provided." | 810 isn't provided." |
| 1443 '("Output Pmail File" . pmail-disable-menu))))) | 1445 '("Output Pmail File" . pmail-disable-menu))))) |
| 1444 | 1446 |
| 1445 | 1447 |
| 1446 ;;;; *** Pmail input *** | 1448 ;;;; *** Pmail input *** |
| 1447 | 1449 |
| 1448 ;;;(declare-function pmail-spam-filter "pmail-spam-filter" (msg)) | 1450 (declare-function pmail-summary-goto-msg "pmailsum" |
| 1449 (declare-function pmail-summary-goto-msg "pmailsum" (&optional n nowarn skip-pmail)) | 1451 (&optional n nowarn skip-pmail)) |
| 1450 (declare-function pmail-summary-mark-undeleted "pmailsum" (n)) | 1452 (declare-function pmail-summary-mark-undeleted "pmailsum" (n)) |
| 1451 (declare-function pmail-summary-mark-deleted "pmailsum" (&optional n undel)) | 1453 (declare-function pmail-summary-mark-deleted "pmailsum" (&optional n undel)) |
| 1452 (declare-function rfc822-addresses "rfc822" (header-text)) | 1454 (declare-function rfc822-addresses "rfc822" (header-text)) |
| 1453 (declare-function mail-abbrev-make-syntax-table "mailabbrev.el" ()) | 1455 (declare-function mail-abbrev-make-syntax-table "mailabbrev.el" ()) |
| 1454 (declare-function mail-sendmail-delimit-header "sendmail" ()) | 1456 (declare-function mail-sendmail-delimit-header "sendmail" ()) |
| 1564 (message "(No new mail has arrived)")) | 1566 (message "(No new mail has arrived)")) |
| 1565 | 1567 |
| 1566 ;; Process the new messages for spam using the integrated | 1568 ;; Process the new messages for spam using the integrated |
| 1567 ;; spam filter. The spam filter can mark messages for | 1569 ;; spam filter. The spam filter can mark messages for |
| 1568 ;; deletion and can output a message. | 1570 ;; deletion and can output a message. |
| 1569 ;; XXX pmail-spam-filter hasn't been tested at all with | |
| 1570 ;; the mbox branch. --enberg | |
| 1571 (setq current-message (pmail-first-unseen-message)) | 1571 (setq current-message (pmail-first-unseen-message)) |
| 1572 (when pmail-use-spam-filter | 1572 (when pmail-use-spam-filter |
| 1573 (while (<= current-message pmail-total-messages) | 1573 (while (<= current-message pmail-total-messages) |
| 1574 (pmail-spam-filter current-message) | 1574 (rmail-spam-filter current-message) |
| 1575 (setq current-message (1+ current-message)))) | 1575 (setq current-message (1+ current-message)))) |
| 1576 ;; Make the first unseen message the current message and | 1576 ;; Make the first unseen message the current message and |
| 1577 ;; update the summary buffer, if one exists. | 1577 ;; update the summary buffer, if one exists. |
| 1578 (setq current-message (pmail-first-unseen-message)) | 1578 (setq current-message (pmail-first-unseen-message)) |
| 1579 (if (pmail-summary-exists) | 1579 (if (pmail-summary-exists) |