[Emacs-diffs] /srv/bzr/emacs/trunk r110068: Fix bug when a name has no key.

[Richard Stallman]

------------------------------------------------------------
revno: 110068
committer: Richard Stallman <address@hidden>
branch nick: trunk
timestamp: Mon 2012-09-17 05:49:55 -0400
message:
  Fix bug when a name has no key.
modified:
  lisp/ChangeLog
  lisp/epa-mail.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-09-17 05:41:04 +0000
+++ b/lisp/ChangeLog    2012-09-17 09:49:55 +0000
@@ -1,3 +1,7 @@
+2012-09-17  Richard Stallman  <address@hidden>
+
+       * epa-mail.el (epa-mail-encrypt): Fix bug when a name has no key.
+
 2012-09-17  Chong Yidong  <address@hidden>
 
        * shell.el (shell-file-name-chars, shell-file-name-quote-list)

=== modified file 'lisp/epa-mail.el'
--- a/lisp/epa-mail.el  2012-03-10 08:43:27 +0000
+++ b/lisp/epa-mail.el  2012-09-17 09:49:55 +0000
@@ -170,24 +170,26 @@
 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