[Emacs-diffs] Changes to emacs/lisp/gnus/mml2015.el,v

[Miles Bader]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     08/02/24 06:43:15

Index: lisp/gnus/mml2015.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/gnus/mml2015.el,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- lisp/gnus/mml2015.el        8 Jan 2008 20:45:21 -0000       1.21
+++ lisp/gnus/mml2015.el        24 Feb 2008 06:43:13 -0000      1.22
@@ -1186,6 +1186,7 @@
 If no one is selected, default secret key is used.  "
                                    mml2015-signers t)
                 (if mml2015-signers
+                    (delq nil
                     (mapcar
                      (lambda (signer)
                        (setq signer-key (mml2015-epg-find-usable-key
@@ -1193,11 +1194,12 @@
                                          'sign))
                        (unless (or signer-key
                                    (y-or-n-p
-                                    (format "No secret key for %s; skip it? "
+                                          (format
+                                           "No secret key for %s; skip it? "
                                             signer)))
                          (error "No secret key for %s" signer))
                        signer-key)
-                     mml2015-signers))))))
+                           mml2015-signers)))))))
         signature micalg)
     (epg-context-set-armor context t)
     (epg-context-set-textmode context t)
@@ -1267,6 +1269,7 @@
 If no one is selected, symmetric encryption will be performed.  "
                                 recipients))
        (setq recipients
+             (delq nil
              (mapcar
               (lambda (recipient)
                 (setq recipient-key (mml2015-epg-find-usable-key
@@ -1278,7 +1281,7 @@
                                      recipient)))
                   (error "No public key for %s" recipient))
                 recipient-key)
-              recipients))
+                    recipients)))
        (unless recipients
          (error "No recipient specified")))
       (message-options-set 'mml2015-epg-recipients recipients))
@@ -1293,6 +1296,7 @@
 If no one is selected, default secret key is used.  "
                                      mml2015-signers t)
                   (if mml2015-signers
+                      (delq nil
                       (mapcar
                        (lambda (signer)
                          (setq signer-key (mml2015-epg-find-usable-key
@@ -1305,7 +1309,7 @@
                                        signer)))
                            (error "No secret key for %s" signer))
                          signer-key)
-                       mml2015-signers))))))
+                             mml2015-signers)))))))
       (epg-context-set-signers context signers))
     (epg-context-set-armor context t)
     (epg-context-set-textmode context t)