[Emacs-diffs] /srv/bzr/emacs/trunk r100182: Skip disabled PGP key when encrypting mail with Gnus.

[Daiki Ueno]

------------------------------------------------------------
revno: 100182
committer: Daiki Ueno <address@hidden>
branch nick: trunk
timestamp: Fri 2010-05-07 17:10:28 +0900
message:
  Skip disabled PGP key when encrypting mail with Gnus.
  
  * lisp/epg.el (epg-key-capablity-alist): Add "D" flag (Bug#5592).
  * lisp/gnus/mml2015.el (mml2015-epg-find-usable-key): Skip disabled key 
(Bug#5592).
modified:
  lisp/ChangeLog
  lisp/epg.el
  lisp/gnus/ChangeLog
  lisp/gnus/mml2015.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-05-07 07:41:53 +0000
+++ b/lisp/ChangeLog    2010-05-07 08:10:28 +0000
@@ -1,3 +1,7 @@
+2010-05-07  Christian von Roques <address@hidden> (tiny change)
+
+       * lisp/epg.el (epg-key-capablity-alist): Add "D" flag (Bug#5592).
+
 2010-05-07  Katsumi Yamaoka  <address@hidden>
 
        * mail/binhex.el (binhex-decode-region-internal)

=== modified file 'lisp/epg.el'
--- a/lisp/epg.el       2010-05-03 15:01:21 +0000
+++ b/lisp/epg.el       2010-05-07 08:10:28 +0000
@@ -137,7 +137,8 @@
   '((?e . encrypt)
     (?s . sign)
     (?c . certify)
-    (?a . authentication)))
+    (?a . authentication)
+    (?D . disabled)))
 
 (defvar epg-new-signature-type-alist
   '((?D . detached)

=== modified file 'lisp/gnus/ChangeLog'
--- a/lisp/gnus/ChangeLog       2010-05-07 07:41:53 +0000
+++ b/lisp/gnus/ChangeLog       2010-05-07 08:10:28 +0000
@@ -1,3 +1,8 @@
+2010-05-07  Christian von Roques <address@hidden> (tiny change)
+
+       * mml2015.el (mml2015-epg-find-usable-key): Skip disabled key
+       (Bug#5592).
+
 2010-05-07  Julien Danjou  <address@hidden>
 
        * gnus-art.el (gnus-mime-pipe-part): Add optional argument `cmd'; pass

=== modified file 'lisp/gnus/mml2015.el'
--- a/lisp/gnus/mml2015.el      2010-03-19 02:55:37 +0000
+++ b/lisp/gnus/mml2015.el      2010-05-07 08:10:28 +0000
@@ -1021,6 +1021,7 @@
       (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)))