summaryrefslogtreecommitdiff
path: root/lisp/epa.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/epa.el')
-rw-r--r--lisp/epa.el6
1 files changed, 5 insertions, 1 deletions
diff --git a/lisp/epa.el b/lisp/epa.el
index 0f8f25206da..23dfeadcecf 100644
--- a/lisp/epa.el
+++ b/lisp/epa.el
@@ -586,7 +586,11 @@ If SECRET is non-nil, list secret keys instead of public keys."
(epg-sub-key-creation-time (car pointer)))
(error "????-??-??"))
(if (epg-sub-key-expiration-time (car pointer))
- (format "\n\tExpires: %s"
+ (format (if (time-less-p (current-time)
+ (epg-sub-key-expiration-time
+ (car pointer)))
+ "\n\tExpires: %s"
+ "\n\tExpired: %s")
(condition-case nil
(format-time-string "%Y-%m-%d"
(epg-sub-key-expiration-time