(rmail-get-new-mail): Don't reference

rmail-use-spam-filter if rmail-spam-filter is not loaded.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b5b28d606a1e42d00ca8b3d97498bcfaf01e6a8f..eb668cd6b22c9498954b0f255dc3bca1df857b64 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-17  Eli Zaretskii  <eliz@elta.co.il>
+
+       * 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  <teirllm@auburn.edu>
 
        * autorevert.el (auto-revert-buffer-p): Only revert dired buffers

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 512c962c0bcca67eb268a3ec70426dcfb49e37c9..4090749d83e1de1d100ac176e61ba33bb01a2dda 100644 (file)
--- 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)))