# HG changeset patch
# User Daiki Ueno <ueno@unixuser.org>
# Date 1288056687 -32400
# Node ID d6dad5b04eb86c7946f5fe99d756521bd56e7871
# Parent  6585f38b9f1d88010235d172f9631284ea401c33
Make epa-mail-encrypt expand mail aliases.

diff -r 6585f38b9f1d -r d6dad5b04eb8 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Oct 26 10:02:08 2010 +0900
+++ b/lisp/ChangeLog	Tue Oct 26 10:31:27 2010 +0900
@@ -1,7 +1,7 @@
 2010-10-26  Daiki Ueno  <ueno@unixuser.org>
 
 	* epa-mail.el (epa-mail-encrypt): Handle local-part only
-	recipients (Bug#7280).
+	recipients; expand mail aliases (Bug#7280).
 
 2010-10-25  Glenn Morris  <rgm@gnu.org>
 
diff -r 6585f38b9f1d -r d6dad5b04eb8 lisp/epa-mail.el
--- a/lisp/epa-mail.el	Tue Oct 26 10:02:08 2010 +0900
+++ b/lisp/epa-mail.el	Tue Oct 26 10:31:27 2010 +0900
@@ -117,23 +117,29 @@
    (save-excursion
      (let ((verbose current-prefix-arg)
 	   (context (epg-make-context epa-protocol))
-	   recipients recipient-key)
+	   recipients-string recipients recipient-key)
        (goto-char (point-min))
        (save-restriction
 	 (narrow-to-region (point)
 			   (if (search-forward mail-header-separator nil 0)
 			       (match-beginning 0)
 			     (point)))
+	 (setq recipients-string
+	       (mapconcat #'identity
+			  (nconc (mail-fetch-field "to" nil nil t)
+				 (mail-fetch-field "cc" nil nil t)
+				 (mail-fetch-field "bcc" nil nil t))
+			  ","))
 	 (setq recipients
 	       (mail-strip-quoted-names
-		(mapconcat #'identity
-			   (nconc (mail-fetch-field "to" nil nil t)
-				  (mail-fetch-field "cc" nil nil t)
-				  (mail-fetch-field "bcc" nil nil t))
-			   ","))))
+		(with-temp-buffer
+		  (insert "to: " recipients-string "\n")
+		  (expand-mail-aliases (point-min) (point-max))
+		  (car (mail-fetch-field "to" nil nil t))))))
        (if recipients
 	   (setq recipients (delete ""
-				    (split-string recipients "[ \t\n]+"))))
+				    (split-string recipients
+						  "[ \t\n]*,[ \t\n]*"))))
        (goto-char (point-min))
        (if (search-forward mail-header-separator nil t)
 	   (forward-line))