From 5eb57ecbe4738e85d5b2c22767ab75c311418b38 Mon Sep 17 00:00:00 2001 From: teranisi Date: Sat, 12 Oct 2002 08:23:39 +0000 Subject: [PATCH] 2002-10-10 KOBAYASHI Shinji * bbdb-wl.el (bbdb-wl-get-addresses-1): Call `bbdb-wl-canonicalize-full-name-function' after decoding full-name string. * bbdb-wl.el (bbdb-wl-get-addresses-2): Ditto. --- utils/ChangeLog | 7 +++++++ utils/bbdb-wl.el | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/utils/ChangeLog b/utils/ChangeLog index f70e833..1fcc913 100644 --- a/utils/ChangeLog +++ b/utils/ChangeLog @@ -1,3 +1,10 @@ +2002-10-10 KOBAYASHI Shinji + + * bbdb-wl.el (bbdb-wl-get-addresses-1): Call + `bbdb-wl-canonicalize-full-name-function' after decoding full-name + string. + * bbdb-wl.el (bbdb-wl-get-addresses-2): Ditto. + 2002-09-05 TAKAHASHI Kaoru * ptexinfmt.el: discard @documentdescription. Support diff --git a/utils/bbdb-wl.el b/utils/bbdb-wl.el index 6896ed6..b40e4c2 100644 --- a/utils/bbdb-wl.el +++ b/utils/bbdb-wl.el @@ -179,8 +179,7 @@ For BBDB 2.33 or earlier." (std11-unfold-string header))) (while (and (setq structure (car structures)) (eq (car structure) 'mailbox)) - (setq fn (funcall bbdb-wl-canonicalize-full-name-function - (std11-full-name-string structure)) + (setq fn (std11-full-name-string structure) fn (and fn (with-temp-buffer ; to keep raw buffer unibyte. (elmo-set-buffer-multibyte @@ -188,6 +187,7 @@ For BBDB 2.33 or earlier." (eword-decode-string (decode-mime-charset-string fn wl-mime-charset)))) + fn (funcall bbdb-wl-canonicalize-full-name-function fn) ad (std11-address-string structure)) ;; ignore uninteresting addresses, this is kinda gross! (when (or (not (stringp uninteresting-senders)) @@ -224,8 +224,7 @@ For BBDB 2.34 or later." (std11-unfold-string header-content))) (while (and (setq structure (car structures)) (eq (car structure) 'mailbox)) - (setq fn (funcall bbdb-wl-canonicalize-full-name-function - (std11-full-name-string structure)) + (setq fn (std11-full-name-string structure) fn (and fn (with-temp-buffer ; to keep raw buffer unibyte. (elmo-set-buffer-multibyte @@ -233,6 +232,7 @@ For BBDB 2.34 or later." (eword-decode-string (decode-mime-charset-string fn wl-mime-charset)))) + fn (funcall bbdb-wl-canonicalize-full-name-function fn) ad (std11-address-string structure)) ;; ignore uninteresting addresses, this is kinda gross! (when (or (not (stringp uninteresting-senders)) -- 1.7.10.4