From: keiichi <keiichi>
Date: Wed, 10 May 2000 01:47:58 +0000 (+0000)
Subject: (gnus-bbdb/split-mail): Support group address.
X-Git-Tag: nana-gnus-7_1_0_22~15
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c58d20309d8df31dcbf81378e985343dd2d9be65;p=elisp%2Fgnus.git-

(gnus-bbdb/split-mail): Support group address.
(gnus-bbdb/insert-address-regexp): New function.
---

diff --git a/lisp/gnus-bbdb.el b/lisp/gnus-bbdb.el
index 181f8db..457eb5c 100644
--- a/lisp/gnus-bbdb.el
+++ b/lisp/gnus-bbdb.el
@@ -34,7 +34,8 @@
 (require 'std11)
 (eval-when-compile
   (defvar bbdb-pop-up-elided-display)	; default unbound.
-  (require 'gnus-win))
+  (require 'gnus-win)
+  (require 'cl))
 
 (defvar gnus-bbdb/decode-field-body-function 'nnheader-decode-field-body
   "*Field body decoder.")
@@ -181,16 +182,32 @@ BBDB-FEILD values is returned.  Otherwise, GROUP is returned."
 						(std11-field-end))
 				  header-values)))
       (let ((address-regexp
-	     (mapconcat
-	      (lambda (lal)
-		(regexp-quote (std11-address-string lal)))
-	      (apply 'nconc
-		     (mapcar #'std11-parse-addresses-string
-			     header-values))
-	      "\\|")))
+	     (with-temp-buffer
+	       (let (lal)
+		 (while header-values
+		   (setq lal (std11-parse-addresses-string
+			      (pop header-values)))
+		   (while lal
+		     (gnus-bbdb/insert-address-regexp (pop lal)))))
+	       (buffer-string))))
 	(unless (zerop (length address-regexp))
 	  (gnus-bbdb/split-mail-1 address-regexp bbdb-field regexp group))))))
 
+(defun gnus-bbdb/insert-address-regexp (address)
+  "Insert string of address part from parsed ADDRESS of RFC 822."
+  (cond ((eq (car address) 'group)
+	 (setq address (cdr address))
+	 (while address
+	   (gnus-bbdb/insert-address-regexp (pop address))))
+	((eq (car address) 'mailbox)
+	 (unless (eq (point) (point-min))
+	   (insert "\\|"))
+	 (let ((addr (nth 1 address)))
+	   (insert (std11-addr-to-string
+		    (if (eq (car addr) 'phrase-route-addr)
+			(nth 2 addr)
+		      (cdr addr))))))))
+
 (defun gnus-bbdb/split-mail-1 (address-regexp bbdb-field regexp group)
   (let ((records (bbdb-search (bbdb-records) nil nil address-regexp))
 	prop rest)