diff options
| author | Eli Zaretskii <[email protected]> | 2004-11-12 17:03:56 +0000 |
|---|---|---|
| committer | Eli Zaretskii <[email protected]> | 2004-11-12 17:03:56 +0000 |
| commit | 7c7d40755ab10f374dd656e9f0e5f2a158ae9edb (patch) | |
| tree | e85ac36dd173cac0ca3f49635ec03694a58f0736 | |
| parent | 63cd573484da1c6ea1859da890bbf4e3412e106f (diff) | |
(rmail-spam-filter): Only check white list if `message-sender' is non-nil.
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/mail/rmail-spam-filter.el | 15 |
2 files changed, 13 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e867fa3de4..d37206b261 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2004-11-12 Diane Murray <[email protected]> (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 <[email protected]> (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 43177b7c99..c7fc8a0da0 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)) |