* epg-package-info.el.in (epg-bug-report-address): New constant.

[elisp/epg.git] / epa.el

diff --git a/epa.el b/epa.el
index 5442f23..8c7305b 100644 (file)
--- a/epa.el
+++ b/epa.el
@@ -156,18 +156,16 @@ the separate window."
     (full . epa-validity-high)
     (ultimate . epa-validity-high))
   "An alist mapping validity values to faces."
-  :type 'list
+  :type '(repeat (cons symbol face))
   :group 'epa)
 
-(defcustom epa-font-lock-keywords
+(defvar epa-font-lock-keywords
   '(("^\\*"
      (0 'epa-mark))
     ("^\t\\([^\t:]+:\\)[ \t]*\\(.*\\)$"
      (1 'epa-field-name)
      (2 'epa-field-body)))
-  "Default expressions to addon in epa-mode."
-  :type '(repeat (list string))
-  :group 'epa)
+  "Default expressions to addon in epa-mode.")
 
 (defconst epa-pubkey-algorithm-letter-alist
   '((1 . ?R)
@@ -573,13 +571,17 @@ If SECRET is non-nil, list secret keys instead of public keys."
              (cdr (assq (epg-sub-key-algorithm (car pointer))
                         epg-pubkey-algorithm-alist))
              "\n\tCreated: "
-             (format-time-string "%Y-%m-%d"
-                                 (epg-sub-key-creation-time (car pointer)))
+             (condition-case nil
+                 (format-time-string "%Y-%m-%d"
+                                     (epg-sub-key-creation-time (car pointer)))
+               (error "????-??-??"))
              (if (epg-sub-key-expiration-time (car pointer))
                  (format "\n\tExpires: %s"
-                         (format-time-string "%Y-%m-%d"
-                                             (epg-sub-key-expiration-time
-                                              (car pointer))))
+                         (condition-case nil
+                             (format-time-string "%Y-%m-%d"
+                                                 (epg-sub-key-expiration-time
+                                                  (car pointer)))
+                           (error "????-??-??")))
                "")
              "\n\tCapabilities: "
              (mapconcat #'symbol-name