Make epa-mail-encrypt handle local-part only recipients.

* epa-mail.el (epa-mail-encrypt): Handle local-part only
recipients (Bug#7280).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e62729555c2006b62d6e3e41d0a05ffb77b8c147..723bb8d5c1b51a4c9324e365b80d00166e1f2610 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-26  Daiki Ueno  <ueno@unixuser.org>
+
+       * epa-mail.el (epa-mail-encrypt): Handle local-part only
+       recipients (Bug#7280).
+
 2010-10-25  Glenn Morris  <rgm@gnu.org>
 
        * term/common-win.el (x-handle-switch): Simplify with pop.

diff --git a/lisp/epa-mail.el b/lisp/epa-mail.el
index 09b3086811514dcbcc017b61ca5aacaccdf79980..2b29e80daa5d6132ac50313eb686db5ae897f960 100644 (file)
--- a/lisp/epa-mail.el
+++ b/lisp/epa-mail.el
@@ -154,7 +154,9 @@ If no one is selected, symmetric encryption will be performed.  "
                            (epa-mail--find-usable-key
                             (epg-list-keys
                              (epg-make-context epa-protocol)
-                             (concat "<" recipient ">"))
+                             (if (string-match "@" recipient)
+                                 (concat "<" recipient ">")
+                               recipient))
                             'encrypt))
                      (unless (or recipient-key
                                  (y-or-n-p