(rmail-spam-filter): Only check white list if `message-sender' is non-nil.

2 files changed, 13 insertions, 7 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e867fa3de48..d37206b261c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-12  Diane Murray  <dsm@muenster.de>  (tiny change)
+
+        * mail/rmail-spam-filter.el (rmail-spam-filter): Only check white
+        list if `message-sender' is non-nil.
+
 2004-11-12  Kevin Rodgers  <ihs_4664@yahoo.com>  (tiny change)
 
         * desktop.el (desktop-create-buffer, desktop-save): Avoid some
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))