From 7c7d40755ab10f374dd656e9f0e5f2a158ae9edb Mon Sep 17 00:00:00 2001
From: Eli Zaretskii
Date: Fri, 12 Nov 2004 17:03:56 +0000
Subject: (rmail-spam-filter): Only check white list if `message-sender' is
 non-nil.

---
 lisp/mail/rmail-spam-filter.el | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'lisp/mail')

diff --git a/lisp/mail/rmail-spam-filter.el b/lisp/mail/rmail-spam-filter.el
index 43177b7c99b..c7fc8a0da03 100644
--- a/lisp/mail/rmail-spam-filter.el
+++ b/lisp/mail/rmail-spam-filter.el
@@ -302,13 +302,14 @@ it from rmail file.  Called for each new message retrieved by
 
         ;; Check white list, and likewise cause while loop
         ;;  bypass.
-        (if (let ((white-list rsf-white-list)
-                  (found nil))
-              (while (and (not found) white-list)
-                (if (string-match (car white-list) message-sender)
-                    (setq found t)
-                  (setq white-list (cdr white-list))))
-              found)
+        (if (and message-sender
+                 (let ((white-list rsf-white-list)
+                       (found nil))
+                   (while (and (not found) white-list)
+                     (if (string-match (car white-list) message-sender)
+                         (setq found t)
+                       (setq white-list (cdr white-list))))
+                   found))
             (setq exit-while-loop t
                   maybe-spam nil
                   this-is-a-spam-email nil))
-- 
cgit v1.2.1


From f431a91000637a53f52b90fa9a8260b6216df2ed Mon Sep 17 00:00:00 2001
From: Eli Zaretskii
Date: Fri, 12 Nov 2004 17:10:38 +0000
Subject: (rmail-get-new-mail): Use the renamed variables `rsf-beep' and
 `rsf-sleep-after-message'.

---
 lisp/mail/rmail.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'lisp/mail')

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index f8e31dfda04..a7524cc8246 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1504,8 +1504,8 @@ It returns t if it got any new messages."
 		(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)))
+		    (progn (if rsf-beep (beep t))
+			   (sleep-for rsf-sleep-after-message)))
 
 		;; Move to the first new message
 		;; unless we have other unseen messages before it.
-- 
cgit v1.2.1