Mercurial > emacs
changeset 100175:be17c10d7381
(epa--show-key): Use past tense of "expire" if the key
has already been expired. Thanks to Peter BARABAS.
| author | Daiki Ueno <ueno@unixuser.org> |
|---|---|
| date | Wed, 03 Dec 2008 06:16:18 +0000 |
| parents | 8c996aad13cc |
| children | 5706ca7c3d02 |
| files | lisp/ChangeLog lisp/epa.el |
| diffstat | 2 files changed, 10 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Wed Dec 03 05:54:27 2008 +0000 +++ b/lisp/ChangeLog Wed Dec 03 06:16:18 2008 +0000 @@ -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:
--- a/lisp/epa.el Wed Dec 03 05:54:27 2008 +0000 +++ b/lisp/epa.el Wed Dec 03 06:16:18 2008 +0000 @@ -586,7 +586,11 @@ (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