Put back the nnimal autoloads needed to do the acl stuff.

[gnus] / lisp / mml2015.el

diff --git a/lisp/mml2015.el b/lisp/mml2015.el
index 6725709..838813e 100644 (file)
--- a/lisp/mml2015.el
+++ b/lisp/mml2015.el
@@ -680,6 +680,7 @@ Whether the passphrase is cached at all is controlled by
        cipher)
     (mm-with-unibyte-current-buffer
       (with-temp-buffer
+       (mm-disable-multibyte)
        ;; set up a function to call the correct gpg encrypt routine
        ;; with the right arguments. (FIXME: this should be done
        ;; differently.)
@@ -1021,6 +1022,7 @@ Whether the passphrase is cached at all is controlled by
       (let ((pointer (epg-key-sub-key-list (car keys))))
        (while pointer
          (if (and (memq usage (epg-sub-key-capability (car pointer)))
+                  (not (memq 'disabled (epg-sub-key-capability (car pointer))))
                   (not (memq (epg-sub-key-validity (car pointer))
                              '(revoked expired))))
              (throw 'found (car keys)))
@@ -1418,5 +1420,4 @@ If no one is selected, default secret key is used.  "
 
 (provide 'mml2015)
 
-;; arch-tag: b04701d5-0b09-44d8-bed8-de901bf435f2
 ;;; mml2015.el ends here