procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
rmail-use-spam-filter if rmail-spam-filter is not loaded.
This commit is contained in:
Eli Zaretskii 2004-02-17 19:55:43 +00:00
parent 43e48bdaa5
commit ac84042c63
2 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -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

11
lisp/mail/rmail.el
View file

@ -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)))