diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/epa.el | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c0a55b4aa48..21f805ed537 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2008-12-03 Daiki Ueno <ueno@unixuser.org> + + * epa.el (epa--show-key): Use past tense of "expire" if the key + has already been expired. Thanks to Peter BARABAS. + 2008-12-03 Lute Kamstra <lute@gnu.org> * align.el: 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 |