From ac84042c630254697a5244b11bef4375579bbf3f Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Tue, 17 Feb 2004 19:55:43 +0000 Subject: [PATCH] (rmail-get-new-mail): Don't reference rmail-use-spam-filter if rmail-spam-filter is not loaded. --- lisp/ChangeLog | 5 +++++ lisp/mail/rmail.el | 11 ++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b5b28d606a1..eb668cd6b22 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2004-02-17 Eli Zaretskii + + * mail/rmail.el (rmail-get-new-mail): Don't reference + rmail-use-spam-filter if rmail-spam-filter is not loaded. + 2004-02-16 Luc Teirlinck * autorevert.el (auto-revert-buffer-p): Only revert dired buffers 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))) -- 2.39.2