# HG changeset patch
# User Daiki Ueno <ueno@unixuser.org>
# Date 1273219828 -32400
# Node ID 023a01688e8b33a0e0a40d7d2586c5c0d916e187
# Parent  0930523ce0d9402438171b5bd6eb5eb8554ea3bc
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).

diff -r 0930523ce0d9 -r 023a01688e8b lisp/ChangeLog
--- a/lisp/ChangeLog	Fri May 07 07:43:41 2010 +0000
+++ b/lisp/ChangeLog	Fri May 07 17:10:28 2010 +0900
@@ -1,3 +1,7 @@
+2010-05-07  Christian von Roques <roques@mti.ag> (tiny change)
+
+	* lisp/epg.el (epg-key-capablity-alist): Add "D" flag (Bug#5592).
+
 2010-05-07  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* mail/binhex.el (binhex-decode-region-internal)
diff -r 0930523ce0d9 -r 023a01688e8b lisp/epg.el
--- a/lisp/epg.el	Fri May 07 07:43:41 2010 +0000
+++ b/lisp/epg.el	Fri May 07 17:10:28 2010 +0900
@@ -137,7 +137,8 @@
   '((?e . encrypt)
     (?s . sign)
     (?c . certify)
-    (?a . authentication)))
+    (?a . authentication)
+    (?D . disabled)))
 
 (defvar epg-new-signature-type-alist
   '((?D . detached)
diff -r 0930523ce0d9 -r 023a01688e8b lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Fri May 07 07:43:41 2010 +0000
+++ b/lisp/gnus/ChangeLog	Fri May 07 17:10:28 2010 +0900
@@ -1,3 +1,8 @@
+2010-05-07  Christian von Roques <roques@mti.ag> (tiny change)
+
+	* mml2015.el (mml2015-epg-find-usable-key): Skip disabled key
+	(Bug#5592).
+
 2010-05-07  Julien Danjou  <julien@danjou.info>
 
 	* gnus-art.el (gnus-mime-pipe-part): Add optional argument `cmd'; pass
diff -r 0930523ce0d9 -r 023a01688e8b lisp/gnus/mml2015.el
--- a/lisp/gnus/mml2015.el	Fri May 07 07:43:41 2010 +0000
+++ b/lisp/gnus/mml2015.el	Fri May 07 17:10:28 2010 +0900
@@ -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)))