From: yoichi <yoichi>
Date: Sat, 19 Jan 2002 16:57:21 +0000 (+0000)
Subject: * wl-address.el (wl-address-make-completion-list): Check whether
X-Git-Tag: wl-2_9_6~35
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=f3d35a20272dce997e602909c9ab8f87f576dfeb;p=elisp%2Fwanderlust.git

* wl-address.el (wl-address-make-completion-list): Check whether
the address is a group list.
* wl-addrmgr.el (wl-addrmgr-mark-check): Ditto.
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index eec592c..06e0c4c 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-19  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+
+	* wl-address.el (wl-address-make-completion-list): Check whether
+	the address is a group list.
+	* wl-addrmgr.el (wl-addrmgr-mark-check): Ditto.
+
 2002-01-19  Hiroya Murata  <lapis-lazuli@pop06.odn.ne.jp>
 
 	* wl-folder.el (wl-folder-check-one-entity): Fixed problem;
@@ -10,7 +16,7 @@
 
 	* wl-score.el (wl-summary-score-update-all-lines): Likewise.
 
-2002-01-20  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
+2002-01-19  Yoichi NAKAYAMA  <yoichi@eken.phys.nagoya-u.ac.jp>
 
 	* wl-address.el (wl-address-make-completion-list): Do not enclose
 	address by " <" and ">" if associated realname is "".
diff --git a/wl/wl-address.el b/wl/wl-address.el
index 2044dc3..13751c6 100644
--- a/wl/wl-address.el
+++ b/wl/wl-address.el
@@ -289,7 +289,8 @@ Matched address lists are append to CL."
       (setq cl
 	    (cons
 	     (cons (nth 0 addr-tuple)
-		   (if (string= (nth 2 addr-tuple) "")
+		   (if (or (string= (nth 2 addr-tuple) "")
+			   (string-match ".*:.*;$" (nth 0 addr-tuple)))
 		       (nth 0 addr-tuple)
 		     (concat
 		      (wl-address-quote-specials
@@ -302,7 +303,8 @@ Matched address lists are append to CL."
 	(setq cl
 	      (cons
 	       (cons (nth 1 addr-tuple)
-		     (if (string= (nth 2 addr-tuple) "")
+		     (if (or (string= (nth 2 addr-tuple) "")
+			     (string-match ".*:.*;$" (nth 0 addr-tuple)))
 			 (nth 0 addr-tuple)
 		       (concat
 			(wl-address-quote-specials
diff --git a/wl/wl-addrmgr.el b/wl/wl-addrmgr.el
index 4714a90..f115523 100644
--- a/wl/wl-addrmgr.el
+++ b/wl/wl-addrmgr.el
@@ -578,7 +578,9 @@ Return nil if no ADDRESS exists."
 	(cond
 	 ((string= mark "To:")
 	  (setq to-list (cons
-			 (if (and full (not (string= realname "")))
+			 (if (and full
+				  (not (or (string= realname "")
+					   (string-match ".*:.*;$" addr))))
 			     (concat
 			      (wl-address-quote-specials realname)
 			      " <" addr">")
@@ -586,7 +588,9 @@ Return nil if no ADDRESS exists."
 			 to-list)))
 	 ((string= mark "Cc:")
 	  (setq cc-list (cons
-			 (if (and full (not (string= realname "")))
+			 (if (and full
+				  (not (or (string= realname "")
+					   (string-match ".*:.*;$" addr))))
 			     (concat
 			      (wl-address-quote-specials realname)
 			      " <" addr">")
@@ -594,7 +598,9 @@ Return nil if no ADDRESS exists."
 			 cc-list)))
 	 ((string= mark "Bcc:")
 	  (setq bcc-list (cons
-			  (if (and full (not (string= realname "")))
+			  (if (and full
+				   (not (or (string= realname "")
+					    (string-match ".*:.*;$" addr))))
 			      (concat
 			       (wl-address-quote-specials realname)
 			       " <" addr">")