X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=utils%2Fbbdb-wl.el;h=b40e4c24550e6f9da90517214e9be0ba8a68ab12;hb=fb40159a1fc3d4fb1400f8fe3befb1056bc75b8c;hp=6896ed61cb1d4c17d2eee97aa5836bc41d446053;hpb=5524a156d1feb2b6fce4443e6ff70adeac9a9e08;p=elisp%2Fwanderlust.git

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))