Merge from emacs-23

[gnu-emacs] / lisp / epg.el

diff --git a/lisp/epg.el b/lisp/epg.el
index fdcd0cbdc70e07b41ea18a7bb211ba5f78face0c..e4bd257d0e46421f27fd31d2219838ef7611a05f 100644 (file)
--- a/lisp/epg.el
+++ b/lisp/epg.el
@@ -4,6 +4,7 @@
 
 ;; Author: Daiki Ueno <ueno@unixuser.org>
 ;; Keywords: PGP, GnuPG
+;; Version: 1.0.0
 
 ;; This file is part of GNU Emacs.
 
@@ -137,7 +138,8 @@
   '((?e . encrypt)
     (?s . sign)
     (?c . certify)
-    (?a . authentication)))
+    (?a . authentication)
+    (?D . disabled)))
 
 (defvar epg-new-signature-type-alist
   '((?D . detached)