diff options
| author | Eli Zaretskii <eliz@is.elta.co.il> | 2004-02-17 19:54:49 +0000 |
|---|---|---|
| committer | Eli Zaretskii <eliz@is.elta.co.il> | 2004-02-17 19:54:49 +0000 |
| commit | 1d293a2160744e15de1bc1588f2f93fcc2140019 (patch) | |
| tree | c85f19dc29de4cfde65fb3f406b67ea900a9a5da /lisp/mail | |
| parent | 52842e8b4a9127c5c98b900b4ea5f037fffa4962 (diff) | |
| download | emacs-1d293a2160744e15de1bc1588f2f93fcc2140019.tar.gz | |
(rmail-get-new-mail): Don't reference
rmail-use-spam-filter if rmail-spam-filter is not loaded.
Diffstat (limited to 'lisp/mail')
| -rw-r--r-- | lisp/mail/rmail.el | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el index 512c962c0bc..4090749d83e 100644 --- a/lisp/mail/rmail.el +++ b/lisp/mail/rmail.el @@ -1448,7 +1448,8 @@ It returns t if it got any new messages." (if (or file-name rmail-inbox-list) (message "(No new mail has arrived)"))) ;; check new messages to see if any of them is spam: - (if rmail-use-spam-filter + (if (and (featurep 'rmail-spam-filter) + rmail-use-spam-filter) (let* ((old-messages (- rmail-total-messages new-messages)) (rsf-scanned-message-number (1+ old-messages)) @@ -1486,7 +1487,9 @@ It returns t if it got any new messages." (message "%d new message%s read%s" new-messages (if (= 1 new-messages) "" "s") ;; print out a message on number of spam messages found: - (if (and rmail-use-spam-filter (> rsf-number-of-spam 0)) + (if (and (featurep 'rmail-spam-filter) + rmail-use-spam-filter + (> rsf-number-of-spam 0)) (if (= 1 new-messages) ", and found to be a spam message" (if (> rsf-number-of-spam 1) @@ -1494,7 +1497,9 @@ It returns t if it got any new messages." rsf-number-of-spam) ", one of which found to be a spam message")) "")) - (if (and rmail-use-spam-filter (> rsf-number-of-spam 0)) + (if (and (featurep 'rmail-spam-filter) + rmail-use-spam-filter + (> rsf-number-of-spam 0)) (progn (if rmail-spam-filter-beep (beep t)) (sleep-for rmail-spam-sleep-after-message))) |