From fd982e480adf82178fa0cb5246b82e01dd3bedf2 Mon Sep 17 00:00:00 2001 From: hmurata Date: Mon, 28 Jan 2002 13:36:53 +0000 Subject: [PATCH] * bbdb-wl.el (bbdb-wl-get-addresses-2): Bind unbound local variable. --- utils/ChangeLog | 5 +++++ utils/bbdb-wl.el | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/utils/ChangeLog b/utils/ChangeLog index 0f3be4a..6454558 100644 --- a/utils/ChangeLog +++ b/utils/ChangeLog @@ -1,3 +1,8 @@ +2002-01-28 Hiroya Murata + + * bbdb-wl.el (bbdb-wl-get-addresses-2): Bind unbound local + variable. + 2002-01-28 Yuuichi Teranishi * bbdb-wl.el (bbdb-wl-get-addresses-1): New function. diff --git a/utils/bbdb-wl.el b/utils/bbdb-wl.el index 10a73e0..e1444bc 100644 --- a/utils/bbdb-wl.el +++ b/utils/bbdb-wl.el @@ -183,7 +183,7 @@ For BBDB 2.33 or earlier." ad (std11-address-string structure)) ;; ignore uninteresting addresses, this is kinda gross! (when (or (not (stringp uninteresting-senders)) - (not + (not (or (and fn (string-match uninteresting-senders fn)) (and ad (string-match uninteresting-senders ad))))) @@ -205,7 +205,7 @@ For BBDB 2.34 or later." (let ((headers bbdb-get-addresses-headers) (uninteresting-senders bbdb-user-mail-names) addrlist header structures structure fn ad - header-type header-fields) + header-type header-fields header-content) (while headers (setq header-type (caar headers) header-fields (cdar headers)) @@ -225,10 +225,9 @@ For BBDB 2.34 or later." (decode-mime-charset-string fn wl-mime-charset)))) ad (std11-address-string structure)) - ;; ignore uninteresting addresses, this is kinda gross! (when (or (not (stringp uninteresting-senders)) - (not + (not (or (and fn (string-match uninteresting-senders fn)) -- 1.7.10.4