* xml.el (xml-parse-string): Fix typo in handling of bad character references.

[gnu-emacs] / lisp / epa-mail.el

diff --git a/lisp/epa-mail.el b/lisp/epa-mail.el
index be5b849651cb0a1d6234acef71f892549a116dba..6ba29d3748fff577e8ccb60540bcf455414c3d1b 100644 (file)
--- a/lisp/epa-mail.el
+++ b/lisp/epa-mail.el
@@ -1,5 +1,5 @@
 ;;; epa-mail.el --- the EasyPG Assistant, minor-mode for mail composer -*- lexical-binding: t -*-
-;; Copyright (C) 2006-2012 Free Software Foundation, Inc.
+;; Copyright (C) 2006-2013 Free Software Foundation, Inc.
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Keywords: PGP, GnuPG, mail, message
@@ -170,24 +170,26 @@ Don't use this command in Lisp programs!"
 If no one is selected, symmetric encryption will be performed.  "
                  recipients)
               (if recipients
-                  (mapcar
-                   (lambda (recipient)
-                     (setq recipient-key
-                           (epa-mail--find-usable-key
-                            (epg-list-keys
-                             (epg-make-context epa-protocol)
-                             (if (string-match "@" recipient)
-                                 (concat "<" recipient ">")
-                               recipient))
-                            'encrypt))
-                     (unless (or recipient-key
-                                 (y-or-n-p
-                                  (format
-                                   "No public key for %s; skip it? "
-                                   recipient)))
-                       (error "No public key for %s" recipient))
-                     recipient-key)
-                   recipients)))
+                  (apply
+                   'nconc
+                   (mapcar
+                    (lambda (recipient)
+                      (setq recipient-key
+                            (epa-mail--find-usable-key
+                             (epg-list-keys
+                              (epg-make-context epa-protocol)
+                              (if (string-match "@" recipient)
+                                  (concat "<" recipient ">")
+                                recipient))
+                             'encrypt))
+                      (unless (or recipient-key
+                                  (y-or-n-p
+                                   (format
+                                    "No public key for %s; skip it? "
+                                    recipient)))
+                        (error "No public key for %s" recipient))
+                      (if recipient-key (list recipient-key)))
+                    recipients))))
             (setq sign (if verbose (y-or-n-p "Sign? ")))
             (if sign
                 (epa-select-keys context