Mercurial > emacs

diff lisp/epa.el @ 100175:be17c10d7381

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(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 73388588c9b4
children a9dc0e7c3f2b
line wrap: on
line diff
--- 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